Commit Graph
57 Commits
Author SHA1 Message Date
Jacques Le Roux 08134723d2 In Controller.xml
path="org/ofbiz/(\w*)/(.*)" (.*) => path="component://$1/script/org/ofbiz/$1/$2" $3
path="org/ofbiz/(\w*)/(.*)" => path="component://$1/script/org/ofbiz/$1/$2"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765798 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 23:07:52 +00:00
Marco Risaliti a657adadf8 Move payment.properties to PaymentGatewayConfig entities (OFBIZ-2269)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763782 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 19:45:31 +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
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Bilgin Ismet Ibryam 7e7c1f375a Added an optional "name" attribute to event element in controller.xml This attribute is used only (also required) in events inside
firstvisit, after-login, before-logout, preprocessor and postprocessor elements. Events with same name will be overridden and only the last one will be executed. Overriding works also in cases when a controller.xml includes other controller files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761220 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:47:48 +00:00
Adam Heath 84ae305958 Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759267 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 17:02:56 +00:00
Adam Heath 7a5fdc866c Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757104 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:48:04 +00:00
Jacques Le Roux 359a95fbfd webpos component
Following best practice.
Changed location="org/ofbiz/......... to location="component:// in the service location attribute.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755954 13f79535-47bb-0310-9956-ffa450edef68
2009-03-19 12:00:14 +00:00
Ashish Vijaywargiya 63ff30537f Applied patch from Jira Issue OFBIZ-2242 (Small typos in ecommerce & webpos components)
Thanks Ashish Nagar for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755157 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 09:03:28 +00:00
Bruno Busco a36cb4dd3e Changed WebSiteId parameter description to be more general
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751214 13f79535-47bb-0310-9956-ffa450edef68
2009-03-07 07:19:07 +00:00
Adam Heath b25c52b9b4 Should be the last of the executable removes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749178 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 04:18:30 +00:00
Adam Heath eae3cbcbd1 Some more unneeded executable props.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749177 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 04:13:24 +00:00
Adam Heath ec2441c8dc Remove executability from these files, that make no sense.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749176 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 04:06:50 +00:00
Jacques Le Roux 79e5bae58a Oops (bad previous commit)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746495 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 12:35:06 +00:00
Jacques Le Roux 43028543c1 We need this since now ProductContentWrapper and categoryContentWrapper return a StringUtil.StringWrapper, else "Photo not available" image never shows
Certainly more to come...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746490 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 12:25:04 +00:00
Marco Risaliti 7712182402 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746406 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 22:53:32 +00:00
Marco Risaliti ff720d540e A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746049 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 23:08:30 +00:00
Marco Risaliti 30bd7c76df A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745286 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 22:57:14 +00:00
David E. Jones 150ebb4beb Fixed issue with general html encoding of String objects in FTL files being applied to dynamic JavaScript from groovy files by leaving them as StringBuffers, ie just removing the toString calls
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742234 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 02:34:23 +00:00
David E. Jones a0d0a10ebc Resolved some more problems with the general html encoding, most of which are from funny code that should be cleaned up anyway so haven't run into any dilemmas so far; still looking though so could happen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742053 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 11:08:32 +00:00
Jacques Le Roux 08915956a1 <if-empty field-name= => <if-empty field=
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739739 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 11:07:47 +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 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
Marco Risaliti 1a3edc02f8 A lot of cleaning into MyPage/MyPortal/Pos/ProjectMgr components and some italian translations (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735131 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 21:03:44 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Hans Bakker 68c30db457 change xml minilanguage from 'obj-field-name=' to 'obj-field='
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731797 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 00:58:33 +00:00
Marco Risaliti 64ca57d106 A lot of labels cleaning in various components (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731549 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 13:05:38 +00:00
Jacques Le Roux 84124c1f43 Some labels fixes
+ a not toally applied patch from Erik Wegner " More German translations" see https://issues.apache.org/jira/browse/OFBIZ-2067?focusedCommentId=12660475#action_12660475 - OFBIZ-2067


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731224 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 11:57:53 +00:00
Jacques Le Roux 3ff501ffa2 <string-append(.*)field-name= => <string-append$1field=
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730644 13f79535-47bb-0310-9956-ffa450edef68
2009-01-01 23:36:25 +00:00
Jacques Le Roux e9fb4bef8e Again the one I used as example when fixing simple-methods tags changes was missing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730360 13f79535-47bb-0310-9956-ffa450edef68
2008-12-31 09:50:33 +00:00
Jacques Le Roux e1ab384fc4 xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd"
=>
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730356 13f79535-47bb-0310-9956-ffa450edef68
2008-12-31 09:28:15 +00:00
Jacques Le Roux 389d3288a1 <field field-name => <field field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730198 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:30:52 +00:00
Jacques Le Roux 3da429d23b ret-field-name => ret-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730197 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:29:33 +00:00
Jacques Le Roux 1d979ede39 <store-value value-name = > <store-value value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730190 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:20:41 +00:00
Jacques Le Roux bbedb431c2 <get-related(.*)value-name => <get-related$1value-field
<get-related(.*)list-name => <get-related$1list
<get-related(.*)\R(.*)list-name => <get-related$1\R$2list-name
<get-related(.*)\R(.*)value-name => <get-related$1\R$2value-field
<calculate field-name => <calculate field
<calcop(.*)field-name => <calcop$1field
<result-to-field(.*)field-name => <result-to-field(.*)field
<result-to-field(.*)field="(.*)"(.*) map-name="(.*)" => <result-to-field$1field="$4.$2"$3
<field-to-request field-name => <field-to-request field

(I had a connection break that's while I put all of them in one sole commit)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730183 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:12:15 +00:00
Jacques Le Roux 7efc2b4a35 <entity-condition(.*)list-name => <entity-condition$1list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730118 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:17:03 +00:00
Jacques Le Roux 38456812e0 <field-to-result(.*)field-name => <field-to-result$1field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730116 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:14:23 +00:00
Jacques Le Roux e01e175266 <entity-one(.*)value-name => <entity-one$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730111 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:07:14 +00:00
Jacques Le Roux e25c1d9c67 <create-value(.*)value-name => <create-value$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730108 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:01:09 +00:00
Jacques Le Roux 5e38ebc0ea <make-value(.*)value-name => <make-value$1value-field
r730090 was naive fix also <iterate list-name and entry-name to <iterate list and entry

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730098 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:28:24 +00:00
Jacques Le Roux 55a4536933 <field-map(.*)env-name => <field-map$1from-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730092 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:11:15 +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
Marco Risaliti 9f3abae9ed Removed some duplicated labels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725812 13f79535-47bb-0310-9956-ffa450edef68
2008-12-11 21:06:16 +00:00
Adam Heath a194f52ce0 Make these like all the other build xmls.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709472 13f79535-47bb-0310-9956-ffa450edef68
2008-10-31 16:51:44 +00:00
Jacques Le Roux 2f4ce470b2 A patch from Erwan de FERRIERES "Added french translations for the webPOS UI" (https://issues.apache.org/jira/browse/OFBIZ-2017) - OFBIZ-2017
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@707897 13f79535-47bb-0310-9956-ffa450edef68
2008-10-25 20:10:28 +00:00
Jacques Le Roux 4c7ca711ac French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@707895 13f79535-47bb-0310-9956-ffa450edef68
2008-10-25 19:43:41 +00:00
Marco Risaliti 630a24c1e5 PAYMENT SET REF. button is not working correctly because it sets now only the first payment of the cart (Issue OFBIZ-1998)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@704645 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 19:48:26 +00:00
Marco Risaliti 44bc1eac17 CLEAR PAYMENT button is not working correctly because it clears now only the first payment of the cart (Issue OFBIZ-1995)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@703851 13f79535-47bb-0310-9956-ffa450edef68
2008-10-12 17:24:07 +00:00
Marco Risaliti 5d79692a89 Add a new "paymentReasonId" on PosTerminalInternTx entity and store payment reason id during Pos Paid IN/OUT (Issue OFBIZ-1991)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@703568 13f79535-47bb-0310-9956-ffa450edef68
2008-10-10 19:56:17 +00:00
Marco Risaliti 78633b3500 Add a new "terminalName" on PosTerminal entity and then show it on web pos login (Issue OFBIZ-1981)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@701675 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 17:19:07 +00:00