Commit Graph
12781 Commits
Author SHA1 Message Date
Jacques Le Roux 94fe299ddf Close "Replace all "0.00" in java code, notably to allow passing different decimals lenghtes" (https://issues.apache.org/jira/browse/OFBIZ-3200) - OFBIZ-3200
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836153 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 11:01:08 +00:00
Scott Gray ca9d5f0b73 Use label for radio input text
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836146 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 08:56:38 +00:00
Bruno Busco 1bba0e374e Moved TabBar menus to tabbar decorator-section for Invoices and Payments screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836143 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 08:41:35 +00:00
Jacques Le Roux ffdbca925e A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - webapp" (https://issues.apache.org/jira/browse/OFBIZ-3116) - OFBIZ-3116
With few changes notably an enhanced for loop instead of while iterator and


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836141 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 08:29:42 +00:00
Bruno Busco 33b6e17262 Moved TabBar menus to tabbar decorator-section for the order application
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836137 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 07:45:47 +00:00
Bruno Busco eaec84df6d Fixed submenu not visible issue reported by Jacques in the ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836136 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 07:43:26 +00:00
Scott Gray e5284279c5 Fix test case that wasn't being specific enough when looking up AcctgTransEntries for assertions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836135 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 07:39:56 +00:00
Ashish Vijaywargiya bd608a43ce Fixed Typo - patch from Sumit Pandit (Thanks!)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836130 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 06:35:52 +00:00
Ashish Vijaywargiya 65eb607948 Applied patch from jira issue OFBIZ-3197 - Batch payment issue.
On cancelling a payment batch (payment group), payment group members (payments) should available for any another batch. Currently it is not happening.

Proposed solution -
Payment Batches are created by assigning of Payments to FinAccount. In batching FinAccountTrans record is created and then it is assigned to Payment. So on cancelling payment batch if FinAccountTrans status set to cancel. And then association of Payment to FinAccount break and it will available for another batch.

Thanks Sumit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836129 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 06:10:47 +00:00
Ashish Vijaywargiya b64228fab1 Applying patch from Sumit Pandit - Better UiLabels.
Thanks Sumit!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836128 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 05:53:38 +00:00
Adam Heath 14c9b6f7f4 Support complex aliases now. Note, that string default values do not
work corretly, and ModelViewEntity does not do any encoding of the
value, and this parser doesn't handle that.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836088 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 01:15:56 +00:00
Adam Heath 6003fb0cf5 Helper method to add several complex alias members.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836086 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 01:14:49 +00:00
Adam Heath 8be78c2804 Add aggregate function support for field definitions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836073 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 00:13:09 +00:00
Scott Gray 64c38ffcc3 Removed anonymous password from the example assert data test since it was removed from the seed data in r829464, the test now passes again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836051 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 23:04:34 +00:00
Jacques Le Roux 5fc931c191 A patch from Bruno Busco "A new droppingcrumbs theme" (https://issues.apache.org/jira/browse/OFBIZ-3156) - OFBIZ-3156
An updated patch to be used to show correctly the tabbars with this theme.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836044 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:47:44 +00:00
Bruno Busco 5899644275 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836021 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:15:03 +00:00
Bruno Busco ae1b45b940 Added a new Visual Theme for back-office applications
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836017 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:01:41 +00:00
Jacques Le Roux 2e4130844b commons-dbcp-1.3-20091113-r835956 .jar replaces commons-dbcp-1.3-20080708-r674758.jar
Built directly from DBCP trunk. Compiles with jdk 1.5 and 1.6 as well, runs also with both

An initiative from Philippe Mouawad at "Memory leak due to transaction management" (https://issues.apache.org/jira/browse/OFBIZ-2599) - OFBIZ-2599

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836015 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:00:12 +00:00
Scott Gray 7b7b1047d5 Might as well add what I learned to the service description
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836007 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 21:44:53 +00:00
Scott Gray 4a8a276f18 Fixed incorrect field mapping
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836004 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 21:32:58 +00:00
Scott Gray 30d0225a03 Improved exception message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835993 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 21:19:12 +00:00
Adam Heath d17a8bf5c6 Make AND have a higher priority than OR.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835938 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:44:44 +00:00
Adam Heath 8bafb94b7e Implement list values, and handle between(needed to be special cased).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835934 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:28:35 +00:00
Adam Heath cc340041ce Implement relations in xml output.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835933 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:27:29 +00:00
Jacopo Cappellato 40dc7cd9ab Replaced hardcoded value for view size in pagination macro with the viewSize variable.
Thanks to Divesh Dutta for the patch, OFBIZ-3194

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835925 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:12:52 +00:00
Ashish Vijaywargiya 76c426670d Applied patch from jira issue OFBIZ-2984 - HTML cleanup for Product Detail page.
In this patch table are removed for non tabular data and used div, and add CSS code for layout issue that created due to this cleanup.

Thanks Rohit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835861 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 14:38:35 +00:00
Jacques Le Roux 03ac565c90 No functional changes just a clean-up : no intermediate var is needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835851 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 14:01:47 +00:00
Jacques Le Roux 21d20c1949 A patch from André Herbst "Danish translations for ContentUiLabels" (https://issues.apache.org/jira/browse/OFBIZ-3191) - OFBIZ-3191
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835850 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 13:59:56 +00:00
Jacques Le Roux 6e89a069e7 Revert r835394 (DBCP upgrade, issue compiling with jdk 1.5 OOTB)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835801 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 10:28:29 +00:00
Adam Heath b33013c644 Add shorthand for keymap lists, making use of "USING".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835792 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:47:58 +00:00
Adam Heath c1a71d6eb0 Example of relations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835790 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:35:52 +00:00
Adam Heath 60c9b07217 Send the debug to the browser, instead of the console.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835789 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:35:33 +00:00
Adam Heath 4a141e10fe Add <TYPE> to NamePart(); the other words should also be added here.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835787 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:21:41 +00:00
Adam Heath 38d0d601ba Add relation support. Not fully correct, as one-nofk is not yet
supported, because of the '-' in the name.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835786 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:20:15 +00:00
Adam Heath a4a9095e69 Fix creation when title=null.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835785 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:18:17 +00:00
Adam Heath 1b52e470c8 Fix compile error with ant-nodeps.jar not being available globally.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835774 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 08:32:05 +00:00
Adam Heath d5c53231e9 Inline AllField and FieldDef, which lets LOOKAHEAD be removed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835768 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:47:04 +00:00
Adam Heath d8d6b957e4 More example usage, shows condition parsing, and makes use of more
sql syntax.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835765 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:24:41 +00:00
Adam Heath 8c84c6c554 Methods to convert dynamic views back to xml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835764 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:20:15 +00:00
Adam Heath eace82a28c Fix KeyMaps(), duplicate keymap in the returned list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835762 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:15:20 +00:00
Adam Heath 4cfae426e4 Create a method to parse stand-alone conditions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835748 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 05:39:11 +00:00
Adam Heath dc56406606 Support sub conditions with ().
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835747 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 05:38:18 +00:00
Adam Heath c8f1e223c8 No longer use jjtree to implement parsing. As a consequence of this,
SQLSelect no longer depended on Parser, so javac wouldn't compile the
generated code.  SQLUtil was added to deal with this(this class will
get more helpers later).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835741 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:55:55 +00:00
Scott Gray 9acbeadad8 During invoiceServiceItems check to make sure each item hasn't already been invoiced before sending it off to createInvoiceForOrder, fixes OFBIZ-3084 reported by Jacques Le Roux
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835738 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:48:51 +00:00
Anil Patel 1aef6f7dae Show reconciliation status on finaccount reconciliation screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835734 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:22:12 +00:00
Adam Heath 65b2182293 Implement ORDER BY and GROUP BY; also, multiple joins work now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:08:59 +00:00
Scott Gray b26b845b4b If we only have an OrderItem to work with when creating an InvoiceItem then take the cancelled and already invoiced quantities into account, the start of a fix for OFBIZ-3084
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835730 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:07:26 +00:00
Adam Heath 4e69fb0764 Allow for setting groupBy fields with just a simple list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835729 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 03:59:34 +00:00
Scott Gray 6ce844153f Ouch, forgot to build before committing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835723 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 03:32:22 +00:00
Scott Gray 5393179c4e Generics markup
Replace ArrayList with FastList
Removed a couple of redundant null checks
No functional changes

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835719 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 03:14:59 +00:00