Commit Graph
220 Commits
Author SHA1 Message Date
Si Chen f11909a191 Disable updating of shipping method for purchase orders. OFBIZ-365
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@512870 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 17:48:49 +00:00
David E. Jones c34a870036 Changed a getRelatedOne for basically seed data to be cached
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@512505 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 00:02:10 +00:00
Si Chen 17b727c327 made the create return button same as the others on the screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@512503 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 23:58:06 +00:00
Jacques Le Roux cd5733729b A patch from Bilgin Ibryam "Wrong fieldlookup image url" (https://issues.apache.org/jira/browse/OFBIZ-764).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@512472 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 22:56:45 +00:00
Si Chen 3f80b5e6b3 Small UI improvements for SetItemShipGroups checkout screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@512376 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 20:01:38 +00:00
Si Chen ab274da7ed Implementing logic to handle automatic creation of drop ship groups during checkout
- If a product is set to always drop ship (Product.requirementMethodEnumId == 'PRODRQM_DS').
    - If a product is set to drop ship when inventory is low (Product.requirementMethodEnumId == 'PRODRQM_DSATP'). In this case, item quantities > ATP will be drop shipped.
    - Items are reassigned to ship groups based on supplier.
    - Ship groups are created if necessary.
    - Suppliers are determined using by ProductSupplier.canDropShip == Y, and ProductSupplier.supplierPrefOrderId - main suppliers are used in preference to alternate suppliers.
    - Changing Enumeration.enumId PRODRQM_DSQOH to PRODRQM_DSATP in ProductTypeData.xml.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@512373 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 19:51:52 +00:00
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
David E. Jones 77a4fe0f9e Small cleanup to use already declared variable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510965 13f79535-47bb-0310-9956-ffa450edef68
2007-02-23 14:49:31 +00:00
Hans Bakker 30b4aaea34 show a list of requirements when no find parameters are entered
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510841 13f79535-47bb-0310-9956-ffa450edef68
2007-02-23 06:03:42 +00:00
Hans Bakker bcb1d6efe7 fix NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510827 13f79535-47bb-0310-9956-ffa450edef68
2007-02-23 05:00:14 +00:00
Hans Bakker 11cf00dafa invalid field on <submit> tag: corrected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510764 13f79535-47bb-0310-9956-ffa450edef68
2007-02-23 02:18:10 +00:00
Si Chen e7670d5bd5 OFBIZ-733: Create invoices for drop ship orders
- Adding logic to createInvoicesFromShipments service to deal with creating both purchase invoices for drop shipment orders and sales invoices for the sales order linked to drop shipment orders - a sales invoice is created if the createSalesInvoicesForDropShipments parameter is true.
- Adding createSalesInvoiceFromDropShipment service to wrap call to createInvoicesFromShipments, passing the createSalesInvoicesForDropShipments parameter.
- Adding SECAs on updateShipment to generate a purchase invoice when a drop shipment is shipped and a sales invoice when a drop shipment is received
- Adding quickDropShipOrder service, linked from orderview page, to create a drop shipment and set the shipment status to shipped and then received, in order to trigger the SECAs for drop shipment invoice generation.
- Fixed flaw in createInvoiceForOrder service - now pro-rating OrderAdjustments based on OrderItem quantity from the database instead of the passed-in OrderItem, in case the OrderItem quantity has been replaced upstream.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@510664 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 21:49:10 +00:00
Jacques Le Roux d896af12af Commented out product.bsh part wich had the same erroneous snippet trying to come back to the same page when login or changing language.
Added a comment from David's advice to use the same metho than add to cart in all concerned files (category.bsh prodcut.bsh and main.bsh)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509990 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 12:56:41 +00:00
David E. Jones 2d6086b7b7 Commented out code that attempts to go back to the same category on language change, but really doesn't go back to the same page AND it messes of the main page which IMO is not acceptable; if this is important it should be done that SAME way we go back to the same page on an add-to-cart
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509955 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 10:00:24 +00:00
David E. Jones 397cb385be Last commit for fixing the prod cat link category ID thingy wasn't adequate, cleaned up the categorydetail.bsh script and simplified what is done in the field mapping in the query in the screen def
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509953 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 09:44:22 +00:00
Si Chen f12d9c207c add missing external login so quick receive PO items doesn't cause a login screen to be shown
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509735 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:16:34 +00:00
Si Chen ad6a2467e0 Made the Create As New Order button on order items accessible on all sales orders
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509727 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:02:34 +00:00
David E. Jones e6815b0ca9 Added ProductCategoryLink screenlet, included from the categorydetail screen; this is based on the work by Ashish in Jira #OFBIZ-737, but includes a number of cleanups and a bit of a re-write to use more of the ProductCategoryLink entity's data; also added some demo data for testing and demonstration
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@509167 13f79535-47bb-0310-9956-ffa450edef68
2007-02-19 11:40:46 +00:00
Jacques Le Roux 5c40f8a5dd Some ASL2 headers cleanup (1 found by chance, and 2 others after with same characteristics : ie copyright 2001-...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508913 13f79535-47bb-0310-9956-ffa450edef68
2007-02-18 16:18:59 +00:00
Si Chen 4247037a87 Add 'description' (type description) field to AgreementTerm, OrderTerm and InvoiceTerm entities to allow for terms that aren't necessarily numeric in nature (EG: supplier shipping method, etc.)
Modify ShoppingCart/ShoppingCartHelper/ShoppingCartEvents.addOrderTerm, ShoppingCartHelper.selectAgreement and InvoiceServices.createInvoiceTerms methods to make them aware of the new description fields
Display OrderTerm.description in order headers and PDF
Fix order PDF so that there's a line break after each order term

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508580 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 20:58:29 +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
Jacques Le Roux d8682aaea5 Deals with the problem reported by Baga Raj in https://issues.apache.org/jira/browse/OFBIZ-724 "After choosing Sidedeepcategory and then getting loged in it shows the error like - Product Category Not Found for this Id!"
in a standard way using _PREVIOUS_PARAM_ as recommended by David.
However I kept the category_id session attribute to deal with languages changes. 

I quickly tried to come back to a product page if opened but I finally kept as it is (come back to the product's category page).
I open a trivial Jira issue for this case as I feel that I will need something like that in some future.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508502 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 17:26:00 +00:00
Si Chen 4de62f59a9 Updating order list screen and OrderListState class to be able to search for held orders
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508473 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 16:22:08 +00:00
Si Chen 73f2b00e77 Introducing the ORDER_HOLD order status
- valid transitions from ORDER_APPROVED and to ORDER_APPROVED, ORDER_CANCELLED
- supporting links in orderview screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508470 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 16:20:24 +00:00
Si Chen 337145f9e9 Adding missing addCategoryDefaults request-map to ordermgr controller
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508448 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 15:29:18 +00:00
Si Chen 2fad9486df no longer set quantity for adding items to order based on last item added, which was a bit confusing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@508144 13f79535-47bb-0310-9956-ffa450edef68
2007-02-15 20:53:34 +00:00
Jacques Le Roux 1d80d744b1 Revert previous commit (using session attribute) at demand of David E. J. Should better use _PREVIOUS_PARAMS_ instead... Will try tomorrow...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507737 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 23:14:11 +00:00
Jacques Le Roux 2ea56a815c From an idea and a kind of patch (word .doc :o) from Baga Raj in https://issues.apache.org/jira/browse/OFBIZ-724
"After choosing Sidedeepcategory and then getting loged in it shows the error like - Product Category Not Found for this Id!"

After some refactoring I applied his "patch" and extended it to deal with changes of languages case. 
So now you can change the lanquages and keep the same category/product page open.

I can't see any problems. But please if you see an obvious one tell me, I will soon revert. Thanks

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507698 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 21:25:18 +00:00
Si Chen fc0d7c2c0e OFBIZ-725: Include a way to specify the bill to party for Approved Product Requirements by Vendor form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507694 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 21:15:48 +00:00
Jacques Le Roux dd19700a8b A patch from Chris Howe "Using hardwired /images instead of <@ofbizContentUrl> in .ftl files" (https://issues.apache.org/jira/browse/OFBIZ-111).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@507435 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 08:28:54 +00:00
David E. Jones c0245d3808 Changed requestParameters to parameters in a bunch of places, as that is the one that should nearly always be usedfor consistency, and to support the request to session etc defaulting pattern; also removed a number of statements to manually create the Map instead of using the one always created by the Screen Widget
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@506575 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 18:50:26 +00:00
Jacopo Cappellato ca160784dc Applied patch from Chris Howe to replace all relative path form resource names with their component:// equivalent when an HtmlFormWrapper object is created.
OFBIZ-711

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@505886 13f79535-47bb-0310-9956-ffa450edef68
2007-02-11 11:08:33 +00:00
David E. Jones 1742dab0e2 Added support for categoryName rather than just description
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@505350 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 16:25:47 +00:00
Scott Gray 722ad2e062 Fixed a couple of references to PartyGroup.description which isn't a valid field of PartyGroup, related to OFBIZ-673 reported by Daniel Kunkel.
Note this may not resolve that issue completely

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@504475 13f79535-47bb-0310-9956-ffa450edef68
2007-02-07 09:34:06 +00:00
Scott Gray f06ac34ad4 Fixed a bug in order manager's quick finalize order which was causing shipping costs to be left off the order. Reported by Rohit Sureka (OFBIZ-690)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@504458 13f79535-47bb-0310-9956-ffa450edef68
2007-02-07 08:14:07 +00:00
Si Chen 0e22151add Safari doesn't honour the onchange attribute for radio buttons, so firing both onchange and onClick events when a payment method type is selected during ordermgr normal checkout, in the payment screen when no payment methods are available.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@504389 13f79535-47bb-0310-9956-ffa450edef68
2007-02-07 00:44:54 +00:00
Jacques Le Roux 30853ccbf5 A slightly enhanced patch from Leon Torres (I added filters) "Pagination in https://host_name:8443/ordermgr/control/orderlist needed" (https://issues.apache.org/jira/browse/OFBIZ-644)
I kept how one-line getters and setters are formatted. Not sure it would be better to put them on more lines.
I deleted the "TODO: Bug: Clicking All so none are selected shows all orders anyway". Because I think this is a good behaviour (rechecking some options by default). Who would want to search for an empty list ?


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@503391 13f79535-47bb-0310-9956-ffa450edef68
2007-02-04 11:40:32 +00:00
Si Chen 92ed36e505 In ordermgr checkout, directing errors from createPostalAddress back to EditShipAddress instead of shipsetting, so that the error message makes sense and refers to what's on the screen. Also repopulating address fields with parameters in case of error.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502669 13f79535-47bb-0310-9956-ffa450edef68
2007-02-02 17:38:20 +00:00
Si Chen 3cedb9e2e4 COD option should be hidden when the 'create new' link is clicked in the payment screen (same as offline option)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502371 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 22:01:04 +00:00
Si Chen c3d21207cf Workflow improvements in ordermgr checkout:
- Directing successful create-customer requests to the EditShipAddress screen, via the new checkout parameter 'finalizeReqNewShipAddress'

- Adding COD as a payment option in the non-quick checkout flows. This required a restructuring of the form that appears when no payment methods are available to the customer - now a Javascript directs the browser either to the finalizeOrder request (if EXT_OFFLINE or EXT_COD are selected) or to the setBilling request (if CC or EFT are selected, to create a new payment method).

- Directing successful payment method creation ahead in the checkout. Includes a fix for OFBIZ-583 (using a similar but lighter approach to the one proposed by Anil Patel and Iain Fogg) via detection of the paymentMethodId request attribute. The newly-created CC/EFT account becomes selected as the only payment method for the order.

- Directing errors in payment setting or creation to the payment settings screen instead of all the way back to orderentry, by discriminating between the 'error' response and a new 'paymentError' response from CheckOutEvents.finalizeOrderEntry()

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502340 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 20:02:51 +00:00
Si Chen 4a9c3d14c9 Change 'Create New' label in shipment settings checkout screen to 'Create New Shipping Address'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502330 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 19:43:25 +00:00
Si Chen 8a2c2eeaa9 Hide the create customer link in the order shortcuts if there are no items in the cart
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502329 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 19:41:47 +00:00
Si Chen 1c5a0eb89b Show the receive payment and cancel links in the order header for EXT_COD orders
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502327 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 19:39:37 +00:00
Jacques Le Roux 947a743f59 Reported by Eriks Dobelis in "Using hardwired /images instead of <@ofbizContentUrl> in .ftl files"
Changes from Chris Howe's comment : https://issues.apache.org/jira/browse/OFBIZ-111#action_12459252

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@502282 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 16:52:24 +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
Si Chen 25215a95b9 Approved requirements list now shows the quantity sold of each product. It reports the last 6 months of sales.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501970 13f79535-47bb-0310-9956-ffa450edef68
2007-01-31 20:00:42 +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 1048bb30dc Added QOH and ATP for the approved product requirements list. The idea is to be able to see what the inventory is before creating POs based on requirements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501633 13f79535-47bb-0310-9956-ffa450edef68
2007-01-30 23:11:32 +00:00
Jacques Le Roux 88c23a44e2 Derived from an Ismail Cansiz's patch for "Bug in displaying order items when using old style calcTax service" (https://issues.apache.org/jira/browse/OFBIZ-667)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501521 13f79535-47bb-0310-9956-ffa450edef68
2007-01-30 19:03:41 +00:00
Si Chen 877b7fd2f6 Also show the extra data for requirements for the other Approved Product Requirements form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@501218 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 22:56:37 +00:00