Commit Graph
341 Commits
Author SHA1 Message Date
Jacques Le Roux a941c13879 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885140 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 19:42:43 +00:00
Bruno Busco aee9b7b437 Moved some application labels out of the framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 21:50:31 +00:00
Bruno Busco e1b3275805 Moved some application labels out of the framework (more to come)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@882011 13f79535-47bb-0310-9956-ffa450edef68
2009-11-19 00:10:52 +00:00
Ashish Vijaywargiya d48eee6986 Applied patch from jira issue OFBIZ-3173 - Better supportability for products of type MARKETING_PKG_AUTO in order processing and fulfillment process.
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
2009-11-10 14:32:53 +00:00
Ashish Vijaywargiya 0664a96244 Applied improved patch from jira issue OFBIZ-3165 - Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page.
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
2009-11-09 12:53:03 +00:00
Ashish Vijaywargiya c0d45d8521 Applied patch from jira issue: OFBIZ-3165 - Add additional screen for gift card certificate buying functionality by CSR in Order manager application in add item page.
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
2009-11-06 09:00:16 +00:00
Jacques Le Roux 26b85909d3 Better French translation even if not really good (should need to split and create a new label, I give up...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830108 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 09:52:03 +00:00
Jacques Le Roux 6dd78d7bd3 Better French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829651 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 21:14:00 +00:00
Jacques Le Roux 06d24f1277 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829605 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 15:25:24 +00:00
Marco Risaliti 5119487c68 Some missing italian translations of order component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829600 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 15:12:52 +00:00
Marco Risaliti 2c9696b07c Some missing internationalization on Picking list management
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829457 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 22:14:36 +00:00
Jacques Le Roux 06ef8cd32e Cleans labels, to be checked in Dutch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829086 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 15:04:36 +00:00
Marco Risaliti 4ffc95c72e Some missing italian translations of order component, sorting the label keys
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828838 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 20:25:18 +00:00
Hans Bakker 8a1913f735 patch from Pierre Smits to add mre dutch labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826585 13f79535-47bb-0310-9956-ffa450edef68
2009-10-19 05:43:17 +00:00
Bruno Busco 0cc834344c Removed the word "Application" from the Application menu title (OFBIZ-3016)
At this stage I did this for the primary applications only.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823833 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 09:27:30 +00:00
Jacques Le Roux afbb983bff I18n of some promotion code errors and French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823694 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 21:20:42 +00:00
Jacques Le Roux 00ea03a370 Better French translation (in relation with http://docs.ofbiz.org/display/~mattboll/Dictionary+for+French+translations)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813733 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 09:17:15 +00:00
Jacques Le Roux 3e248b994c A patch from Eric DE MAULDE "Translation error into OrderConfirmNotice screen" (https://issues.apache.org/jira/browse/OFBIZ-2925) - OFBIZ-2925
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
2009-09-11 06:25:39 +00:00
Jacques Le Roux d481244e29 Show the total taxes included in sub total when taxes included in prices is selected in store
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813136 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 22:00:20 +00:00
Jacques Le Roux 89ddce4f54 A slightly modified patch (see comment in Jira) from Nicolas Malin "Add PartyIdentification feature" (https://issues.apache.org/jira/browse/OFBIZ-2848) - OFBIZ-2848
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
2009-09-08 14:38:30 +00:00
Jacques Le Roux d6bb9b998f From a patch done by Erwan at https://issues.apache.org/jira/browse/OFBIZ-2906 - OFBIZ-2906 : "Replacement of ProductCreatedBy with CommonCreatedBy"
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
2009-09-08 12:17:50 +00:00
Jacques Le Roux 831e21fa2a Intially from a Vikas's comment on dev ML...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810870 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 10:27:55 +00:00
Jacques Le Roux 1a1903f2e9 A patch from Carsten Schinzer "ordermgr webapp - catalog - productsummary contains hard coded labels" (https://issues.apache.org/jira/browse/OFBIZ-OFBIZ-2856) - OFBIZ-2856
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810814 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 08:41:24 +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
Vikas Mayur 0f70cebf5c Correction to label name, reported by Pranay Pandey.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@804135 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 09:20:18 +00:00
Hans Bakker fd4d514dff do not allow changes to the customer request when cancelled or completed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@799192 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 07:29:05 +00:00
Adrian Crum c87e4f5d4a Chinese translation for the applications folder, provided by Shi Yusen - https://issues.apache.org/jira/browse/OFBIZ-2767.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798955 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 15:39:59 +00:00
Vikas Mayur 4133eb8982 Minor correction to the label names and the script.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795884 13f79535-47bb-0310-9956-ffa450edef68
2009-07-20 15:54:40 +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
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
Vikas Mayur 41f6476815 While placing an order through order manager user can add shipping notes. These notes are saved similar to internal order notes but shipping notes are public while internal
order notes are private. Patch from Akash Jain.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792402 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 05:22:02 +00:00
Vikas Mayur bf9f24b5de Added an option to cancel selected order items on Order Detail Page. Applied patch from Divesh Dutta, part of OFBIZ-2696 (https://issues.apache.org/jira/browse/OFBIZ-2696)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791100 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 10:57:01 +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 aba849d199 Thanks to Scott we now use the indicator of the productstore to show/hide the giftwrap options anywhere
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790801 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 06:28:16 +00:00
Vikas Mayur 852b9337a2 Fix typo, Recieved -> Received
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790522 13f79535-47bb-0310-9956-ffa450edef68
2009-07-02 09:40:35 +00:00
Hans Bakker 76b8c7354d introduce a 'gift enable' with default = Y in the order.properties file and pos, ecommerce and ordermgr itself use it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790517 13f79535-47bb-0310-9956-ffa450edef68
2009-07-02 09:25:14 +00:00
Hans Bakker 2374289262 more corrections on the customer request list shown to a customer
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789778 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 14:58:30 +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
Vikas Mayur a2f0641b4a Changed the label from "Create return" to "Create Return", the first letter of second word is now capital. Also removed the duplicate label. The reason for doing this is
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
2009-06-26 05:55:12 +00:00
Vikas Mayur c09d083e0e User cannot verify order items (Facility > Verify Pick) if there is insufficient inventory in the system. Patch from Akash Jain.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788290 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 08:21:18 +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 7410dc0426 Applied patch from jira issue OFBIZ-2407 (Functionality for "Weight Packages Only" option on pack order screen)
-- 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
2009-06-09 09:46:03 +00:00
Ashish Vijaywargiya b4f5dace64 Applied patch from jira issue OFBIZ-2407 (Functionality for "Weight Packages Only" option on pack order screen).
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
2009-06-06 13:15:14 +00:00
Vikas Mayur 0f1ffdf0f8 Added a field to ProductStore to specify Store Credit Account type (FIN_ACCOUNT or BILLING_ACCOUNT) for refund return. For Demo ProductStore it is default to Financial Account.
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
2009-06-04 17:32:02 +00:00
Vikas Mayur 537cb983c8 Adding back label OrderOrderHistory as there was a reference to this label in order screen. Reported by Hans on dev list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781292 13f79535-47bb-0310-9956-ffa450edef68
2009-06-03 08:12:33 +00:00
Vikas Mayur 0ffbecd3a1 Better label. This is used on Order Detail Page > Action screenlet and this would now describe the action in better way for the user.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@781286 13f79535-47bb-0310-9956-ffa450edef68
2009-06-03 07:29:20 +00:00
Vikas Mayur ee9d11bbdc Added an option to create a duplicate order with total adjusted to $0 from an existing order in case of shipment is lost for the existing order etc. This order can be created
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
2009-06-03 07:18:58 +00:00
Vikas Mayur e47702e2ba Added UPS integration support for sending Shipment Return Label email to customer. This option will be available on order detail screen and as well on return screen when
order is in COMPLETED status and return is in ACCEPTED status respectively.
Patch from Pranay Pandey, part of OFBIZ-2553 (https://issues.apache.org/jira/browse/OFBIZ-2553)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@780582 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 07:52:23 +00:00
Vikas Mayur 3ea5683831 Small change in the label.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779437 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 05:21:04 +00:00