Commit Graph
15 Commits
Author SHA1 Message Date
Jacopo Cappellato 56fa69ae48 Pretty important change to data model to allow more flexible shipping rules per store:
the primary key of the entity ProductStoreShipmentMeth is no more composed by:
  productStoreId
  shipmentMethodTypeId
  partyId
  roleTypeId

but by one (new) pk field :
productStoreShipMethId

Also modified existing business rules and demo data to reflect this change.
OFBIZ-735


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@511250 13f79535-47bb-0310-9956-ffa450edef68
2007-02-24 11:07:08 +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
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 6734c79135 Based on a recent discussion on the dev mailing list, I've now refactored the entities and code to associate order items:
* OrderItemAssociation has been deprecated and renamed to OldOrderItemAssociation
* two new entities has been added: OrderItemAssoc and OrderItemAssocType
* all the code that was using the OrderItemAssociation entity has been modified to use the new entity
* added seed data for the OrderItemAssocType
Now the new entity can be used not only to store an association between a sales order item and a purchase order item, but also different kinds of relations, such as drop shipments, replacements, new versions of orders etc...

I'm going to commit (in my next commit) a service that can be used to migrate data from the old entity to the new ones.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@485144 13f79535-47bb-0310-9956-ffa450edef68
2006-12-10 08:19:40 +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
Si Chen 1bea986172 New OrderAdjustmentBilling entity to record the relationship between OrderAdjustment and InvoiceItem to help determine which tax, shipping, or promo has been invoiced
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@470162 13f79535-47bb-0310-9956-ffa450edef68
2006-11-02 01:24:29 +00:00
David E. Jones e6444f07e1 Added more support for recurring prices, in this case recurringAmount on adjustments including adjustments based on selection of optional features, this gets us pretty close to complete functionality for initially showing and tracking recurring prices; note that there is no follow up like auto-orders automatically for these prices, just display and store them to pass on to other systems for now; if someone needs it that functionality could certainly be added later on
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@450569 13f79535-47bb-0310-9956-ffa450edef68
2006-09-27 20:46:34 +00:00
Jacopo Cappellato ea5a8d688d Added salesChannelEnumId to the CustRequest entity.
The field is populated from the cart when the cart is saved as a request, and is also propagated to the quote when a quote is created from the request.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@450525 13f79535-47bb-0310-9956-ffa450edef68
2006-09-27 17:54:52 +00:00
David E. Jones d3f94c5aef Replaced all old references to [Copyright * The Open For Business Project] which should take care of all of the legal loose ends
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@446798 13f79535-47bb-0310-9956-ffa450edef68
2006-09-16 00:35:48 +00:00
Jacopo Cappellato 988eb54361 First step in the implementation of drop shipments:
* added new field "supplierPartyId" to the OrderItemShipGroup entity; if a supplier id is in this field (in a ship group of the sales order) it means that the item in the ship group will be drop shipped by the supplier
* added the new field (and accessor methods) to the ShoppingCart
* in the shipsetting order entry checkout screen, added ability to set a supplier for ship groups 
* the info about the new field are now available in the order confirm and order detail screens

Next steps:

* automatic creation of a purchase order from the 'drop ship' shipment group; the ship to address in the po will be the one set in the sales order 'drop ship' shipment group
* reservations/issuances of the items in the 'drop ship' shipment group (of the sales order) should be skipped
* when the po's shipment (the drop shipment) is delivered to the customer we should change the status (completed) of the sales order items associated to the 'drop shipment' ship group


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@441752 13f79535-47bb-0310-9956-ffa450edef68
2006-09-09 07:24:19 +00:00
David E. Jones 7d5919d655 Added functionality for picking out and retrying CC auths for NSF failures, meant for auto-orders to get better chance of successful charge for subscriptions and such; tries once a week for the number of times specified on the ProductStore
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@441736 13f79535-47bb-0310-9956-ffa450edef68
2006-09-09 04:15:54 +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 dc9c759053 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@422819 13f79535-47bb-0310-9956-ffa450edef68
2006-07-17 19:47:26 +00:00
David E. Jones ceba1a5648 Added a new OrderHeader field: autoOrderShoppingListId, used to track the shoppingListId for orders auto-created from a ShoppingList; also added some fields to the ProductStore to configure certain payment retry settings for these automatic orders from shopping lists; the new OrderHeader field is now also being saved through the storeOrder service, ie all changes in place there
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@420753 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 07:47:06 +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