Commit Graph
72 Commits
Author SHA1 Message Date
Hans Bakker 029dee7381 added the warehouse processing for the ordersales entities. Contribution by our Antwebsystems employee Tom
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883699 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 14:07:47 +00:00
Hans Bakker b7d6914ced add purchase orderlist portlet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834800 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 08:17:15 +00:00
Bruno Busco f33c01737f Part of OFBIZ-3067 - Menus and form widget files location
Order component
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829377 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 14:29:27 +00:00
Jacques Le Roux 9aa9cf54b0 Fix a bug reported by Cimballi on user ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@808787 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 07:23:05 +00:00
Scott Gray e3ab7ca8c3 Implemented a services to keep track of products purchased together by creating ProductAssoc records of type ALSO_BOUGHT.
These associated products are then shown to the customer on the product pages as "Customers who bought this item also bought: ..." sorted by popularity.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798500 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 12:13:28 +00:00
Anil Patel c3bf310205 Now rendering Reports tab of Order manager using ofbiz portal page technology.
Patch from OFBIZ-2745. Thanks Vivek for patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796654 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 09:58:37 +00:00
Vikas Mayur a97c5ec812 Added the ability to cancel received items against a purchase order if the user make a mistake and receive something incorrectly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796272 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 12:28:52 +00:00
Hans Bakker e837675297 rename Request files to CustRequest files as discussed in the mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795304 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 03:30:19 +00:00
Anil Patel 9527d73b56 New return reason for size exchange.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792962 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 14:47:49 +00:00
David E. Jones 76c1355214 Added adjustment type for donation to keep track of them separate from other discounts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791887 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 16:00:47 +00:00
Hans Bakker 54232da5f2 OFBIZ-2657: implemented the addition of the default 'from' email address
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789652 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 10:19:59 +00:00
Hans Bakker 0b3d4f311d small corrections of the customer viewing his customer requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789596 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 07:23:20 +00:00
Anil Patel 021d9296bb New Order main page using Portlets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789244 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 07:23:22 +00:00
Bruno Busco 4418ba53f6 Added screenshot for Incoming Customer Requests portlet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788989 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 15:05:28 +00:00
Ashish Vijaywargiya 9bf8d8131e Created new PortletCategory for ORDERMGR and used it in other portlets.
Removed old record.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788952 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 11:00:22 +00:00
Ashish Vijaywargiya 97e8ccd8ef Applied patch from jira issue OFBIZ-2655 (Portlet to list Sales Orders placed on a day.)
Thanks Chirag for your contribution on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788945 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 10:13:11 +00:00
Hans Bakker 0f2db54b40 several adjustments on customer request notifications and added a notification when a note is added to the customer request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788606 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 06:35:54 +00:00
Hans Bakker e911bc8f88 added a new portlet: view a specific customer request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788592 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 05:51:34 +00:00
Ashish Vijaywargiya 132387981d Applied patch from jira issue OFBIZ-2402 (Create a Portlet that show a list of orders placed by a customer)
Thanks to Ravindra Mandre for working on this, Chirag for functional review & Sumit for reviewing and doing minor changes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785113 13f79535-47bb-0310-9956-ffa450edef68
2009-06-16 08:44:43 +00:00
Hans Bakker fbd84b7489 move myportal demo data into the related components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779048 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 08:22:21 +00:00
Vikas Mayur e7bffd93ea A zero amount replacement order gets created in held status when a return is accepted by using return type "Wait Replacement Reserved".
If the return is not received within 30 days then all these replacement orders are canceled by a scheduled batch process.

Applied a slightly modified patch from Mukesh Choudhary, part of OFBIZ-2464 (https://issues.apache.org/jira/browse/OFBIZ-2464)

IMO, we can define a new field daysToCancelRepOrder (or any better name) on ProductStore entity instead of reading days till cancel from a properties file. This would
be a very easy change. Thoughts?


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@775091 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 11:48:46 +00:00
Vikas Mayur b057ce7808 New return type "Refund Immediately" which trigger refunds on when return is accepted.
Patch from Deepesh Kapoor, part of OFBIZ-2429 (https://issues.apache.org/jira/browse/OFBIZ-2429) 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@774291 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 12:30:20 +00:00
Vikas Mayur 41ac15143c Added new return type "Replace Immediately". This could be used with returns for which items are not expected to be returned and even item(s) cost less then the shipping
charges.

Patch from Deepesh Kapoor (reviewed and tested by Pranay Pandey), part of OFBIZ-2428 (https://issues.apache.org/jira/browse/OFBIZ-2428)
Note: I have made only one change, changed the return type from RTN_REPLACEIMMEDIATE to RTN_REPLACE_IMMEDIAT just for sake of clarity. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772642 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 13:11:48 +00:00
Vikas Mayur fd3dc10998 While doing a refund return, customer may want to purchase new items in exchange of returned items. A CSR can do this by creating an exchange order against the return.
To support this, new type EXCHANGE added for OrderItemAssocType.

Patch from Akash Jain (reviewd and tested by Pranay Pandey), part of OFBIZ-2377 (https://issues.apache.org/jira/browse/OFBIZ-2377)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770659 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 13:04:24 +00:00
Vikas Mayur c49aedf159 Added support for new return type "Wait Replacement Reserved".
If a return is created using this return type then
1) If status of this return is changed to accepted then a replacement order is created in Hold status. 
2) If status of this return is changed to recieved then this replacement order status is changed to approved.

Applied slighlty modified patch from Deepesh Kapoor, part of OFBIZ-2376 (https://issues.apache.org/jira/browse/OFBIZ-2376)
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770128 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 09:26:24 +00:00
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