Skip to content
This repository has been archived by the owner on May 9, 2020. It is now read-only.

Trunk #10

Open
wants to merge 10,000 commits into
base: trunk
Choose a base branch
from
Open

Trunk #10

wants to merge 10,000 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 21, 2015

  1. OFBIZ-4154 Use ZXing to generate QR 2d barcode. 

    1. Add zxing-core-3.2.0.jar to framework/base/lib and .classpath.
2. Add services_qrcode.xml and QRCodeService.java in framework/common/.
3. Add qrcode request in common-controller.xml and QRCodeEvents.java under framework/common/.
4. Add qrcode.properties and QRCodeUiLabels.xml under framework/common/.
5. Add a barcode example page in specialpurpose/example, entry is on page: /example/control/EditExample?exampleId=EX01, the example can be seen on page: /example/control/ExampleReportPdfBarcode?exampleId=EX01

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1696921 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    1b060f9 View commit details
    Browse the repository at this point in the history

  2. Replaces tabs with spaces 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1696950 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    5bf8912 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2015

  1. Eclipse uses tabs so better to have them in repo, thanks to Adrian on… 

    … dev ML

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697072 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Aug 22, 2015
    Configuration menu
    Copy the full SHA
    2f6cf84 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2015

  1. A patch from Pierre Smits for "Incorporate the readme for the Lucene … 

    …component" https://issues.apache.org/jira/browse/OFBIZ-6577

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697166 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Aug 23, 2015
    Configuration menu
    Copy the full SHA
    699c1c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2015

  1. (OFBIZ-6362) Added missing code in header.ftl file to include compone… 

    …nt specific js file.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697574 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    7624c5c View commit details
    Browse the repository at this point in the history

  2. Reverted 1530237: the sql type for Postgres for "comments" and "descr… 

    …iption" fields was changed from VARCHAR(255) to TEXT; the new TEXT type allows strings of any length; however all other types definitions (MySQL, Derby etc...) are using VARCHAR(255) thus limiting the length of "comments" and "description" fields to 255 characters.

By reverting this change we make sure that the Postgres db will be consistent with the other dbs.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697590 13f79535-47bb-0310-9956-ffa450edef68
    @jacopoc
    jacopoc committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    7458d9f View commit details
    Browse the repository at this point in the history

  3. (OFBIZ-6571) Passed parameter in correct sequence while doing EntityU… 

    …til.getRelated.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697647 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    e135475 View commit details
    Browse the repository at this point in the history

  4. (OFBIZ-6563) Fixed lookup party search form, used correct name for gr… 

    …oupName field. Fix the focus-field-name from partyName to partyId as partyName is not a valid field on lookup party form. Used correct jQuery.each method in for paginationMenus. Now lookup party is working fine.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697674 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    a8dcabb View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. A patch from Pierre Smits for "SQL Exceptions (OPTION) occuring when … 

    …running OFBiz 13.07.02 against MySQL" https://issues.apache.org/jira/browse/OFBIZ-6582

Updates the "MySQL Connector/J" from 5.1.6 to 5.1.36 
This follows OFBIZ-4800 where the "MySQL Connector/J 5.1.6" was used. See 
    http://mvnrepository.com/artifact/mysql/mysql-connector-java/5.1.6 
and 
    https://dev.mysql.com/doc/relnotes/connector-j/en/news-5-1.html
for details


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697993 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    ae050d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. A patch from Wai for "simple coding cleanup" https://issues.apache.or… 

    …g/jira/browse/OFBIZ-6583

This fixes and improves CompanyHeader.groovy

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698259 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    62a9c3e View commit details
    Browse the repository at this point in the history

  2. Crap I had this wrong change pending, but forgot to save after checki… 

    …ng for OFBIZ-6583

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698261 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    91e6959 View commit details
    Browse the repository at this point in the history

  3. No functional change: Wai removed newline at end of file with OFBIZ-6583 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698263 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    86dacee View commit details
    Browse the repository at this point in the history

  4. Added a FIXME comment. No functional change. 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698406 13f79535-47bb-0310-9956-ffa450edef68
    @adrian-crum
    adrian-crum committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    6523aab View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2015

  1. OFBIZ-5042 Apache Solr Implementation. 

    1. Put the patch into trunk.
2. Added access control to solr /admin/ pages.
3. Upgraded solr to 4.9.0 to match Lucene version in trunk.
4. Removed solr.solr.home, used 
SolrResourceLoader loader = new SolrResourceLoader("specialpurpose/solr/conf");
instead.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700119 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Aug 30, 2015
    Configuration menu
    Copy the full SHA
    0d6d997 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2015

  1. (OFBIZ-6589) Removed date picker localization data from theme file. G… 

    …lobalActions decorator will generate this data and will be added in screens accordingly. Now date picker working fine.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700250 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    02640d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. OFBIZ-6591 ofbiz does not compile 

    The reason behind is lack of jars in applications/content/build/lib and specialpurpose/lucene/lib.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700446 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    a6af49c View commit details
    Browse the repository at this point in the history

  2. OFBIZ-6591 ofbiz does not compile 

    Replaces tabs with spaces.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700448 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    22e8925 View commit details
    Browse the repository at this point in the history

  3. Add framework/base/lib/zxing-core-3.2.0.jar into LICENSE. 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700460 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    5786220 View commit details
    Browse the repository at this point in the history

  4. OFBIZ-5042 Apache Solr Implementation. 

    Add all the jars under specialpurpose/solr/ into LICENSE.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700461 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    d0018b3 View commit details
    Browse the repository at this point in the history

  5. A patch from Pierre Smits for "Have hard coded links in admin screen … 

    …open in new windows" https://issues.apache.org/jira/browse/OFBIZ-6593

Currently the various hard coded links at the bottom of the admin screen open in the same window. These should open in a new window to provide a better UX.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700555 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    9f1a533 View commit details
    Browse the repository at this point in the history

  6. OFBIZ-5042 Apache Solr Implementation. 

    Add apache solr to secondary top menu and /solr/control/main request to accept the link from the menu.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700599 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    bc743a3 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2015

  1. OFBIZ-6596 The Solr redirection does not work in trunk demo. 

    1. Use response.sendRedirect to forward url to login page instead of the response.setHeader("location", url), this avoids the warning messages from EntityUtilProperties. Besides, when testing in similar config as demo-ofbiz-trunk is (port 80 -> 8080, port 443 -> 8443), this change can keep the url to 80 or 443.

2. Replace tabs to spaces in several java files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700739 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    ce5865b View commit details
    Browse the repository at this point in the history

  2. Make primitive initialization explicit. 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700864 13f79535-47bb-0310-9956-ffa450edef68
    @adrian-crum
    adrian-crum committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    fb49575 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2015

  1. OFBIZ-6596 The Solr redirection does not work in trunk demo. 

    Commented out https scheme check. Let see whether it would work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700960 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 3, 2015
    Configuration menu
    Copy the full SHA
    d823274 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2015

  1. A patch from Pierre Smits for "Update site-conf.xsd to prioritise Gro… 

    …ovy over BSF" https://issues.apache.org/jira/browse/OFBIZ-6597

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701150 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    4f0a868 View commit details
    Browse the repository at this point in the history

  2. Removes build-website and docs targets, copy-dtds is enough 

    I did not remove copy-apis and other doc (API) related targets because they are used by Buildbot.

I should modify the Buildbot conf to automatically use the copy-dtds target, but that's for another insomnia night...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701157 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    ebef3d9 View commit details
    Browse the repository at this point in the history

  3. Upgraded Apache Tomcat to the latest bug fix release of the 7 series:… 

    … 7.0.64

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701164 13f79535-47bb-0310-9956-ffa450edef68
    @jacopoc
    jacopoc committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    f152920 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2015

  1. OFBIZ-6596 The Solr redirection does not work in trunk demo. 

    Removed https scheme check and demo-trunk-ofbiz.apache.org/solr/ can be displayed correctly now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701379 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 5, 2015
    Configuration menu
    Copy the full SHA
    b5fcf32 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2015

  1. OFBIZ-6601 example component causes exceptions 

    1. Add specialpurpose/webapp/exampleext/error/error.jsp to display error page.
2. Move specialpurpose/example/widget/exampleext to specialpurpose/exampleext/widget/example.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701441 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 6, 2015
    Configuration menu
    Copy the full SHA
    ec1f3e2 View commit details
    Browse the repository at this point in the history

  2. OFBIZ-5042 Apache Solr Implementation. 

    Add permission check on /update, /update/json, /update/csv and /update/extract requests. These requests are defined in an index's solrconfig.xml.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701495 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 6, 2015
    Configuration menu
    Copy the full SHA
    6ccb72c View commit details
    Browse the repository at this point in the history

  3. No functional changes, fixes typos 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701498 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 6, 2015
    Configuration menu
    Copy the full SHA
    57bd16b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2015

  1. A patch from Pierre Smits for "Scrum total billing cause exception" h… 

    …ttps://issues.apache.org/jira/browse/OFBIZ-6600

"import java.sql.Timestamp;" was missing

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701819 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    ab6fc3f View commit details
    Browse the repository at this point in the history

  2. A patch from Pierre Smits for "Some groovy files using Timestamp.valu… 

    …eOf are missing essential jar." https://issues.apache.org/jira/browse/OFBIZ-6606

"import java.sql.Timestamp;" was missing in CommissionReport.groovy, CommissionRun.groovy change is non functional (import ordering)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701825 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    17c6bef View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2015

  1. No functional change: comments out "docs-all" ant target since it's n… 

    …ow done automatically by Buildbot at the ASF

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701914 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    42c3726 View commit details
    Browse the repository at this point in the history

  2. A completed patch from Oleg Andreyev for "Using official content type… 

    … for json requests" https://issues.apache.org/jira/browse/OFBIZ-6608

I suggest using application/json instead of application/x-json as it is official content type. It seems x-json does not cause any problem for the time being but browsers will load json responses correctly without asking for download. It's handy in development time. It also matches JQuery Accept header.

jleroux: I also used it in Solr




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701915 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    fd544ef View commit details
    Browse the repository at this point in the history

  3. A slightly modified patch from Pierre Smits for "view sprint overview… 

    … has errors" https://issues.apache.org/jira/browse/OFBIZ-4861

When viewing the sprint overview page errors are shown related to burndown chart and the sprint backlog list

Regarding the burndown chart:

The following items have errors:

Chart (id = 113):
+ A BIRT exception occurred. See next exception for more information.
Invalid javascript expression: row["sprintDay"] (Element ID:113) 

Regarding the sprint backlog list

org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen [component://common/widget/CommonScreens.xml#GlobalDecorator]: java.lang.IllegalArgumentException: Error evaluating BeanShell use-when condition [showPosition1&&"RF_PROD_BACKLOG"=="RF_SCRUM_MEETINGS"] on the field custRequestId of form sprintBacklogListItems: Sourced file: inline evaluation of: ``showPosition1&&"RF_PROD_BACKLOG"=="RF_SCRUM_MEETINGS";'' : illegal use of null value or 'null' literal : at Line: 1 : in file: inline evaluation of: ``showPosition1&&"RF_PROD_BACKLOG"=="RF_SCRUM_MEETINGS";'' : ;
(Error evaluating BeanShell use-when condition [showPosition1&&"RF_PROD_BACKLOG"=="RF_SCRUM_MEETINGS"] on the field custRequestId of form sprintBacklogListItems: Sourced file: inline evaluation of: ``showPosition1&&"RF_PROD_BACKLOG"=="RF_SCRUM_MEETINGS";'' : illegal use of null value or 'null' literal : at Line: 1 : in file: inline evaluation of: ``showPosition1&&"RF_PROD_BACKLOG"=="RF_SCRUM_MEETINGS";'' : ;
)

jleroux: I did not see the sprint backlog list. I put back the removed license header



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701936 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    049b3e5 View commit details
    Browse the repository at this point in the history

  4. A slightly modified patch from Pierre Smits for "Scrum productstatist… 

    …ics shows errors" https://issues.apache.org/jira/browse/OFBIZ-4863

Those were only rptdesign issues

jleroux: I put back the removed license headers



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1702002 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    c5e394b View commit details
    Browse the repository at this point in the history

  5. A slightly modified patch from Pierre Smits for "Remove unused view-m… 

    …aps from SCRUM controller" https://issues.apache.org/jira/browse/OFBIZ-6478

jleroux: only EditSprintItem was still concerned





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1702005 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    a5f8180 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2015

  1. A patch from Pierre Smits for "Move PartyRelationshipAndPartyDetail e… 

    …ntity to Party component" https://issues.apache.org/jira/browse/OFBIZ-5814

jleroux: actually it does a bit more than moving. It also adds 
        <member-entity entity-alias="PTYRELTP" entity-name="PartyRelationshipType"/>
and
        <alias entity-alias="PTYRELTP" name="relParentTypeId" field="parentTypeId"/>
+
        <view-link entity-alias="PTYREL" rel-entity-alias="PTYRELTP" rel-optional="true">
          <key-map field-name="partyRelationshipTypeId"/>
        </view-link>




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1702168 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 10, 2015
    Configuration menu
    Copy the full SHA
    9a06a46 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2015

  1. No functional changes, removes an useless assignation found by chance… 

    … an fixes indentation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1702420 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    6b50952 View commit details
    Browse the repository at this point in the history

  2. A patch from Wei Zhang for "The EntityListIterator must be closed in … 

    …EntityQuery.query()" https://issues.apache.org/jira/browse/OFBIZ-6615

jleroux: The EntityListIterator at line 453 is now closed (dynamicViewEntity complete list retrieved once, eg: agreementServices.getCommissionForProduct())

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1702548 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    c322002 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2015

  1. OFBIZ-6610 Upgrade Solr and Lucene librairies to version 5 

    Add runtime/indexes/index.properties to exclude in clean-search-indexes target.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1702703 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Sep 13, 2015
    Configuration menu
    Copy the full SHA
    9c79bff View commit details
    Browse the repository at this point in the history

  2. A patch for "createQuoteRole, createContentRole, and createRequiremen… 

    …tRole allow for adding Roles to a Party without permissions" https://issues.apache.org/jira/browse/OFBIZ-6605

Rerported by Forrest Rae:
The following functions automatically add a PartyRole entry if the PartyRole does not exist.  This is possible even when the userLogin doesn't have PARTYMGR_UPDATE or PARTYMGR_CREATE.

createQuoteRole
createContentRole
createRequirementRole

Repo:
1) Remove PARTYMGR_UPDATE or PARTYMGR_CREATE permissions from the ORDERENTRY group.
2) Login as DemoRepStore
3) Create a Quote
4) Add a QuoteRole with partyId of DemoRepStore and Role of your choosing.
5) View DemoRepStore roles.

This is a security problem for anyone building component that leverages Role based security.

jleroux: simple solution, check before creating the new role the user has  PARTYMGR_UPDATE or PARTYMGR_CREATE.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1702704 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 13, 2015
    Configuration menu
    Copy the full SHA
    979004b View commit details
    Browse the repository at this point in the history

  3. No functional changes, since I put the 2 conditions in the error mess… 

    …age at r1702704 no needs to put 2 <check-errors/>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1702708 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 13, 2015
    Configuration menu
    Copy the full SHA
    0245bc3 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2015

  1. A patch from Gareth Carter for "PurgeJob.java does not delete Recurre… 

    …nceRule because it is still referenced by RecurrenceInfo" https://issues.apache.org/jira/browse/OFBIZ-6619

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703121 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    b5c6596 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2015

  1. A patch from Gaudin Pierre for "error in isValidEan util" https://iss… 

    …ues.apache.org/jira/browse/OFBIZ-6624

There is an error in isValidEan util. It should be 12 and not 13 in the methods charAt and calcChecksum  because they start at 0.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703586 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 17, 2015
    Configuration menu
    Copy the full SHA
    36a254f View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2015

  1. [OFBIZ-6460] Fixed the exception due to incorrect use of EntityQuery … 

    …method. Fixed the Query statement.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703945 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    b861657 View commit details
    Browse the repository at this point in the history

  2. Applied patch for OFBIZ-6621: MapContext.entrySet() slows down when B… 

    …yteBuffer objects are in the context.

Introduces a private inner class ListSet representing a Set backed by a List instead of the HashSet implementation.

Thanks Gareth Carter for spotting this and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703954 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    565567e View commit details
    Browse the repository at this point in the history

  3. Applied patch for OFBIZ-6594: Wrong Documentation for Temporal Expres… 

    …sions.

The integer value representing the HOUR was wrong in the documentation.

Thanks Mirco Vogelsmeier for spotting this and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703965 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    9d9f7b9 View commit details
    Browse the repository at this point in the history

  4. [OFBIZ-6438] Fixed issue: PartyGeoLocation shows menus when accessed.… 

    … Thanks Pravin for your patch and thanks Pierre for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703969 13f79535-47bb-0310-9956-ffa450edef68
    Divesh Dutta committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    56ebd04 View commit details
    Browse the repository at this point in the history

  5. [OFBIZ-6499] Added z-index value with dialog class to fix the issue o… 

    …f lookup in theme.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703971 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    8884009 View commit details
    Browse the repository at this point in the history

  6. [OFBIZ-6348] Applied patch attached by Christian on the ticket. Repor… 

    …ted issue of row alignment has been fixed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703976 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    76aa631 View commit details
    Browse the repository at this point in the history

  7. Applied patch for OFBIZ-6629: Duplicate calculation and typo in Shopp… 

    …ingCart.getGrandTotal().

This removes duplicate code, fixes a methode name typo and adds type safety to an iterator.

Thanks Martin Becker for spotting this and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703977 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    7c6ec64 View commit details
    Browse the repository at this point in the history

  8. [OFBIZ-5927] Applied the changes as discussed on ticket. Thanks Jacqu… 

    …es and Scott for concluding it and thanks to Prateek for reporting this bug.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703981 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    40b9360 View commit details
    Browse the repository at this point in the history

  9. [OFBIZ-5970] Removed unused form as discussed on ticket. Thanks Pierr… 

    …e for reporting.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703987 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    29b9e0b View commit details
    Browse the repository at this point in the history

  10. [OFBIZ-6091] Supplier preferred currency not considered for drop-ship… 

    … order. Applying patch from OFBIZ-6091. Thanks Akash Jain for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1703988 13f79535-47bb-0310-9956-ffa450edef68
    Mridul Pathak committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    4ccb017 View commit details
    Browse the repository at this point in the history

  11. Applied patch for OFBIZ-6631: Optimize ShoppingCart.removeCartItem (s… 

    …kip price calc and inventory check).

Thanks Martin Becker for spotting this and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704000 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    92e6ccc View commit details
    Browse the repository at this point in the history

  12. Applied patch for OFBIZ-6526: ordermgr/control/searchorders findOrder… 

    …s service returns incorrect orderCount and therefore viewSize.

This patch replaces the HashSet with LinkedHashSet for fieldsToSelect because otherwise statusId was being added to the front of the set which was then passed to count distinct query causing incorrect counts. LinkedHashSet preserves the order in which items are added so orderId always appears at the front of the set for the count distinct query.

Thanks Christian Carlow for spotting this and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704005 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    d4b7880 View commit details
    Browse the repository at this point in the history

  13. [OFBIZ-6212] Fixed the issue apache#1 of Accounting reports due to a … 

    …minor typo and missing screen.Added a decorator screen for using with accounting report.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704014 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    6b4948b View commit details
    Browse the repository at this point in the history

  14. Applied patch for OFBIZ-6630: Update ShoppingCartItem locale if Shopp… 

    …ingCart locale is changed.

Introduces the setLocale methode for ShoppingCartItem and sets the locale for every item if the ShoppingCart setLocale method is called.

Thanks Martin Becker for spotting this and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704018 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    adbd3a5 View commit details
    Browse the repository at this point in the history

  15. Applied patch for OFBIZ-6633: Eclipse .classpath is missing the runti… 

    …me libs for the solr component.

Added the missing libs so OFBiz can be started with the solr component out of Eclipse.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704027 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    6331405 View commit details
    Browse the repository at this point in the history

  16. Applied patch for OFBIZ-6515: partymgr/control/EditPartyRelationships… 

    … add odd-row="alternate-row" for ListPartRelationships and remove navigation-form-name for containing screenlet for better UI.

Displays the relationship table with alternate colors for better visibility and uses the screenlet pagination controls at top/bottom of the list.

Thanks Christian Carlow for this improvement.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704036 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    86c2799 View commit details
    Browse the repository at this point in the history

  17. Applied patch for OFBIZ-6632: Incorrect comparison in TemporalExpress… 

    …ionWorker.java

This patch introduces some constants for the expression types and corrects the wrong comparison.

Thanks Vyom Jain for spotting this issue and Martin Becker for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704043 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    7e6c0b2 View commit details
    Browse the repository at this point in the history

  18. Applied patch for OFBIZ-6635: Old UserLogin from userLoginId-change i… 

    …s not correctly disabled.

If a userLoginId of an existing user is updated by LoginServices.updateUserLoginId, a new UserLogin value is created with the data of the old one and the old one is disabled afterwards. In addition to switch the enabled flag to "N" the disabledDateTime is set to current date. This is wrong because this makes it possible to reenable the old UserLogin by just do a login with the old userLoginId (standard mechanism to lock the login for a while after subsequent failed login requests).

Thanks Martin Becker for spotting this and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704052 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    416cb71 View commit details
    Browse the repository at this point in the history

  19. A patch from Gil Portenseigne for "multiple select dropdown listbox s… 

    …hows only one entry" https://issues.apache.org/jira/browse/OFBIZ-6627

Wai reported:
Use this link https://localhost:8443/ordermgr/control/FindRequest
Notice the customer request type id, status id, etc

This patch extend existing asm dropdown implementation to allow several asm dropdown in the same form using a simple ftl.
Find Request use the new ftl in this example.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704082 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    e24557b View commit details
    Browse the repository at this point in the history

  20. A patch from François Lecomte for "Adding the week number in date pic… 

    …king dropdowns" https://issues.apache.org/jira/browse/OFBIZ-5361

For some users, having the week shown in dropdown calendars is an important thing.
There is an option to show week numbers in the dropdown date picker used by OFBiz. (datetimepicker)
It can be done by adding "showWeek: true," in the datetimepicker calls in framework/widget/templates/htmlFormMacroLibrary.ftl.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704086 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 19, 2015
    Configuration menu
    Copy the full SHA
    6540aaf View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2015

  1. A patch from Martin Becker from a Gareth Carter's idea for "Fix depre… 

    …cation issues in framework/entity" https://issues.apache.org/jira/browse/OFBIZ-5361

As reported Adam:
It appears that the storeAll() variants are being refactor; basically, the useCache parameter is being removed.  However, this has caused the entity engine to have deprecation with itself.

Gareth suggested:
What about new method that allows passing in an options object
storeAll(List<GenericValue> values, StoreOptions options) ?
You can deprecate the old methods without changes
Moving forward, you would just need to add new values to the StoreOptions class rather than adding new parameters to the existing one
I am not sure about the name StoreOptions though, EntityOptions ?

Martin contributed the implementation and suggested EntityStoreOptions for the new class name.
Ha created a patch which removes the use of deprecated API and the deprecated API itself from Delegator and GenericDelegator.
Introduced the EntityStoreOptions class as mentioned in a comment before to substitute the createDummyFks parameter of storeAll method to avoid ambiguous API after removing the deprecated doCacheClear parameter.
The decryptFieldValue method, just defined deprecated by Jacopo is left there as deprecated. Only the "old" deprecated methods where removed.

Gil Portenseigne supplied a pure svn patch, actually I had conflicting pending changes locally which prevented me to apply Martin's original patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704108 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 20, 2015
    Configuration menu
    Copy the full SHA
    347f2b5 View commit details
    Browse the repository at this point in the history

  2. A patch from Christian Carlow for "FOP renderer doesn't apply title-a… 

    …rea-style" https://issues.apache.org/jira/browse/OFBIZ-6356

NotoSans is the defaultFontFamily for FOP and the extra stylings and the font-weight="bold" are not rendered correctly unless changed to another font family

jleroux: this needs clarification, I will ask Christian 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704130 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 20, 2015
    Configuration menu
    Copy the full SHA
    3a8847d View commit details
    Browse the repository at this point in the history

  3. A patch from Christian Carlow for "FOP renderer does not support alte… 

    …rnate row style" https://issues.apache.org/jira/browse/OFBIZ-6355

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704137 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 20, 2015
    Configuration menu
    Copy the full SHA
    14c646e View commit details
    Browse the repository at this point in the history

  4. A patch from Martin Becker for "Missing CountryCodeData.xml values fo… 

    …r countries of the former Yugoslavia" https://issues.apache.org/jira/browse/OFBIZ-6641

Instead of former YUGOSLAVIA there should be SERBIA.
Also CountryTeleCode and CountryCapital is missing for MONTENEGRO.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704140 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 20, 2015
    Configuration menu
    Copy the full SHA
    324ccd3 View commit details
    Browse the repository at this point in the history

  5. A patch from Martin Becker for "Eclipse .classpath contains internal … 

    …Groovy Library classpath container" https://issues.apache.org/jira/browse/OFBIZ-6640

There are unnecessarily eclipse internal Groovy Library classpath container referenced in the .classpath file. This may lead to conflicts with the OFBiz "original" groovy libs contained in the framework and produces errors while running OFBiz within eclipse.

{{<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>}}
{{<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>}}

I'll provide a patch for this.

jleroux: I must say I never clearly understood nor researched why we should hace those :D

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704146 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 20, 2015
    Configuration menu
    Copy the full SHA
    84879f4 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2015

  1. A patch from Pierre Smits for "Replace bsf event type and handler wit… 

    …h groovy" https://issues.apache.org/jira/browse/OFBIZ-6598

jleroux: I did the same in order controller (was only in ecommerce) even if only a commented out example was used there

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704227 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    ce84bea View commit details
    Browse the repository at this point in the history

  2. Err goofy, I forgot to save (related with OFBIZ-6598) after reverting… 

    … pending changes I did to test OFBIZ-6111 locally

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704228 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    94ce3ec View commit details
    Browse the repository at this point in the history

  3. A modified patch from Oleg Andreyev for "Non-breaking space incorrect… 

    …ly encoded in forms" https://issues.apache.org/jira/browse/OFBIZ-6642

jleroux: rather than replacing &amp;nbsp; by &#160; as Oleg suggested, I removed or replaced by spaces

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704230 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    0cb62c2 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2015

  1. An enhanced patch from Pierre Smits for "Order items for GZ-1006-5 vi… 

    …a ecommerce/ordermgr shows error" https://issues.apache.org/jira/browse/OFBIZ-6643

When an order is entered via the ecommerce component for a GZ-1006-5 an error is shown in the order items section

jleroux: actually, as Vyom Jain suggested "This is happening due to changes OFBIZ-6276. Either r1704108 should be reverted or additional patches be provided to avoid this reported issue (which is only one of them). Removing deprecated delegator methods require thorough testing as many as used in scripts and templates." I checked there was only 3 such changes for findByAnd and no others but getRelated where called in *.ftl and *.groovy. This completes the findByAnd case I will create a new Jira for the rest (did not check already, 238 cases!)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704478 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    e4164d3 View commit details
    Browse the repository at this point in the history

  2. No functional change: in relation with OFBIZ-6649, though we have not… 

    … (yet) removed the deprecated methods from GenericValue this commit replaces deprecated getRelated() calls in a 1st preparation of this removing .

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704666 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    29fb51a View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2015

  1. No functional changes for https://issues.apache.org/jira/browse/OFBIZ… 

    …-6651

Removes unused methods (not in Java code, FTL templates and Groovy scripts) in GenericValue and EntityUtil classes + misc related comments or logs
Adds log warning to spot possible use cases in templates and scripts of getRelated() and getRelatedOne() methods

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704769 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    a8b16d8 View commit details
    Browse the repository at this point in the history

  2. Referring to the excellent answer at https://stackoverflow.com/questi… 

    …ons/14231037/java-safevarargs-annotation-does-a-standard-or-best-practice-exist it's safe to put SafeVarargs annotation here (it's only used to iterate over the elements). I was curious about that

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704771 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    8402c59 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2015

  1. A patch from Oleg Andreyev for "Errors in ProductSummary.groovy" http… 

    …s://issues.apache.org/jira/browse/OFBIZ-6652

In all releases the code in ProductSummary.groovy tries to collect prices for variants. Doing so it use NumberFormat.format() to transform base price into string that is part of an embed JS snippet. In case purchase order this price is rather empty. Using null with formatting method cause error. You may see this error in the trunk if you starts PO and and try Browser Categories->Widgets->Small Widgets. This price should appear if you select Select Units of Measure for WG-1111 but currently this does not work.
I'm not sure these prices make sense for purchase orders but my goal was just fix ugly error message. Solution display N/A if price is not available. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1705004 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 24, 2015
    Configuration menu
    Copy the full SHA
    d788075 View commit details
    Browse the repository at this point in the history

  2. No functional change, while reviewing new OFBIZ-293 proposition I stu… 

    …mbled upon this. The value="null" is here unnecessary and confusing

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1705136 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 24, 2015
    Configuration menu
    Copy the full SHA
    10bde05 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2015

  1. I found a possible XSS attack through ProductContentWrapper.java.getP… 

    …roductContentAsText() which is notably used in several FTL files. This exists also in others *ContentWrapper.java.

Note that in supported releases it's hard to exploit, it's a Stored XSS https://www.owasp.org/index.php/Types_of_Cross-Site_Scripting which means you need 1st to somehow inject exploiting code in the DB.

This fixes it by changing the ContentWrapper interface
from
    public interface ContentWrapper {
        public StringUtil.StringWrapper get(String contentTypeId);
    }
to
    public interface ContentWrapper {
        public StringUtil.StringWrapper get(String contentTypeId, String encoderType) {
    }

And changing the Category, Party, Product, ProductPromo and WorkEffort ContentWrapperS accordingly. This means to use 2 types of encoderTypes: "html" and "url".
The "html"  encoderType will be used for all ProductContentTypes but those who contain URL in their ContentTypeIdS (actually end with, "_URL") which will use "url" encoderType.
It concerns not only the get() method but also methods like getPartyContentAsText(), getProductContentAsText(), etc.

It seems a big change but it's straightforward. It's normally complete. 

There are some (unrelated) tabs replaced by spaces here and there, and few trailing spaces removed but nothing big

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1705329 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 25, 2015
    Configuration menu
    Copy the full SHA
    d43fa51 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2015

  1. I missed some cases, if ever you spot some others or typos please let… 

    … me know

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1705405 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 26, 2015
    Configuration menu
    Copy the full SHA
    3d3c52b View commit details
    Browse the repository at this point in the history

  2. I just spotted cases like 

       categoryContentWrapper.DESCRIPTION; 
before committing r1705405. This fixes them

Thanks also for Deepak's report about it, it was obvious when you loaded the ecommerce apps


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1705412 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 26, 2015
    Configuration menu
    Copy the full SHA
    5b85b44 View commit details
    Browse the repository at this point in the history

  3. I spotted some misses in FTL templates after r1705329, this fixes them 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1705417 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 26, 2015
    Configuration menu
    Copy the full SHA
    ac27104 View commit details
    Browse the repository at this point in the history

  4. Still missed those ones in groovy after r1705329 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1705427 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 26, 2015
    Configuration menu
    Copy the full SHA
    c4ae8b7 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2015

  1. Fixes a typo spotted while checking changes introduced with r1705329 … 

    …and related. This typo was introduced long ago by r1127449, so can be backported to all releases

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1705532 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 27, 2015
    Configuration menu
    Copy the full SHA
    ebb7555 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2015

  1. Fixes a typo introduced with r1705329 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706159 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    307871f View commit details
    Browse the repository at this point in the history

  2. While working on r1705329 I did not notice that OrderContentWrapper w… 

    …as not using the same scheme than other *ContentWrapper (implementing ContentWrapper interface). This fixes it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706162 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    6fb34bb View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2015

  1. A patch from Martin Becker for "data import - nulling fields impossib… 

    …le" https://issues.apache.org/jira/browse/OFBIZ-293

In my opinion it would be straight forward, if the entity import would treat fields that are mentioned in entity XML files as fields that should be updated always, as the GenericDAO does. The current logic ignores fields, if there is only an empty string as value.

The enhancement brought by the solution of OFBIZ-4949 makes it possible to generally configure an entity-engine-xml file to be interpreted as replacement, so that all NOT mentioned fields are set to NULL instead of leaving the old value while updating the entity.

Nevertheless I think, that the default (update) behavior, the one with fine grained control over which fields are touched, should also give the possibility to set field values to NULL by including them in the XML.

The solution with the lowest impact on existing XML files and the most natural meaning should be to interpret empty string values in the XML as NULL, as it is today. The only difference would be, that they are not longer ignored but set as NULL values in the database. The only drawback I see is, that you're still not able to set "empty string" values as concrete values to the database (no loss of function, because you can't do it today, too).

As far as I can see, there should be no conflict with current existing data files. There are some where for example a parentTypeId is contained with empty string as value. Interpreting it as NULL and setting in database is exactly what is meant by such a definition.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706316 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    9d5bdfb View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2015

  1. Adds a French label 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706371 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 2, 2015
    Configuration menu
    Copy the full SHA
    1881ab5 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2015

  1. [OFBIZ-6650] Fixed a typo in product.groovy which causing error on re… 

    …dering product page. Removed additional ')' from the statement

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706531 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    8b73103 View commit details
    Browse the repository at this point in the history

  2. (OFBIZ-6584) Display submitter partyId on edit response screen. Now i… 

    …f submitter partyId exists then display the same else logged-in partyId will be displayed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706549 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    e2d620d View commit details
    Browse the repository at this point in the history

  3. [OFBIZ-4651] Handled error in js code to fix timeout issue. 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706553 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    3b1a6c1 View commit details
    Browse the repository at this point in the history

  4. [] 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706561 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    ea80a0a View commit details
    Browse the repository at this point in the history

  5. (OFBIZ-6663) Fixed broken "Print Deposit Slip" pdf rendering. Thanks … 

    …Paveen Patil for the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706569 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    549462f View commit details
    Browse the repository at this point in the history

  6. (OFBIZ-6212) Fixed accounting report PDF export issue, it was throwin… 

    …g FOP exception. It was due to empty description string, if description is empty then makeHyperlinkString does not call the makeHyperlinkString macro to render the hyper link and due to this fo:table-cell is render without fo:block and its not a valid syntax of fo:table-cell.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706577 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    8dbcdc7 View commit details
    Browse the repository at this point in the history

  7. [OFBIZ-6171] Applied patch from Pierre Smits for replacing 'Open for … 

    …Business' references with 'Apache OFBiz'.Thanks Pierre for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706589 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    1918e47 View commit details
    Browse the repository at this point in the history

  8. [OFBIZ-5579] When adding Asset products into the cart, we will show N… 

    …umber of Persons field in UI only when reserMaxPersons field is defined in Product table. So this way we are binding Number of Persons field to datbase field. This way we avoid confusing UI that we don't show Number Of Persons field when its not needed. Simillarly Number Of Rooms field is also confusing in UI when Asset product is not room. We don't have any way to figure out which product is Room. So for now we have generalized the field and called it quantity.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706591 13f79535-47bb-0310-9956-ffa450edef68
    Divesh Dutta committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    fa00568 View commit details
    Browse the repository at this point in the history

  9. [OFBIZ-6171] Replacing 'Open for Business' references with 'Apache OF… 

    …Biz'from remaining occurences.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706593 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    5a01c69 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2015

  1. Applied patch for OFBIZ-6662: PartyRelationship.securityGroupId not a… 

    …dded when adding a PartyRelationship.

When adding a PartyRelationship the value selected for SecurityGroupId is ignored as createPartyRelationship service expects the parameter to be named securityGroupId. The AddOtherPartyRelationship form incorrectly names the field groupId causing the value to be missed in the set-nonpk-fields call in applications/party/script/org/ofbiz/party/party/PartyServices.xml.

Thanks Forrest Rae for spotting this and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706694 13f79535-47bb-0310-9956-ffa450edef68
    @mbrohl
    mbrohl committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    d597e12 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2015

  1. Make layered-window available in forms and menu (OFBIZ-6327), adding … 

    …example to use on example form and widget example and set new properties to define defaut layered windows size. Thanks Jacques Leroux for the submission

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706909 13f79535-47bb-0310-9956-ffa450edef68
    @nmalin
    nmalin committed Oct 5, 2015
    Configuration menu
    Copy the full SHA
    1610c10 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2015

  1. OFBIZ-6610 Upgrade Solr and Lucene librairies to version 5 

    1. Upgrade the solr/lucene component to the latest 5.3.1.
2. Angular related js and html files are removed.
3. The jquery-1.7.2.min.js is removed as it's not used in solr.
4. Change specialpurpose/solr/conf to specialpurpose/solr/home.
5. Move specialpurpose/solr/solrdefault to specialpurpose/solr/home/solrdefault.
6. The files under specialpurpose/solr/home/solrdefault are all from solr-5.3.1 package/server/solr/configsets/sample_techproducts_configs/, the solrconfig.xml is configured: <dataDir>${solr.data.dir:runtime/indexes}</dataDir>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707042 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    2e1c1e1 View commit details
    Browse the repository at this point in the history

  2. OFBIZ-6610 Upgrade Solr and Lucene librairies to version 5 

    Remove the specialpurpose/solr/home/solrdefault/runtime/indexes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707045 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    027eaf9 View commit details
    Browse the repository at this point in the history

  3. OFBIZ-6610 Upgrade Solr and Lucene librairies to version 5 

    1. Remove the specialpurpose/solr/home/solrdefault/runtime.
2. Remove src attribute in solr jars in .classpath.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707047 13f79535-47bb-0310-9956-ffa450edef68
    @shijh
    shijh committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    c4f0c73 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2015

  1. OFBIZ-6637 : Work Effort Month Calendar View Is Broken 

    Fix a possible endless loop in TemporalExpression Evaluation. Daybump flag must be turned off when used.
Thanks Adrian Crum for Report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707782 13f79535-47bb-0310-9956-ffa450edef68
    @gilPts
    gilPts committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    d26b4c3 View commit details
    Browse the repository at this point in the history

  2. OFBIZ-6654 Display of a recurrent workeffort in workeffort calendar d… 

    …o not respect estimatedStart/CompletionDate

Fix getWorkEffortEventsByPeriod service by :
- ignoring actual date timed workeffort in temporal expression process
- excluding workeffort occurence that are out of estimated date range
Thanks Adrian for testing and feedback

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707791 13f79535-47bb-0310-9956-ffa450edef68
    @gilPts
    gilPts committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    e5d29ea View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2015

  1. [OFBIZ-6666] Added missing service model attributes while cloning it. 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707837 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Oct 10, 2015
    Configuration menu
    Copy the full SHA
    149c7d4 View commit details
    Browse the repository at this point in the history

  2. Fixes "ecommerce screen exception" https://issues.apache.org/jira/bro… 

    …wse/OFBIZ-6665 reported by Wai

I missed this hidden ProductConfigItemContentWrapper class while working on r1705329 and sequels. I checked there are no other *ContentWrapper classes left now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707857 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 10, 2015
    Configuration menu
    Copy the full SHA
    c1c37a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2015

  1. Fixes typo in a French label 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707946 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    1d060fb View commit details
    Browse the repository at this point in the history

  2. Printing the Rupee symbol did not work there. Not sure why it did not… 

    …, but at least this fixes it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707947 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    6427e28 View commit details
    Browse the repository at this point in the history

  3. Part of previous commit, just missed it, no functional changes 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707948 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    09875f5 View commit details
    Browse the repository at this point in the history

  4. OFBIZ-6327: I got a way to see a button with a link using widget-area… 

    …-style="smallSubmit" w/o other stylings (else they remove the button style) but the size and width seems not not apply to a link element

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707949 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    99a198f View commit details
    Browse the repository at this point in the history

  5. Ignores runtime folder in solrdefault 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1707950 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    67a0e23 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2015

  1. Fix for ContentWorker at OFBIZ-6669. For that I have added owasp-java… 

    …-html-sanitizer-r239.jar and put a "content.sanitize=true" property in content.properties with some explanations. The reason I put this property is because the sanitizer does some (safe) changes which might be unwanted in a context where you are "sure" no one can inject/exploit your DB, see the JIra issue for details. Note that this does not affect the *ContentWrapper.java classes where we use OWASP encoding and not sanitizer. The reason we need the sanitizer here is because we are no only handling content but also HTML code...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708274 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    db39fd9 View commit details
    Browse the repository at this point in the history

  2. "Fixes" .classpath by changing only the added line 

    <classpathentry kind="lib" path="framework/base/lib/owasp-java-html-sanitizer-r239.jar"/>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708276 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    1023623 View commit details
    Browse the repository at this point in the history

  3. This adds caches to CategoryContentWrapper and ProductConfigItemConte… 

    …ntWrapper classes

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708326 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    6ba9837 View commit details
    Browse the repository at this point in the history

  4. A patch from Wei for "The filter-by-date="true" of <entity-condition>… 

    …</entity> in view entity PartyExport does not work" https://issues.apache.org/jira/browse/OFBIZ-6495

I changed ViewEntityCondition.getWhereCondition(), ViewConditionExpr.createCondition() and ViewConditionList.createCondition() which will add additional condition of filtering by date to where clause.

Please test by following steps.

1. Change the code below in GenericDAO
 if (queryTotalTime > 150) {
    Debug.logTiming("Ran query in " + queryTotalTime + " milli-seconds: " + " EntityName: " + modelEntity.getEntityName() + " Sql: " + sql + " where clause:" + whereEntityConditionParams, module);
}
to  
{code:title=GenericDAO.java|borderStyle=solid}
 if (queryTotalTime > 0) {
    Debug.logTiming("Ran query in " + queryTotalTime + " milli-seconds: " + " EntityName: " + modelEntity.getEntityName() + " Sql: " + sql + " where clause:" + whereEntityConditionParams, module);
}
It will always log the sql to the log file.
2. Open https://localhost:8443/partymgr/control/ImportExport
2. Enter a valid partyId for export and click SUBMIT
3. Check ofbiz.log file under runtime folder. You should able to see the query below which contains filter data condition
SELECT
  PRT.PARTY_ID,
  PRT.STATUS_ID,
  PRT.PREFERRED_CURRENCY_UOM_ID,
  GRP.GROUP_NAME,
  PER.FIRST_NAME,
  PER.MIDDLE_NAME,
  PER.LAST_NAME,
  PR.PARTY_ID_FROM,
  CGRP.GROUP_NAME,
  PRL.ROLE_TYPE_ID,
  CM.CONTACT_MECH_TYPE_ID,
  PCP.CONTACT_MECH_PURPOSE_TYPE_ID,
  CM.INFO_STRING,
  TN.COUNTRY_CODE,
  TN.AREA_CODE,
  TN.CONTACT_NUMBER,
  PA.ADDRESS1,
  PA.ADDRESS2,
  PA.CITY,
  PA.STATE_PROVINCE_GEO_ID,
  PA.POSTAL_CODE,
  PA.COUNTRY_GEO_ID,
  PCM.FROM_DATE,
  PCM.THRU_DATE
FROM (((((((((public.PARTY PRT
LEFT OUTER JOIN public.PARTY_GROUP GRP
  ON PRT.PARTY_ID = GRP.PARTY_ID)
LEFT OUTER JOIN public.PERSON PER
  ON PRT.PARTY_ID = PER.PARTY_ID)
LEFT OUTER JOIN public.PARTY_RELATIONSHIP PR
  ON PRT.PARTY_ID = PR.PARTY_ID_TO
  AND ((PR.ROLE_TYPE_ID_FROM = 'ACCOUNT'
  AND PR.PARTY_RELATIONSHIP_TYPE_ID = 'EMPLOYMENT')))
LEFT OUTER JOIN public.PARTY_GROUP CGRP
  ON PR.PARTY_ID_FROM = CGRP.PARTY_ID)
LEFT OUTER JOIN public.PARTY_ROLE PRL
  ON PRT.PARTY_ID = PRL.PARTY_ID)
LEFT OUTER JOIN public.PARTY_CONTACT_MECH PCM
  ON PRT.PARTY_ID = PCM.PARTY_ID
  AND (((PCM.THRU_DATE IS NULL
  OR PCM.THRU_DATE > '2015-06-15 13:21:30.157')
  AND (PCM.FROM_DATE IS NULL
  OR PCM.FROM_DATE <= '2015-06-15 13:21:30.157'))))
LEFT OUTER JOIN public.POSTAL_ADDRESS PA
  ON PCM.CONTACT_MECH_ID = PA.CONTACT_MECH_ID)
LEFT OUTER JOIN public.CONTACT_MECH CM
  ON PCM.CONTACT_MECH_ID = CM.CONTACT_MECH_ID)
LEFT OUTER JOIN public.TELECOM_NUMBER TN
  ON PCM.CONTACT_MECH_ID = TN.CONTACT_MECH_ID)
LEFT OUTER JOIN public.PARTY_CONTACT_MECH_PURPOSE PCP
  ON PCM.CONTACT_MECH_ID = PCP.CONTACT_MECH_ID
  AND (((PCM.THRU_DATE IS NULL
  OR PCM.THRU_DATE > '2015-06-15 13:21:30.157')
  AND (PCM.FROM_DATE IS NULL
  OR PCM.FROM_DATE <= '2015-06-15 13:21:30.157')))
  AND PCM.PARTY_ID = PCP.PARTY_ID
  AND (((PCM.THRU_DATE IS NULL
  OR PCM.THRU_DATE > '2015-06-15 13:21:30.236')
  AND (PCM.FROM_DATE IS NULL
  OR PCM.FROM_DATE <= '2015-06-15 13:21:30.236')))
WHERE (((PRL.ROLE_TYPE_ID = ?
OR PRL.ROLE_TYPE_ID = ?
OR PRL.ROLE_TYPE_ID = ?)
AND (PRT.STATUS_ID <> ?
OR PRT.STATUS_ID IS NULL)
AND PRT.PARTY_ID = ?))
ORDER BY PRT.PARTY_ID ASC


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708341 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    6940971 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2015

  1. Move guava lib from solr/lib/runtime to base/lib to avoid dependency … 

    …on solr component, thanks to Vyom for the reminder

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708560 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    7d32140 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2015

  1. Update after r1708560, thanks to Jacopo's reminder on dev ML 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708731 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    45f58c7 View commit details
    Browse the repository at this point in the history

  2. Update after r1708560, thanks to Jacopo's reminder on dev ML (Oops I … 

    …forgot it was a move not an add)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708732 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    0dcccba View commit details
    Browse the repository at this point in the history

  3. [OFBIZ-6674] In addToCart() method, reset shipment method information… 

    … in cart only if shipping applies on product.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708742 13f79535-47bb-0310-9956-ffa450edef68
    Arun Patidar committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    52d6eef View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2015

  1. Fixes a bug reported by Pierre Smits and commented by Vyom Jain at "v… 

    …iewimage in order generates an error" https://issues.apache.org/jira/browse/OFBIZ-6678

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708930 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    1f07697 View commit details
    Browse the repository at this point in the history

  2. A patch from Pierre Smits for "PartyRole Lifespan fields - Have Quote… 

    …Role entity work with the change" https://issues.apache.org/jira/browse/OFBIZ-6679

This adds the from an thru date to the QuoteRole entity

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708969 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    f8d8285 View commit details
    Browse the repository at this point in the history

  3. Grid widget cache settings are missing - https://issues.apache.org/ji… 

    …ra/browse/OFBIZ-6405.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709111 13f79535-47bb-0310-9956-ffa450edef68
    @adrian-crum
    adrian-crum committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    8bcb5c8 View commit details
    Browse the repository at this point in the history

  4. A patch from Pierre Smits for "CcTypes.groovy misses licence" https:/… 

    …/issues.apache.org/jira/browse/OFBIZ-6679

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709117 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    298d5d6 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2015

  1. Changes for "SalaryStep entity missing From and Thru dates" https://i… 

    …ssues.apache.org/jira/browse/OFBIZ-5758

I applied the patch I created for the Jira and added 
    <parameter param-name="fromDate"/>
in ListSalarySteps form, to be able to delete a salary step from the screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709192 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 17, 2015
    Configuration menu
    Copy the full SHA
    c00392b View commit details
    Browse the repository at this point in the history

  2. Misc. non functional changes which were pending in my working copy 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709213 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 17, 2015
    Configuration menu
    Copy the full SHA
    3d56139 View commit details
    Browse the repository at this point in the history

  3. Completes r1709192 for Changes for "SalaryStep entity missing From an… 

    …d Thru dates" https://issues.apache.org/jira/browse/OFBIZ-5758

I decided other changes (adding a fromDate), notably in "Position Type Rate" and "Lookup Salary StepSeq Id" were not necessary
     





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709214 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 17, 2015
    Configuration menu
    Copy the full SHA
    11b7f01 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2015

  1. Completes r1709192 for Changes for "SalaryStep entity missing From an… 

    …d Thru dates" https://issues.apache.org/jira/browse/OFBIZ-5758

I also decided that the "Salary StepSeq Id" Lookup needed not only a search on the fromDate but also to display the through date and the amount.
     





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709231 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    2880767 View commit details
    Browse the repository at this point in the history

  2. Fixes a wrong lang value, thanks to Adrian on dev ML 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709236 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    9f6c2e0 View commit details
    Browse the repository at this point in the history

  3. Completes r1709192 for Changes for "SalaryStep entity missing From an… 

    …d Thru dates" https://issues.apache.org/jira/browse/OFBIZ-5758

I'm certainly tired so I did not find a smart way to use entity-auto in createSalaryStep service and also create several salary steps different on the from date, at least using the older simple service works.
     





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709238 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    968d84d View commit details
    Browse the repository at this point in the history

  4. fix the classpath for guava which was moved from specialpurpose to fr… 

    …amework

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709259 13f79535-47bb-0310-9956-ffa450edef68
    @pythys
    pythys committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    54d64a9 View commit details
    Browse the repository at this point in the history

  5. upgrade OFBiz to JDK 8 in reference to the JIRA https://issues.apache… 

    ….org/jira/browse/OFBIZ-6458

This commit upgrades the framework to Java JDK 8 and prevents compiling
on earlier versions. Hence the build system should be updated to compile on
Java 8. After this point users can commit code holding Java 8 features such
as streams and lambdas

REFS OFBIZ-6458


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709262 13f79535-47bb-0310-9956-ffa450edef68
    @pythys
    pythys committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    d741105 View commit details
    Browse the repository at this point in the history

  6. Completes r1709192 for Changes for "SalaryStep entity missing From an… 

    …d Thru dates" https://issues.apache.org/jira/browse/OFBIZ-5758

The dateModified field was not modified (not even before auto-engine was used). I found that while changing updateSalaryStep from auto-engine to simple for lastModifiedByUserLogin and setting the createdByUserLogin field in createalaryStep services. It's now fixed
     





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709271 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    e1604ea View commit details
    Browse the repository at this point in the history

  7. Completes r1709192 for Changes for "SalaryStep entity missing From an… 

    …d Thru dates" https://issues.apache.org/jira/browse/OFBIZ-5758

This adds the migrateSalaryStep service to migrates data from OldSalaryStep to SalaryStep.
Since revision 1709214 (2015-10-18) the entity SalaryStep has been deprecated.
This service can be used to upgrade existing data from the OldSalaryStep entity to the new SalaryStep entity.
This service must be run only once, else you will get duplicates.

     





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709272 13f79535-47bb-0310-9956-ffa450edef68
    asf-sync-process committed Oct 18, 2015
    Configuration menu
    Copy the full SHA
    72b7dda View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2015

  1. Updated documentation, no functional change. 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709339 13f79535-47bb-0310-9956-ffa450edef68
    @adrian-crum
    adrian-crum committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    2a79500 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2015

  1. Selenium web driver integration using XML files: https://issues.apach… 

    …e.org/jira/browse/OFBIZ-6618

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709516 13f79535-47bb-0310-9956-ffa450edef68
    @hansbak
    hansbak committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    33c3e02 View commit details
    Browse the repository at this point in the history

  2. Show the main title of pages in Tomahawk theme. REF OFBIZ-6153 

    Issue raised by Jacques Le Roux and resolved with this patch.
I kept the colors consistent with the standard colors found
in style.css.

Satisfies https://issues.apache.org/jira/browse/OFBIZ-6153


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709580 13f79535-47bb-0310-9956-ffa450edef68
    @pythys
    pythys committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    3e2a46f View commit details
    Browse the repository at this point in the history

  3. Fixes a wrong reference and better document a target in main build 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709582 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    e3b3589 View commit details
    Browse the repository at this point in the history

  4. An improved patch from Pierre Gaudin for "JGrowl to display alerts " h… 

    …ttps://issues.apache.org/jira/browse/OFBIZ-6023

I've been working on Jgrowl integration for a project. (https://github.com/stanlemon/jGrowl)
This allowS to display system's messages in a popup at the top of the windows even if you scroll. This is also useful for ajax call because there is no need to scroll to the top of the screen to view message.
Message can stick to the screen until it is intentionally closed by the user or not.

jleroux? as already explained in the Jira: to have it working in trunk HEAD I had to make some changes

    I put the jgrowl loading in GlobalActions rather than GlobalDecorator
    in showjGrowl() js function
        I Added a test for if (contentMessages.length) because of an error in lookups
        I did some formatting in function showjGrowl()
        I used jQuery instead of $ (same for expandAllP() and expandAll() functions)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709679 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    f150a96 View commit details
    Browse the repository at this point in the history

  5. By chance, I stumbled upon a remaining small chunk of change Sumit Pa… 

    …ndit created for example component at "Adding placeholder attribute to text fields rendered via Form-Widget's text tag." https://issues.apache.org/jira/browse/OFBIZ-5341

Since I don't like to waste, here is the commit he asked for

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709684 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    f3a5ed9 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2015

  1. Since we now use Java 8, we no longer need to use MaxPermSize 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709718 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    e8f0540 View commit details
    Browse the repository at this point in the history

  2. Forgot to save before committing r1709718: "Since we now use Java 8, … 

    …we no longer need to use MaxPermSize"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709726 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    183e038 View commit details
    Browse the repository at this point in the history

  3. A slightly modified patch from Taher Alkhateeb for <<replace widget-s… 

    …tyle="required" with required-field="true">> https://issues.apache.org/jira/browse/OFBIZ-6690

jleroux: after a cursory review, I simply did the chunk related to exampleName by hand, it needed more work. I also removed some trailing blanks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709872 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    867f87f View commit details
    Browse the repository at this point in the history

  4. Removes tooltip="${uiLabelMap.CommonRequired}" from fields, https://i… 

    …ssues.apache.org/jira/browse/OFBIZ-6691

Instead of a quiet S/R action, this was an unexpected pain in the ass. A considerable number of forms:
    EmployeeForms.xml
    EmploymentForms.xml
    EmplPositionForms.xml
    GlobalHRSettingForms.xml
    RecruitmentForms.xml
    QuoteForms.xml
    PartyForms.xml
    StoreForms.xml
    ContactForms.xml
    FixedAssetForms.xml
    TaskForms.xml
    scrumForms.xml
    TaskForms.xml
contained a large number of fields with 
  tooltip="${uiLabelMap.CommonRequired}"
but no 
  required-field="true"


Of course display and display-entity should not be concerned, I spotted a number of them in the lot.

I also removed a bunch of harcoded * at end of labels (those followed by required-field="true"* and spotted a number of others }*"  who still need to be carefully reviewed to see if required=true is not missing there :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709882 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    4f78b96 View commit details
    Browse the repository at this point in the history

  5. remove two unnecessary @suppersswarning tags. No impact on code 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709900 13f79535-47bb-0310-9956-ffa450edef68
    @pythys
    pythys committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    68f931d View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2015

  1. convert Parent Customer Request Id field from text to lookup field RE… 

    …F OFBIZ-6177

Issue raised thanks to Pierre Smits, the form has autoattributes which renders
the above mentioned field as text when it should be a lookup. This commit
fixes this issue by explicitly overriding the <auto-fields-service ...>

fixes https://issues.apache.org/jira/browse/OFBIZ-6177


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710073 13f79535-47bb-0310-9956-ffa450edef68
    @pythys
    pythys committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    e0c9ae4 View commit details
    Browse the repository at this point in the history

  2. Completes r1709882 for <<Remove tooltip="${uiLabelMap.CommonRequired}… 

    …" from fields>> https://issues.apache.org/jira/browse/OFBIZ-6691

Replaces all }*" by requiredField but for forms using auto-fields-entity or auto-fields-service for which I created the subtask "Enhance auto-fields-entity and auto-fields-service to generate required fields on PK ones" https://issues.apache.org/jira/browse/OFBIZ-6695

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710086 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    2cc0a56 View commit details
    Browse the repository at this point in the history

  3. Completes r1709882 for <<Remove tooltip="${uiLabelMap.CommonRequired}… 

    …" from fields>> https://issues.apache.org/jira/browse/OFBIZ-6691

Removes nonsensical required-field="true" for <display* field types

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710093 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    654be98 View commit details
    Browse the repository at this point in the history

  4. This slipped in inadvertently with r1710086 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710096 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    985a44f View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. another round of javolution removal in achieving OFBIZ-5169 

    Remove javolution reference from multiple java source files and a few
BIRT reports. I had to replace the FastList with a LinkedList in 
SolrProductSearch.getSideDeepCategories(..) because it uses the 
implementation methods getLast() and removeFirst()

REF https://issues.apache.org/jira/browse/OFBIZ-5169


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710122 13f79535-47bb-0310-9956-ffa450edef68
    @pythys
    pythys committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    412ba55 View commit details
    Browse the repository at this point in the history

  2. A patch from Christian Carlow for "Form widget <auto-fields-entity de… 

    …fault-field-type="find"/> does not render range find fields for fixed-point" https://issues.apache.org/jira/browse/OFBIZ-6443

A form widget with auto-entity-fields for OrderItem will render the quantity fields as text find fields but the prices as range find fields. The quantity find field should match the price range find capability.

This patch adds "fixed-point" to the condition that renders RangeFindField for induceFieldInfoFromEntityField, with support RangeFindField rendering for currency-precise fields also.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710177 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    8ded10d View commit details
    Browse the repository at this point in the history

  3. (OFBIZ-6687) Moved FixedAssetMaintWorkEffort view entity from special… 

    …purpose/assetmaint to accounting.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710178 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    ca1e6dc View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2015

  1. Add french labels in ProductEntityLabels.xml, no functional change. T… 

    …hanks Wai for providing the patch. https://issues.apache.org/jira/browse/OFBIZ-6700

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710317 13f79535-47bb-0310-9956-ffa450edef68
    @gilPts
    gilPts committed Oct 24, 2015
    Configuration menu
    Copy the full SHA
    cd61b65 View commit details
    Browse the repository at this point in the history

  2. Tiny changes after r1710317 for OFBIZ-6700 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710337 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 24, 2015
    Configuration menu
    Copy the full SHA
    10e3816 View commit details
    Browse the repository at this point in the history

  3. A patch from Christian Carlow for "FindService.performFindList listSi… 

    …ze = null causes errors when list is empty because the rendering system expects 0" https://issues.apache.org/jira/browse/OFBIZ-6425

I was testing at catalog/control/FindProduct. I just changed ProductForms.xml#ListProducts service-name from performFind to performFindList. Then upon initially visiting the page the error is displayed.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710348 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 24, 2015
    Configuration menu
    Copy the full SHA
    616655b View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2015

  1. A patch from Christian Carlow for "Paginator.getListLimits listSize g… 

    …ets set to viewSize for FindServices.performFindList" https://issues.apache.org/jira/browse/OFBIZ-6422

This patch adds code to Paginator to account for the entryList being instanceOf List and extracts from the context.results object the original listSize.

jleroux, important note from OFBIZ-6423 which depends on OFBIZ-6422: it is necessary to assign a value (true makes sense) to override-list-size attribute so that FormRenderer.renderItemRows sets the lowIndex correctly, because once the results of performFindList are displayed, otherwise pages > 0 are rendered as empty.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710413 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    f876724 View commit details
    Browse the repository at this point in the history

  2. Completes schema documentation for override-list-size in case of perf… 

    …ormFindList use - OFBIZ-6422

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710424 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    a73a45e View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2015

  1. The <description> tag was not close in last commit 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710507 13f79535-47bb-0310-9956-ffa450edef68
    @hellozhangwei
    hellozhangwei committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    a607441 View commit details
    Browse the repository at this point in the history

  2. Commmits as an example of using performFindList instead of performFin… 

    …d in a list form. "result-map-list" and "list-name" must use "list" as parameter instead of "listIt" and "override-list-size" must use "true" for things to work, see OFBIZ-6422 and OFBIZ-6422 for details

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710515 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    a0a8996 View commit details
    Browse the repository at this point in the history

  3. A patch from Christian Carlow for "FOP rendered list form widgets do … 

    …not work for fields with postition > 0" https://issues.apache.org/jira/browse/OFBIZ-6354

It doesn't work because of the way the renderFormatHeaderRowOpen is called causes the FOP renderer to create more than one <fo:table-header>.

This patch adds renderFormatHeaderOpen and renderFormatHeaderClose to separately generate <fo:table-header> for FOP and <thead> for html.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710527 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    577da0b View commit details
    Browse the repository at this point in the history

  4. A patch from Christian Carlow for "FOP rendered list form widgets do … 

    …not work for fields with postition > 0" https://issues.apache.org/jira/browse/OFBIZ-6354

This patch adds the new list form widget header methods to the deprecated HtmlFormRenderer needed by EmailServices.java to handle OFBIZ-6360 until replaced with MacroFormRender.

jleroux: completes r1710527  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710528 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    7f514b1 View commit details
    Browse the repository at this point in the history

  5. (OFBIZ-6699) Removed invalid field condition from StatusValidChange d… 

    …ata.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710566 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    73a05d0 View commit details
    Browse the repository at this point in the history

  6. Reverts r1710527 and r1710528 (was for OFBIZ-6354), thanks to Deepak … 

    …for warning on dev ML (BuildBot still down but infra is working on it)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710675 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    49f6de6 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2015

  1. 3 patches from Christian Carlow for "FOP rendered list form widgets d… 

    …o not work for fields with postition > 0" https://issues.apache.org/jira/browse/OFBIZ-6354

It doesn't work because of the way the renderFormatHeaderRowOpen is called causes the FOP renderer to create more than one <fo:table-header>.

The 1st patch adds renderFormatHeaderOpen and renderFormatHeaderClose to separately generate <fo:table-header> for FOP and <thead> for html.
The 2nd patch adds the new list form widget header methods to the deprecated HtmlFormRenderer needed by EmailServices.java to handle OFBIZ-6360 until replaced with MacroFormRender.
The 3rd patch handles the other FormRenderers FOP, Text, Xml. This issue is still a work in process.

jleroux: there is this  "FIXME: this is an hack to avoid FOP rendering errors for empty lists (fo:table-body cannot be null)" in code



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710727 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 27, 2015
    Configuration menu
    Copy the full SHA
    31fdcb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2015

  1. No functional changes: 

    Removes trailing blanks
Indent differently (to be discussed)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711019 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    750adf0 View commit details
    Browse the repository at this point in the history

  2. Fix a bug in createLead service as described in OFBIZ-6703 

    Fix a bug in createLead service in which a system user cannot create
a lead more than one time in the SFA screens. The reason is that
the createLead service tries everytime to create a PartyRole of type
OWNER in this service even if it already exists which leads to a failure
and transaction rollback for the entire call.

REF https://issues.apache.org/jira/browse/OFBIZ-6703


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711020 13f79535-47bb-0310-9956-ffa450edef68
    @pythys
    pythys committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    8a3415f View commit details
    Browse the repository at this point in the history

  3. fix commit 1711020 by adjusting the comment location in XML file REF … 

    …OFBIZ-6703

The comment was positioned badly, this fixes it to make it clear to the user
when the logic for checking actually starts.

REF https://issues.apache.org/jira/browse/OFBIZ-6703


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711021 13f79535-47bb-0310-9956-ffa450edef68
    @pythys
    pythys committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    bdc71c1 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2015

  1. Fixes warnings appearing in log, thanks to Adrian on dev ML 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711426 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    85dffb1 View commit details
    Browse the repository at this point in the history

  2. Fixes a French label 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711513 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    7edd7c4 View commit details
    Browse the repository at this point in the history

  3. Fixes a typo after "clearchris"'s report on user ML. 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711519 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    e302aac View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2015

  1. A modified patch from Ritu Raj Lakhera for "Enhancement in the conten… 

    …t wrappers" https://issues.apache.org/jira/browse/OFBIZ-6701

Some enhancements in the content wrapper JAVA classes. We used these enhancements in our project and observed good change in website performance. 

1. If content is empty string or null then method 'get*ContentAsText' are not caching the result. 
And thus every time this method is making SQL call even no content in database. Method should cache the empty string and null as result.
2. Overloaded method 'get*ContentAsText' is also using cache method of Delegator for '*Content' entity selection and passing 'true' to use cache for '*Worker.renderContentAsText' method. This approach is making unnecessary copies of cache for content.
	I Content wrapper cache
	II *Content entity cache
	III Content, Dataresource, ElectrocText and etc... entities cache(ContentWorker.renderContentAsText)

If I again call the 'get*ContentAsText' method then this will return the result from content wrapper cache. So there is no use of *Content, Content, Dataresource and ElectrocText cache. And these cache also filling the memory of application.



jleroux: Ritu Raj initially provided the changes only for the product content wrapper saying "We also applied the same logic for category content wrapper." I asked him if he could provide a patch for all content wrappers. I completed the parts for Category and Workeffort content wrapper which missed some lines.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711578 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Oct 31, 2015
    Configuration menu
    Copy the full SHA
    46b16cc View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2015

  1. It's easier to type 

      tools\test
than
  ant clean-data load-demo run-tests
:)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711767 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    66f126b View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2015

  1. Fixes a bug introduced with r1710513 for OFBIZ-6422 and OFBIZ-6423, t… 

    …rue can(must) now be used here if performFindList is used

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711903 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    6b18ffc View commit details
    Browse the repository at this point in the history

  2. No functional change, removes an useless warning 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711914 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    cbd6871 View commit details
    Browse the repository at this point in the history

  3. Fixes a typo I introduced, thanks to Nicolas at r1711918 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711941 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    21d5dd8 View commit details
    Browse the repository at this point in the history

  4. This is an (almost) automatically done (ie I locally ran createJsLang… 

    …uageFileMapping service) update of the JsLanguageFilesMapping for Java 8

There are some things interesting in it: look for instance for de-GR or ja-JP-JP-#u-ca-japanese
You can already seen those at http://demo-trunk-ofbiz.apache.org/catalog/control/ListLocales (yes you read well Deutsch (Griechenland) - [de-GR] weird isn'it?). Some others like ja-JP-JP-#u-ca-japanese or th_TH_TH_#u-nu-thai, also introduced with this commit were already present with at least Java 7. Not sure why we have de_GR here also http://grepcode.com/file/repository.grepcode.com/java/root/jdk/openjdk/6-b14/sun/util/LocaleDataMetaInfo.java

I checked you have ja-JP-JP-#u-ca-japanese but not de_GR when you get to https://localhost:8443/catalog/control/ListLocales running with Java 7

Don't ask how I went there: serendipity in it's higher form :D https://twitter.com/jeroenfrijters/status/464753273275428865 but hè: https://bugs.openjdk.java.net/browse/JDK-8065555


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712091 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    4711da8 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2015

  1. An updated and modified patch from Bob Morley for "ProductStore did n… 

    …ot allow the default timezone to be set" https://issues.apache.org/jira/browse/OFBIZ-2813

The ProductStore has the defaultLocaleString and the defaultCurrencyUomId but does not have a defaultTimeZoneString.  What happens when a store is selected (from e-commerce or the POS) is that it will look to the user for a lastTimeZone and if that is not set, it would simply revert to the TimeZone.getDefault() (so the timezone based on the server).

The trouble we had was that you may have an application server that is running in a completely different timezone than what is desired for the store.

jleroux: see comments in the Jira issue for the modifications I did

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712347 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    1fb7a88 View commit details
    Browse the repository at this point in the history

  2. These changes accidentally slipped in with r1712347, reverting 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712366 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    dda03cc View commit details
    Browse the repository at this point in the history

  3. Fixes https://issues.apache.org/jira/browse/OFBIZ-6673 "Form layered-… 

    …modal is not respecting passed (default) width"

Actually this worked perfectly well, I just used size instead of height in the hyperlink definition. Better to not set anything and use default value which are committed uncommented here

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712411 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    84b97ee View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2015

  1. Implements "Improve the way default position and size lookup paramete… 

    …rs are set" https://issues.apache.org/jira/browse/OFBIZ-6710

Inspired by Nicolas's recent work on modal-layer windows

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712520 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    98f4932 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2015

  1. A rearranged patch from Gareth Carter for "Update SimpleContentViewHa… 

    …ndler to return mime type on file extension and use inline for content-disposition" https://issues.apache.org/jira/browse/OFBIZ-6702

SimpleContentViewHandler will return mime type 'text/html' for all DataResource values without a specified mimeTypeId. Changing to DataResourceWorker.getMimeType will allow determining the mimeTypeId by file extension 
Fixing the mime type will allow the browsers to display content inline if UtilHttp is updated aswell. All unknown extensions will be set to octet-stream causing the browser to prompt for download

jleroux: after some discussions, this finally uses a content-disposition-type property in requestHandler.properties to allow more flexibility for users (see UtilHttp.setContentDisposition() method). Beware "inline" is less secure. For this reason, Gareth forced the "dangerous" text/html mime type to application/octet-stream in SimpleContentViewHandler class. This to prevent possible static XSS attacks. See the Jira issue for more details.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712835 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    a397223 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2015

  1. I missed to copy the OFBIZ-6669 Jira issue reference here 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712971 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 6, 2015
    Configuration menu
    Copy the full SHA
    4dba075 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2015

  1. Better French labels 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713093 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 7, 2015
    Configuration menu
    Copy the full SHA
    01c60a5 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2015

  1. OFBIZ-6714 Removing unexplained TODO from Manufacturing services 

    Removing old unexplained TODO.
Thanks Pierre Smits for the patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713544 13f79535-47bb-0310-9956-ffa450edef68
    @gilPts
    gilPts committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    723f8d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2015

  1. A modified patch from Pierre Smits for "Display GeoPoint with map in … 

    …WebTools" https://issues.apache.org/jira/browse/OFBIZ-6527

Currently only a list of geoPoints is shown. The user experience will improve when we not only show that, but a map as well.

jleroux: 
I refactored the js scripts in party editGeoLocation.ftl and added webtools GeoLocation.ftl into a new common GoogleGeoLocation.ftl template now included in both party editGeoLocation.ftl and webtools GeoLocation.ftl 
I also removed trailing blanks in common GeoLocation.ftl template. 
I also added a French label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713627 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    acb803a View commit details
    Browse the repository at this point in the history

  2. This has slipped in inadvertently, removes to add in next commit 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713632 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    cf9f575 View commit details
    Browse the repository at this point in the history

  3. Completes r1709882 for <<Possible static XSS issue with Content>> htt… 

    …ps://issues.apache.org/jira/browse/OFBIZ-6669

As explained in OFBIZ-6669 last comments, contrary to what I did in ContentWorker class, when I before did the work on *ContentWrapper classes I did not use the sanitizer but only an encoder (either HTML or URL).
Because I wrongly supposed that only plain text was used there and certainly my lazy mind thought it was easier because of the URL encoderType to also handle.

When the encoderType is HTML, we now use the sanitizer in *ContentWrapper classes, and ContentWorker.java has also been adapted. 
For that I enhanced the UtilCodec class. The sanitizer is only used when HTML is requested, else the sanitize() method simply calls the encode() method.

I removed the content.sanitize property in content.properties and added a sanitizer.permissive.policy property in the new owasp.properties (in base config) with some explanations. This allows for more configuration.

I changed the line 85 in productsummary.ftl to use an HTML content wrapper, same in minilastviewedcategories.ftl. 
To be totally complete, we should change *lines like* in productsummary.ftl line 85 to use an HTML content wrapper.
Not easy to spot but anyway those not done will simply not totally show well, without any security impacts.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713634 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    58afe4e View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2015

  1. A patch from Ingo Wolfmayr for "EcomSEO generates an error when used … 

    …in multi-tenancy setup" https://issues.apache.org/jira/browse/OFBIZ-6525

When using the ecomseo application of the ecommerce component in a tenant the tenant entity can't be accessed, and an error is returned.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713778 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    e68af10 View commit details
    Browse the repository at this point in the history

  2. Good to know which Java version was used to compile, no? 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713900 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    4111267 View commit details
    Browse the repository at this point in the history

  3. Forgot the label used in previous commit 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713901 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    0b4c055 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2015

  1. A modified patch from Pierre Smits for "Remove superfluous .propertie… 

    …s extension from EntityUtilProperties requests" https://issues.apache.org/jira/browse/OFBIZ-6719

Currently many EntityUtilProperties requests have the .properties extension in the parameters for the resource, but this is not needed as it is stripped later on.

jleroux: I found 5 others, replaced also


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713985 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    ad0806a View commit details
    Browse the repository at this point in the history

  2. No functional change, completes r1713985 ("Remove superfluous .proper… 

    …ties extension from EntityUtilProperties requests" https://issues.apache.org/jira/browse/OFBIZ-6719) for groovy files (nothing left elsewhere)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713989 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    20808a9 View commit details
    Browse the repository at this point in the history

  3. Non functional changes 

    Removes useless commented out code in UtilCodec.java
Replaces a tab by spaces in ContextFilter.java
Removes useless line in OFBizSolrContextFilter.java (annoying in compare)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713991 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    c8c7ab4 View commit details
    Browse the repository at this point in the history

  4. No functional change, "load-tenant-admin-user-login" is not a main ta… 

    …rget and should be only used being called by other targets. Then there should not be a description, it's confusing! See this comment and comments above https://issues.apache.org/jira/browse/OFBIZ-5757?focusedCommentId=14338165

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714007 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    b169b55 View commit details
    Browse the repository at this point in the history

  5. A patch from Pierre Smits for "Remove tenant data from the demo data … 

    …set" https://issues.apache.org/jira/browse/OFBIZ-5757

The demo data set (in location /framework/entity/data/TenantDemoData.xml) contains elements to load the tenants DEMO1 and DEMO2 into the implemented OFBiz setup.

This data set is intended to be loaded into the master tables when a user wants to explore multity tenancy. However, when a user also wants/needs to load demo data into the tenant DEMO1 or DEMO2 OFBiz also tries to upload the demo setup data for each tenant. This is not allowed as tenants do not have access to tables:
# Tenant
# Tenantdatasource
# etc

jleroux: (based on a Pierre's comment)
With
    ./ant create-tenant
and
    ./ant load-tenant-data-readers

We provide enough tools to explore the opportunity to demonstrate the multi-tenancy aspects of OFBiz. 
Moreover OFBIZ-6720 will be used to rewrite the multi-tenant support page in wiki. We will then see if we should not remove old ant tenant related targets now useless


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714085 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    09c5d3c View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2015

  1. A patch from Forrest Rae for "org.ofbiz.common.login.LoginServices.us… 

    …erLogin causes stack track when username or password is incorrect" https://issues.apache.org/jira/browse/OFBIZ-6721

org.ofbiz.common.login.LoginServices.userLogin is returning ERROR when a username or password is incorrect. It should return FAILURE instead of error. The error causes stack track to be printed to the log. The stack trace makes watching the log for actual errors difficult. This is especially hard when running and analyzing the log after a full test run, of in my case, a custom set of test cases.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714244 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 13, 2015
    Configuration menu
    Copy the full SHA
    261d9dd View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2015

  1. Let's try being nice on demos VM (manual cases, cron done) 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714304 13f79535-47bb-0310-9956-ffa450edef68
    asf-sync-process committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    d78eedc View commit details
    Browse the repository at this point in the history

  2. A patch from Pierre Smits for "remove superfluous comment from entity… 

    …-eca.xsd" https://issues.apache.org/jira/browse/OFBIZ-6724

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714308 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    bab2f33 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2015

  1. A patch from Ankush Upadhyay attached by Ratnesh Upadhyay with analys… 

    …is comments from Swapnil Shah for "Require Inventory of Marketing Package Product can't be shipped" https://issues.apache.org/jira/browse/OFBIZ-817 reported by Daniel Kunkel

Setting Require Inventory for a Marketing Product and (or ???) its Marketing Component causes the shiping system to fail. The shipping system reports nothing is ready to ship, ( [0 + 0 = 0] < 1 ).

---- exception report ----------------------------------------------------------
[TransactionUtil.setRollbackOnly] Calling transaction setRollbackOnly; this stack trace shows where this is happening:
Exception: java.lang.Exception

Message: Error in simple-method [Quick ships an entire order from multiple facilities [file:/wrk/ofbiz/ofbiz/applications/
product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml#quickShipEntireOrder]]: ; [Warning: no shipments created;
could not find anything ready and needing to be shipped.]

---- stack trace ---------------------------------------------------------------

java.lang.Exception: Error in simple-method [Quick ships an entire order from multiple facilities [file:/wrk/ofbiz/ofbiz/
applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml#quickShipEntireOrder]]: ; [Warning: no shipments
created; could not find anything ready and needing to be shipped.]

Swapnil Shah
As per further testing over trunk, it is found that setting requireInventory=Y over any marketing package type product means that for component products as well it would get honored even if its not set as Y for each or any of the components. 
In other words say,
* The flag is as set as Y for a marketing package type product A and it has ATP/QOH=15/15
* Product A has two component B & C as finished good and each having ATP/QOH = 8/8 and requireInventory is not set as Y for any of the components.
*  If sales order is attempted to be placed for A with ordered qty = 10 then system won't allow it to be placed because component B & C don't have sufficient ATP (irrespective of fact that none of them have requireInventory=Y)
Expected behavior in above case should be to allow user to place the order for Product A as it has sufficient ATP=15 to fulfill the ordered qty=10. If the ordered qty happens to exceed 15 then only it should prevent ordering based on requireInventory=Y

Ideally we shouldn't use the MARKETING_PKG product types as its a parent product type for product types MARKETING_PKG_AUTO, MARKETING_PKG_PICK. Thus we have changed the logic in "getMktgPackagesAvailable" service to handle product types MARKETING_PKG_AUTO, MARKETING_PKG_PICK to handle the reported issues more gracefully. Following are the changes we have done in the service vis-a-vis RequireInventory=Y setting for Package and/or its components. Now at the time of add to cart :
# if product type is MARKETING_PKG_AUTO then system will check it's own ATP instead of checking it's component ATP to allow or prevent placing order for package product..
# If product type is MARKETING_PKG_PICK then system will check it's component ATP to allow or prevent placing order for package product.

jleroux:
I agree with Swapnil,, since we can receive inventories of  MARKETING_PKG_AUTO, without regard to their components availability, I see no reasons why we could not ship them. 
BTW I tried the same with MARKETING_PKG_PICK and it works as expected: you need to have the components at hand to ship them even if you tried to receive an inventory before. Since they need to be picked this makes sense.

While at it I fixed a related French label, so it will be backported as well...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714410 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 15, 2015
    Configuration menu
    Copy the full SHA
    cc89225 View commit details
    Browse the repository at this point in the history

  2. Fixes "Project Manager throws error if project user is not assigned t… 

    …o every project" OFBIZ-4206 reported by Tolulope Aganga-Williams and well commented by Mansour Al Akeel and Pierre Smits

The project manager returns an error on the main page unless every user is added to every single project. It should return a list of just the projects the user is assigned to.

:ERROR MESSAGE: 
org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen [component://common/widget/CommonScreens.xml#GlobalDecorator]: java.lang.IllegalArgumentException: Error running Groovy script at location [component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy]: org.ofbiz.service.ServiceAuthException: You have no access to the project#: 10040 (Error running Groovy script at location [component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy]: org.ofbiz.service.ServiceAuthException: You have no access to the project#: 10040) 
It defeats the point.

Mansour:
Pierre,
The patch seems to restrict access to this scree to "PROJECTMGR_ADMIN".
I am not sure if this issue is to be resolved in the screen or making the service returns projects the user has access to.
I appreciate your help here.

Pierre:
Hi Mansour,
You are right. The patch indeed does that and returns a blank screen for
users other than with access 'PROJECTMGR_ADMIN. Other users can look at
projects which will show projects the user is a member of.

jleroux:
I did not test all, but because of ListCurrentProjects.groovy, it seems to me that this is a better solution
I added the CommonAsk label to help lambda users better understand the situation (by asking :p)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714415 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 15, 2015
    Configuration menu
    Copy the full SHA
    d3e7b75 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2015

  1. Updates commons-collections lib from 3.2.1 to 3.2.2 

    Adrian, I remembered to use the Eclipse/Project/Properties/Java Build Path ;)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714571 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    e1a616e View commit details
    Browse the repository at this point in the history

  2. No functional change, completes r1713985: removes superfluous .proper… 

    …ties extension from UtilProperties requests (and yes I checked UspsServicesTests ;))

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714652 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    d115a47 View commit details
    Browse the repository at this point in the history

  3. Fixes OFBIZ-6727 - Webtools Entity edition, the suggested date and ti… 

    …me formats are not localised

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714657 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    843d682 View commit details
    Browse the repository at this point in the history

  4. Adds French labels 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714683 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    de239c0 View commit details
    Browse the repository at this point in the history

  5. Fixed a bug introduced w/ r1714652 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714686 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    b5cb0b5 View commit details
    Browse the repository at this point in the history

  6. Fixed a bug introduced w/ r1714652 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714688 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    20fe8f6 View commit details
    Browse the repository at this point in the history

  7. Fixed a bug introduced w/ r1714652 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714689 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    daf6554 View commit details
    Browse the repository at this point in the history

  8. Fixed a bug introduced w/ r1714652 (not sure on this one but better s… 

    …afe than sorry)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714691 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    2b9d46a View commit details
    Browse the repository at this point in the history

  9. Better French label 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714693 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    b5dd886 View commit details
    Browse the repository at this point in the history

  10. Better French label 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714694 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 16, 2015
    Configuration menu
    Copy the full SHA
    391fab1 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2015

  1. A patch from Jean-Luc Malet for "Add some UiLabels in French" https:/… 

    …/issues.apache.org/jira/browse/OFBIZ-6732

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714828 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 17, 2015
    Configuration menu
    Copy the full SHA
    9be8744 View commit details
    Browse the repository at this point in the history

  2. Being nice on demos VM (manual cases) with not stuck script 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714897 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 17, 2015
    Configuration menu
    Copy the full SHA
    c499572 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2015

  1. OFBIZ-6703 Cannot create more than one lead in the SFA component by s… 

    …ame user

Replace createPartyRole service call with ensurePartyRole, avoiding duplicate pk creation error.

Thanks Taher for reporting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714974 13f79535-47bb-0310-9956-ffa450edef68
    @gilPts
    gilPts committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    e7542c5 View commit details
    Browse the repository at this point in the history

  2. OFBIZ-5750 

    I did review all createPartyRole service call in java/minilang/groovy, and replace some of the occurence with ensurePartyRole, one in SubscriptionServices.java that could cause issue, and others to ease the readability.

Thanks Taher for reporting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714976 13f79535-47bb-0310-9956-ffa450edef68
    @gilPts
    gilPts committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    796c403 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2015

  1. (OFBIZ-6171) Replace remaining occurrence of Open For Business with A… 

    …pache OFBiz.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715470 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    3e2b46a View commit details
    Browse the repository at this point in the history

  2. [OFBIZ-6725] Best Selling Products section in main order page takes i… 

    …nto account cancelled orders. Applying patch from OFBIZ-6725. Thanks Aditya Patwa for your contribution. Thanks Jacques for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715471 13f79535-47bb-0310-9956-ffa450edef68
    Mridul Pathak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    e1faaa4 View commit details
    Browse the repository at this point in the history

  3. Applied bug fix from jira issue - OFBIZ-6698 - sendCommEventAsEmail d… 

    …oes not filter CommEventContentAssoc.

Thanks Gareth for reporting the issue and thanks Rohit for providing the patch for this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715475 13f79535-47bb-0310-9956-ffa450edef68
    @ashishvijaywargiya
    ashishvijaywargiya committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    4434ce7 View commit details
    Browse the repository at this point in the history

  4. (OFBIZ-6683) Corrected the lookup-target request for AddCommEventWork… 

    …Effort, Thanks Irshad for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715477 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    71fecf5 View commit details
    Browse the repository at this point in the history

  5. (OFBIZ-6681) Corrected the lookup-target request for AddQuoteWorkEffo… 

    …rt, Thanks Irshad for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715478 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    dd81b84 View commit details
    Browse the repository at this point in the history

  6. Applied patch from jira issue - OFBIZ-6682. 

    Type-ahead regarding requirement in ListWorkEffortRequirements throws an error.
Thanks Pierre for reporting the issue and thanks Jitendra for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715482 13f79535-47bb-0310-9956-ffa450edef68
    @ashishvijaywargiya
    ashishvijaywargiya committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    0320e7e View commit details
    Browse the repository at this point in the history

  7. Implemented ability to refund non-physical goods (e.g. services). 

    Thanks to Akash Jain for the contribution: OFBIZ-6728, OFBIZ-6729, OFBIZ-6730


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715485 13f79535-47bb-0310-9956-ffa450edef68
    @jacopoc
    jacopoc committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    088eb09 View commit details
    Browse the repository at this point in the history

  8. Fixed EntitySaxReader compile time warning related to Freemarker conf… 

    …iguration.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715491 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    0fffd76 View commit details
    Browse the repository at this point in the history

  9. (OFBIZ-6241) Fixed table-layout="auto" FOP warning. Used table-layout… 

    …="fixed" to fix the warning.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715493 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    be6398d View commit details
    Browse the repository at this point in the history

  10. (OFBIZ-6107) Applied patch from jira issue. 

    ===========================================================
Currently the quote report (or print) opens in the same 
window. This should be in a new window(target = _BLANK)

Thanks Pierre Smits for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715494 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    d4b4be1 View commit details
    Browse the repository at this point in the history

  11. Applied bug fix from jira issue - OFBIZ-6741 - The state list is not … 

    …populated when trying to add a shipping address from the Quick Finalize Order screen.

Thanks Aditya for reporting the issue and providing the fix for the same.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715495 13f79535-47bb-0310-9956-ffa450edef68
    @ashishvijaywargiya
    ashishvijaywargiya committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    683891f View commit details
    Browse the repository at this point in the history

  12. (OFBIZ-6708) Applied patch from jira issue. 

    ============================================================
Fixed Missing userLogin error on party profile screen when 1st content is non public. 

Thanks Jacques for reporting the issue :) and Thanks Vishal for providing the patch for the issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715501 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    fccdfb7 View commit details
    Browse the repository at this point in the history

  13. (OFBIZ-2995) Applied patch from jira issue. 

    ============================================================
Layout improvement for showing cart properly on order entry page for bizznesstime theme.

Thanks Aditya for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715504 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    7a3b94d View commit details
    Browse the repository at this point in the history

  14. [OFBIZ-6709] Now when you add party content, party profile page refre… 

    …sh, earlier it was not refreshing. Updated uiLabelJsonObjects method's (used for jsonify ui lables) signature. Added callback function in this method to get response returned from asynchronous ajax request. After this uiLabel object is available which resolves the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715505 13f79535-47bb-0310-9956-ffa450edef68
    Divesh Dutta committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    6f462a1 View commit details
    Browse the repository at this point in the history

  15. (OFBIZ-6655) Applied patch from jira issue. 

    ============================================================
- Added session cookies config for ecommerce,ecomseo and ecomclone web.xml. 
- Used web-app 3.0 version for web-app
- Re-arrange description and display-name attribute as per the web-app structure.

Thanks Rahul for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715506 13f79535-47bb-0310-9956-ffa450edef68
    @dixitdeepak
    dixitdeepak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    cc19b55 View commit details
    Browse the repository at this point in the history

  16. [OFBIZ-6534] Same Billing Address generates an error. Continue button… 

    … was generating error as well. Applying patch from OFBIZ-6534. Thanks Pierre Smits for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715531 13f79535-47bb-0310-9956-ffa450edef68
    Mridul Pathak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    caa830f View commit details
    Browse the repository at this point in the history

  17. [OFBIZ-6742] Last categories section in e-commerce pages is broken. A… 

    …pplying patch from OFBIZ-6742. Thanks Amardeep Singh Jhajj for reporting the issue and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715536 13f79535-47bb-0310-9956-ffa450edef68
    Mridul Pathak committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    a1c6da3 View commit details
    Browse the repository at this point in the history

  18. Last categories section in e-commerce pages is broken. OFBIZ-6742 

    jleroux: This initially was my error in r1705417, So I simply reverted the change in r1715536 done for OFBIZ-6742 and also reverted r1705417 in this file. I will check other changes done in r1705417

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715573 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 21, 2015
    Configuration menu
    Copy the full SHA
    e4cca3d View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2015

  1. Better French label, there are plenty similar others but it's OK 

    git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715670 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 22, 2015
    Configuration menu
    Copy the full SHA
    8551e8e View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2015

  1. A completed patch from Christian Carlow for "Replace EditProductAssoc… 

    … ftl with widgets" https://issues.apache.org/jira/browse/OFBIZ-6320

jleroux:
Added
    bottom note (in both lists now)
    title="${uiLabelMap.ProductProductId}"
    title="${uiLabelMap.ProductProductIdTo}"
    fromDate <date-time default-value="${nowTimestamp}"
    tooltip="${uiLabelMap.ProductRecreateAssociation}"    
Removed
    EditProductAssoc.ftl
    old screen with ftl ref in screen (commented out by Christian)
    UNUSED FORMS comment
    Product column when same than picked (depend on iterate-section)

I liked the idea of changing the main product using a lookup in edit part.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715755 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    0b3a656 View commit details
    Browse the repository at this point in the history

  2. complete commit r1710727 on OFBIZ-6354 that adding new ftl macros ren… 

    …derFormatHeaderOpen and renderFormatHeaderClose on htmlFromMacroLibrary.ftl. This commit adding these macro on textFormMacroLibrary.ftl, xmlFormMacroLibrary.ftl and csvFormMacroLibrary.ftl. The unit test widgettests now pass without failure

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715756 13f79535-47bb-0310-9956-ffa450edef68
    @nmalin
    nmalin committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    1d18df0 View commit details
    Browse the repository at this point in the history

  3. Convert Survey entites CRUD service from simple to entity-auto, relat… 

    …ed to issue OFBIZ-6744.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715788 13f79535-47bb-0310-9956-ffa450edef68
    @nmalin
    nmalin committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    ca269dc View commit details
    Browse the repository at this point in the history

  4. convert entities crud service from simple to entity-auto for : 

    * DataResourceAttribute
* ContentRole (not for create will set on second step)
* ContentMetaData
* ContentOperation
* ContentPurpose
* ContentPurposeOperation
* ContentAttribute
* ContentKeyword
* ContentType
* ContentAssocType
* ContentAssocPredicate
* ContentPurposeType
I also move some service definition from file services.xml to services_content.xml for all entities that concern content
relate issue OFBIZ-6745

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715960 13f79535-47bb-0310-9956-ffa450edef68
    @nmalin
    nmalin committed Nov 23, 2015
    Configuration menu
    Copy the full SHA
    a9f2cb3 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2015

  1. Reverts r1715506, I crossed many issues, reported on dev ML and OFBIZ… 

    …-6655

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716036 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    7b7acb3 View commit details
    Browse the repository at this point in the history

  2. Implements "Can not display product category name in Unicode." https:… 

    …//issues.apache.org/jira/browse/OFBIZ-6739

Rerported by Thanakrit Wongyued
I found problem to display product category name in Unicode (Thai UTF-8) . The problem is services in CategoryContentWrapper are create content mimeType in "text/html". Then i try to fixed this problem by replace "text/html" with "text/html; charset=utf-8". After that i recompile and restart OFBiz the problem is disappear.

jleroux: uses a new defaultMimeType content property, defaulting to "text/html; charset=utf-8", retrieved by EntityUtilProperties.getPropertyValue()


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716261 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    9624c28 View commit details
    Browse the repository at this point in the history

  3. convert entities crud service from simple to entity-auto for : 

    * WebSiteRole
* WebSitePathAlias
* WebSiteContentType
* WebSiteContent
* WebSite
* DataResourcePurpose
* DataResourceMetaData
* OtherDataResource
* AudioDataResource
* VideoDataResource
* ImageDataResource
* DataResource (update/delete)
* ContentApproval
* ContentRevisionItem
* ContentRevision
I also move some service definition from file services.xml to services_content.xml for ContentApproval, ContentRevisionItem and ContentRevision
relate issue OFBIZ-6745

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716271 13f79535-47bb-0310-9956-ffa450edef68
    @nmalin
    nmalin committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    17c4f39 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2015

  1. A patch from Anne Jessel for "Entity ECAs not triggered correctly whe… 

    …n using Delegator.storeAll() method" https://issues.apache.org/jira/browse/OFBIZ-3847

As reported by  Martin Kreidenweis 
The conditions don't work when updating (not creating) entities using the Delegator.storeAll() method. E.g. the following condition does not work:
<eca entity="Product" operation="create-store" event="return">
        <condition field-name="autoCreateKeywords" operator="not-equals" value="N"/>
        <action service="indexProductKeywords" mode="sync" value-attr="productInstance"/>
</eca>
The indexProductKeywords service is called anyway when the product is updated and the autoCreateKeywords was "N" and stays "N". It works correctly for newly created products. 
The problem is in the method GenericDelegator.storeAll(), where unchanged field values are not passed down to the store() method. The store method calls the ECA engine, which does not receive the unchanged values at all and thus cannot evaluate the EECA conditions correctly. 

Scott's comment:We could consider having EntityEcaCondition.eval() perform a db lookup if any of the fields it needs to evaluate are missing. If they are missing it could fully populate the entity with the missing fields so that a lookup is only required at most once per delegator operation. If no ECA conditions require any missing fields then the lookup wouldn't be performed, so the performance penalty would only be incurred when necessary.


Anne: I've created a patch modeled after Scott's suggestion. I'd appreciate someone reviewing it. It does work for me, however I am concerned that it might fail when the value of a field that is part of the EECA condition is being changed from non-null to null using GenericDelegator.storeAll, because of the way storeAll works. There may be a simple solution I've missed.

jleroux: After reviewing  and waiting for Anne's feedback, I commit because even if in some cases it would not work it's at least better than current situation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716319 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 25, 2015
    Configuration menu
    Copy the full SHA
    9149b9a View commit details
    Browse the repository at this point in the history

  2. convert createContentRole from simple to entity-auto. It's already li… 

    …nked to ensurePartyRole service, relate issue OFBIZ-6745

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716542 13f79535-47bb-0310-9956-ffa450edef68
    @nmalin
    nmalin committed Nov 25, 2015
    Configuration menu
    Copy the full SHA
    9827739 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2015

  1. A modified patch from Harsha Chadhar for "New feature to reclaim a us… 

    …er account - Using Security Questions" https://issues.apache.org/jira/browse/OFBIZ-4983

jleroux: the issue description is quite lengthy so I will summarise it here, please refer to the Jira issue for details.
"When a customer creates an account on eCommerce site, s/he will also need to answer a security question. This security question then can be used by the user to reclaim her/his account in case s/he forgets her/his password. If the user correctly answers the required security question while reclaiming her/his account, her/his password will be sent through email notification. This part would work in the same way as the existing functionality of email password (forget password)."

The description was actually more ambitious (several questions, possibility for users to create own questions) but AFAIK these parts have not been implemented.

Apart updating the patch which did not merge, I got 2 majors issues (and few others I will not report here) I bypassed with workarounds.

Unlike Harsha, and as I reported earlier in the issue, I never got the username (userLoginId) back when using hidden parameters in the request body (not in requestParameters, ie UtilHttp.getParameterMap(request)), nor actually any parameters. This is maybe due to my OS (Windows7 was XP before) or my email client (Outlook Express then, now Thunderbird) or even my SMTP configuration (I used my ISP SMTP server) but most probably because I did it all on my sole machine (localhost). I tried to understand what was happening to request body parameters with http://www.telerik.com/fiddler, but finally gave up because it's even more complicated when https is in the picture. So I decided to rather use parameters in the URL (Query string). It's a bit less safe, though the password is OFBiz encrypted, and should be replaced. But it's safe enough because only the user should receive this message and even if the message is sniffed during its journey it should be hard to decrypt the password!

Harsha used the SecurityExtUiLabels.xml (created by ashish at r1618415) in securityext component but there is already a SecurityextUiLabels.xml in common component. Since I use Windows OFBiz was unable to retrieve the labels from SecurityExtUiLabels.xml since I guess it looked into a SecurityextUiLabels.xml. So I renamed a SecurityExtUiLabels.xml to EmailPassword.xml.










git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716915 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    7605ff7 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2015

  1. Temporary workaround which should be used by anyone responsible for O… 

    …FBiz security until OFBIZ-6568 is fixed. To get the contrast-rO0.jar see https://github.com/Contrast-Security-OSS/contrast-rO0

Note that we are safe from an exploit using the commons collections see OFBIZ-6726. The demos will be using contrast-rO0.jar starting this night.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717058 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 29, 2015
    Configuration menu
    Copy the full SHA
    529e244 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2015

  1. Temporary workaround which should be used by anyone responsible for O… 

    …FBiz security until OFBIZ-6568 is fixed. To get the contrast-rO0.jar see https://github.com/Contrast-Security-OSS/contrast-rO0

In r1717058 I missed to add start-batch-secure and both-secure

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717180 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    6edb836 View commit details
    Browse the repository at this point in the history

  2. Updates commons collections from 3.2.2 to 4.1 - OFBIZ-6748 

    Even if we are covered from the Java Object possible deserialisation exploit by the 3.2.2 version, since it's easy to update, this issue to update the trunk to the last available release.

I updated the .classpath file by hand, but kept the tabs in it, so I could move misplaced entries to their right alphabetical places.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717247 13f79535-47bb-0310-9956-ffa450edef68
    @JacquesLeRoux
    JacquesLeRoux committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    95007be View commit details
    Browse the repository at this point in the history

  3. Fix compilation error since OFBIZ-6748 improvements in TransactionUti… 

    …l.java,

Testsuite entity-test successfull

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717333 13f79535-47bb-0310-9956-ffa450edef68
    @gilPts
    gilPts committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    660bed3 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2015

  1. Merge remote-tracking branch 'refs/remotes/apache/trunk' into trunk

    @wilsonlindelof
    wilsonlindelof committed Dec 1, 2015
    Configuration menu
    Copy the full SHA
    b6dce4f View commit details
    Browse the repository at this point in the history

  2. Added a bit more support for Hungarian translations 

    Hungarian Translations. I tried to bring this up to a comparable level
with the Deutsch file.
    @wilsonlindelof
    wilsonlindelof committed Dec 1, 2015
    Configuration menu
    Copy the full SHA
    bdd5bd7 View commit details
    Browse the repository at this point in the history