Commit Graph
231 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 364d0505aa added html=safe to opportunity services text fields and move the servicedef from order to marketing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820898 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 06:38:05 +00:00
Jacques Le Roux 71046660f1 A patch from Prateek Jain "Make ATP/QOH button in purchase order independent of productStore" (https://issues.apache.org/jira/browse/OFBIZ-2967) - OFBIZ-2967
When we click on ATP/'Qoh button in purchase order for a particular order item it gives error that facility id is not present.Ideally in case of purchase order it should not be dependent on productStore. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@818715 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 04:34:57 +00:00
Jacopo Cappellato a69b936254 No reason to keep this parameter non optional: order terms are not required to create an order.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810985 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 15:05:42 +00:00
Jacopo Cappellato d39fb5c1d6 Added ability to specify an issuedDateTime for item issuances and an effective date for payments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@806102 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 10:00:52 +00:00
Vikas Mayur 50a2168371 Added noteName attribute in service definition of createOrderNote. Applied patch from Arun Patidar, part of OFBIZ-2802 (https://issues.apache.org/jira/browse/OFBIZ-2802)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@801686 13f79535-47bb-0310-9956-ffa450edef68
2009-08-06 15:52:52 +00:00
Jacopo Cappellato e823b0a295 Fixed missing or optional out parameters in sendMail service definitions. They were causing errors for example when email notifications were disabled.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@801523 13f79535-47bb-0310-9956-ffa450edef68
2009-08-06 07:19:17 +00:00
Jacopo Cappellato 482beec464 Added option to quick ship test orders
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@801317 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 17:22:00 +00:00
Ashish Vijaywargiya 87dffafd04 This was making my life difficult since last few days.
Although I have't had a chance to look on this issue, but now here you go.

The subject missing error was coming on the console again and again although it was sending emails.

In case of any error like missing subject it was sending email again and again. 
I see the orderComplete notification four times on my machine.

Here is the sample log message of one of the service sendShipmentCompleteNotification which was failing:

Exception: org.ofbiz.service.ServiceValidationException
Message: Unknown parameter found: [sendShipmentCompleteNotification.subject]
---- stack trace ---------------------------------------------------------------
org.ofbiz.service.ServiceValidationException: Unknown parameter found: [sendShipmentCompleteNotification.subject]
org.ofbiz.service.ModelService.validate(ModelService.java:638)
org.ofbiz.service.ModelService.validate(ModelService.java:552)
org.ofbiz.service.ServiceDispatcher.runSync(ServiceDispatcher.java:482)
org.ofbiz.service.ServiceDispatcher.runSync(ServiceDispatcher.java:221)
org.ofbiz.service.GenericDispatcher.runSync(GenericDispatcher.java:159)
org.ofbiz.service.job.GenericServiceJob.exec(GenericServiceJob.java:70)
org.ofbiz.service.job.JobInvoker.run(JobInvoker.java:242)
java.lang.Thread.run(Thread.java:619)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799889 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 15:38:32 +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 18eb07ab01 Fixed unknown parameter found exception. Was resulting in multiple order confirmation emails.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797924 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 13:08:18 +00:00
Anil Patel 92144d5718 Making postal address fields options. Map processor in service checks required fields and returns error if appropriate. In case shipping contact mach should be used for billing then we don't need postal address fields data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797067 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 13:34:27 +00:00
Vikas Mayur a3f6e7bf50 Added an option to mass cancel remaining purchase order items.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@794546 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 06:22:19 +00:00
Vikas Mayur 174827cdd4 Added an option to Add/Edit Gift Message on Order Detail Page when the order is a gift.
Applied patch from Arun Patidar, part of OFBIZ-2707 (https://issues.apache.org/jira/browse/OFBIZ-2707)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791509 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 15:06:36 +00:00
Hans Bakker f59e3fae3f allow 'safe' html in customer request notes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791206 13f79535-47bb-0310-9956-ffa450edef68
2009-07-05 07:30:29 +00:00
Vikas Mayur 53cf3b7f62 Shipping Instructions on order detail page can now be added (if the user does not enter any instructions while doing a checkout) as well as can be edited.
Applied patch from Akash Jain, part of OFBIZ-2687 (https://issues.apache.org/jira/browse/OFBIZ-2687)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790886 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 12:32:47 +00:00
Hans Bakker 9d1004714b Now allows for employees to add a note to the customer request, the customer gets notified by email with an url. If he logs in he can also add a note as a reply to the note of the employee, the employee will be notified with a system info message when the customer added the note
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788950 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 10:54:31 +00:00
Ashish Vijaywargiya 46c40a4c1b Applied patch from jira issue OFBIZ-2660 (shipToName is not being processed while creating shipping address through createUpdateShippingAddress service )
Thanks Pranay for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788649 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 10:35:10 +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
Ashish Vijaywargiya aa73f29855 Applied patch from jira issue OFBIZ-2470 (In Cross-Ship Replacement we need to make sure return for refund is possible after a return for replacement)
This patch covers following scenarios:

1) Refund of the replacement order possible now. Since the replacement order has no payment preferences associated to it, payment preferences of the original order are used to process the refund. When the replacement order refund is complete you can look for the related entry in payment information section of the original order. Also you can find the payments for this return in ReturnItem screen.

2) When a replacement order is cancelled, and replacement return against which it was created is already received, then that return is refunded.

Thanks Mridul, Arun for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@786827 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 13:57:48 +00:00
Anil Patel 2e07c7ddd6 Added options to perform quickShip action on selected orders from list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@786711 13f79535-47bb-0310-9956-ffa450edef68
2009-06-19 23:11:42 +00:00
Ashish Vijaywargiya 64524e4add Applied patch from jira issue OFBIZ-2619 (Issues with Receive PO functionality).
I have tested this patch extensively and now things looks more accurate.
I agree with the issues specified from Mridul in the jira issue.

Thanks Mridul for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@786013 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 10:48:09 +00:00
Ashish Vijaywargiya 49342edf9c Applied patch from jira issue OFBIZ-2548 (When shipment is put on hold from Packing screen then show online shipping estimates on order details page for UPS)
Thanks Divesh, Pranay for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@784130 13f79535-47bb-0310-9956-ffa450edef68
2009-06-12 14:21:56 +00:00
Ashish Vijaywargiya 0b546e87d0 Applied patch from jira issue OFBIZ-2527 (When editing items, Promotion Codes are getting deleted when we click Update Items.)
Thanks Ratnesh and Chirag for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@783369 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 14:37:35 +00:00
Vikas Mayur f9810fbfee Improve the Return Status process so that it also take into account the ReturnItem status change.
Slightly modified patch from Awdesh Singh Parihar, part of OFBIZ-2541 (https://issues.apache.org/jira/browse/OFBIZ-2541)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779926 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 10:54:48 +00:00
Anil Patel 329d0a8016 add field to add lead party from create sales opportunity screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778558 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 03:46:45 +00:00
Anil Patel 0f61806304 made salesOpportunityId optional to fit needs of create new screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778556 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 03:22:46 +00:00
Anil Patel 8555fc06e3 moved Opportunity services to Order component where entity definitions are. Added eca to add Account Party when partyId is entered in create opportunity form.
Updated names of artifacts to match entity they deal with.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778515 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 21:34:04 +00:00
Vikas Mayur d16e9e2c68 Enable audit for few fields on ReturnItem entity namely returnTypeId, returnReasonId, returnQuantity, receivedQuantity and returnPrice. The history of changes on these fields
can be viewed through new tab Return History. Also added a new service for creating return status and removed the inline code that was used earlier to create Return Status.
Patch applied from Awdesh Singh Parihar, part of OFBIZ-2483 (https://issues.apache.org/jira/browse/OFBIZ-2483)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778463 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 18:02:47 +00:00
Vikas Mayur 405fa592c1 Added few more search filters on find order page. They are shipping method, order viewed and PaymentGatewayResponse - gatewayAvsResult, gatewayScoreResult.
Applied modified patch from Arpit Singh Pandya, part of OFBIZ-2496 (https://issues.apache.org/jira/browse/OFBIZ-2496)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777084 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 11:54:35 +00:00
Vikas Mayur b0772226ff Misc. improvement over recently added filters on find order page
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777007 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 08:23:08 +00:00
Hans Bakker 9365575c9e move of requestlist request to projectmgr, create request from commevent enhancements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776994 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 07:43:11 +00:00
Vikas Mayur 5f5e108099 Just put the attributes in right order
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776804 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 18:46:31 +00:00
Vikas Mayur 892276bae5 These attribute on findOrders service should be just IN and not OUT
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776803 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 18:45:01 +00:00
Vikas Mayur 155797db20 Added new filters on find order page. This filter is about finding orders ship to a country. This work along with the option "Include Only" and "Do Not Include".
With the former option system will display only orders that are ship to the selected country and with latter it will display only order that are not shipped to the 
selected country. 
Patch from Amit Sharma, part of OFBIZ-2477 (https://issues.apache.org/jira/browse/OFBIZ-2477). Thanks Pranay for testing.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776662 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 11:17:20 +00:00
Vikas Mayur 2f783ae886 When inventory is found or returned for a Discontinued Item then update ProductCategoryMember so that this item is shown in front-end store.
Slightly modified patch from Akash Jain, part of OFBIZ-2484 (https://issues.apache.org/jira/browse/OFBIZ-2484)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776275 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 11:35:30 +00:00
Hans Bakker 53b0d3715f some error corrections on r775883: create custreq,task and assign from commevent all in one screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776217 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 07:20:55 +00:00
Hans Bakker d8a175d4a6 added a function to check for the presence of a companent, make the projectmanager custrequest creation working using the commevent as the data, added some allow-html= safe flags
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@775883 13f79535-47bb-0310-9956-ffa450edef68
2009-05-18 10:07:51 +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
Andrew Zeneski 0eb248bda0 message wrapper added to order notification interface (now returned by the sendMail service)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@774197 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 04:59:40 +00:00
Hans Bakker 81acb60df5 allow safe html in customer request name and item content
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@773772 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 03:20:28 +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
Hans Bakker 1a05ec9312 html allow corrections and default view
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771576 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 06:17:44 +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 cc87cc205f Misc. cleanups. Btw, I am not able to find any usage of updateReturnItemsStatus service?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770157 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 10:43:48 +00:00
Vikas Mayur 953c5fcc05 Changed currentStatusId --> oldStatusId, as this was actually old status and not current status.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770148 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 10:24:22 +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
Hans Bakker 4c0c034121 some more faultfixing on customer request notifications: mainly the partyIdTo was not provided
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@769274 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 07:49:12 +00:00
Hans Bakker 0c5a93074c fix the new notification services using sendMailFromTemplateSetting using body parameters
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768245 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 10:08:55 +00:00