Commit Graph
10472 Commits
Author SHA1 Message Date
Taher A. Alkhateeb a35fc14557 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
2015-10-18 11:15:59 +00:00
Jacques Le Roux 2de8359b3b A patch from Pierre Smits for "CcTypes.groovy misses licence" https://issues.apache.org/jira/browse/OFBIZ-6684
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709117 13f79535-47bb-0310-9956-ffa450edef68
2015-10-16 21:13:05 +00:00
Adrian Crum 8a85268f91 Grid widget cache settings are missing - https://issues.apache.org/jira/browse/OFBIZ-6405.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709111 13f79535-47bb-0310-9956-ffa450edef68
2015-10-16 20:55:20 +00:00
Jacques Le Roux 83b092356e 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
2015-10-14 08:51:36 +00:00
Jacques Le Roux d6783003f3 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
2015-10-13 11:24:17 +00:00
Jacques Le Roux ee6164d8bd 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
2015-10-13 00:40:47 +00:00
Arun Patidar 3d444b6b8d [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
2015-10-10 06:16:51 +00:00
Gil Portenseigne fced6c0a42 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
2015-10-09 18:18:52 +00:00
Shi Jinghai d52db9b7bb 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
2015-10-06 12:48:53 +00:00
Nicolas Malin adbd19dc0b 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
2015-10-05 19:56:28 +00:00
Arun Patidar 4f52380dca [OFBIZ-6171] Replacing 'Open for Business' references with 'Apache OFBiz'from remaining occurences.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706593 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 14:31:12 +00:00
Arun Patidar 3865ff485d [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
2015-10-03 14:15:21 +00:00
Deepak Dixit ab6cfacebc (OFBIZ-6212) Fixed accounting report PDF export issue, it was throwing 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
2015-10-03 13:16:46 +00:00
Jacques Le Roux c4f05659be A patch from Martin Becker for "data import - nulling fields impossible" 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
2015-10-01 20:24:17 +00:00
Jacques Le Roux 925c51d691 Referring to the excellent answer at https://stackoverflow.com/questions/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
2015-09-23 08:15:50 +00:00
Jacques Le Roux 2a8dadbc91 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
2015-09-23 08:03:45 +00:00
Jacques Le Roux e814250573 A patch from Martin Becker for "Missing CountryCodeData.xml values for 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
2015-09-20 13:56:40 +00:00
Jacques Le Roux 73d02547cd A patch from Christian Carlow for "FOP renderer does not support alternate 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
2015-09-20 13:48:26 +00:00
Jacques Le Roux e4cfb02613 A patch from Christian Carlow for "FOP renderer doesn't apply title-area-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
2015-09-20 13:42:16 +00:00
Jacques Le Roux 39ab353837 A patch from Martin Becker from a Gareth Carter's idea for "Fix deprecation issues in framework/entity" https://issues.apache.org/jira/browse/OFBIZ-6276
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
2015-09-20 08:37:51 +00:00
Jacques Le Roux 55ea7a66d4 A patch from François Lecomte for "Adding the week number in date picking 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
2015-09-19 20:01:17 +00:00
Jacques Le Roux d34955cd4b A patch from Gil Portenseigne for "multiple select dropdown listbox shows 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
2015-09-19 19:53:47 +00:00
Michael Brohl 18bb9d6717 Applied patch for OFBIZ-6635: Old UserLogin from userLoginId-change is 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
2015-09-19 16:02:15 +00:00
Michael Brohl cd6eedc2c3 Applied patch for OFBIZ-6632: Incorrect comparison in TemporalExpressionWorker.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
2015-09-19 14:27:54 +00:00
Michael Brohl b9816d1d5d Applied patch for OFBIZ-6594: Wrong Documentation for Temporal Expressions.
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
2015-09-19 09:14:48 +00:00
Michael Brohl 82b7386e3d Applied patch for OFBIZ-6621: MapContext.entrySet() slows down when ByteBuffer 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
2015-09-19 08:43:40 +00:00
Jacques Le Roux f98543b1ff A patch from Gaudin Pierre for "error in isValidEan util" https://issues.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
2015-09-17 12:05:19 +00:00
Jacques Le Roux 32b4877639 A patch from Gareth Carter for "PurgeJob.java does not delete RecurrenceRule 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
2015-09-15 08:34:41 +00:00
Jacques Le Roux d2ab653ea7 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
2015-09-11 20:49:42 +00:00
Jacques Le Roux c04f6e84c9 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
2015-09-09 07:16:18 +00:00
Jacopo Cappellato 02415d77ea 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
2015-09-04 06:56:13 +00:00
Jacques Le Roux faed9fe69d A patch from Pierre Smits for "Update site-conf.xsd to prioritise Groovy 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
2015-09-04 03:51:55 +00:00
Adrian Crum 6066e4e42f Make primitive initialization explicit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700864 13f79535-47bb-0310-9956-ffa450edef68
2015-09-02 18:43:41 +00:00
Adrian Crum 26198405b9 Added a FIXME comment. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698406 13f79535-47bb-0310-9956-ffa450edef68
2015-08-28 20:26:01 +00:00
Deepak Dixit 23d692dd3f (OFBIZ-6563) Fixed lookup party search form, used correct name for groupName 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
2015-08-25 13:43:12 +00:00
Jacopo Cappellato 6b36022817 Reverted 1530237: the sql type for Postgres for "comments" and "description" 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
2015-08-25 07:46:31 +00:00
Shi Jinghai 85ab0e0eff 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
2015-08-21 10:03:11 +00:00
Deepak Dixit 509727e6a1 Applied patch from jira issue - OFBIZ-6566 -SecurityGroup doesn't get removed from a Party.
Thanks Pierre Smits for reporting the issue and thanks  Neeraj Kumawat for providing the patch for the same.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1696234 13f79535-47bb-0310-9956-ffa450edef68
2015-08-17 10:53:20 +00:00
Jacques Le Roux 067df90ae1 After r1695126, I found that most of the Java files have svn:eol-style=native. So only 116 Java files were missing svn:eol-style=native. I guess those have been added by committers who are not using the OFBiz svn config file on their machines. So rather than removing svn:eol-style=native, this commits add the property to the files which miss it. Here 116+89=205 files have their svn:eol-style property changed to native.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1695129 13f79535-47bb-0310-9956-ffa450edef68
2015-08-10 16:33:23 +00:00
Jacques Le Roux dca48b0893 Reverts r1044202. No functional change.
This reverts svn:eol-style=native on Java files which were forced by r1044202n, 89 Java files are concerned. This commit hopefully makes things more consistent. 
It's indeed hard to see the impact of this change before it's committed. I'll check once done, I already found 116 Java files w/o svn:eol-style=native but there are 1231 Java files at all, so not sure how most are set...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1695126 13f79535-47bb-0310-9956-ffa450edef68
2015-08-10 16:15:37 +00:00
Deepak Dixit b43c43d7d2 (OFBIZ-6572) Fixed character encoding issue if multitenant is set to Y, move the setCharacterEncoding and setAttributesFromRequestBody method before the multitenant block in ContextFilter, as multitenant block reading the tenatId form request parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1695017 13f79535-47bb-0310-9956-ffa450edef68
2015-08-10 10:45:49 +00:00
Jacques Le Roux 9e85e905ad Fixes the indent, thanks to Gil's reports
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693864 13f79535-47bb-0310-9956-ffa450edef68
2015-08-03 08:55:56 +00:00
Jacques Le Roux 465a25f631 Based on recent Moqui addition, adds description and geoPointTypeEnumId to GeoPoint entity, see https://github.com/sssonline/moqui/commit/39a12eaedcc8e8d134457f6a38146737728bda24 for details
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693799 13f79535-47bb-0310-9956-ffa450edef68
2015-08-02 09:40:02 +00:00
Deepak Dixit aafe193fbd (OFBIZ-6561) Reverted r#1668267 and related changes done in r1674064, 1669537 to fix the cache issue,
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693701 13f79535-47bb-0310-9956-ffa450edef68
2015-08-01 10:12:39 +00:00
Jacques Le Roux c9bfd92ad0 A solution from Gareth Carter for "Wrong percent encoding in Webtool/SQL Processor" https://issues.apache.org/jira/browse/OFBIZ-6567
This was reported by Gareth Carter;

If for instance you use this SQL expression
    select * from Party_Role where role_Type_Id LIKE  '%CA%'
It will be interpreted (and returned to UI) as
   select * from Party_Role where role_Type_Id LIKE  'Ê%'
And no result will be returned when OOTB there is  6 <PartyRole partyId="***" roleTypeId="CARRIER"/> entities

The solution is to keep the SQL expression string from the context at the top of the EntitySQLProcessor.groovy script and put it back in context after the request call (at bottom)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693579 13f79535-47bb-0310-9956-ffa450edef68
2015-07-31 11:56:58 +00:00
Shi Jinghai e173523638 Comment out
Debug.logInfo("======save last view: " + session.getAttribute("_LAST_VIEW_NAME_"));


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693417 13f79535-47bb-0310-9956-ffa450edef68
2015-07-30 12:33:05 +00:00
Jacques Le Roux 1310a182cc Document to makes the changes for OFBIZ-6504 more clear
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693400 13f79535-47bb-0310-9956-ffa450edef68
2015-07-30 09:26:20 +00:00
Deepak Dixit cc7d7333c1 (OFBIZ-6562) Used getCombinedMap instead of getParameterMap while preparing param map for string-map-prefix. Now string-map-prefix will work fine in case of ajax call as well.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693393 13f79535-47bb-0310-9956-ffa450edef68
2015-07-30 08:07:20 +00:00
Jacques Le Roux 9f00d68173 Fixes an issue crossed while checking OFBIZ-6504 - how to Create PDF with password Protected in Ofbiz
There was still an issue in normal (not PDF) mode, I thought I had just to replace \' by void, but I got fooled, because \' already transformed in Unicode characters (&#x5c;&#x27;) at this stage. So I replaced "&#x5c;&#x27;" by "&#x27;"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693258 13f79535-47bb-0310-9956-ffa450edef68
2015-07-29 13:33:12 +00:00
Shi Jinghai 8f3c4a1bda OFBIZ-6504.
In ScreenFopViewHandler.java, removed a line:
            pdfEncryptionParams.setEncryptionLengthInBits(256);
it's redundant to the line
            pdfEncryptionParams.setEncryptionLengthInBits(encryptionLength);


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693243 13f79535-47bb-0310-9956-ffa450edef68
2015-07-29 11:58:48 +00:00