Commit Graph
53 Commits
Author SHA1 Message Date
Jacques Le Roux 7ada24fd04 This removes the pos component. OFBIZ-7804 "Check if we should fix or remove the POS (hence WebPos?)"
Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else.

I have voluntarily left 2 or 3 moot points
I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read.
I have to check if we should keep or not this code snippet
                <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
                <entity-count entity-name="InventoryItem" count-field="iiCount">
                    <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
                </entity-count>
I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change
//                if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
//                    continue;
//                }

While at it, since I modified OPTIONAL_LIBRARIES, I also changed these svn:properties: svn:eol-style = native & svn:mime-type = text/plain


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754402 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 12:27:20 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Ashish Vijaywargiya e1e45da5ed Applied patch from jira issue - OFBIZ-7705 - Remove Google Checkout component from specialpurpose as it was discontinued.
Thanks Ravi for removing the reference of Google Checkout from everywhere.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751393 13f79535-47bb-0310-9956-ffa450edef68
2016-07-05 04:24:53 +00:00
Jacques Le Roux 0dd553ec96 A modified patch from Harsha Chadhar for "New feature to reclaim a user account - Using Security Questions" https://issues.apache.org/jira/browse/OFBIZ-4983
jleroux: the issue description is quite lengthy so I will summarise it here, please refer to the Jira issue for details.
"When a customer creates an account on eCommerce site, s/he will also need to answer a security question. This security question then can be used by the user to reclaim her/his account in case s/he forgets her/his password. If the user correctly answers the required security question while reclaiming her/his account, her/his password will be sent through email notification. This part would work in the same way as the existing functionality of email password (forget password)."

The description was actually more ambitious (several questions, possibility for users to create own questions) but AFAIK these parts have not been implemented.

Apart updating the patch which did not merge, I got 2 majors issues (and few others I will not report here) I bypassed with workarounds.

Unlike Harsha, and as I reported earlier in the issue, I never got the username (userLoginId) back when using hidden parameters in the request body (not in requestParameters, ie UtilHttp.getParameterMap(request)), nor actually any parameters. This is maybe due to my OS (Windows7 was XP before) or my email client (Outlook Express then, now Thunderbird) or even my SMTP configuration (I used my ISP SMTP server) but most probably because I did it all on my sole machine (localhost). I tried to understand what was happening to request body parameters with http://www.telerik.com/fiddler, but finally gave up because it's even more complicated when https is in the picture. So I decided to rather use parameters in the URL (Query string). It's a bit less safe, though the password is OFBiz encrypted, and should be replaced. But it's safe enough because only the user should receive this message and even if the message is sniffed during its journey it should be hard to decrypt the password!

Harsha used the SecurityExtUiLabels.xml (created by ashish at r1618415) in securityext component but there is already a SecurityextUiLabels.xml in common component. Since I use Windows OFBiz was unable to retrieve the labels from SecurityExtUiLabels.xml since I guess it looked into a SecurityextUiLabels.xml. So I renamed a SecurityExtUiLabels.xml to EmailPassword.xml.










git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716915 13f79535-47bb-0310-9956-ffa450edef68
2015-11-27 20:37:15 +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 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
Jacques Le Roux a61be3e0ff A patch from Shi Jinghai for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
I fixed the duplicated zh:
<value xml:lang="zh">分类页面</value>
<value xml:lang="zh">分類頁面</value>
to
<value xml:lang="zh">分类页面</value>
<value xml:lang="zh_TW">分類頁面</value>
in this patch.

Others are corrections on zh labels thank to Nick Ho's translation.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623359 13f79535-47bb-0310-9956-ffa450edef68
2014-09-08 11:13:00 +00:00
Jacques Le Roux 425ce1c003 A patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
more added/updated translations patch files for zh-TW locale

jleroux: 
I added the label
<value xml:lang="zh_TW">服務執行程式拋出一個異常</value>
by hand
Only 1 label was not added:
<value xml:lang="zh_TW">代號</value>
Because of the fuzziness and presence of several possibilities


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621688 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 06:51:33 +00:00
Adrian Crum 57816747d7 Refactored SecurityFactory implementation - use Java's ServiceLoader to discover Security implementations, instead of using configuration files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1531577 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 18:54:59 +00:00
Jacopo Cappellato 2294582c2d Fixed typo in comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517451 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 07:59:44 +00:00
Adam Heath 256a4af82b FEATURE: Allow for externalLoginKey parameter generation to be turned
off; the use for this feature will become apparent shortly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497891 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:08:24 +00:00
Adrian Crum 34704f3fdc Some work on the security component:
1. Fixed the XSD.
2. Fixed a bad config file.
3. Removed cached DOM code.
4. Simplified Security factory code.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1491345 13f79535-47bb-0310-9956-ffa450edef68
2013-06-10 05:53:54 +00:00
Jacques Le Roux 54ece545d9 I missed to commit security.properties with r1465185. Thanks to Leon for warning
+ French labels


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465347 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 09:08:21 +00:00
Jacques Le Roux 03a62ac947 A slightly modified patch from Sumit Pandit for "Additional Validation for Password : Make password pattern driven" https://issues.apache.org/jira/browse/OFBIZ-4958
Provides an additional validation for password  with following capability to the system:

Admin can enable/disable pattern based password capability of system. Configuration will reside in security.property file.
 To enable : security.login.password.pattern.enable=true
 To disable: security.login.password.pattern.enable=false

Admin is flexible to provide his pattern string by making pattern more/less restrictive as per system requirement. Configuration will reside in security.property file.
 Example: security.login.password.pattern=^.*(?=. {5,})(?=.[a-zA-Z])(?=.[!@#$%^&*]).*$

Admin can provide custom error message string which will display to end user if wrong password is entered. Configuration will reside in security.properity file.

jleroux: I quickly handled the error message localisation for the OOTB case. It's more complicated when the pattern gets complex...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418996 13f79535-47bb-0310-9956-ffa450edef68
2012-12-09 14:59:52 +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 b46c7a2c06 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Got an issue merging GeoData_JP.xml with Subclipse, using Toirtoise solved it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1403746 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:48:42 +00:00
Hans Bakker 7e5c9958a5 manual payment is used: reverting r1352439
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352441 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 08:03:11 +00:00
Hans Bakker 66d5f75d5e removed unused security permission: MANUAL_PAYMENT
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352439 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 07:52:23 +00:00
Hans Bakker 9607b08c5c Removed unused SHIPRATE_* security
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351587 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 07:07:01 +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
Jacques Le Roux b8689d9e7a A patch from Sascha Rodekamp "Security Update for forgotten passwords " (https://issues.apache.org/jira/browse/OFBIZ-3842) - OFBIZ-3842
Improve the a random Password generation when the "require new password" function is called. In the current Trunk it's a kind of hard coded password that will be send to the user. After generating a new pass the "requireNewPassword" flag will be set to true (configurable).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1038209 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 17:13:53 +00:00
Jacques Le Roux dca34d2893 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829867 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 17:30:18 +00:00
Adrian Crum c13c47f919 Chinese translation for the framework folder, provided by Shi Yusen - https://issues.apache.org/jira/browse/OFBIZ-2767.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798941 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 15:14:01 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Hans Bakker 897e5b96f1 delete mypage component,moved some labels, myportal is a good replacement
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762245 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 07:53:25 +00:00
Hans Bakker e32f78ac2c shorten the text so the dropdown box fit on the screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761176 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:17:15 +00:00
Jacques Le Roux ccadfbacbb LabelReferences4.patch from Marco "New tool to get labels information" https://issues.apache.org/jira/browse/OFBIZ-2070 OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748732 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 23:01:41 +00:00
Jacques Le Roux 7a259f221f Fixes done automatically by the Label Manager. I changed the wrong ones by hand, see https://issues.apache.org/jira/browse/OFBIZ-2070 - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737585 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 21:41:15 +00:00
Jacques Le Roux 40f1371b56 A patch from Guy Gershoni "Allow use of HttpServletRequest.getRemoteUser() for 3rd party authentication" '(https://issues.apache.org/jira/browse/OFBIZ-1906) - OFBIZ-1906
I did not test the CAS case, but reviewed the code and tested in std mode (not using CAS) and it's OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736660 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 14:52:24 +00:00
Jacques Le Roux 372a329c5b Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735465 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 14:25:33 +00:00
Jacques Le Roux 322169e32f French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735438 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 11:26:32 +00:00
Jacques Le Roux 9c5e043c53 Cleanup_labels35.patch from Marco Risaliti 'Clean up labels" (https://issues.apache.org/jira/browse/OFBIZ-1780) - OFBIZ-1780
This close this issue.
There are some labels related to geoLocation in this commit, I will commit the geoLocation work as is since I will not have much time this next weeks to work on it. Anyway it's already sufficient as a basis for other parts. 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735402 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 09:06:03 +00:00
Jacques Le Roux 4334686f10 Thanks to Marco's "New tool to get labels information" (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
I fixed some issues remaining in labels. I'm sorry to say that most of them came from French translation. On the other hand, I believe know thant French translation is the more complete, and hopefully accurate, translation we have so far :o)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731260 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 13:45:43 +00:00
Jacques Le Roux f36843386d Close "Grey list feature for confidential data access" (https://issues.apache.org/jira/browse/OFBIZ-2074) - OFBIZ-2074
I put an explanation in http://docs.ofbiz.org/display/OFBTECH/OFBiz+security

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@727508 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 20:50:11 +00:00
Jacques Le Roux d5f99b443a A modified patch from Erik Wegner "Patch for all language files (*Labels.xml) to correct language order, find duplicates or invalid entries" (https://issues.apache.org/jira/browse/OFBIZ-2073) - OFBIZ-2073
I removed some hunks, see https://issues.apache.org/jira/browse/OFBIZ-2073?focusedCommentId=12656651#action_12656651



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726808 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 21:28:06 +00:00
Jacques Le Roux 3457f0f750 A patch from Karim Rahimpur "more and improved spanish translations" (https://issues.apache.org/jira/browse/OFBIZ-2046) - OFBIZ-2046
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718580 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 13:28:33 +00:00
Adrian Crum b06a17e6fd Added LDAP user authentication, based on work contributed by Mohamed Amine Azzi and Torsten Schlabach - https://issues.apache.org/jira/browse/OFBIZ-811.
Internationalization note: this commit contains new UI labels.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@669994 13f79535-47bb-0310-9956-ffa450edef68
2008-06-20 17:09:19 +00:00
Andrew Zeneski 5095e4e09f added support for third party policy servicers; setting the userLoginId in a request header, ofbiz will assume the user has already been authenticated and log the user in.
This is DISABLED by default (see security.properties) be sure your policy server is running in front of ofbiz to avoid security issues (spoofing).

Jira: OFBIZ-1781


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@656008 13f79535-47bb-0310-9956-ffa450edef68
2008-05-13 20:59:03 +00:00
Hans Bakker 2e3b51529a correction of various thai translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@631903 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 09:40:11 +00:00
Hans Bakker d3732f6bc3 convert most of the framework language properties files to xml and added the thai language
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@630751 13f79535-47bb-0310-9956-ffa450edef68
2008-02-25 07:39:46 +00:00
Adrian Crum f6bb7cb42b Clarify OFBTOOLS_VIEW permission description.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@605296 13f79535-47bb-0310-9956-ffa450edef68
2007-12-18 18:58:58 +00:00
Jacques Le Roux 728c3f4446 Replacing unused ACCOUNTING_ATX_ by ACCTG_ATX_
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@604987 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 20:33:59 +00:00
Andrew Zeneski 08362be9c0 implemented code to support pre-account email verification (verify email before account is created)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@582705 13f79535-47bb-0310-9956-ffa450edef68
2007-10-08 03:48:24 +00:00
Andrew Zeneski 6548a71c1e implementation (from Anil Patel) to support restricting changed passwords to not allow the use of a previous password (the length of tracking is configurable in security.properties)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@573458 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 04:58:35 +00:00
Jacopo Cappellato 44f5f4d1dd Russian labels from Oleg Andreyev OFBIZ-1037
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@545455 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 08:23:18 +00:00
Andrew Zeneski 5073124b68 made the pattern which finds the userLoginId from the common name (x500) configurable; also can disable cert login from security.properties
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@532403 13f79535-47bb-0310-9956-ffa450edef68
2007-04-25 16:45:18 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
Jacques Le Roux 64cea174fc This is the change of ASL2 headers in properties files only. Please see comments in another post in dev ML.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@497074 13f79535-47bb-0310-9956-ffa450edef68
2007-01-17 16:49:01 +00:00
Jacques Le Roux 192c72e8a8 Thanks to Marco Risaliti reminder on another commit, I remembered that these 2 files had no ASL2 headers.
BTW Guido Amarilla had checked the ASL grant when attaching this files in Jira so it's ok even if he has not signed an iCLA.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@496510 13f79535-47bb-0310-9956-ffa450edef68
2007-01-15 21:55:59 +00:00