Commit Graph
886 Commits
Author SHA1 Message Date
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
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
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
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 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
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
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
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
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
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 7f81facb85 Minor fix for variable name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834045 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:57:46 +00:00
Ashish Vijaywargiya 0664a96244 Applied improved patch from jira issue OFBIZ-3165 - Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page.
Following points are covered in this patch:

1) Removed hard-coded product ids for Gift certificates products from GiftCertificates.ftl and added new category type called "GIFT_CARD_CATEGORY" and related demo data, also added groovy script for fetching logic to address this issue.

2) Also handled hard-coded surveyId in AddGiftCertificates.groovy

3) Added user friendly messages if required data is not available .

4) Added missing license header in GiftCertificates.ftl

Thanks Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834042 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:53:03 +00:00
Ashish Vijaywargiya c0d45d8521 Applied patch from jira issue: OFBIZ-3165 - Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page.
1) Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page

2) Also add feature to fill survey on same page.

3) Also if CSR selects "Create as new order" from Actions block for Gift card products then survey responses will be created automatically for the new order, which will be same as last order. 

Thanks Arun / Divesh for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833323 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 09:00:16 +00:00
Ashish Vijaywargiya fa60ccd7b4 Applied patch from jira issue OFBIZ-3159 - Move geoAutoCompleter.js from ecommerce to ordermgr.
geoAutoCompleter.js currently resides in specialpurpose/ecommerce component. But now it is also used in OrderViewScreen.xml#OrderHeaderView screen. First of all we can't have dependency of ordermgr on ecommerce component. Secondly, if I am developing a custom ecommerce application with mount point /ecommerce, thus overriding specialpurpose/ecommerce webapp, and copying the geoAutoCompleter.js to my custom application (to customize) in a directory structure other than that of specialpurpose/ecommerce, then the JS file is not loaded in OrderHeaderView screen due to change of location. The only reason is the dependency stated above. Hence this change is vital.

While doing this change, all the references to geoAutoCompleter.js will need to be updated too.

Thanks Arpit for the contribution.
Special thanks to Mridul for providing notes for the implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833026 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 10:08:35 +00:00
Jacques Le Roux e739fc04b9 A slightly modified patch from Deepak Dixit "List boxes are not displayed properly in bizznesstime theme." (https://issues.apache.org/jira/browse/OFBIZ-3134) - OFBIZ-3134
I simply used the same syntax than in other themes (XHTML)
+ added =multiple (XHTML compliant) where needed
+ fixed in product quick admin (wrong syntax multiple=true)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831801 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 06:15:12 +00:00
Jacques Le Roux 3d247fbaca A patch from Deepak Dixit "Html cleanup of keyword search boxes." (https://issues.apache.org/jira/browse/OFBIZ-2986) - OFBIZ-2986
For the order component.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830679 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 17:20:11 +00:00
Jacques Le Roux 061b06acf1 Please gents, no words sentences, thanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829875 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 17:41:41 +00:00
Jacques Le Roux aedeb6ca51 Changes method="POST" to method="post", from Scott's comment about XHTML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829660 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 21:38:47 +00:00
Jacques Le Roux de8c54571b A patch from Rohit Jain "HTML cleanup for orderHeaderInfo.ftl file." (https://issues.apache.org/jira/browse/OFBIZ-3005) - OFBIZ-3005
orderHeaderInfo.ftl file used in order entry process.
In this file table used for non tabular data and its and markup of this file not correct.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829421 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 17:43:12 +00:00
Jacques Le Roux b05b9e6f8f Fix a "bug" : HTML code was shown as is and not as an URL text
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829416 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 17:38:19 +00:00
Jacques Le Roux 7b15a9879c A patch from Akash Jain "NPE appears on create customer from order entry screens." (https://issues.apache.org/jira/browse/OFBIZ-3079) - OFBIZ-3079
There is a session issue, actually there is getting ShoppingCart object from session when session is expired then ShoppingCart object will be null and there is no check for this ShoppingCart object and call method of ShoppingCart.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829412 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 16:58:43 +00:00
Bruno Busco f33c01737f Part of OFBIZ-3067 - Menus and form widget files location
Order component
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829377 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 14:29:27 +00:00
Adam Heath e72a0ff97c Freemarker does not reset values each time thru a loop, so reset billTo
and billFrom to empty.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@827730 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 16:49:13 +00:00
Vikas Mayur 89f6f08561 Removed an extra parentheses enclosing carrier party on order detail page. Patch applied from Mukesh Marathe, part of OFBIZ-3014 (https://issues.apache.org/jira/browse/OFBIZ-3014)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823499 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 10:14:18 +00:00
Adrian Crum a4d68934c9 Converted GenericDelegator concrete class references to Delegator interface references.
This commit requires ant clean. Also, external libraries that reference GenericDelegator will need to be updated.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Bruno Busco 62652236c1 Cleanup of the screenlet title in all FTL files.
Removed all occurrences of <div class="screenlet-header"><div class="boxhead"></div></div>
Replaced with the new
<div class="screenlet-title-bar"><div class="h3"></div></div>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821476 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 08:04:35 +00:00
Bruno Busco 27d52b9c01 Cleaned up several ftl screenlets markup.
Changed from <div class="screenlet-header"> to <div class="screenlet-title-bar">.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821281 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 09:30:48 +00:00
Bruno Busco 486c8f477c Cleaned up several ftl screenlets markup.
Changed from <div class="screenlet-header"> to <div class="screenlet-title-bar">.
Replaced <div class="boxhead"> with <div class="h3">.
This fixes also a white text on white background issue with bluelight theme reported by Matthieu Bollot in the dev ML.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821197 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 23:00:22 +00:00
Adam Heath 2275d32ecc Another NPE, UserLogin may not have an associated party.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820787 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 21:01:23 +00:00
Adam Heath 304503d6a1 Fix rounding error on order stats screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820761 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 19:30:41 +00:00
Jacques Le Roux 71046660f1 A patch from Prateek Jain "Make ATP/QOH button in purchase order independent of productStore" (https://issues.apache.org/jira/browse/OFBIZ-2967) - OFBIZ-2967
When we click on ATP/'Qoh button in purchase order for a particular order item it gives error that facility id is not present.Ideally in case of purchase order it should not be dependent on productStore. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818715 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 04:34:57 +00:00
Ashish Vijaywargiya 6bec388b92 Applied patch from jira issue - OFBIZ-2966 - User Friendly Urls on Breadcrumbs of ecommerce/order manager.
Thanks Chirag and Rishi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818457 13f79535-47bb-0310-9956-ffa450edef68
2009-09-24 12:14:33 +00:00
Vikas Mayur afc07559bf The priority drop down on order detail page was not showing selected value.
Fix provided by Amit Sharma and patch applied from OFBIZ-2961 (https://issues.apache.org/jira/browse/OFBIZ-2961)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818066 13f79535-47bb-0310-9956-ffa450edef68
2009-09-23 11:35:36 +00:00
Ashish Vijaywargiya bc1b7e4e26 No functional change -formating fixes from Sumit Pandit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816530 13f79535-47bb-0310-9956-ffa450edef68
2009-09-18 08:29:16 +00:00
Jacopo Cappellato d852ca1f6b Better link to payment screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815663 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 08:28:15 +00:00
Jacopo Cappellato 1e45ca65f6 Quick fixes to prevent NPE (but the code should be reviewed/improved here).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815656 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 08:07:02 +00:00
Jacopo Cappellato da1ebe418b Fix for bad variable name
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815653 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 07:59:39 +00:00
Jacopo Cappellato a101919fd6 Fix for bug affecting the return total (it was not considering adjustments).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815652 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 07:56:33 +00:00
Hans Bakker d34dbebce8 all upload content screens (hopefully we did not forget any) can now also select an existing contentId which can be selected from a navigation tree. Added also the possibility when a file is uploaded to put it at a particular leave in the tree. Programmed by my employee Berm
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815651 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 07:48:51 +00:00
Jacques Le Roux abf1551dc1 Fix a problem reported by Sharan Foga at "Error in Viewing Returned Items" (https://issues.apache.org/jira/browse/OFBIZ-2934) - OFBIZ-2934
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@815165 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 06:42:50 +00:00
Vikas Mayur a67f6c9939 Applied a combined patch from Eric DE MAULDE and Deepak Dixit where the former is related to fix to the tag and latter is related to markup improvements. For details refer
to jira issue OFBIZ-2935 (https://issues.apache.org/jira/browse/OFBIZ-2935)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814542 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 09:31:43 +00:00
Jacques Le Roux dbe9cbd76d A patch from Bharat Soni "Content of Find Orders page of order component is not coming properly" (https://issues.apache.org/jira/browse/OFBIZ-2912) - OFBIZ-2912
Content of Find Orders page of order component is not coming properly. Not showing content below the "Web Site" select box.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814531 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 09:08:15 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacopo Cappellato a38f8202aa New util method to find out if a "type" record has a given ancestor.
The method is also used to clean the code related to the two existing marketing package types (that have now in common the same parent).
This will make the framework more flexible because you will be able to create a new product subtype and the system will treat them as its parent type; then you can add custom code to treat it in the special way (if needed). This pattern can be extended in other areas of the system, starting from product types (right now it is also applied to marketing packages).
Thanks to Mridul Pathak for the patch - OFBIZ-2902

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813413 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 13:02:33 +00:00