Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux 2d295a8641 Marco's artifact_cleaning_framework.patch " Artifact cleaning after recent changes on xsd files" (https://issues.apache.org/jira/browse/OFBIZ-2137) - OFBIZ-2137
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@740114 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 21:40:50 +00:00
Jacques Le Roux 5abb9596cb LabelsInfo14.patch from Marco "New tool to get labels information" (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
+ some correct changes done with this update of Labels Manager (I updated some wrong ones by hand to keep going forward...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739955 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 10:17:34 +00:00
Jacopo Cappellato e1b1c85e1e Added two new methods to the ViewHandler interface: getter/setter methods for the "name" field, used to store the name of the view handler as set in the controller.xml file.
No functional change, but this mode is required by the upcoming new screen renderer based on Freemarker macros.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739792 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 17:12:19 +00:00
Jacopo Cappellato f9572816da Fixed typo in a comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739790 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 17:00:13 +00:00
Adrian Crum 2d25c4e591 Fixed a bug where the property name wasn't being returned when the property wasn't found - reported on dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739786 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 16:55:09 +00:00
Jacopo Cappellato 4eeaa929bb Modified two FreeMarkerWorker methods to return the Environment object; no functional change, but this mode is required by the upcoming new screen renderer based on Freemarker macros.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739785 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 16:54:53 +00:00
Jacopo Cappellato 900ddd63cf Added ability to define entity-data-readers on the fly.
For example, if in a custom ofbiz-component.xml file you have:

<entity-resource type="data" reader-name="prod1" loader="main" location="data/ProdData1.xml"/>

you can load it running the ant task:

ant run-install-readers -Ddata-readers=prod1

even if the reader is not defined in entityengine.xml.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739782 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 16:43:05 +00:00
Jacques Le Roux 2eeaa25b8d <if-compare field-name= => <if-compare field=
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739769 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 14:13:19 +00:00
Jacques Le Roux aa1259c96e Another time caught by Eclipse (editing a file while replacing strings in other files)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739766 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 14:05:29 +00:00
Jacques Le Roux 5d9fd471dc <field-map(.*)env-name => <field-map$1from-field
<service(.*)result-map-name => <service$1result-map

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739764 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 13:54:08 +00:00
Jacopo Cappellato 98e71f1922 Misc cleanups for data files:
1) added {SHA} prefix to all hashed passwords
2) moved "admin" user to demo data; the only user maintained with seed data is now the "system" user
3) removed password for the "system" user; now there are no passwords in seed data



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739743 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 11:40:55 +00:00
Jacques Le Roux fb9d3a2e18 <entity-condition(.*) list-name= => <entity-condition$1 list=
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739740 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 11:08:49 +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
Jacopo Cappellato af9e2ab62d Enhanced checkNewPassword to work like the "userLogin" method when dealing with hashed passwords.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739738 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 11:02:46 +00:00
Jacques Le Roux 290534059d <entity-one entity-name=(.*)value-name => <entity-one entity-name=$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739732 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 10:27:43 +00:00
Bruno Busco c4d9922812 Removed Login and Logout menu item from FTL based app-navigation menus. (Moved now to the header).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739724 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 09:58:36 +00:00
Jacques Le Roux 81fd022764 LabelsInfo15.patch from (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739720 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 09:21:32 +00:00
Scott Gray c152c76dd6 Fix for issue OFBIZ-2142 reported by Hans Bakker: " error message of login service does not show with common/messages.ftl
"
The labels had been moved to a different resource file

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739651 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 23:15:01 +00:00
Jacques Le Roux 6b08a4dfaa A patch from Bruno Busco "Removing Login/Logout from AppBarMenu" '(https://issues.apache.org/jira/browse/OFBIZ-2156) - OFBIZ-2156
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739594 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 19:58:33 +00:00
Jacques Le Roux 5a27bd50ad Reverted on Jacopo's advice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739574 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 16:22:41 +00:00
Jacques Le Roux 80d35cda90 Make easier to see demonstration
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739568 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 14:57:28 +00:00
Bruno Busco 6ac6c68719 Reverted rev. 739406
Actually the issue reported should be solved changing any custom AppMenu markup structure (see Example for a markup template)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739523 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 08:30:48 +00:00
Jacques Le Roux 9ca39359a9 i18n, French l10n
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739409 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 21:06:22 +00:00
Jacques Le Roux c6113c578a A patch from Stephen Rufle "app-navigation style change breaks" '(https://issues.apache.org/jira/browse/OFBIZ-2153) - OFBIZ-2153
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739406 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 20:49:19 +00:00
Jacques Le Roux 12fd67fe8c Enhancement from Karim Rahimpur
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739219 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 09:26:21 +00:00
Hans Bakker 40f67a85d4 another error message improvement on the form type which can be confused with a service attribute type
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739195 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 07:02:59 +00:00
Hans Bakker 741e725f95 give an error message instead of NPE when a field is not found
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739188 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 06:02:31 +00:00
Alfred Maxwell Byers 1bd543704e Added FlexibleLocation to "entityImport" service so that "component" protocol could be used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738962 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 19:00:23 +00:00
Jacques Le Roux 805a5f7058 A patch from Bruno Busco "Selected Visual Theme not shown as selected" '(https://issues.apache.org/jira/browse/OFBIZ-2144) - OFBIZ-2144
Signaled by Michael Pätzold



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738879 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 15:05:02 +00:00
Jacques Le Roux 2cd3740648 A slightly modified patch from Karim Rahimpur "Localized values are not retrieved from LocalizedMaps (through BasicVariableMapper)" '(https://issues.apache.org/jira/browse/OFBIZ-2148) - OFBIZ-2148
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738870 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 14:50:45 +00:00
Jacques Le Roux ce297d5a9b Add geolocation screens to Facility ContactMechs, FacilityLocation and FixedAsset + miscellaneous enhancements, also in data.
I have began to refactor toward putting as much as possible geolocation artifacts in framework/common with the idea of creating an applications/common component where all shared (transversal) features/artifacts would be. More explanations on dev ML soon...
There is also an unused taxAuthorityVATReport request/view-map in accounting controller (part of another task I slowly work on)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738452 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 11:03:20 +00:00
Scott Gray 773fe29a3d Fixed a misplaced </p>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738371 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 05:27:37 +00:00
Scott Gray 8c5d3f720d Removed duplicate type attributes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738366 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 05:01:49 +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 7ed1f28f7b A patch from Bruno Busco "Visual Themes for Ecommerce" '(https://issues.apache.org/jira/browse/OFBIZ-2106) - OFBIZ-2106
+ 2 images added



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737506 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 11:54:13 +00:00
Jacques Le Roux b00283d857 A patch from Bruno Busco "Drop-down Applications Bar" '(https://issues.apache.org/jira/browse/OFBIZ-2118) - OFBIZ-2118
Fix an issue in Example component



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737505 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 11:44:46 +00:00
Jacques Le Roux 93d458ba1f LabelsInfo13.patch by Marco from "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@737491 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 08:41:44 +00:00
Scott Gray 52271c33d5 Applied patch from OFBIZ-2060 by Harmeet Bedi
Import ambiguity in CrossSubdomainSessionValve.java


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737408 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 18:09:41 +00:00
Jacques Le Roux bcb4424888 Last French translations done "by hand" before (hopefully) using Labels Manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737390 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 16:33:13 +00:00
Jacques Le Roux 0d9b46d1b9 Modified LabelsInfo11.patch from Marco Risaliti "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@737382 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 15:35:14 +00:00
Jacques Le Roux 90264b4180 Add popup address Geolocation in party profile
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737369 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 14:48:25 +00:00
Jacques Le Roux be52ca66b2 These 2 lines are to be dropped later
<!-- tooltip="Same as above, uses the ${'${'bsh:...} notation to call an util method to get the now timestamp}"-->
            <!-- tooltip="Same as above, uses the \${bsh:...} notation to call an util method to get the now timestamp}"-->
Maybe even all the block about this bsh syntax should be dropped anyway... (but can still be used, so maybe better to keep it ?)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737329 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 10:57:45 +00:00
Jacques Le Roux fceaeb561a I think we have an issue in UEL when it comes to escape UEL expressions in literals.
I tried what is documented in the PDF here http://docs.ofbiz.org/download/attachments/6430/UEL.pdf, but no way.
<<To generate literal values that include the character sequence "${" or “#{“, the developer can choose to use a composite expression as shown here:
${'${'}exprA}
#{'#{'}exprB}The resulting values would then be the strings ${exprA} and #{exprB}.
Alternatively, the escape characters \$ and \# can be used to escape what would otherwise be treated as an eval-expression. Given the literal-expressions:
\${exprA}
\#{exprB}
The resulting values would again be the strings ${exprA} and #{exprB}.>>
Or maybe I'm missing something ? (Anyway it's a weird case ;o)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737328 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 10:56:00 +00:00
Jacques Le Roux 65fa17a5c6 A patch from Bruno Busco "Drop-down Applications Bar" '(https://issues.apache.org/jira/browse/OFBIZ-2118) - OFBIZ-2118
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737309 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 06:56:32 +00:00
David E. Jones ebc039406c Chanded a few more attribute names for consistency, based on feedback from Marco
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737194 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 21:30:17 +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
Hans Bakker 89523898d0 missed a change in last commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736959 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 06:17:48 +00:00
Hans Bakker 9b31d5dcb7 move temporary captcha to /runtime/tempfiles, this directory can now now read via the /tempfiles mountpoint in the browser, make it work on windows (not tested), reduced the size of the registration screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736896 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 03:14:27 +00:00
David E. Jones 40981c7f0c Added new themes directory with Bruno's bluelight theme as a first one to OOTB; this directory is like hot-deploy in that all components dropped in will be loaded, and ONLY themes should go in this directory
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736892 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 02:28:49 +00:00
David E. Jones 806eb98c1b Applied patches from Bruno Busco in Jira #OFBIZ-2118 to add flexibility to menus and themes for more dramatic changes in themes, includes patches AppMenuDropDown.patch and VisualThemeMessage.patch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736887 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 01:50:28 +00:00