Commit Graph
108 Commits
Author SHA1 Message Date
Gil Portenseigne 7c8aab3d9d Improved: Migrate checkCreateOrderRequirement service to groovy
(OFBIZ-9984)

This commit migrate also dependent method and remove createRequirementFromItemATP service
2020-06-19 16:59:00 +02:00
Suraj Khurana a178b79107 Improved: Added UI labels for success/error messages for humanres, marketing, order component.
(OFBIZ-7696)
Thanks Deepak Nigam for reporting and Sourabh Punyani for the patch.
2020-05-24 13:03:03 +05:30
Suraj Khurana 4facbaed79 Improved: All the service level error messages for missing required field for order component (#86)
* Improved: All the service level error messages for missing required field for order component
(OFBIZ-7736)
Thanks Ratnesh Upadhyay for reporting and Ankush Upadhyay for providing the updated patch
2020-05-02 11:33:35 +05:30
Pawan Verma 463648a6ea Fixed: Error while CSR creates a return
(OFBIZ-11068)

Added check to validate Payment Method passed from UI while creating return. If not available in system, throw an error.

Thanks: Dikpal Kanungo for report and Rohit Hukkeri for the patch.
2019-11-23 11:10:30 +05:30
Suraj Khurana 443bac5d8f Improved: Added support for Inventory (Supply) Allocation Planning.
(OFBIZ-10518)
Thanks Deepak Nigam for initiating this feature and providng the patches, Arun Patidar for review and Swapnil Shah for design discussions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858270 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 13:05:30 +00:00
Nicolas Malin 98814e5c03 Improved: Convert QuoteServices.xml mini lang to groovy - Deprecate Mini Lang
(OFBIZ-10553) (OFBIZ-9350)
Convert all QuoteServices.xml and their xml test
Thanks to Antoine Ouvrard, Leila Mekika, Gil Portenseigne and Mathieu Lirzin for this team work to convert all function and tests case

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849800 13f79535-47bb-0310-9956-ffa450edef68
2018-12-27 14:40:03 +00:00
Jacques Le Roux 8a0ab58083 Improved: ID should be the abbreviation for identity in English
(OFBIZ-100131)

Completes r1820451, not sure why and how those missed

Thanks: James Yong for the Jira and r1820451 commit


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1821029 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 20:13:58 +00:00
James Yong 38d0f7455d Fixed: ID should be the abbreviation for identity in English
(OFBIZ-10131)

Replaced the word 'Id' with 'ID' in the *Labels.xml files for "en" locale.
Improved the logic for auto title so that labels generated for variables like productTypeId 
will be 'Product Type ID' instead of 'Product Type Id'.

Thanks: Jacques for the review.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819906 13f79535-47bb-0310-9956-ffa450edef68
2018-01-02 21:58:37 +00:00
Arun Patidar 3d17256a93 Credit card valdation does not work properly during anonymous quick checkout process. ShoppingCart's 'getPaymentMethodTypes' method should use 'getPaymentMethodTypeIds' internally instead of 'getPaymentMethodIds'
Merged patches from ticket OFBIZ-1585 and OFBIZ-9755
Thanks Amit Gadaley, Deepak Dixit, Divesh Dutta and Mridul Pathak for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1813598 13f79535-47bb-0310-9956-ffa450edef68
2017-10-28 09:30:16 +00:00
Deepak Dixit 2df8b88b6c (OFBIZ-7994) Applied patch from jira issue
=====================================
Add UI labels for success / error messages in order component
=====================================
Thanks Tanmay for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759070 13f79535-47bb-0310-9956-ffa450edef68
2016-09-03 10:40:04 +00:00
Mridul Pathak 25dfb657e6 [OFBIZ-7196] Order: Arrange UI labels in alphabetic order. Thanks Shivangi Tanwar for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749000 13f79535-47bb-0310-9956-ffa450edef68
2016-06-18 13:04:03 +00:00
Jacques Le Roux fc25d442b3 Reverts r1735777, it was for "Credit card valdation does not work properly during anonymous quick checkout process" - https://issues.apache.org/jira/browse/OFBIZ-1585
Few tests don't pass

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736164 13f79535-47bb-0310-9956-ffa450edef68
2016-03-22 09:18:59 +00:00
Divesh Dutta 368bb334d7 Fixed : Credit Card validation does not work properly during anonymous quick checkout process. Added new method checkoutValidation which will validate if shipping method and payment method are in cart and if not available then this method will return error. Thanks Jagpreet Kaur for the patch and Late Raj Saini for reporting this bug.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735777 13f79535-47bb-0310-9956-ffa450edef68
2016-03-19 14:38:48 +00:00
Shi Jinghai 85bed69778 Refs #6518.
Translated new labels in trunk version into zh locale (Simplified Chinese).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686778 13f79535-47bb-0310-9956-ffa450edef68
2015-06-22 07:10:41 +00:00
Taher A. Alkhateeb 07cb144a6c Translate the framework to Arabic
Another part of the translation of OFBiz to Arabic 
project found in JIRA OFBIZ-6432.

The commit translates the following components (in varying degrees):
- Content
- Order
- Party
- WorkEffort
- more framework translations

refs https://issues.apache.org/jira/browse/OFBIZ-6432


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682725 13f79535-47bb-0310-9956-ffa450edef68
2015-05-31 12:13:45 +00:00
Michael Brohl 2d1e765ee6 New German translations and a lot of corrections for the Order Manager.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682633 13f79535-47bb-0310-9956-ffa450edef68
2015-05-30 18:03:10 +00:00
Jacques Le Roux 0264fcffe4 A patch from Deepak Dixit for "If orderDecimalQuantity set to N then system should return error if user add partial quantity in order" https://issues.apache.org/jira/browse/OFBIZ-5962
If productStore.orderDecimalQuantity OR product.orderDecimalQuantity is set to N, then system should return error if we try to add to partial quantity then system should return error instead of rounding it to 0, 
Actual Behavior: If partial quantity is not allowed in order process, and user enter 1.5 quantity then it rounded it and add 2 quantity.
Expected Behavior: if partial quantity is not allowed then system should return error instead of doing rounding if partial quantity passed during add/update item.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1661862 13f79535-47bb-0310-9956-ffa450edef68
2015-02-24 08:21:21 +00:00
Jacques Le Roux 0f284fb6af Slightly modified bunch of uilabels patches from Pierre Smits for Dutch translations (Manufacturing, Order, Party)
https://issues.apache.org/jira/browse/OFBIZ-6018
https://issues.apache.org/jira/browse/OFBIZ-6019
https://issues.apache.org/jira/browse/OFBIZ-6020

jleroux: I have fixed some trivial issues within these changes, 
Wrong change at <value xml:lang="fr">OFBiz: Gestion commerciale</value>
Removed all Dutch changes which were simply duplicating the English ones

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653208 13f79535-47bb-0310-9956-ffa450edef68
2015-01-20 07:40:50 +00:00
Jacques Le Roux b8ca5543c9 Changes in all labels files: <value xml:lang="(.*)_(.*)"> to <value xml:lang="$1-$2">
Changes also listLocales.ftl to show dashes rather than underscores

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650880 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 09:59:32 +00:00
Adrian Crum 91feff5f51 Updated the UI label files so they reference a schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:24:18 +00:00
Jacques Le Roux 5abf245037 Implements "Allow to edit ship groups contents after and order has been created" https://issues.apache.org/jira/browse/OFBIZ-5761
From an UI perspective this adds a "View ship group by order item" button which allows to create new ship groups by order items and to move the quantity of the order item between ship groups.
This is the adaptation of the "oisg-management" addon for R12.04 to the trunk. Thanks to Nicolas and Leila from Nereides for their help

For more information refer to the Jira issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1643077 13f79535-47bb-0310-9956-ffa450edef68
2014-12-03 10:15:20 +00:00
Jacques Le Roux 5ebc58cc6a An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
jleroux: some changes I spotted in Nick Ho's patch which sounded sound to me. Some groups of label internal ending white spaces would have been caught by HTML rendering, but anyway better like that.
I also fixed a number of wrong line returns. And found duplicates zh labels entries that I will report to Nick Ho to fix. And finally fixed some errors introduced by Nick Ho I spotted, I hope there are not too much left :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625893 13f79535-47bb-0310-9956-ffa450edef68
2014-09-18 05:54:04 +00:00
Jacques Le Roux 3b118d4842 An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
added/revised zh-TW translations in the framework, applications and specialpurpose folders to have consistent, commonly-used meaningful terms in Traditional Chinese.

jleroux: from Nick Ho's patch I have extracted only the Chinese changes, w/o the proposed  dash to underscore changes
This contains notably this 14 "zh" (not "sh-TW") changes:
<value xml:lang="zh">人将由电子邮件接受一个临时密码。</value><!-- was 客户将通过电子邮件收到一个临时密码。 -->
<value xml:lang="zh">合计属于公司: </value>
<value xml:lang="zh"> 完整文本:${fullText}</value>
<value xml:lang="zh">供货商佣金百分比</value>
<value xml:lang="zh">文本大小</value>
<value xml:lang="zh">值</value>
<value xml:lang="zh">算子</value>
<value xml:lang="zh">不能转移已序列化的库存。</value>
<value xml:lang="zh">货运收据</value>
<value xml:lang="zh">获取标识为 ${productStoreShipMethId} 的产品店铺送货方法(ProductStoreShipmentMeth)时出错:${errorString}</value>
<value xml:lang="zh">中国人民币元</value>
<value xml:lang="zh">如果选择"specify other",下拉框旁边会出现文本框。参考form的drop-down元素的other-field-size属性说明</value>
<value xml:lang="zh">文本消息</value>
<value xml:lang="zh">能够收到和解析XML消息,但是BSR->NOUN(买卖关系->名词) ${bsrNoun} 和/或 BSR->VERB(买卖关系->动词) ${bsrVerb} 是空的</value>
I have no competency to judge these changes, but from previous Shi Jinghai's feedback I believe there are OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625816 13f79535-47bb-0310-9956-ffa450edef68
2014-09-17 20:44:07 +00:00
Adrian Crum 14a110880b Fix grammar in service error message.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618458 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 05:52:19 +00:00
Anil Patel 6e9e7586c8 [OFBIZ-4459] call to Quickshipdrop should be make on approved orders. Thanks to Kiran Gawde and ofbiz.us team for contributions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618411 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 20:40:20 +00:00
Jacques Le Roux f89f3be3e3 Fixes some French labels related to agreement and term
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1583681 13f79535-47bb-0310-9956-ffa450edef68
2014-04-01 14:31:39 +00:00
Jacques Le Roux eb01bb126d Misc. cleaning in labels
Removes all empty ones
Removes some redundant/duplicates ones (please committers don't commit those again, I know it's not easy to catch, hopefully now we should have less of them)
Automatically replaces some tabs
Few French labels improvements
Removes 2 orphan entries ("ja" & "cs")
Fixes the schema header of WebtoolsUiLabels.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551594 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 16:00:50 +00:00
Jacques Le Roux 69ca22e987 Removes nl labels which are actually duplicates of en.
Those were introduced (as wrong C/P I guess) at r732423

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551460 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 05:31:14 +00:00
Hans Bakker ad53a69f28 now you can also (next to the payment method type) enter the payment on the sales order using the payment method used by the related receiving accounting company
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494466 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 05:59:13 +00:00
Jacques Le Roux 890b2e0abb A slightly modified patch from Parimal Gain for "Find Order functions - Not working when junk values entered for product Id" https://issues.apache.org/jira/browse/OFBIZ-5201
Problem specification and step -
1) Go to Order Manager app > Find Orders
2) Enter valid product id for which order exists
3) Relevant orders with entered product value would be shown in search results
4) Enter invalid product id - JUNK value
5) Error behvaior:All orders on the system would be highlighted 
6) Actual behavior: No order should be shown as search results, as no order exists with this JUNK product id on system

Observation -
When looked into code level found that system apply check for two condition -
1) If passes productId starts or ends with % or * then add that in condition list as it is and it returns all order that contains the word for product Ids.
2) If the above condition is failed the check if the product corresponding to product id is present or not.
3) If exists then check for variants (if its virtual)all this.
4) If product not exists then the action is missing i.e. no condition is added and it returns all order available.

Recommendation -
There are two ways to solve the issue -
1) If product corresponding to passes productId is not present then return message to user that order is not present.
2) If the thought process for current behavior is show all record if product not available then user should get a message as well that "Order is not available for your search product but we have all these order in system" to convey the correct message to user. 

jleroux: The 1st solution is used. I simply added in label that no productId entered would return all the orders, also in French



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1487854 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 13:21:28 +00:00
Jacques Le Roux cc9fa9624f A patch from Shi Jinghai for "Chinese localizations (zh) for trunk (Part II)" https://issues.apache.org/jira/browse/OFBIZ-5137
Translated missing zh labels for oagis and order components.





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447170 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 09:35:51 +00:00
Jacques Le Roux ecd2de6362 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Completed Japanese translation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1412997 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 17:35:16 +00:00
Jacques Le Roux e8ded2674d A patch from Tri Duc Vo for "Next Vietnamese Ofbiz translation https://issues.apache.org/jira/browse/OFBIZ-4759
fixed few issues, 3 remains, Tri will have to choice

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345379 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 22:32:57 +00:00
Christian Geisert 85ee0b3a7d Finished German translation for OrderErrorUiLabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1306751 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 08:32:48 +00:00
Christian Geisert 23d43373d4 German translation for some OrderErrorUiLabels (work in progress)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1213199 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 12:02:53 +00:00
Christian Geisert 2c21b31845 German translation for some OrderErrorUiLabels (work in progress)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1206248 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 16:28:20 +00:00
Christian Geisert 01fd1b003b German translation for some OrderErrorLabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1205385 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 12:56:16 +00:00
Christian Geisert 72870e4638 a few German translations for OrderErrorLabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1203717 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 16:22:24 +00:00
Christian Geisert 98e68607fa more German translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1203147 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 10:51:03 +00:00
Jacques Le Roux 3008a8d500 Better French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1182257 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 08:27:59 +00:00
Hans Bakker 02d94d9532 show error message when a virtual product is added to a quote
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1177318 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 14:16:38 +00:00
Erwan de Ferrieres 827364c80b A patch from Nicolas Malin - Add missing french label on OrderUiLabels file - https://issues.apache.org/jira/browse/OFBIZ-4353
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1151221 13f79535-47bb-0310-9956-ffa450edef68
2011-07-26 19:50:16 +00:00
Christian Geisert e9f7f30441 Improvement of german Labels
See OFBIZ-4195
Submitted by Konstantin N.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1092353 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 15:49:13 +00:00
David E. Jones 06ebb26631 Fixed bad string expansion syntax in a few localized error messages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1085327 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 11:35:43 +00:00
Marco Risaliti ac3117e68b Internationalization of java services for manufacturing component (OFBIZ-4091)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060963 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 20:24:04 +00:00
Marco Risaliti b28e0e1a14 Internationalization of ServiceUtil.returnSuccess, ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059362 13f79535-47bb-0310-9956-ffa450edef68
2011-01-15 15:59:14 +00:00
Marco Risaliti b96bd103e8 Internationalization of ServiceUtil.returnSuccess, ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059352 13f79535-47bb-0310-9956-ffa450edef68
2011-01-15 15:14:49 +00:00
Marco Risaliti 9ead10572c Replace some fail-message to fail-property tag in ordermgr component (OFBIZ-1874)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1051606 13f79535-47bb-0310-9956-ffa450edef68
2010-12-21 18:42:10 +00:00
Marco Risaliti b69375e8ec Replace some fail-message to fail-property tag in ordermgr component (OFBIZ-1874)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050933 13f79535-47bb-0310-9956-ffa450edef68
2010-12-19 19:02:54 +00:00
Jacques Le Roux 66c5dd10a0 A patch from Dukian "Add Traditional Chinese translation for applications, ecommerce, and ofbizsetup" (https://issues.apache.org/jira/browse/OFBIZ-4031) - OFBIZ-4031
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039574 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 21:56:14 +00:00