Commit Graph
47 Commits
Author SHA1 Message Date
David E. Jones 298fbb94ef Fixed issue with data loading I caused when moving this record from the ecommerce component to the order component; reported on the ml by gil portenseigne
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764074 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 22:03:14 +00:00
David E. Jones bc073306e7 Added/moved some missing WebSite data needed for selecting themes, etc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763828 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 22:12:11 +00:00
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
Hans Bakker c1491066f0 moved custrequest notification from myportal to order,moved other programs around, reorganized customer request status handling, replaced cust request roles from ftl to form, removed other used programs from myportal. Now only the party registration is left in myportal.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763135 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 07:58:00 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Hans Bakker cbbe02a1d8 many cleanups, moved customer requests back into order, fixed the edit contactmech in portal as reported in the mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761186 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:57:09 +00:00
Hans Bakker 2d047ff733 move incoming cust request back from myportal into order and update party portlet descriptions and portlet categories
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759674 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 12:56:50 +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
Adam Heath a56206c9da Fix test party:test-CreateNewRequest; The system user tries to create
a new customer request on behalf of DemoCustomer; however, the
permissions don't allow this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750078 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 17:11:27 +00:00
Jacopo Cappellato 98e71f1922 Misc cleanups for data files:
1) added {SHA} prefix to all hashed passwords
2) moved "admin" user to demo data; the only user maintained with seed data is now the "system" user
3) removed password for the "system" user; now there are no passwords in seed data



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739743 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 11:40:55 +00:00
Adrian Crum 50724da6b9 More temporal expression work - additional JavaDocs, code fixups, converted all job sandbox jobs to temporal expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@695995 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 18:19:55 +00:00
Jacques Le Roux febf82686b Undoing change committed in r680663. I completely Removed ORDER_SENT status which is unused OOTB and now simply hide it in UI.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@680675 13f79535-47bb-0310-9956-ffa450edef68
2008-07-29 11:33:51 +00:00
Jacques Le Roux e7219f3400 Removed ORDER_SENT status which was actually unused
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@680663 13f79535-47bb-0310-9956-ffa450edef68
2008-07-29 10:23:17 +00:00
Vikas Mayur e968dd12d0 Earlier comment was a bit confusing since there was no mapping between order item types and return item types for entity ReturnItemTypeMap.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677511 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 06:46:59 +00:00
Jacopo Cappellato 81d059620d New seed data for vendor (suppliers) returns.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677288 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 13:52:08 +00:00
Scott Gray 6bf04d0238 Moved the workflow related data to the workflow component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@667499 13f79535-47bb-0310-9956-ffa450edef68
2008-06-13 12:22:12 +00:00
Hans Bakker 74ff3e83ac created a automatic subscription extension, improved the (product) subscription screens, and added 3 fields in the subscription and subscription resource to enable this function
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@661283 13f79535-47bb-0310-9956-ffa450edef68
2008-05-29 10:31:14 +00:00
Bilgin Ismet Ibryam 553941e8f2 Added UI for entering Order Item Change reason and comments during Order Item update/cancel/append.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658036 13f79535-47bb-0310-9956-ffa450edef68
2008-05-19 23:13:02 +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
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
Si Chen 262fff86da manual refund status for returns that require manual refunds
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@605746 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 00:03:41 +00:00
Bilgin Ismet Ibryam 68f5d9e4e9 My first commit. A patch from me for adding "Missing ReturnItemTypeMap for AGGREGATED prodcuts" OFBIZ-1423
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603189 13f79535-47bb-0310-9956-ffa450edef68
2007-12-11 09:56:24 +00:00
Si Chen 952c6cc6d6 Add payment refunded status for order payment prefs. Mark refunded prefs with this status, which fixes a bug where system would attempt to release them if the order was cancelled. This also displays that the pref is a Refund on orderview, which is more sensible than displaying 'Settled'.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@602998 13f79535-47bb-0310-9956-ffa450edef68
2007-12-10 19:12:16 +00:00
Jacopo Cappellato f7c5a8e86e Added ORDERMGR_SALES_UPDATE permission.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@579248 13f79535-47bb-0310-9956-ffa450edef68
2007-09-25 13:49:38 +00:00
Jacopo Cappellato 65e63cc0a3 Implemented ability to change the shipToParty in the cart; I have only implemented the ui for this in the quick checkout screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574259 13f79535-47bb-0310-9956-ffa450edef68
2007-09-10 14:32:49 +00:00
Andrew Zeneski 0ee53316b2 added mass order change for hold/process/cancel
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@573665 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 18:38:36 +00:00
Jacopo Cappellato 1eecbaef0e Without the ORDERMGR_VIEW permission, the users in the ORDERADMIN_LTD group cannot access the Order Manger application.
This is probably intended as a temporary fix since, in my opinion, the ORDERMGR_ROLE_VIEW permission should be enough to access the Order Manager application.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@571156 13f79535-47bb-0310-9956-ffa450edef68
2007-08-30 13:02:10 +00:00
Si Chen a49bc5827d Commenting out the autoCancelOrderItems service by default. Only some businesses do this, and most of the others are usually shocked if this happened, so it should not be part of seed data and default behavior
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@564444 13f79535-47bb-0310-9956-ffa450edef68
2007-08-10 00:56:22 +00:00
David E. Jones ba5807a8a6 Added transition so HELD can be an initial status
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@562834 13f79535-47bb-0310-9956-ffa450edef68
2007-08-05 05:41:28 +00:00
Jacopo Cappellato 6ca265d3bc This is the first version (still not completed) of the eBay integration (import of orders from eBay to OFBiz and export of products from OFBiz to eBay). Thanks to Marco Risaliti for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@557392 13f79535-47bb-0310-9956-ffa450edef68
2007-07-18 20:41:01 +00:00
Adrian Crum 9684b69ee5 Moved blog and order component demo data out of the securityext component - OFBIZ-813.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@557077 13f79535-47bb-0310-9956-ffa450edef68
2007-07-17 22:27:04 +00:00
Jacopo Cappellato 9492c38aca Added record needed to return the new 'mkt pkg on pick'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@542233 13f79535-47bb-0310-9956-ffa450edef68
2007-05-28 14:08:21 +00:00
Jacopo Cappellato 46b3079609 Moved seed data for OrderPaymentPreference status from the accounting to the order component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@540870 13f79535-47bb-0310-9956-ffa450edef68
2007-05-23 07:45:38 +00:00
David E. Jones a99893c1ff Added some new types for new return stuff for repair replacement and for refurbished equivalent
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532864 13f79535-47bb-0310-9956-ffa450edef68
2007-04-26 21:07:42 +00:00
Andrew Zeneski af104e0969 added new return type
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@531665 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 00:00:17 +00:00
Jacopo Cappellato e8833c6601 Added new status of "proposed" to Requirement, that is the initial status of all the requirements proposed by the mrp.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@519005 13f79535-47bb-0310-9956-ffa450edef68
2007-03-16 15:20:53 +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
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
Si Chen 05c7525892 new return reason: COD payment rejected
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@489205 13f79535-47bb-0310-9956-ffa450edef68
2006-12-20 21:49:26 +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
Hans Bakker 90cadf7981 move all parties/userLogins not required for production from seed to demo data. Only party/Userlogin 'admin' as usable loginId left
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@442409 13f79535-47bb-0310-9956-ffa450edef68
2006-09-12 01:40:22 +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 ee38e0e796 Applied patch from Rodrigo Aguinaga (OFBIZ-173) to implement some basic features to allow the creation of purchase requests and quotes, that can be transformed to purchase orders.
I did some changes to contributed code for QuoteServices.xml because there were some formatting issues and one error in the minilang syntax.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@439356 13f79535-47bb-0310-9956-ffa450edef68
2006-09-01 15:45:47 +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
Jacopo Cappellato 01e8a94366 Fixed wrong data for marketing package returns.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419283 13f79535-47bb-0310-9956-ffa450edef68
2006-07-05 17:11:29 +00:00
Jacopo Cappellato 129e780830 Misc bug fixes for the return marketing package feature.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@419258 13f79535-47bb-0310-9956-ffa450edef68
2006-07-05 15:39:26 +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