Commit Graph
48 Commits
Author SHA1 Message Date
Jacopo Cappellato 37ec41dee7 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@511769 13f79535-47bb-0310-9956-ffa450edef68 2007-02-26 10:11:32 +00:00
Si Chen 258135aa3b Moved the create as new order button on the orderview page next to the edit items button, instead of way down at the bottom below the order notes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508576 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 20:49:10 +00:00
Si Chen 744bfbc9c1 Improvements to look of Approved Product Requirements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502040 13f79535-47bb-0310-9956-ffa450edef68
2007-01-31 23:31:12 +00:00
Jacques Le Roux 2dde476020 A patch from Guido Amarilla "Replace harcoded UI labels in Order and Requirement Screens" (https://issues.apache.org/jira/browse/OFBIZ-675)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501789 13f79535-47bb-0310-9956-ffa450edef68
2007-01-31 10:33:47 +00:00
Si Chen a5322bc7f5 More requirements stuff: Add a summary showing the quantity of products to be ordered and the distinct product count. Required changing the in-form service call to bsh script called externally.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501644 13f79535-47bb-0310-9956-ffa450edef68
2007-01-31 00:07:13 +00:00
Si Chen c0c5566262 OFBIZ-654: Approved product requirements by vendor screen. This is an interesting screen as it uses two view entities chained together to perform a two-level query. One view entity is a subquery to group requirements, the next one calls it and counts the results.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@500287 13f79535-47bb-0310-9956-ffa450edef68
2007-01-26 17:37:11 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
Jacopo Cappellato c47b822de2 Added link and event to initialize a cart from an existing order: this implements the ability to clone an order.
The link to run it is at the bottom of the "order view" screen.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@487781 13f79535-47bb-0310-9956-ffa450edef68
2006-12-16 10:06:36 +00:00
Si Chen af26f503a3 put in a default currency for the create quote form based on user configured default
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@482753 13f79535-47bb-0310-9956-ffa450edef68
2006-12-05 20:08:28 +00:00
Si Chen bdb32342dd OFBIZ-468: Added CustRequest.fulfillContactMech and a screen to view the related address/phone/email.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@477453 13f79535-47bb-0310-9956-ffa450edef68
2006-11-21 01:20:06 +00:00
Jacopo Cappellato 8bd3b9b4d7 Moved some more bsh/ftl files that were referenced by the order component from the ecommerce to the order component: the order component is at a lower level than the ecommerce one and so cannot use ecommerce's resources.
Part of OFBIZ-220, but the task is not complete: the order component still references the uilabel files of the ecommerce component.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@471156 13f79535-47bb-0310-9956-ffa450edef68
2006-11-04 09:51:09 +00:00
Jacopo Cappellato 81c5951267 Moved some more bsh/ftl files that were referenced by the order component from the ecommerce to the order component: the order component is at a lower level than the ecommerce one and so cannot use ecommerce's resources.
Part of OFBIZ-220, but the task is not complete: the order component still references the uilabel files of the ecommerce component.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@471155 13f79535-47bb-0310-9956-ffa450edef68
2006-11-04 09:43:07 +00:00
Jacopo Cappellato 185c81a47d Moved some a few bsh/ftl files that were referenced by the order component from the ecommerce to the order component: the order component is at a lower level than the ecommerce one and so cannot use ecommerce's resources.
Part of OFBIZ-220, but the task is not complete.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@471152 13f79535-47bb-0310-9956-ffa450edef68
2006-11-04 09:25:48 +00:00
Jacques Le Roux 18063c00c2 This commit add filters on Inventory Problems and Authorization Problems in Order List Screen and filter on Inventory Problems in Find order screen
Inventory Problems are:
1. Partially Received POs
2. POs open past their ETA
3. POs with rejected items

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@465360 13f79535-47bb-0310-9956-ffa450edef68
2006-10-18 20:16:25 +00:00
Jacopo Cappellato 1365d7409a Fixed layout issue in order view screen (OFBIZ-369).
Thanks to David Jones for having provided the solution.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@454328 13f79535-47bb-0310-9956-ffa450edef68
2006-10-09 10:17:24 +00:00
Si Chen 162e29f384 Fixed pagination bug in find cust requests.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@453049 13f79535-47bb-0310-9956-ffa450edef68
2006-10-04 22:15:03 +00:00
Jacopo Cappellato ac79a1d617 Refactored the quote pdf report to share the common report template.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@452879 13f79535-47bb-0310-9956-ffa450edef68
2006-10-04 13:09:15 +00:00
Jacopo Cappellato 00caf9ca0c Added pdf version of the "approved product requirements" (aka "purchase order requirements") screen: the link to call it is rendered using the new "genericLink" screen.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@452780 13f79535-47bb-0310-9956-ffa450edef68
2006-10-04 07:25:47 +00:00
Jacopo Cappellato c9b9db5abb Break up of orderheader templates (for order confirm and order view screens) and the showPromotions template with multiple screenlets: this should improve the template readability and also make the customization much more simple.
Really thanks to Chris Howe for this work (OFBIZ-68): I had to manually apply the patch (many templates were changed after the patch was submitted, and in the patch there were some issues) and so I did something different from Chris' patch, however his work is now finally committed. 
I've also removed some unused resources from the ecommerce component (a few entries in the controller, a screen definition and a template).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@452766 13f79535-47bb-0310-9956-ffa450edef68
2006-10-04 06:47:22 +00:00
Si Chen 9a3e2f4976 Fix issues with open order item report and 'Required for SO' value in orderview. Introduced a new view-entity to report quantities ordered, issued and open gropued by order item. Renamed the view entity grouped by product to be consistent. Simplified the report bsh and InventoryWorker methods. These fixes are dependent on a the <complex-alias> COALESCE issue OFBIZ-336.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@451399 13f79535-47bb-0310-9956-ffa450edef68
2006-09-29 19:37:41 +00:00
Si Chen a78b7f1f17 Fix two minor issues with the open order items report.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@450578 13f79535-47bb-0310-9956-ffa450edef68
2006-09-27 21:07:16 +00:00
Si Chen 15bd42e394 Added orderDate field to report of open order items. Use OrderHeaderAndItem instead for this report.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@450271 13f79535-47bb-0310-9956-ffa450edef68
2006-09-27 01:05:33 +00:00
Si Chen 3aeda4a8a3 Added report for open order items. Basically allows one to see what orders have unshipped items.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@450266 13f79535-47bb-0310-9956-ffa450edef68
2006-09-27 00:26:12 +00:00
Jacques Le Roux dd9127f417 Closes I18n of categories
Thanks to Si and Marco for their tests and help.
In this last version I have added the breadcrumbs and a demo file.
I have also commented some stuff in CategoryContentWrapper
For more informations see  https://issues.apache.org/jira/browse/OFBIZ-75

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@449957 13f79535-47bb-0310-9956-ffa450edef68
2006-09-26 09:13:32 +00:00
Jacopo Cappellato 2753fd7da4 Approved product requirements are checked by default.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@448936 13f79535-47bb-0310-9956-ffa450edef68
2006-09-22 13:58:15 +00:00
Jacopo Cappellato 5f0410704f Removed the no more used "OrderComplete" screen definition (and related bsh script).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@441748 13f79535-47bb-0310-9956-ffa450edef68
2006-09-09 06:42:32 +00:00
Jacopo Cappellato eae557399b First draft of quick purchase order creation from requirements list.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@440422 13f79535-47bb-0310-9956-ffa450edef68
2006-09-05 17:56:15 +00:00
Jacopo Cappellato 1c336218f1 In the purchase order entry requirements' screen, now by default only the requirements that have a role of SUPPLIER for the given party are shown.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@440330 13f79535-47bb-0310-9956-ffa450edef68
2006-09-05 12:24:39 +00:00
Jacopo Cappellato aef79c21cc Implemented services and ui to manage the RequirementRole entries.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@440284 13f79535-47bb-0310-9956-ffa450edef68
2006-09-05 07:14:53 +00:00
Jacopo Cappellato 5954203b5e Fixed pagination bug in quick product lookup page in po entry screen.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@434121 13f79535-47bb-0310-9956-ffa450edef68
2006-08-23 18:34:49 +00:00
Jacopo Cappellato a893437f29 Completed the implementation of user interface for ship groups management during order entry checkout: there is now a new screen to assign shopping cart items to the ship groups in the cart.
Empty ship groups are automatically removed from the cart during the checkout process.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@433243 13f79535-47bb-0310-9956-ffa450edef68
2006-08-21 13:31:03 +00:00
Jacopo Cappellato 37d077d4a7 A bunch of changes to the backoffice order entry checkout screens (ship settings and option settings) and related events to better support the multi ship groups management.
Now the creation of more than one ship group is very easy, but the screen to assign the items to different ship groups is still not implemented.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@433195 13f79535-47bb-0310-9956-ffa450edef68
2006-08-21 08:07:26 +00:00
Jacopo Cappellato 2bc7c3ca80 First pass in the implementation of the user interface to create, in the order entry checkout process, more than one ship group.
It is now possible to create ship groups and set different addresses and options for them but it is still not possible to assign the products in the cart to them.
I'm going to start the implementation of a new checkout screen that will allow this.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@432836 13f79535-47bb-0310-9956-ffa450edef68
2006-08-19 13:55:15 +00:00
Jacopo Cappellato 33abd266c7 Applied patch from Christian Geisert (OFBIZ-167) to refactor the return pdf into smaller fo.ftl templates included into the new fo global decorator.
There are still some minor layout issues mostly due to the different page dimension of the global decorator template.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@432830 13f79535-47bb-0310-9956-ffa450edef68
2006-08-19 11:54:59 +00:00
Jacopo Cappellato 5a493b2988 Added new common template for document based pdf reports (sales and purchase orders, invoices, returns etc...).
Refactored the sales/purchase order pdf to use the common template.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@432302 13f79535-47bb-0310-9956-ffa450edef68
2006-08-17 17:38:38 +00:00
Jacopo Cappellato d8f8f58e0c The "Approve Requirements" screen has been moved from the manufacturing to the order component.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@431867 13f79535-47bb-0310-9956-ffa450edef68
2006-08-16 09:28:12 +00:00
Jacopo Cappellato 29cd61f90d Implemented new lookup search for products limited by supplier's product if the order is a purchase order.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@429290 13f79535-47bb-0310-9956-ffa450edef68
2006-08-07 10:12:53 +00:00
Jacopo Cappellato c88b16034b Added new quote header field to store the quote's sales channel (Quote.salesChannelEnumId).
The quote's sales channel is propagated to the order and when a cart is used to create a quote, the sales channel of the cart is used to populate the sales channel of the quote.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427099 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 12:25:24 +00:00
Jacopo Cappellato 32606aa777 Implemented new screen, forms and services to manage order terms for existing orders.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@424684 13f79535-47bb-0310-9956-ffa450edef68
2006-07-23 06:37:15 +00:00
Jacopo Cappellato 0c431fe3e3 License change from MIT to ASL2.0 for the files of the order component.
Thanks to Ashish Vijaywargiya for the patch (Apache OFBIZ-87).


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@422818 13f79535-47bb-0310-9956-ffa450edef68
2006-07-17 19:46:37 +00:00
Si Chen 394b4a43a0 Fixed bad headerItem for various orderview-related pages, including add note, edit delivery schedule, receive offline payment, and send confirmation email
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421949 13f79535-47bb-0310-9956-ffa450edef68
2006-07-14 17:03:10 +00:00
Hans Bakker c0673be3a0 wrong link in edit workefforts attached to a quote + update nl labels
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421630 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 13:51:39 +00:00
Hans Bakker 7bc0010707 extended the list of workefforts for a quote by adding a new view
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421541 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 08:32:49 +00:00
Hans Bakker 9628d2a325 small text change quoteWorkeffort
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421505 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 05:55:51 +00:00
Hans Bakker 99e924a2b3 use of the web.xml maindecorator in the quotescreens + fix quoteworkefforts screenproblems + dutch language file update
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@421501 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 05:23:20 +00:00
Jacopo Cappellato 86ff215457 Applied i18n patch from Marco Risaliti (Apache OFBIZ-25).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418930 13f79535-47bb-0310-9956-ffa450edef68
2006-07-04 07:07:51 +00:00
Jacopo Cappellato 550b26f223 Applied slightly modified patch from Chris Howe to split up the View Quote screen into reusable screenlets; also changed quote's artifacts license to ASL2.0.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418557 13f79535-47bb-0310-9956-ffa450edef68
2006-07-02 07:31:16 +00:00
David E. Jones 94fe6d1cda Initial OFBiz import from revision 7923 of the old svn.ofbiz.org SVN repository.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@418498 13f79535-47bb-0310-9956-ffa450edef68
2006-07-01 19:05:20 +00:00