Commit Graph
12781 Commits
Author SHA1 Message Date
Jacques Le Roux a3b3d8623f A simple fix to avoid NPE in grovvy scripts, from Jeremy Wickersheimer at "Possible NPE in security check" (https://issues.apache.org/jira/browse/OFBIZ-3160) - OFBIZ-3160
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835161 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:38:05 +00:00
Adrian Crum 3fe7e1f03e Oops, I forgot to include one of the Converter collections in my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835159 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:29:21 +00:00
Adam Heath f949f92e57 Create runtime/uploads correctly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835108 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 22:40:51 +00:00
Jacques Le Roux 17fc22e958 A patch from André Herbst "Danish translations for ContentErrorUiLabels" (https://issues.apache.org/jira/browse/OFBIZ-3185) - OFBIZ-3185
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835105 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 22:28:42 +00:00
Jacques Le Roux 36823d499a A patch from André Herbst "Danish translations for ContentUiLabels" (https://issues.apache.org/jira/browse/OFBIZ-3182) - OFBIZ-3182
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 22:27:15 +00:00
Adam Heath 7e450f6235 Create runtime/uploads correctly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835092 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 21:58:58 +00:00
Bilgin Ismet Ibryam 108bcc056e Fixed rendering of image elements inside link elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835081 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 21:38:16 +00:00
Adam Heath 86872afc45 Handle runtime/tempfiles not existing; it's an empty folder, so some
revision control systems don't handle that case, and never create it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835074 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 21:20:02 +00:00
Anil Patel 310ef32b14 Fixed type reported by Adam, also changed event from focus to onChange.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835038 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 19:58:04 +00:00
Adrian Crum a55f49fce5 More improvements to the conversion framework, plus bug fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835032 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 19:35:34 +00:00
Adrian Crum ae236a6b7d Conversion framework improvements, fixed bugs reported on mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834978 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 17:45:33 +00:00
Jacques Le Roux c288cd7627 Correct French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834935 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 16:09:43 +00:00
Jacopo Cappellato 0d3c666044 Added "invoice term" block to invoice PDF.
Slightly adjusted the layout of the "orders" block.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834836 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 10:37:14 +00:00
Hans Bakker 0eb91e3a02 intenationalization problem reported by jacopo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834835 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 10:36:29 +00:00
Hans Bakker 3872ac44e9 typo reported by jeremy
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834825 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 10:02:18 +00:00
Hans Bakker 0ba134f8e3 typo: '.xml' forgotten
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834824 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 09:58:29 +00:00
Hans Bakker bf3790cc50 ordered and itemized list now possible in the help screens and works in all three themes, see for an example in the example help screens: OFBIZ-3170 provided patch partly implemented
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834823 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 09:50:01 +00:00
Hans Bakker b7d6914ced add purchase orderlist portlet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834800 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 08:17:15 +00:00
Jacques Le Roux 4a019210e3 Some better log info. Related to OFBIZ-487 which was actually already in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834793 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 07:50:56 +00:00
Anil Patel ca9ba906dd use has_content to check if text parameter has any value
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834748 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 03:13:35 +00:00
Adrian Crum 7ec17ed148 Some work on CachedClassLoader.java. Fixed non-thread-safe code, converted HashMap and HashSet to Javolution classes, added a registerClass method, and simplified the Init interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834727 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 00:39:44 +00:00
Anil Patel 10defe6957 Adding a view to fetch data from Payment Group Member, Payment and FinAccountTrans entities.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834715 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 23:53:23 +00:00
Anil Patel 0ef1031b3c Reorganized acctgtransentry form into two columns. removed attribute setting that don't apply to single type form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834689 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 21:45:55 +00:00
Adrian Crum 2f53c75789 Revert unintended change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 21:08:31 +00:00
Anil Patel 90492f6f54 updated menu name to simple and generic. Updated screens using it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834623 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 19:33:57 +00:00
Anil Patel 1e602479e8 Added style to paymentgroupmembers list header.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834620 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 19:24:23 +00:00
Adrian Crum b4d02def78 Modified ObjectType.java to use only the new conversion framework.
This change can be reverted if any major issues come up. I will monitor the dev mailing list and fix any issues that are reported.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834552 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:18:34 +00:00
Adrian Crum 3fcdc998af Minor improvements to the new object type Converters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:14:58 +00:00
Jacques Le Roux 4ec0dddba6 A partial patch from Amit Sharma "Improvement in input validation of 1st step (shopping cart) on onePageCheckout page." (https://issues.apache.org/jira/browse/OFBIZ-3098) - OFBIZ-3098
A common label, complete r834493

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834527 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 16:20:53 +00:00
Ashish Vijaywargiya 9752748bf4 Applied patch from jira issue: OFBIZ-3098 - Improvement in input validation of 1st step (shopping cart) on onePageCheckout page.
On onePageCheckout page in Shopping Cart(step1), if we enter any character(not numeric value) in quantity text box, then this text box become empty and show 'required' validation message, It should show "Please enter a valid number in this field."

Step to reproduce:-
1) Add item in cart.
2) Move on onePageCheckout page.
3) Enter any character in item quantity text box.
4) Then it show validation message "required".

Thanks Amit and Rohit for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834493 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 15:14:14 +00:00
Jacopo Cappellato 0deb15a7b0 Misc enhancements and cleanups to the invoice PDF report:
1) xsl-fo layout cleanup
2) suppressed the invoiceItemSeqId field from the output document
3) there are now two separate invoice item layouts for the items and and adjustments
4) improved code to retrieve the bill-to-party tax id, required by VAT rules only: now the tax id is retrieved only if in the invoice there are taxes of type VAT_TAX
5) added shipment date if available
6) as required by EU rules for VAT taxes, if there are VAT taxes in the invoice, then a break-down of the VAT amount payable per VAT rate is displayed at the bottom of the invoice

Now most of the mandatory information required by EU/VAT countries as described here:

http://ec.europa.eu/taxation_customs/taxation/vat/traders/invoicing_rules/article_1733_en.htm

are implemented.
Important: the information that are not relevant for "sales tax" invoices (e.g. US invoices) are not rendered if VAT taxes are not available in the invoice.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834486 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:49:44 +00:00
Ashish Vijaywargiya d48eee6986 Applied patch from jira issue OFBIZ-3173 - Better supportability for products of type MARKETING_PKG_AUTO in order processing and fulfillment process.
Following points are covered in this patch:
1) Show associated products for product of type "MARKETING_PKG_AUTO" on order items section of show cart page in order manager application.

2) Marketing packages should only shown backordered when ATP of product which compose Marketing packages product are less than quantity added in cart.

3) Pick sheets should show Products of type Marketing Packages along with the products which compose Marketing Packages.

4) Show link of production run created on order items section of Order detail page while placing order for product of type MARKETING_PKG_AUTO.

5) Product of type Marketing Packages should be shown on Verify Pick Screen along with Products they are composed of.

Thanks Divesh for the contribution - this is very nice addition to the trunk.
I would be more then happy to see comments / concern from - Jacopo? Scott? Anil? or others?

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834479 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:32:53 +00:00
Ashish Vijaywargiya c8b6576edd Applied fix from jira issue OFBIZ-3158 - Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
The last implementation was blocking Quick Ship Entire order processing.
Thanks Ratnesh for reporting the bug and Arun for quick fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834473 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 14:14:52 +00:00
Jacques Le Roux 107acdde60 I prefer to revert as it's not needed anymore since r834444. I had an intuitive feeling that something was wrong, and forgot to check :( Thanks to Todor it's ok!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834447 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 12:16:43 +00:00
Jacques Le Roux c8372e6329 Fix bugs I introduced at r833725 converting while loops to enhanced for loops, thanks to Todor Spasov on dev ML.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834444 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 12:01:37 +00:00
Jacopo Cappellato 2be4c4f4a3 Added new Tax Authority Rate Type for "VAT" taxes.
Reorganized all the invoice item adjustment types so that now they all share the same parent type INVOICE_ADJ; this change is backward compatible because the type id are not modified and I have simply added new parent types.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834429 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 11:10:45 +00:00
Ashish Vijaywargiya 28f12bc714 Applied patch from jira issue OFBIZ-3158 - Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
Following points are covered in this implementation:

1) Send item shipped request from OFBiz to Google in a collection instead of sending multiple request for each item shipped.
2) Also show limitation messages for Google orders, while updating manual adjustments from order detail page.

Thanks Pranay / Arun  for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834385 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:37:40 +00:00
Hans Bakker 96d54615ca removed default-option='contains' because now set from widget.properties which is the current default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834379 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 08:12:45 +00:00
Anil Patel 52e7a3ad66 Removed extra container around labels. Apply h1 (or h2, h3) style to label instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834376 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:38:24 +00:00
Hans Bakker 14c0c8dcda help general index cleanedup, started first features list but need 'orderedlist' docbook tag for that
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834369 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:17:17 +00:00
Anil Patel a1f28554e0 Adding description to company credit card demo data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834361 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 06:24:31 +00:00
Anil Patel f20d6df304 Moved call to getPartyAccountingPreferences from PartyAcctgPreference screen to form. This is much more flexible.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834359 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 06:07:21 +00:00
Anil Patel 330c88d9e9 Arranged AcctgTrans view in two columns. Corrected spelling for productId.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834334 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 04:18:44 +00:00
Anil Patel 3a26508dea Reformatting, no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834327 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 03:34:52 +00:00
Hans Bakker ef81fd35ac HR help screens contribution by Sharan OFBIZ-2219
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834326 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 03:32:46 +00:00
Anil Patel cf19810478 removed field-group. Form is looking lot better without them.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834324 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 03:31:32 +00:00
Anil Patel c5b51f17e8 Fix duplicate fk-name error.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834313 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 02:52:07 +00:00
Scott Gray 74752fb02d Removed some strange code that was attempting to work out the next sub-sequence id but was doing it incorrectly, replaced with the operation make-next-seq-id which was built for this purpose
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834282 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 23:56:13 +00:00
Scott Gray 48f5472639 Instead of parsing a default string of "0.00" into a BigDecimal just assign BigDecimal.ZERO
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834274 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 23:01:34 +00:00
Bruno Busco d6135debae Reverted change 826379 to OrderEntryOrderScreens.xml because this introduced a bug reported by matthieu bollot in https://issues.apache.org/jira/browse/OFBIZ-3179
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834261 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 22:35:04 +00:00