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
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
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
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
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
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
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
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
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
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
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
Anil Patel
1d26ae9f32
Add screenlet to show list of opportunity for an account.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778544 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 01:22:10 +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
d124ccbbf2
Enabled audit on few fields on OrderItem to archive changes in OrderItem price and quantities as well as on OrderItemShipGroup to archive changes in shipment method for an
...
order. This can be viewed through "Order History" link under Actions screelet on Order Detail Page.
Slightly modified patch from Amit Sharma, part of OFBIZ-2499 (https://issues.apache.org/jira/browse/OFBIZ-2499 )
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778406 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 12:35:33 +00:00
Vikas Mayur
a06348da4a
Added an option to add a new shipping address from Order detail page. New shipping address cannot be added for orders that are completed as well as canceled.
...
Applied patch from Anurag Singh Senger, part of OFBIZ-2478 (https://issues.apache.org/jira/browse/OFBIZ-2478 )
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777130 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 14:30:45 +00:00
Vikas Mayur
6e30a5f247
Missed changes in last commit, rev. 777084. Part of OFBIZ-2496
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@777085 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 11:56:38 +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
David E. Jones
1d46468bd9
A few small changes to use more consistent terminology (supplier instead of vendor) and to have more flexible default options
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@774621 13f79535-47bb-0310-9956-ffa450edef68
2009-05-14 02:50:37 +00:00
Vikas Mayur
f4f58034ca
New feature to mark order as viewed.
...
Patch from Anurag Singh Senger, part of OFBIZ-2446 (https://issues.apache.org/jira/browse/OFBIZ-2446 )
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@773854 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 11:08:24 +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
257f8d5341
User can print pick sheets for each order in a group which will show detailed information of each order like shipping method, and number of order items
...
in each order, Product ID and supplier Product ID.
Patch from Arun Patidar (reviewed and tested by Pranay Pandey), part of OFBIZ-2225 (https://issues.apache.org/jira/browse/OFBIZ-2225 )
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767482 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 12:19:39 +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
2205720dc2
Better French translation
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762502 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 20:53:23 +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