Commit Graph
249 Commits
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Hans Bakker 7c8b20c6ee customer request name should not be displayed encoded, when created by the service it already is set to 'safe'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830462 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 08:33:19 +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
Bruno Busco df78c784c8 Part of OFBIZ-3067 - Menus and form widget files location
Order component
Renamed order/widget/ordermgr/Menus.xml to order/widget/ordermgr/OrderMenus.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829130 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 17:12:35 +00:00
Bruno Busco 1d9b09eaab Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826473 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 17:37:47 +00:00
Bruno Busco b015b789ff Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826451 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 14:39:33 +00:00
Bruno Busco 15e9f46584 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826379 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 09:16:40 +00:00
Hans Bakker 105fd19f84 creating a customer request from a communication event was not working in mycommunications in the party component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825410 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 06:48:08 +00:00
Bruno Busco 0cc834344c Removed the word "Application" from the Application menu title (OFBIZ-3016)
At this stage I did this for the primary applications only.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823833 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 09:27:30 +00:00
Jacques Le Roux 641575e6ca Fix labels in Order/Reports
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@819276 13f79535-47bb-0310-9956-ffa450edef68
2009-09-27 08:58:05 +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 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
Jacques Le Roux a7430a2fc2 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Scott Gray 3b055daffc Fix some issues I caused with the purchase order Bulk Add Supplier Product screen
Two things I didn't realize:
1. for VIEW_INDEX_x parameters, x is 1 based rather than 0 based
2. when override-list-size is used in the form widget it expects the list to be a window of the result set 
   and not a size limited list

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812085 13f79535-47bb-0310-9956-ffa450edef68
2009-09-07 11:19:58 +00:00
Scott Gray 507fd7fa07 I incorrectly added viewSize/viewIndex parameters to this form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810354 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 04:21:35 +00:00
Hans Bakker 11e06ce202 viewindex not for this service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810343 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 02:42:42 +00:00
Scott Gray 62dfb43ed0 A few improvements mostly the LookupBulkAddSupplierProducts.groovy script which takes a very long time to load even with relatively modest result sizes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809104 13f79535-47bb-0310-9956-ffa450edef68
2009-08-29 08:52:07 +00:00
Scott Gray 12566c26b9 Wherever possible changed ELI queries to limit the result set to the actual rows required of the query, should improve time
and memory performance if a cursor isn't being used on large result sets quite a bit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808820 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 08:58:10 +00:00
Vikas Mayur 27f19774ea Fixed a variable not defined. A patch from Bharat Soni, part of OFBIZ-2860 (https://issues.apache.org/jira/browse/OFBIZ-2860)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@807610 13f79535-47bb-0310-9956-ffa450edef68
2009-08-25 13:25:50 +00:00
Hans Bakker fd4d514dff do not allow changes to the customer request when cancelled or completed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799192 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 07:29:05 +00:00
Scott Gray 68f180a494 OFBIZ-2625 Ability to perform product comparisons in ecommerce and during order entry in ordermgr.
Compares things like name, price, description, long description, brand name and standard, distinguishing and optional features.

Could do with some styling and would be nice to add customer ratings in there as well.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797259 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 23:28:32 +00:00
Anil Patel c3bf310205 Now rendering Reports tab of Order manager using ofbiz portal page technology.
Patch from OFBIZ-2745. Thanks Vivek for patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796654 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 09:58:37 +00:00
Hans Bakker fe146772e2 take the default currency as set in the commonext component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795474 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 03:54:22 +00:00
Hans Bakker 682a7e365f rename the communication files in the same pattern as the custrequest files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795306 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 04:03:07 +00:00
Hans Bakker e837675297 rename Request files to CustRequest files as discussed in the mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795304 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 03:30:19 +00:00
Ashish Vijaywargiya 50ac1e216a Added error uiLabelMap to CommonScreens.xml of order component.
Thanks Sumit for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791704 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 05:08:40 +00:00
Vikas Mayur e67c91369f Product Quick Lookup on Order Entry shopping cart page show additional information for purchase order.
Applied slightly modified patch from Sharad Gupta, part of OFBIZ-2701 (https://issues.apache.org/jira/browse/OFBIZ-2701) 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791447 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 11:38:19 +00:00
Hans Bakker 5c95e78d1f forgot a gift text showing up when the option is set to 'n'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790783 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 03:19:07 +00:00
Hans Bakker 76b8c7354d introduce a 'gift enable' with default = Y in the order.properties file and pos, ecommerce and ordermgr itself use it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790517 13f79535-47bb-0310-9956-ffa450edef68
2009-07-02 09:25:14 +00:00
Hans Bakker 28b82b15ee change the ordering of the customer requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789786 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 15:11:32 +00:00
Hans Bakker 2374289262 more corrections on the customer request list shown to a customer
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789778 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 14:58:30 +00:00
Hans Bakker d7b1240550 notes on customer request did not show
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789654 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 10:22:57 +00:00
Hans Bakker 0b3d4f311d small corrections of the customer viewing his customer requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789596 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 07:23:20 +00:00
Anil Patel 021d9296bb New Order main page using Portlets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789244 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 07:23:22 +00:00
Hans Bakker 9d1004714b Now allows for employees to add a note to the customer request, the customer gets notified by email with an url. If he logs in he can also add a note as a reply to the note of the employee, the employee will be notified with a system info message when the customer added the note
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788950 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 10:54:31 +00:00