Commit Graph
2222 Commits
Author SHA1 Message Date
Jacques Le Roux 12e9c7f36c No functional change, just removing trailing blanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750585 13f79535-47bb-0310-9956-ffa450edef68
2016-06-28 21:11:06 +00:00
Jacques Le Roux a025b28013 Fixes an issue related done with "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 reported by Swapnil M Mane
<<xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">> was missing, this happened in r1749488. It was the only case like that (checked in Eclipse using validate, there are tons of other mnior issues BTW)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750050 13f79535-47bb-0310-9956-ffa450edef68
2016-06-24 08:51:05 +00:00
Jacques Le Roux 642f42886e A temporary workaround for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
Reverts the simple method to use the original schema without namespace. "Duplicates" simple-methods.xsd in simple-methods-ns.xsd as we did, to get the simple-method namespace for compound-widgets.

For myself: when we will do the 3rd more elegant option (no schema duplication), have been changed also:
minilang-catalog.xml
compound-widgets.xsd


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749938 13f79535-47bb-0310-9956-ffa450edef68
2016-06-23 16:40:22 +00:00
Arun Patidar a91b9edae9 Applied patch from ticket - OFBIZ-7339 - Replace EntityUtilProperties getPropertyValue method with correct method calls. Thanks Rahul Singh Kushwah and Rishi Solanki for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749882 13f79535-47bb-0310-9956-ffa450edef68
2016-06-23 13:10:51 +00:00
Jacques Le Roux c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Jacques Le Roux bd0b57613c A patch from Wai for "EntityUtilProperties" https://issues.apache.org/jira/browse/OFBIZ-7112
OFBiz reads properties from either a properties file or the entity:SystemProperty. The way it worked previously is that OFBiz reads from the entity:SystemProperty first and if there is no value associated with the target propertyname, it would then locate the value from the relevant properties file.
In other words, if there is a database entry for a property, the database entry should override the associated properties file.
The issue is that if a database entry exist but the value is empty, it would look for a value from the properties file.  It should not do so.  If a database entry exists for the propertyname of interest, the value should be taken from the database even if it holds an empty value.

"isExistInDb" is first defined in Map<String, String> getSystemPropertyValue(String, String, Delegator).  This method is call by many other methods.  "isExistInDb" is used to indicate whether the method is returning an empty value for the property that 'exists' in the database rather than as a result of an absent database entry for the property.

The other methods...
  boolean propertyValueEqualsIgnoreCase(String, String, String, Delegator)
  String getPropertyValue(String, String, String, Delegator)
  String getPropertyValue(String, String, Delegator) 
  String getMessage(String, String, Locale, Delegator)
uses the above method and needs to decide whether to use the empty value returned (ie. empty value from an existing property entry in database) or decide if it needs to read from the property file (ie. property entry does not exist in database)

jleroux: this also add systemPropertyValue data in CommonSystemPropertyData.xml

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748560 13f79535-47bb-0310-9956-ffa450edef68
2016-06-15 11:23:54 +00:00
Jacques Le Roux 27b736e3ed No functional changes. While reviewing Wai's patch for OFBIZ-7112 I noticed that he (re)used this pattern introduced earlier:
(resource == null || resource.length() <= 0)
From Java spec. a String, Collection, Map or CharSequence can't have a negative length, so the pattern above can be reduced to 
  (resource == null || resource.length() == 0)
which can be replaced using 
  UtilValidate.isEmpty()
I checked, there are several other occurrences of this pattern (some very old, I guess most were routinely copied from an initial occurrence). I decided to replace all of them, here they are.

I did that already long ago for the 
  (resource == null || resource.length() == 0)
pattern. It remains 4 of them. Three are justified (because of the dependency on base component or because using isEmpty() on Object is disputable for performance reasons). I took care of the remaining one right aways (in SplashScreen.java)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747976 13f79535-47bb-0310-9956-ffa450edef68
2016-06-12 10:43:58 +00:00
Deepak Dixit 4a276ecf91 (OFBIZ-7231) Relocate .groovy files in the framework/common component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747776 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:58:37 +00:00
Deepak Dixit e929d179d8 (OFBIZ-7228) Relocate .groovy files in the party component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747770 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:39:22 +00:00
Jacques Le Roux ec66e361e1 A big but straightforward commit for "Move minilang scripts from component://componentname/script/org/ofbiz to component://componentname/minilang" - https://issues.apache.org/jira/browse/OFBIZ-7267
I removed duplicate paths were componentname was uselessly repeated after component://componentname/script/org/ofbiz (projectmngr was the only one using there project instead)

I had few typos, easily fixed thanks to the tests. There could be still typos but they are unexpected and anyway no-brainer to fix 

I'm still wondering about specialpurpose/example/minilang/README.txt.
I changed its content to 
  "The minilang directory is for static resources that are interpreted at run time rather than being compiled. This goes on the classpath, but does not get built or put into a JAR file."
not sure it makes any sense, I don't see how this relates to the classpath. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747712 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 14:04:30 +00:00
Pranay Pandey 247df14284 [OFBIZ-7209] No functional change. Corrected formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747207 13f79535-47bb-0310-9956-ffa450edef68
2016-06-07 12:44:52 +00:00
Pranay Pandey be6ece2105 [OFBIZ-7209] Fixed Order Ship Group PDF.
This issue was due to the declaration of map with list syntax. It was introduced when we moved from Javolution collections to java collections.
One more issue found after fixing map syntax, that is missing block elements error. Added checks to handle that error as well.

Thanks Amardeep Singh Jhajj for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747202 13f79535-47bb-0310-9956-ffa450edef68
2016-06-07 12:14:29 +00:00
Deepak Dixit 09ca38b7f6 (OFBIZ-7164) Fix typo in freemarker else tag.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746691 13f79535-47bb-0310-9956-ffa450edef68
2016-06-03 08:59:56 +00:00
Arun Patidar fbe2dfb9d2 [OFBIZ-7140] Added Fetch Log Functionality parallel to View Log in webtools. Thanks Rishi Solanki for new feature and patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746227 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 05:26:43 +00:00
Pranay Pandey 681ebea533 [OFBIZ-7130] Applied patch from the ticket to fix error on console when navigating to update party email address view.
This error occurs due to the code used for dependent drop down for country and state. At party email address update page, no dependent drop down used, so js code triggering the request with empty countryGeoId and generating console error. Added check in code that if drop down field is not present on page then no need to observe it for the change. 

Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746130 13f79535-47bb-0310-9956-ffa450edef68
2016-05-30 13:34:35 +00:00
Nicolas Malin ab92393570 Add xls screen renderer to convert a screen definition like an html flow directly ready by a spreadsheet application
In addition, add an export example button on FindExample screen and add complete macro ftl renderer unit test. Issue OFBIZ-6931 proposed by Leila Mekika. Thanks to her, jacques and pierre for theirs remarks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746045 13f79535-47bb-0310-9956-ffa450edef68
2016-05-29 18:38:26 +00:00
Jacques Le Roux e7cdb8a30d Implements "Use only HTTPS in OFBiz" - https://issues.apache.org/jira/browse/OFBIZ-6849
All tests passes and the normal use of OFBiz seems to work

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1745525 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 18:02:23 +00:00
Deepak Dixit 5bb84a92ca (OFBIZ-6810) Removed some unused screen and ftl, found during ftl cleanup. I took extra care while removing these code this should not break anything.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1745500 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 15:05:50 +00:00
Ashish Vijaywargiya 8d5599c88d Applied patch from jira issue - Quote report doesn't show terms of the quote - https://issues.apache.org/jira/browse/OFBIZ-5861
Thanks Pierre for creating the issue and Thanks Ravi for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744910 13f79535-47bb-0310-9956-ffa450edef68
2016-05-21 11:38:36 +00:00
Deepak Dixit 83696e3203 (OFBIZ-7021) Renamed framework common component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744783 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:52:54 +00:00
Deepak Dixit 79a4302d2c (OFBIZ-7021) Renamed framework widget component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744782 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:21:02 +00:00
Deepak Dixit b3264aa9fc (OFBIZ-5740) Updated fromDate and thruDate filed type for CustomTimePeriod entity from date to date-time, and made chagnes accordingly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743656 13f79535-47bb-0310-9956-ffa450edef68
2016-05-13 11:31:23 +00:00
Jacques Le Roux 6d5dd1c5ba Things got totally wrong with r1742196 which contained much more than expected.
This reverts things which should not have been committed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742197 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 21:03:11 +00:00
Jacques Le Roux 31ef1f9186 "Continue the work on the form widget grid element" - https://issues.apache.org/jira/browse/OFBIZ-7029
Completes in screens the changes done in forms at r1741873. I then replaced few form lists by grids, where it was possible to do it with regexp.
Also complete StatsForms.xml to use only grids and "searchList" form in ecommerce ContentForms to NOT use grid (not called in screen)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742196 13f79535-47bb-0310-9956-ffa450edef68
2016-05-03 20:50:10 +00:00
Jacques Le Roux f5d8feac88 An enhanced patch from Christian Carlow for "Add ability to change Routing statuses" - https://issues.apache.org/jira/browse/OFBIZ-6307
Only ROU_ACTIVE statusItem exists for statusTypeId ROUTING_STATUS.  Adding another such as ROU_INACTIVE would allow for more control over routings.  Doing so entails adding the statusId to the find and edit screens.
ROU_INACTIVE was add as a StatusItem and currentStatusId was added to the routing find form as a multi-drop down

jleroux: I added use of common/webcommon/includes/setMultipleSelectJs.ftl and French labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741789 13f79535-47bb-0310-9956-ffa450edef68
2016-04-30 18:43:10 +00:00
Wei Zhang 3fefdb2617 OFBIZ-5732 Error in sendMailHiddenInLog service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741563 13f79535-47bb-0310-9956-ffa450edef68
2016-04-29 07:53:44 +00:00
Deepak Dixit 209b95cbbf (OFBIZ-6823) relocate .ftl files in the framework/common component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740497 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 12:28:46 +00:00
Deepak Dixit cee0263cef (OFBIZ-6815) relocate .ftl files in the content component
Thanks Pierre for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740446 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 06:12:08 +00:00
Michael Brohl eaafbb0779 Applied patch for OFBIZ-6972: Fix resource leaks in CommonServices.java.
File1 and file2 should be fixed by closing them in byteBufferTest. Taken from refactor todo list at https://cwiki.apache.org/confluence/display/OFBIZ/Re-Factor+To-Do+List .

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737631 13f79535-47bb-0310-9956-ffa450edef68
2016-04-04 08:16:59 +00:00
Jacques Le Roux 1e7d539a7a Removes old simple-methods.xsd from the trunk as it's useless now (was replaced by simple-methods-v2.xsd)
Also renames simple-methods-v2.xsd in simple-methods.xsd and replaces simple-methods-v2.xsd references by simple-methods.xsd references everywhere it's needed



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737087 13f79535-47bb-0310-9956-ffa450edef68
2016-03-30 09:13:03 +00:00
Jacques Le Roux 2f43c5a993 Patches from Pierre Smits for <<Enhancing *Attribute entities with a description field>> https://issues.apache.org/jira/browse/OFBIZ-6962
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736846 13f79535-47bb-0310-9956-ffa450edef68
2016-03-28 09:31:53 +00:00
Jacques Le Roux b021268fa7 Fixes "Comment out RMI related code because of the Java deserialization issue" - https://issues.apache.org/jira/browse/OFBIZ-6942
I decided to comment out as less as possible because once the RMI loaders, the RMI dispatcher and the related test services are off there is no RMI related danger left (test services are not a danger but would fail during tests run). It's then easier for users who need RMI in their projects to have only to uncomment those and not digg everywhere. Because the naming (JNDI) server relies on the rmi loader it will also be commented out.

[CVE-2016-2170] The infamous Java serialization vulnerability

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735569 13f79535-47bb-0310-9956-ffa450edef68
2016-03-18 10:38:04 +00:00
Hans Bakker 10c844b687 improve uom convert error message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1734875 13f79535-47bb-0310-9956-ffa450edef68
2016-03-14 02:37:12 +00:00
Jacques Le Roux 05667aa340 Adds a comments to the testRemoteSoap service to clarify when to use it how it works.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1734241 13f79535-47bb-0310-9956-ffa450edef68
2016-03-09 13:57:39 +00:00
Jacques Le Roux 2c79c094ea "Currently the testRemoteSoap test services does not work." - https://issues.apache.org/jira/browse/OFBIZ-6922
This temporarily replaces the demo-trunk.ofbiz.apache.org domain by ofbiz-vm.apache.org:8080

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1733951 13f79535-47bb-0310-9956-ffa450edef68
2016-03-07 18:14:53 +00:00
Arun Patidar 4f484099a8 [OFBIZ-6909] Applied patch for adding a new fieled 'disabledBy' in UserLogin entity.Thanks Yashwant for reporting issue and patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731390 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 12:35:31 +00:00
Deepak Dixit 9e29f0d9fb (OFBIZ-6282) Replace html widget rendering with Macro widget rendering in EmailServices.java file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731343 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 08:48:31 +00:00
Jacques Le Roux 327fb83021 A patch from Tomas Pytelka for "Czech translation" https://issues.apache.org/jira/browse/OFBIZ-6885
jleroux: this was git patch, I'm now used to change them to apply, but I will explain how to generate svn patch from it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729078 13f79535-47bb-0310-9956-ffa450edef68
2016-02-08 07:56:23 +00:00
Jacques Le Roux adb90faef8 A modified patch from Pierre Smits for "Replace Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue in .ftl files with EntityUtilProperties variant" https://issues.apache.org/jira/browse/OFBIZ-6884
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue is used in several .ftl files. 

Replaces with EnittyUtilProperties variant where appropriate. 

jleroux: In this is the 2nd commit from the 3rd patch (the 2nd had issues) I fixed 2 "typos" I spotted while reviewing in
  ecommerce/customer/editcontactmech.ftl
  ecommerce/customer/newcustomer.ftl
where "UtilProperties" was not replaced



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729002 13f79535-47bb-0310-9956-ffa450edef68
2016-02-07 18:23:49 +00:00
Jacques Le Roux c19af8a60b Reverts r1728959 because of misc. issues with the patch, see my comment at https://issues.apache.org/jira/browse/OFBIZ-6884
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728961 13f79535-47bb-0310-9956-ffa450edef68
2016-02-07 13:59:41 +00:00
Jacques Le Roux 3a5cc393cf A patch from Pierre Smits for "Replace Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue in .ftl files with EntityUtilProperties variant" https://issues.apache.org/jira/browse/OFBIZ-6884
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue is used in several .ftl files. 

Replaces with EnittyUtilProperties variant where appropriate.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728959 13f79535-47bb-0310-9956-ffa450edef68
2016-02-07 13:18:50 +00:00
Hans Bakker 9d39583bcf be able to set accounting company in the header, so other companent can change it too. https://issues.apache.org/jira/browse/OFBIZ-6802
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728584 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 01:45:50 +00:00
Julien Nicolas 324bc0af74 Add new theme rainbowstone JIRA6843
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728388 13f79535-47bb-0310-9956-ffa450edef68
2016-02-03 22:51:33 +00:00
Gil Portenseigne 63e01c97f7 OFBIZ-6869 : Add properties in widget.properties, for easy customization of JGrowl alert. Thanks Jacques for the idea
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728351 13f79535-47bb-0310-9956-ffa450edef68
2016-02-03 19:18:35 +00:00
Gil Portenseigne f3dd6cbadc OFBIZ-6869 : Jgrowl enhancement for internationalization, center and speed up display, with some format/typo fixes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728029 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 00:38:51 +00:00
Nicolas Malin 40d44a3513 Add new template location : VT_LOGIN_TMPLT_LOC for the login
VT_CHPWD_TMPLT_LOC for the changePassword
VT_FGPWD_TMPLT_LOC for the forgetPassword
VT_GSQUE_TMPLT_LOC for the getSecurityQuestion
Related issue OFBIZ-6868. The origin requirement came from issue OFBIZ-6843 with proposition to adding new theme with dedicate template for these previous element

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728026 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 00:08:55 +00:00
Nicolas Malin 0c5de17f41 Add the possibility to set a blackout period for job manager service. During this time all async and scheduled service are put on hold.
This improvement add a entity JobManagerLock, a new screen to add/edit job manager lock and an information for end user on FindJob and ScheduleJob screen.
See more information on issue OFBIZ-6790. Thanks to Jacques for sharing on this improvement.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1727570 13f79535-47bb-0310-9956-ffa450edef68
2016-01-29 12:52:34 +00:00
Nicolas Malin 3a07efc5df correct locale (en to fr) associate to french translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1726486 13f79535-47bb-0310-9956-ffa450edef68
2016-01-24 12:50:01 +00:00