Adrian Crum
13ff4e3f4c
Fixed a recent change that caused tests to fail.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1239119 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 13:15:17 +00:00
Adrian Crum
651c0677ec
Reduce some of the info logging.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1239054 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 10:54:00 +00:00
Hans Bakker
c690a5aba5
some missing files in -r1238993
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238998 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 08:24:36 +00:00
Hans Bakker
cc8c924b89
make <property-to-field/> in minilanguage first look in the newly created SystemProperty entity to be able to override the system properties defined in the properties files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238993 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 08:14:53 +00:00
Hans Bakker
f484f7b9d0
revert r1238954 some local changes were added
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238991 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 08:13:21 +00:00
Hans Bakker
204b9eb01a
Wrong commit reverted in r1238991
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1238954 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 07:22:12 +00:00
Erwan de Ferrieres
771e7a9b55
OFBIZ-2405 - Create a Portlet to show the payments
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1235513 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 21:38:48 +00:00
Erwan de Ferrieres
9af1f47aee
OFBIZ-2401 - Create a Portlet for training
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1234931 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 18:28:17 +00:00
Erwan de Ferrieres
f09f963cb0
Adding missing training statuses, as they are used in forms but not created in base. Adding entity labels related
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1234035 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 17:57:24 +00:00
Erwan de Ferrieres
9b03a5022b
Improvements on the EmplLeave entity. Adding entityLabels for the leaveStatus field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1232158 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 20:51:18 +00:00
Erwan de Ferrieres
e8c5d98519
Adding missing labels for portalPageName
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1232008 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 14:35:32 +00:00
Erwan de Ferrieres
8c0a41e885
tabs to spaces, no functional changes - xml files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230481 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:51:58 +00:00
Erwan de Ferrieres
0aead2f1ac
tabs to spaces, no functional changes - ftl files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230479 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:39:49 +00:00
Erwan de Ferrieres
05c9bae6e5
tabs to spaces, no functional changes - java files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230478 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:37:35 +00:00
Adrian Crum
9e24170402
Converted login message in lookup screen to a link to the login page.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229344 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 20:52:04 +00:00
Adrian Crum
bae6b61fe8
Give the login screen a page title.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229135 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 13:07:23 +00:00
Erwan de Ferrieres
09529c62a4
OFBIZ-4648 - Better french translations - A patch from Youssef Khaye
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1228649 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 16:23:54 +00:00
Erwan de Ferrieres
c919f07e52
OFBIZ-4643 - Add description for Component, only complete existing functionality - a patch from Olivier Heintz
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226954 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 21:28:24 +00:00
Jacques Le Roux
db4b30ba20
A small comment to better understand the reason of the trick
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226072 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 11:42:49 +00:00
Erwan de Ferrieres
afa8f33046
Removing JSON handlers as they are deprecated since December 2009. More info @ http://s.apache.org/6zF
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225242 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 17:32:16 +00:00
Adrian Crum
7d71b0b4b6
Fixup for my previous commit. Browsers should not parse the contents of CDATA elements, but apparently they do.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225224 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 16:39:56 +00:00
Adrian Crum
19cc573a09
Bug fix for lookup screens - jQuery was loaded twice, which resulted in quirky behavior in the lookup screens.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1224914 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 14:31:17 +00:00
Hans Bakker
91d206a71d
add the possibility of adding tags to products next to having keywords to products, can also optionally approve/reject via a status field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222544 13f79535-47bb-0310-9956-ffa450edef68
2011-12-23 03:49:11 +00:00
Jacques Le Roux
fb5d588fb3
A patch from andrewzn "Help screen/navigation do not take into account content expiration" https://issues.apache.org/jira/browse/OFBIZ-4626
...
Help screens use entity-and to retrieve ContentAssoc without fromDate/truDate conditions while help content expiration still may be useful.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1220527 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 20:24:48 +00:00
Andrew Zeneski
11bcb7d52e
reverted previous commit since it breaks SUN (oracle) JDK, ick.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211088 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 20:25:52 +00:00
Andrew Zeneski
15228ae88b
few minor changes to fix compiling with openjdk icetea6 1.7.9
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211073 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 19:51:28 +00:00
Adrian Crum
3704ef9399
Moved screen rendering context initialization from the GlobalDecorator to a separate screen widget - so the initializations can be included in other decorators. Also cleaned up the GlobalDecorator formatting.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1209054 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 12:41:03 +00:00
Sascha Rodekamp
9836b8f320
IMPROVEMENT: When creating a new product for a productId which already exists, an user unfriendly exception will be shown in the backend. I added a quick check to see that the ID is not in use, otherwise a user friendly error text will be shown.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1207891 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 14:49:44 +00:00
Jacques Le Roux
27fb4a1990
A patch from Kiran Gawde https://issues.apache.org/jira/browse/OFBIZ-4568 "CommonUpdatingData is missing from CommonUiLabels"
...
When you try to update the address from eCommerce application (Profile->ManageAddress->Edit). It shows CommonUpdatingData at the top.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1203350 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 20:17:15 +00:00
Sascha Rodekamp
9a85b1ccf4
Missing german uiLabels ( https://issues.apache.org/jira/browse/OFBIZ-4562 ) A patch from Dimitri Unruh: Some missing german labels and also some better translations
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201656 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 10:16:33 +00:00
Jacques Le Roux
6d839bb4a5
A patch from Leon "add datetimepicker language file for zh-CN, zh-HK, zh-TW, and an en one in order to avoid "jquery-ui-timepicker-en.js" not found error" https://issues.apache.org/jira/browse/OFBIZ-4555
...
1. add datetimepicker language file to system: jquery-ui-timepicker-zh-CN.js, jquery-ui-timepicker-zh-HK.js and jquery-ui-timepicker-zh-TW.js.
2. also add a "jquery-ui-timepicker-en.js" file, it's the default datetimepicker language file but not exist now.
3. run service "createJsLanguageFileMapping" to update sLanguageFileMapping.java accordingly.
jleroux: not sure "jquery-ui-timepicker-en.js" is really needed, but cleaner for sure
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201229 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 09:31:49 +00:00
Jacques Le Roux
1626222154
Fixes some errors recently introduced in labels
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201122 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 00:34:18 +00:00
Sascha Rodekamp
91ffcbdae6
Update jQuery:
...
jQuery library to version 1.7
jQuery UI to version 1.8.16
jQuery Validation to version 1.9
jQuery Flot to version 0.7
jQuery datetimepicker to version 0.9.7
and jsTree
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1199218 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 12:35:33 +00:00
Hans Bakker
aa3d73675b
also introduce keyword size limit(configurable) in product and move property setting to content component
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1199130 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 07:02:16 +00:00
Erwan de Ferrieres
42dc6ecb47
A patch from Olivier Heintz - OFBIZ-4548 - Some french label in Projectmgr (and one in common ;-)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1198932 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 20:57:57 +00:00
Hans Bakker
f644018217
create a configurable maxlength keyword for content search keywords
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1198709 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 12:04:16 +00:00
Jacques Le Roux
49482cb281
A patch from Jose F. Fernandez "Add spanish translation to CommonUiLabels.xml" https://issues.apache.org/jira/browse/OFBIZ-4536
...
Completes spanish translation to framework/common/config/CommonUiLabels.xml
New labels translated, some corrections to translated ones
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1196165 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 17:51:14 +00:00
Hans Bakker
1fc8c427f5
find service did not work properly on the selection end date
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1195354 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 06:48:10 +00:00
Erwan de Ferrieres
617345a17e
A patch from Nicolas Malin - OFBIZ-4474 - PortalPage Admin screen : change portlet sequence is broken
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1195175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 15:25:36 +00:00
Erwan de Ferrieres
9369ba5176
A patch from Leon - OFBIZ-4522 - Chinese (zh_CN) translation for CommonPerson
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1190763 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 06:34:25 +00:00
Adrian Crum
4a03998c48
Spanish translations provided by Jose F. Fernandez:
...
https://issues.apache.org/jira/browse/OFBIZ-4531
https://issues.apache.org/jira/browse/OFBIZ-4532
https://issues.apache.org/jira/browse/OFBIZ-4533
https://issues.apache.org/jira/browse/OFBIZ-4534
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1190423 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 16:14:17 +00:00
Adrian Crum
b6413f40a9
Spanish translations provided by Jose F. Fernandez:
...
https://issues.apache.org/jira/browse/OFBIZ-4524
https://issues.apache.org/jira/browse/OFBIZ-4529
https://issues.apache.org/jira/browse/OFBIZ-4530
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1190092 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 23:37:34 +00:00
Joseph Eckard
f2b2bbaa63
Added two missing countries, Guernsey and Jersey
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1189961 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:33:21 +00:00
Erwan de Ferrieres
0df2322108
A patch from Olivier Heintz - OFBIZ-4507 - French spelling correction in uiLabel
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1188389 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 21:21:22 +00:00
Hans Bakker
2c234661ac
update the backend top left logo by specifying a url in the current accounting company partygroup or uploading a logon in partycontent. the logo will also show in the partyprofile. All themes are updated. Contribution of Antwebsystems employee 'Nop'
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1185102 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 10:58:47 +00:00
Jacques Le Roux
dc056e77ed
Replaces 3 hardcoded sentences in <default-message> introduced at (r1170129, r1142915) since r1132726. Few remains... asking Hans...
...
Introduces also 2 new labels that will be used soon with commit for WIP OFBIZ-3913 (External Devices by Nicolas)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1183423 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 16:59:16 +00:00
Jacques Le Roux
d10ff1719f
JQuery team does not care about plugins consistency, so we have to be careful. For instance, for more fun: in validate plugin we have also ptpt and ptbr...
...
Just found by chance while looking for consistency in JsLanguageFileMappingCreator class after refactoring
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1182858 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 13:51:37 +00:00
Jacques Le Roux
690a5dd02e
Fix a bug reported by Chatree "JavaScript location is empty causes a double requests problem" https://issues.apache.org/jira/browse/OFBIZ-4477
...
In r1178199, I missed to use the default DateTime file (jquery.ui.datepicker-en.js) being still with the idea that it was handled internally.
I have also refactored/simplified JsLanguageFileMappingCreator class and put comments to better explain how all that works
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1182731 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 09:07:12 +00:00
Jacques Le Roux
810bd966a8
Fix a small bug: layoutSettings.javaScripts was used when layoutSettings.styleSheets should have been used
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1182310 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 11:18:28 +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