Commit Graph
14724 Commits
Author SHA1 Message Date
Erwan de Ferrieres aff44ccb2f Removing "Réf" from some French uiLabels and adding new ones
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936370 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 15:53:06 +00:00
Ashish Vijaywargiya 7b0b6d9a95 Applied patch from jira issue OFBIZ-3735 - Added defaultSequenceNum field for sort order in makeCategoryFeatureLists method for ParametricSearch.
Description of the work:
Added defaultSequenceNum field for sort order in makeCategoryFeatureLists method for ParametricSearch.java.
If user want to display product feature in specific order for advanced search so this could be done through defaultSequenceNum. Currently product feature sort only basis of description in makeCategoryFeatureLists method.So if user set defaultSequenceNum field for ProductFeature, then productFeature can not sequence according to defaultSequenceNum for advanced search.
After adding defaultSequenceNum field in sort order, ProductFeature now also sort with respect to defaultSequenceNum. 

Thanks Deepak & Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936296 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 13:29:08 +00:00
Ashish Vijaywargiya 51cbf6993d Adding statusId optional input parameter in createOrderPaymentPreference service.
Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936260 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 11:35:55 +00:00
Ashish Vijaywargiya a9d1a7a8f5 Applied patch from jira issue: OFBIZ-3633 - Minimum order quantity.
It will work as follows;
We will set the special type price as 'MINIMUM_ORDER_PRICE' for a Product in ProductPrice entity. On the basis of it we will get the minimum order quantity of the product on the basis of this price and sale price.
Will get the minimum order quantity for product by division. For example we have selling price of product P1 is $10.00 and its MINIMUM_ORDER_PRICE is $100.00 then minimum order quantity for the product will be --> 100/10 ==> 10.

To achieve the above ;
write a getMinimumOrderQuantity() method in ShoppingCart.java which takes the itemBasePrice and productId as in parameter, and call it where we add, update the cart items and change the quantity to minmumOrderQuantity if it is less then minimum.

Thanks Deepak & Rishi for the contribution and others for providing valuable comments / suggestions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936228 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 09:36:40 +00:00
Jacques Le Roux d8515b0d03 The recent CSS changes had an impact on clearText position.
I quickly commit but if I had enough time I would prefer to put the style as a class in the themes CSS files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936175 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 06:50:16 +00:00
Hans Bakker 4b1e6c5fad corrected sequence generator
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936154 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 04:19:22 +00:00
Adam Heath ceb3fad391 Add a releaseDate to a product, mostly informational, intended to mean
when the product was first assembled for purchase, or, for books, when
it was published initially.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936100 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 22:46:14 +00:00
Adam Heath 53dd5cc4eb interfaceProductPromoAction.cartItemModifyException needs to be
optional.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936099 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 22:46:05 +00:00
Adam Heath 3bd6e61b99 Make casing of Sales Discontinuation Thru Date consistent.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936098 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 22:46:00 +00:00
Jacques Le Roux 76afdc5fa2 A patch from Sascha Rodekamp related to "The minimize/enlarge buttons (+ -) blocks the layer" (https://issues.apache.org/jira/browse/OFBIZ-3692) - OFBIZ-3692
This patch fixes also some issues with buttons inside lookups not showing. However the main reason is still not fixed in the case of lookup rendered from FTL files

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936008 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 17:31:15 +00:00
Jacopo Cappellato 28b3d7ee19 Patch from Bob Morley, OFBIZ-3724: when a ProductionRun was created the WorkEffortCostCalc relations were not cloned from the routing tasks. This resulted in not being able to change the CostCalc as part of a ProductionRun unless you were to change the routing task template for all production runs. –
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935969 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 15:55:27 +00:00
Erwan de Ferrieres 6f2642a5dd Adding a whole set of generic portlets. Those are more designed to be customised
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935923 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:57:26 +00:00
Jacques Le Roux 84df06abef A patch from Sascha Rodekamp related to "Pagination in Layered Lookups" (https://issues.apache.org/jira/browse/OFBIZ-3726) - OFBIZ-3726
The pagination in the layered lookups was broken because of a previous patch. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935904 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:23:40 +00:00
Erwan de Ferrieres a290ba895d misc. corrections on portal :
* when editing a portlet, getting the previous values
* displaying portlets with the right order
* portletId was not retrieved in showPortlet

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935898 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:04:17 +00:00
Erwan de Ferrieres 6f83531f2e Modifying French uiLabels to have them shorter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935892 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 12:29:09 +00:00
Erwan de Ferrieres 72d261af4b Buttons at the bottom of an list weren't working
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935891 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 12:22:25 +00:00
Ashish Vijaywargiya 9712434557 Applied patch from jira issue: OFBIZ-3719 - Include DOCTYPE at the begining of CMS driven html page.
Description of work:
Include DOCTYPE at the begining of html pages, that are render through cms.
Currently DOCTYPE is included in HtmlHead.ftl for cms.
By doing so the DOCT YPE is always included on the top of the page before rendering single HTML statement.

Thanks Deepak & Rishi for the contribution and Scott for the comments.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935886 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 12:03:21 +00:00
Jacques Le Roux c064f81282 A patch from Luís Alfredo Harriss Maranesi "Brazilian Portuguese Translation for Manufacturing" (https://issues.apache.org/jira/browse/OFBIZ-3725) - OFBIZ-3725
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935880 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 11:45:35 +00:00
Jacques Le Roux f66aeda383 Fix 2 labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935879 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 11:43:16 +00:00
Scott Gray 1fb82378eb At some point the behavior of initEntityEcaHandler() was changed so that a new handler wasn't inititated if the delegator already had one. The broke the test delegator because it requires a new handler be created for it rather than inherit the one provided by the delegator that it cloned. Worked around by setting the handler to null on the while making the test delegator before calling initEntityEcaHandler().
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935870 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 11:10:45 +00:00
Scott Gray a3837cdcd2 Fix a problem reported by Bob Morley in OFBIZ-3663. When a delegator is cloned during test execution then the test mode isn't inherited by the new delegator and subsequently any changes made by that delegator are not tracked for rollback. Fixed by setting the testMode of the new delegator to match that of the one being cloned.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935869 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 11:10:34 +00:00
Bilgin Ismet Ibryam 8e26a2b0e9 Updated the descriptions of some TemporalExpressions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935695 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 18:27:08 +00:00
Andrew Zeneski d581e1f823 text-find can also include 'numeric' fields; added lessThan, greaterThan options to the schema (code support was already there)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935687 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 18:00:24 +00:00
Bilgin Ismet Ibryam 524e0f300e Added autocompleter to LookupContactList and LookupPreferredContactMech screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935657 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 16:34:09 +00:00
Bilgin Ismet Ibryam 667e52e947 Fixed lookup descriptions, which got broken after changes in the generated html.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935644 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 16:04:30 +00:00
Jacopo Cappellato 9f49ca16f7 Added ofbizHome to the path to fop.xconf (user config file) for consistency with the url for font.base set later in this method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935615 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 15:18:35 +00:00
Jacopo Cappellato 9fa32439f0 Fixed wrong labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935591 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 14:22:02 +00:00
Jacques Le Roux 4cd873d37c A slightly modified "only one lookup decorator" patch from Sascha Rodekamp related to "Replace popup lookups by layer lookups" (https://issues.apache.org/jira/browse/OFBIZ-3442) - OFBIZ-3442
Merge the 2 lookup decorators in only one and dynamically adapt the rendered content

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935578 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 14:03:41 +00:00
Ashish Vijaywargiya dee58397d9 Applied patch from jira issue OFBIZ-3717 - Cancel items should not displays on receive inventory of PO.
Thanks Arun & Pranay for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935497 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 09:43:58 +00:00
Jacques Le Roux 246b3f1395 Fix a bug reported by Blas Rodriguez Somoza: "Error in screen Accounting->Tax Authorities->Edit->GL Accounts" at https://issues.apache.org/jira/browse/OFBIZ-3714 - OFBIZ-3714
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935494 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 09:38:42 +00:00
Jacques Le Roux a5da982794 A patch from Bob Morley "Resolve java warnings exposed in Eclipse (Product part of OFBIZ-3100)" https://issues.apache.org/jira/browse/OFBIZ-3587 - OFBIZ-3587
Medium set of changes; most very trivial (adding suppress serial, filling in Collection generics signature, removing or commenting out unused variables, etc.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935487 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 09:23:10 +00:00
Hans Bakker e1035e1c0d fixed error when open export product listing screen in ebaystore component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935455 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 05:40:46 +00:00
Scott Gray 63e75ce253 Fixed wrong class name, reported by Blas Rodriguez Somoza in OBIZ-3715
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935434 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 01:32:56 +00:00
Scott Gray 11ab7cdeac Fix bad variable reference, reported by Blas Rodriguez Somoza in OFBIZ-3713
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935432 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 01:23:08 +00:00
Scott Gray 911a066540 Added missing import. Fixes bug report by Blas Rodriguez Somoza in OFBIZ-3712.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935403 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 20:20:54 +00:00
Scott Gray 1a0df2ec7c As it turns out, Groovy's List.first() method doesn't quite behave as I'd assumed. Fixes bug report by Blas Rodriguez Somoza in OFBIZ-3711.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935402 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 20:20:41 +00:00
Scott Gray fbd346436a Replaced some commas with colons, fixes bug reported by Blas Rodriguez Somoza in OFBIZ-3710
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935401 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 20:20:14 +00:00
Bilgin Ismet Ibryam 1562b0a308 Added description field to TemporalExpression entity and related data plus forms. Part of https://issues.apache.org/jira/browse/OFBIZ-3521
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935387 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:41:20 +00:00
Adam Heath e3b9b75242 Don't create a temporary string to hold the digestChars.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935383 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:59 +00:00
Adam Heath 7f439d2b60 Remove duplicate OrderItem relation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935382 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:53 +00:00
Adam Heath 95949ff2b7 Add <test-jar> macro.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935381 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:47 +00:00
Adam Heath f2bfef6274 Create a main-jar macro.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935380 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:37 +00:00
Adam Heath 8724fdcba5 Don't define a fileset; instead separately define the extra source
selector, and the dir to scan.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935379 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:30 +00:00
Adam Heath 6e22a55e8b s/_src-extra-set/src-extra-files/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935378 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:25 +00:00
Adam Heath 8c3916223c In _src-extra-set, convert the implicit patternset list to a nested <or>
selector.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935377 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:21 +00:00
Adam Heath 0cea5e14c1 With <if> always available, _src-extra-set can be defined at the
top-level, without having to wait until some target is run.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935376 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:16 +00:00
Adam Heath e4e3b3a92d Always define the <if> task, not just after init has been called.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935375 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:12 +00:00
Adam Heath f4d16eb03c Fix name property.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935374 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:03:07 +00:00
Adrian Crum 70f5bc5ea7 Fixed a bug in TimeDuration.java. Added test for same.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935372 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 17:52:01 +00:00
Adrian Crum 52f2ba2b1f Fixed a bug in ComparableRange.equals method, added test for same.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935371 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 17:39:22 +00:00