Commit Graph
2256 Commits
Author SHA1 Message Date
Jacques Le Roux a1efddafbe Some i18n and French l10n
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728288 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 15:08:03 +00:00
Jacques Le Roux 978a1bbe63 A patch from Bruno Busco "Error in DashBoardExample" '(https://issues.apache.org/jira/browse/OFBIZ-2096) - OFBIZ-2096
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728251 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 08:44:43 +00:00
Jacques Le Roux 957f67f3cd Fixed one
value="${bsh: org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"
replacing by 
    value="${date:nowTimestamp()}"
    
I let the other for now (it's easy to fix in all OFBiz by replacing the one by the other) for an live example to Adrian who is currently working on JUEL
    

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728135 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 20:29:14 +00:00
Jacques Le Roux 63e03b9043 Add a date:nowTimestamp() function
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728133 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 20:24:09 +00:00
Jacques Le Roux 7334f7e684 A patch from Bruno Busco "Adding some Collapsible FieldGroup usage examples in the Form Widget Example" '(https://issues.apache.org/jira/browse/OFBIZ-2095) - OFBIZ-2095
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728125 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 19:55:39 +00:00
Jacques Le Roux 6f9bc98a92 From an Erwan suggestion "details on a project task" (https://issues.apache.org/jira/browse/OFBIZ-2087) - OFBIZ-2087
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728119 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 19:24:25 +00:00
Jacques Le Roux 1e9dabed6a A patch from Erwan de FERRIERES "Button to print a preview of fonts in OFBiz" (https://issues.apache.org/jira/browse/OFBIZ-2094) - OFBIZ-2094
+ some i18n and French translation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728073 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 17:23:19 +00:00
Jacques Le Roux 7dd8ecf6de Merge all current CompanySubtitle labels in all languages.
It was a real mess. I wondered if I should put them all under a ComonCompanySubtitle label and remove all others. 
But I guess they could be used with other meaning in real world applications (ie not OOTB). So I kept them all.
There are some duplicates in some languages. I kept them commentent out at end of each line.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728061 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 16:30:55 +00:00
Adrian Crum 2c32e6fbb4 Fixed bug in FlexibleMapAccessor.java parsing - someMap[this.that] syntax works now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@727845 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 22:29:19 +00:00
David E. Jones 461cde8932 These messages are logged as warnings but have the word error in them, so changing that to warning so hopefully we wont have multiple messages per week asking about it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@727827 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 21:07:41 +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
Christian Geisert 48554c95b0 Fix for delegator.removeByAnd(entityName)
(it failed because of empty where condition)
Submitted by Marco Ruocco
See OFBIZ-1952


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@727342 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 10:52:06 +00:00
Jacopo Cappellato 5b810b9f29 Minor formatting fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726836 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 22:07:55 +00:00
Jacques Le Roux 7e7f74dc8b Related to OFBIZ-2073. Now all labels should be correctly sorted (I know this will not last a lot, but it should help in the meantime :o)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726814 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 21:40:37 +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 fc0634b739 Removed duplicate Spanish translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726725 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 16:17:16 +00:00
Bilgin Ismet Ibryam 16fc8c3514 A patch from Bruno Busco " Extending TabBar menus from CommonTabBar" - OFBIZ-2069
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726655 13f79535-47bb-0310-9956-ffa450edef68
2008-12-15 08:56:52 +00:00
Jacques Le Roux 7ee3cf8194 Finally this was not needed now
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726518 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 19:13:45 +00:00
Adrian Crum ad0147d45b A couple more UEL functions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726374 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 05:45:32 +00:00
Adrian Crum c0fd5f4261 More Unified Expression Language built-in functions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726338 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 02:35:58 +00:00
Adrian Crum 48860ab47b Removed unnecessary deprecation warning from FlexibleMapAccessor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726290 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 23:18:25 +00:00
Adrian Crum 03ae66d708 Implemented FlexibleMapAccessor.getInstance() in the remaining classes. Deprecated the FlexibleMapAccessor constructor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726260 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 19:25:33 +00:00
Jacques Le Roux 36bbac1d06 Oops this one was good
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726258 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 19:06:44 +00:00
Jacques Le Roux 03c6bdb7bb This made really no sense where it's used (my fault ;o)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726257 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 19:02:55 +00:00
Jacques Le Roux f32dc0b5bb This made really no sense where it's used (my fault ;o)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726255 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 18:58:17 +00:00
Adrian Crum 7f50663b15 Implemented FlexibleMapAccessor.getInstance() in mini language.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726254 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 18:46:35 +00:00
Adrian Crum e4c9442ed6 Oops, I missed a couple of files in my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726252 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 18:26:52 +00:00
Adrian Crum 07e8661959 Implemented FlexibleMapAccessor.getInstance() in the screen widgets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726246 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 18:13:05 +00:00
Adrian Crum d0e7d7ab3e Removed debugging code from recent commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726233 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 16:58:48 +00:00
Jacques Le Roux fe4fa08e79 A change needed for the protect view feature
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726180 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 07:22:20 +00:00
Adrian Crum dc3dc713ec FlexibleMapAccessor refactor - added Unified Expression Language support and a cache/factory method.
The UEL implementation is asymmetric - get() method calls are delegated to the UEL library, and put() and remove() method calls are implemented with internal classes. The reason is because FlexibleMapAccessor supports object creation during assignment and UEL does not. The UEL specification clearly states that assignment can only happen to existing variables. The JUEL library implements that - you can only assign values to existing variables.

I've spent several days testing this, but there is still a chance that something will break. I'll watch the dev mailing list closely and fix any problems as they come up.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726165 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 03:23:47 +00:00
Jacopo Cappellato 62a546391b small misc cleanups
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726147 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 23:31:30 +00:00
Jacopo Cappellato fa390788fa Renamed file to follow standard naming conventions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726141 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 22:31:58 +00:00
Jacques Le Roux 4085538f6f Fix 2 erroneous entity view titles found by chance while working on ProtectedView
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726131 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 22:04:33 +00:00
Adrian Crum 60de21586d UtilMisc work - expanded and improved Object to number conversions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726074 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 17:22:35 +00:00
Jacques Le Roux 17899ba65b French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725615 13f79535-47bb-0310-9956-ffa450edef68
2008-12-11 08:03:49 +00:00
Jacques Le Roux 52595e4f48 A slightly modified patch from Bilgin Ibryam "Allow multi-pagination in a page" (https://issues.apache.org/jira/browse/OFBIZ-1935) - OFBIZ-1935
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725053 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 10:39:16 +00:00
Adrian Crum 647530a6d2 Eliminated some unnecessary nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724882 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 20:55:33 +00:00
Adrian Crum a6f7092892 Converted ${env...} expression syntax to ${sys:getProperty(String)}. The old syntax still works.
I didn't like how an expression starting with "env." was treated differently, especially since it wasn't documented anywhere.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724851 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 19:46:44 +00:00
Adrian Crum dc76c292df Finished building out the Unified Expression Language functions, added detailed JavaDocs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724835 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 19:08:19 +00:00
Adrian Crum 00c2bc4a62 Fixed a bug I introduced in FlexibleStringExpander - the special ${env...} syntax wasn't being expanded properly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724792 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 17:31:28 +00:00
Jacques Le Roux 1e26fcea95 French update
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724638 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 08:31:42 +00:00
Hans Bakker 54a5a1094a update of portal pages with including column support and now using the 'normal' ofbiz interface
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724618 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 06:17:35 +00:00
Adrian Crum f7b4614553 Added some functions to the Unified Expression Language. See the UelFunctions.java JavaDoc for details.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724616 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 05:58:18 +00:00
Adrian Crum f48fa23ce4 More work on the Unified Expression Language code:
1. Renamed some things in UelUtil.java to make them more understandable
2. Moved exception handling out of UelUtil.java and into calling methods
3. Added missing UEL implementation to FlexibleStringExpander.java


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724428 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 18:00:22 +00:00
Adrian Crum b8b7fa131e Fixed parsing errors in Unified Expression Language code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724373 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 14:58:14 +00:00
Adrian Crum d838febb44 Integrated the Unified Expression Language (JSR-245) into the FlexibleStringExpander class.
This commit also includes an example usage in InventoryServices.xml.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724146 13f79535-47bb-0310-9956-ffa450edef68
2008-12-07 16:11:44 +00:00
Hans Bakker 949345f912 adding solution for oracle problem running services
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@723336 13f79535-47bb-0310-9956-ffa450edef68
2008-12-04 14:22:44 +00:00
Jacques Le Roux 7dc45110e9 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@722963 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 16:41:14 +00:00
Adrian Crum c09cf015a1 Fixed bug where properties using the ${} syntax weren't being expanded, reported by Mridul Pathak - https://issues.apache.org/jira/browse/OFBIZ-2066.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@722104 13f79535-47bb-0310-9956-ffa450edef68
2008-12-01 15:53:13 +00:00