Following points are covered in this patch:
1) Show associated products for product of type "MARKETING_PKG_AUTO" on order items section of show cart page in order manager application.
2) Marketing packages should only shown backordered when ATP of product which compose Marketing packages product are less than quantity added in cart.
3) Pick sheets should show Products of type Marketing Packages along with the products which compose Marketing Packages.
4) Show link of production run created on order items section of Order detail page while placing order for product of type MARKETING_PKG_AUTO.
5) Product of type Marketing Packages should be shown on Verify Pick Screen along with Products they are composed of.
Thanks Divesh for the contribution - this is very nice addition to the trunk.
I would be more then happy to see comments / concern from - Jacopo? Scott? Anil? or others?
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834479 13f79535-47bb-0310-9956-ffa450edef68
Following points are covered in this patch:
1) Removed hard-coded product ids for Gift certificates products from GiftCertificates.ftl and added new category type called "GIFT_CARD_CATEGORY" and related demo data, also added groovy script for fetching logic to address this issue.
2) Also handled hard-coded surveyId in AddGiftCertificates.groovy
3) Added user friendly messages if required data is not available .
4) Added missing license header in GiftCertificates.ftl
Thanks Divesh for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834042 13f79535-47bb-0310-9956-ffa450edef68
1) Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page
2) Also add feature to fill survey on same page.
3) Also if CSR selects "Create as new order" from Actions block for Gift card products then survey responses will be created automatically for the new order, which will be same as last order.
Thanks Arun / Divesh for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833323 13f79535-47bb-0310-9956-ffa450edef68
When OrderConfirmNotice screen call OrderNoticeEmail.ftl orderheader.ftl has some uiLabelMap variable without source to translate
+ a space in OrderUiLabels.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813672 13f79535-47bb-0310-9956-ffa450edef68
I also changed some "numéro" to n°, but I kepts numéros as n°s is bad (French language is really weird, full of exceptions ;o)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812532 13f79535-47bb-0310-9956-ffa450edef68
I had to remove a conflict in ProductUiLabels.xml and also removed OrderCreatedBy but kept the German translation from OrderCreatedBy and ProductCreatedBy instead of CommonCreatedBy because it seemed more widely used. Please German speaking people check...
I don't backport as suggested Erwan as it's really not a bug!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812478 13f79535-47bb-0310-9956-ffa450edef68
to keep consistency among all the labels displayed under Action screenlet on Order Detail Page.
Applied patch from Divesh Dutta, part of OFBIZ-2650 (https://issues.apache.org/jira/browse/OFBIZ-2650).
Note: The translation for locale fr, it and nl was different in both the labels, out of which one label is now removed. I am not sure which one is correct so
contributors from these locales please do take sometime to see which one is correct. Thanks!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788594 13f79535-47bb-0310-9956-ffa450edef68
-- Worked on "Warning Form". Now when newEstimatedShippingCharges is greater/less than 10% of estimatedShippingCharges then shown warning form.
Thanks Akash Jain for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@782931 13f79535-47bb-0310-9956-ffa450edef68
I have cursory reviewed the code and did the functional testing. And found functionality working fine.
Thanks Akash Jain for your contribution.
Specially thanks to other members involved in this work are Divesh, Pranay & Vikas.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@782258 13f79535-47bb-0310-9956-ffa450edef68
The work flow is based on following steps:
1) If for a return both finAccountId and billingAccountId are supplied, then preference goes to the setting on Product Store. A warning message is shown so that the
user know which account is used.
2) If a finAcccountId is supplied then first billing account with -ve amount are searched and if it is found then amount is credit to the billing account else it goes to
financial account.
3) If a billingAccountId is supplied then it is used to credit the refund amount.
4) If none of them is supplied, then preference again goes to the setting on Product Store.
Patch applied from Mridul Pathak, part of OFBIZ-2502 (https://issues.apache.org/jira/browse/OFBIZ-2502)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781804 13f79535-47bb-0310-9956-ffa450edef68
through a new link "Create Replacement Order" under Action screelet on the Order Detail Page. This link only appear for an order in complete status.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781283 13f79535-47bb-0310-9956-ffa450edef68