Commit Graph
2012 Commits
Author SHA1 Message Date
Jacques Le Roux a941c13879 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885140 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 19:42:43 +00:00
Jacques Le Roux 9b5c289ab0 More uses of is(Not)Empty (certainly last)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885116 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 17:19:33 +00:00
Jacques Le Roux e07ab48fb4 Some cleaning related to is(Not)Empty
* remove duplicate ()
* remove casts no longer needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885103 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 15:46:52 +00:00
Vikas Mayur aeda03e7c9 Its better to show description instead of ID.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885094 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 14:17:50 +00:00
Jacques Le Roux 569a4afeea Some cleaning related to isEmpty
* remove duplicate ()
* remove casts no longer needed

I'm doing these last tasks around isEmpty and isNotEmpty mostly to be sure that nothing has slipped in. Despite I have been very careful, I prefer double check.

+ one typo in ofbizSelenium help (not sure this file is used yet though, seems to be missing some parts which are commented out, for now I guess)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885093 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 14:08:16 +00:00
Jacques Le Roux 2777b83223 Fix r885091 where isNotEmpty has been used by error instead of isEmpty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885092 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 13:59:45 +00:00
Jacques Le Roux 5d4b9b5982 More uses of isEmpty(expr) instead of (expr == null) || (expr.size() == 0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885091 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 13:31:52 +00:00
Ashish Vijaywargiya f93a26c26b Applied patch from jira issue OFBIZ-3264 - OFBiz Change cart item price according to the price role.
Working Area: OnePageCheckout >> ShoppingCart.

Change minicart item price according to the price rule that will change according to the item quantity.
A product have different price as following:
A product feature contain different price rule with different condition for action like
1 product ---> Price $10.00
50 product ----> Price $8.00 (productPriceAction.amount = "-20.0" with productPriceActionTypeId="PRICE_POL").
If we change the quantity on shoppincart in OnePageCheckout the item price is not reflecting in the cart.

For this we need to add an out item price from getShoppingCartData service so that we can update value in the OnePageCheckout shoppingcart.

Thanks Brajesh & Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884780 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 08:24:16 +00:00
Jacques Le Roux 70d7a15dfb Partially fix an issue I discussed with Akash on dev ML on how to format decimals in prices
* Mostly parameterize UtilFormatOut.formatPrice() from general.properties
* I removed unused currency.decimal.format calls in CheckOutEvents class
* Also removed unused priceNumberFormat in UtilFormatOut class

Still have to fix 11 harcoded  "##0.00" in ftl files using ofbizCurrency 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884023 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 10:43:09 +00:00
Ashish Vijaywargiya d0929dde7d Lookup form will not show values by default it will show resultant list only on clicking Lookup button on the lookup form.
Thanks Akash for the contribution.
Special thanks to Pranay for commenting to do this improvement.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883700 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 14:16:10 +00:00
Hans Bakker 029dee7381 added the warehouse processing for the ordersales entities. Contribution by our Antwebsystems employee Tom
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883699 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 14:07:47 +00:00
Jacopo Cappellato 1cc8ea400a Fixed entity definition for new olap entities in the order component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883645 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 10:23:33 +00:00
Jacques Le Roux c72b29cb1f Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 4e0d303e06 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.length == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883507 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 21:42:18 +00:00
Jacques Le Roux 8ae9319710 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883492 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 20:34:27 +00:00
Ashish Vijaywargiya 6449e9e2c0 Applied patch from Akash Jain.
Order Lookup is not working properly for Receive Inventory process.

Steps to reproduce :-

(1) Hit url
https://demo.ofbiz.org/facility/control/ReceiveInventory?facilityId=WebStoreWarehouse 
(2) Depress Lookup for Purchase Order Number. 
(3) First time it works proper there is shown list of purchase orders properly. 
(4) Depress LOOKUP button, now there is no purchase order in the result. 

Thanks Scott & Rishi for jumping in b/w and providing your useful comments on it.
For more details please refer: http://markmail.org/message/qrgrlpyk24f4jipy?q=Order+Lookup+is+not+working+properly+for+Receive+Inventory

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883328 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 13:02:51 +00:00
Hans Bakker 8142ef2fdc show communication even screens within in the communication portlet avoiding having required decorators.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883323 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 12:45:36 +00:00
Adam Heath 820d11eb97 Deprecate UtilCache constructors, and add a create helper function.
This is the first step to making utilCacheTable concurrent, and
non-blocking.  To do so, the constructor has to have no side-effects.
This means it can't modify utilCacheTable itself; this will be moved to
the helper function created above.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:56:28 +00:00
Hans Bakker f8e9df50f0 A first proposal open for comments of the order OLAP entities. secas and initial load are on the way and implemeted following the same pattern as Jacopo's accounting entities
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883034 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 04:37:27 +00:00
Bruno Busco aee9b7b437 Moved some application labels out of the framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 21:50:31 +00:00
Ashish Vijaywargiya 3b245ade90 In case of variant product it returns NPE while calculating purchase price and base price is not been set or we can say data is not prepared for it.
Thanks Amit for your help.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882644 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 17:16:20 +00:00
Ashish Vijaywargiya 9ae56f1ef1 Minor correction for service name - Thanks Amit for reporting the issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882641 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 17:01:37 +00:00
Ashish Vijaywargiya 70548f0b98 Applied patch from jira issue OFBIZ-3077 - Error for productStoreId when click on productId link from showcart of purchase order.
Steps regenerate error:
1) Hit url: https://localhost:8443/ordermgr/control/orderentry
2) Select purchase order with supplier
3) Add product for order
4) Click on the productId from showcart page

it will generate error as following
org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productdetail: java.lang.NullPointerException: Cannot get property 'productStoreId' on null object (Cannot get property 'productStoreId' on null object)

Notes from Mridul:
As Joe has already stated that we need to do few adjustments in the code based on presence of productStoreId. I would vote for:

   1. Showing all reviews.
   2. Skipping surveys.

The third section, which is the most important one and needs productStoreId is getProductVariantTree service invoked in ProductDetail.groovy (line 232). getProductVariantTree service needs productStoreId to get available inventory. In case of PO's we don't need to check for available inventory at all. Now for being able to use the same code to display product detail page in case of a PO, we will need to make modifications to getProductVariantTree service too, which can be done in two ways:

   1. Add a boolean IN attribute checkInventory to service definition, if its true check the available inventory and if false do not.
   2. A check on productStoreId in the implementation can serve our purpose too.

I like #1 more as it won't eliminate importance of productStoreId in case of a sales order. Looking forward to suggestions from community to handle this situation.

Thanks Amit for the contribution. Mridul Thanks a lot for providing useful notes for the implementation.
Guys, I appreciate your coordination on this!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882618 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 15:54:39 +00:00
Ashish Vijaywargiya e474a6eca2 Applied patch from jira issue OFBIZ-3208 - On order view page when clicking on "Create As New Order", the adjustments Shipping and Handling and Sales Tax are duplicated.
Patch will resolve the following Issues

1) Shipping and Handling Charges are added twice in new order amount.
2) Sales Tax are added twice in new order amount.
3) Add extra tax on shipping and handling charges for new order.
4) When click on "Create as New Order" Link, it is Giving NPE on some Promotion (Happy Hour
Promotion 9020).
5) Click on "Edit Items" Link and then "Update" Link it is it is Giving NPE on some Promotion (Happy
Hour Promotion 9020).

Thanks Arpit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882454 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 08:59:05 +00:00
Ashish Vijaywargiya b261859529 Applied patch from jira issue OFBIZ-3226 - "Quick lookup" screen for purchase order is broken when adding item from order detail page in edit mode.
Steps to produce the bug:

1) Place a purchase order
2) Once your order is placed then click on "Edit items" button of "Actions block"
3) After this down at the bottom click on "Quick lookup" button
4) You will land on screen which is broken 

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882132 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 12:49:07 +00:00
Ashish Vijaywargiya c4706b7adc Applied patch from jira issue OFBIZ-3225 - cancelAllBackOrders scheduled service should not attempt to cancel "Completed" Orders.
-- cancelAllBackOrders scheduled service should not attempt to cancel "Completed" Orders. When this service runs for Completed Purchase Orders, it throws error as Completed cannot be cancelled.

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882131 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 12:46:54 +00:00
Ashish Vijaywargiya d1c4fc90ae Conditional check for billingAccount amount. If no account limit is set with party's billing account then 0.00 will be shown on checkout page. Thanks Akash for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882127 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 12:30:58 +00:00
Bruno Busco e1b3275805 Moved some application labels out of the framework (more to come)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882011 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 00:10:52 +00:00
Bruno Busco f6fe95d163 Reverted changes 836143 and 836137 following Adrian's issue report in https://issues.apache.org/jira/browse/OFBIZ-3206 "Recent Markup Changes Break Layout"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880628 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 06:49:10 +00:00
Scott Gray 90fef09ddf Wrong parameter names were being submitted when clicking on "New Shipment For Ship Group" from the order view resulting in a completely empty shipment being created
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836273 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 22:19:25 +00:00
Scott Gray f1127ea513 Changed order tax calculation to group tax adjustments by tax auth/geo before rounding to tax final, fixes a rounding error I encountered
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836272 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 22:07:12 +00:00
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 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
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
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
Scott Gray 0dd673d528 Forgot to remove a now unused local variable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835702 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 01:46:30 +00:00
Scott Gray d47ade76ed Cleaned up the invoiceServiceItems service, no functional changes just removed unnecessary code and made more use of utility methods
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835701 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 01:44:30 +00:00
Jacques Le Roux 1f91884e1e Avoid a bug in a peculiar case :
Create an order from order manager with a GZ-BASKET only
Print the PDF picksheet from the order, use Ctrl+clic (in FF) to return to the order on a new tab : bingo

With this change you don't get an error but an error message, far better for users

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835421 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 15:53:49 +00:00
Jacques Le Roux 9ee3bca642 A patch from Deepak Dixit "popup.js is missing on product page for order entry." (https://issues.apache.org/jira/browse/OFBIZ-3188) - OFBIZ-3188
Steps to check:
1) Start placing a sales order from order manager application.
2) Then add WG-9943 in to the cart.User will land on page where he need to select feature of the product as "WG-9943".
3) In this page in cross sell and up sell section product images are displayed twice.

With the patch Popup is display correctly in blue light and flat grey theme but in bizznesstime theme popup is still not displayed properly. (I have opened https://issues.apache.org/jira/browse/OFBIZ-3189 for this)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835357 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 12:01:09 +00:00
Scott Gray 8d27aa9be2 Replace some divs with labels for radio option descriptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835330 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 10:50:47 +00:00
Scott Gray af95db299b Replace spans with labels for radio input descriptions, finally got tired of playing bullseye with the radio buttons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835327 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 10:44:37 +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 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
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
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
Bruno Busco cfd42291e1 Reverted change 826379 to OrderEntryCommonScreen.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@834221 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 20:44:18 +00:00