Commit Graph
57 Commits
Author SHA1 Message Date
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Vikas Mayur a131758b9e Another new feature from Pranay and Co.
Now Order reservation can be changed manually by setting priority (new field priority on OrderHeader and OrderItemShipGrpInvRes) for the order. This way few orders can be
fulfilled while waiting for sufficient inventory to fulfill large orders.

Applied patch from OFBIZ-2224 (https://issues.apache.org/jira/browse/OFBIZ-2224).
Thanks Pratik Khera and Pranay Pandey.

i18n Note: This commit has three new labels (IMO, they can be moved to common component with names something like CommonHigh, CommonLow etc.)

Pratik, I have done minor changes in the service and they are
1) Used <if-empty field=""> instead of <if> <condition> <if-empty> as this makes the logic more clearer.
2) Removed <condition-list> because their is only one expression in the <entity-condition>
3) Added <clear-field> in the iteration, to make sure that always a new value will be set in the map that is passed to a service and <store-value>  



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756001 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 13:58:08 +00:00
Vikas Mayur 7bc9f320d3 Cancel back orders from supplier if the cancelBackOrderDate (new field on OrderItem) has passed. This is achieved using a schedule job.
Patch applied from OFBIZ-2220 (https://issues.apache.org/jira/browse/OFBIZ-2220). 

Thanks Deepesh Kapoor and Pranay Pandey for testing.

On a side note, I have changed the field description on the entity to use <description> element instead of <!-- -->. Also changed this for adjacent field.
Changed the description of the service a bit. 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755596 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 13:54:53 +00:00
Jacques Le Roux 219f600813 A patch from Divesh Dutta " Functionality for putting in estimatedShipDate and estimatedDeliveryDate for order items." (https://issues.apache.org/jira/browse/OFBIZ-2239) - OFBIZ-2239
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755011 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 21:34:50 +00:00
Marco Risaliti 2d8f185142 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753028 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 21:50:12 +00:00
Marco Risaliti b9601cfffb Some missing default-resource-name for entity labels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748683 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 20:26:54 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Hans Bakker 5cea27a539 implementation of OFBIZ-2024: add content attachments to a customer request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709427 13f79535-47bb-0310-9956-ffa450edef68
2008-10-31 14:09:43 +00:00
Bilgin Ismet Ibryam 93745e20ac Applied (with few modifications) patch from Len Shein, OFBIZ-1928: "Allow the Shopping Cart to accept a facility per ship group to specify where inventory should be reserved from".
Also added a dropdown button to choose a facility in order manager shipping screen.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688993 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 08:30:05 +00:00
Ashish Vijaywargiya d7867af0b0 Patch from JIRA issue https://issues.apache.org/jira/browse/OFBIZ-1910 "Add support of fromDate & thruDate in CustRequestRole entity".
Slight change in Entity name in this commit.
In the attached patch the  name of entity was "CustomerRequestRole" but in this commit the name of new entity is "CustRequestParty"(Looked more close to the data model pattern).

Thanks Bilgin for your valuable Input on this.
I have also written the Migration service for providing the Backward compatibility.

Special thanks to Ratnesh & Jacopo in discussing with me on this work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686731 13f79535-47bb-0310-9956-ffa450edef68
2008-08-18 11:47:14 +00:00
Jacques Le Roux dd838e22a6 Better descriptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685087 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 08:46:23 +00:00
Jacques Le Roux 5584b0c222 From David's comments on dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685082 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 08:34:15 +00:00
Jacques Le Roux cb5be4be47 Some fields descriptions from BJ comments on user ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@684812 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 16:54:39 +00:00
Hans Bakker 35ec502a49 added partyId field to customerRequestType, created related view to partyReLationship to be able to list customerRequests by reponsible person and added new service to change customer request status
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@678339 13f79535-47bb-0310-9956-ffa450edef68
2008-07-21 04:08:30 +00:00
Jacques Le Roux 641ff10050 Update Copyright to 2008
A real replace in files feature was one of the reasons I use Eclipse 3.4 for near a year now (I even helped to test, a real must have :o)
Not sure previous commit was sent partially or not at all (I needed to update)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677685 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 18:56:25 +00:00
Jacopo Cappellato e8a991abba Several fixes and enhancements to the return process: now a return shipment is automatically created when the return is approved, and when the return is completed an invoice is also created. Added new entity to associate a return item with a shipment.
Several small enhancements to the ui to link returns with shipments and inventory receipts.
Still, a lot of works needs to be done in this area (e.g. manual creation of return shipments, improve the ui, verify the code that creates the invoice for the return, verify the code that apply payments to invoices etc...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@669188 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 14:29:16 +00:00
Vikas Mayur fbffaacc97 New entity SalesForcastDetail - part of jira issue OFBIZ-194
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@661700 13f79535-47bb-0310-9956-ffa450edef68
2008-05-30 13:03:55 +00:00
Bilgin Ismet Ibryam 2727a93034 "Store Order Item changes" from Jira Issue OFBIZ-1773
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655452 13f79535-47bb-0310-9956-ffa450edef68
2008-05-12 09:36:04 +00:00
David E. Jones b6174f540a Some data model cleanups/fixes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@641640 13f79535-47bb-0310-9956-ffa450edef68
2008-03-26 23:27:48 +00:00
Jacopo Cappellato 162a34d428 Fixed duplicated foreign key name; thanks to Yin T for the report. OFBIZ-1713
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@638415 13f79535-47bb-0310-9956-ffa450edef68
2008-03-18 15:27:18 +00:00
Jacques Le Roux eebd98c9c8 A patch from Chris Lombardi "POS: credit card data compliance" 'https://issues.apache.org/jira/browse/OFBIZ-1674) - OFBIZ-1674
+ a file which was missing in a previous commit (base component-load.xml)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@637395 13f79535-47bb-0310-9956-ffa450edef68
2008-03-15 11:31:20 +00:00
Vikas Mayur 0d35f81a22 Applied patch from Jira Issue OFBIZ-1686 (https://issues.apache.org/jira/browse/OFBIZ-1686)
Added new Entity definations for SalesOpportunityTrackingCode, SalesOpportunityCompetitor
with modifications to other entities for SFA component

Thanks to Jyotsna Rathore, Saurabh Nayak for the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@632034 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 15:55:59 +00:00
Bilgin Ismet Ibryam a16275649e Applied my (modified) patch from JIRA Issue # OFBIZ-1453 "store/load possibility for AGGREGATED product configurations".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@613216 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 17:47:01 +00:00
David E. Jones b013ab4f40 Added rateCode field and code to set it in OrderItemPriceInfo, now set in calc price service too
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@598933 13f79535-47bb-0310-9956-ffa450edef68
2007-11-28 09:55:33 +00:00
David E. Jones a1214b539a Removed some redundant and unnecessary constraints in OrderItemPriceInfo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@593272 13f79535-47bb-0310-9956-ffa450edef68
2007-11-08 19:41:29 +00:00
David E. Jones 15aa19b1d8 Added a shipGroupSeqId field to the OrderPaymentPreference to make it possible to tie them to a ship group on the order; this is like the orderItemSeqId field that has been around for a while to tie it to an item, and also fills the gap to be able to associate an order item and ship group combination to a payment preference; also added an orderPaymentPreferenceId to the OrderStatus entity so that this entity can also be used for payment preference status changes; related logic/UI changes will be coming along soon
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@588181 13f79535-47bb-0310-9956-ffa450edef68
2007-10-25 09:48:53 +00:00
Jacopo Cappellato e0c893e5a8 Moved entity to the right package (from requirement to request); thanks to Chris Howe for the patch OFBIZ-726
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585211 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 18:04:54 +00:00
David E. Jones ed3f89cdfa Added new data model elements and seed data for modeling vendor-specific store settings and order with ship group per vendor
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@583076 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 08:49:46 +00:00
David E. Jones a119e17705 A bit of refactoring, but mostly implemented feature only previously implied to save the replacementOrderId on ReturnItemResponse, and attach to relevant ReturnItems
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@569386 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 13:49:21 +00:00
Hans Bakker c995e02a6a OFBIZ 1171, patch from Bilgin Ibryam to allow reservations also on quotes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@566181 13f79535-47bb-0310-9956-ffa450edef68
2007-08-15 14:17:37 +00:00
David E. Jones 7d70c41c12 Did a big search/replace to change all xsd file refs from www.ofbiz.org to ofbiz.apache.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@539504 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 15:47:14 +00:00
Si Chen 80e2c9ca61 Added textValue to InvoiceTerm, OrderTerm and AgreementTerm to store an actual
description of what the term is and can be filled in with seed data.  The 
description fields are retained, but are intended to be user editable.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@536333 13f79535-47bb-0310-9956-ffa450edef68
2007-05-08 21:22:09 +00:00
Andrew Zeneski e32872653c added new field OrderItem.fromInventoryItemId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533919 13f79535-47bb-0310-9956-ffa450edef68
2007-05-01 02:59:48 +00:00
David E. Jones f76e1b5cf8 Small fix for fk-name which was over 18 chars; fixes warning on startup
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@533035 13f79535-47bb-0310-9956-ffa450edef68
2007-04-27 09:34:51 +00:00
Andrew Zeneski a921174f85 added more detailed information for financial accounts when used for payment on orders
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532933 13f79535-47bb-0310-9956-ffa450edef68
2007-04-27 02:20:50 +00:00
Si Chen b33e670ddc Adding a sequenceId field to the OrderItemShipGrpInvRes entity and ordering secondarily by this field when inventory reservations are retrieved in the balanceInventoryItems service, as an aid to prioritizing reservations when a RDBMS (such as MySQL) doesn't support fractional seconds on timestamp fields
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532412 13f79535-47bb-0310-9956-ffa450edef68
2007-04-25 17:20:21 +00:00
David E. Jones ffb29963f6 A few small changes to facilitate handling of certain order and inventory status scenarios; more supporting code should be added that use these in coming weeks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@531870 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 10:41:55 +00:00
Andrew Zeneski c59a124bc4 added paymentMethod to return header
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@531217 13f79535-47bb-0310-9956-ffa450edef68
2007-04-22 16:08:49 +00:00
David E. Jones 4f4863c3d7 Added productPromoCodeId to ShoppingList, and change order from list service code to add it to the cart when a shopping list order is placed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@525534 13f79535-47bb-0310-9956-ffa450edef68
2007-04-04 15:19:45 +00:00
David E. Jones c3f2b9a4c7 Added a bunch of index definitions based on being annoyed by console log messages about slow queries
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@523013 13f79535-47bb-0310-9956-ffa450edef68
2007-03-27 17:44:11 +00:00
David E. Jones ded855f00b Removed cvvNumber from CreditCard, added comment about use of securityCode on the OrderPaymentPreference which is where this should really be stored
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@515393 13f79535-47bb-0310-9956-ffa450edef68
2007-03-07 00:23:44 +00:00
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