apache · faoziahmedtaher · Feb 27, 2018 · Feb 27, 2018 · Mar 9, 2018 · Mar 12, 2018
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache OFBiz
 Copyright 2001-2016 The Apache Software Foundation
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
@@ -33,16 +33,38 @@ For more details about OFBiz please visit the OFBiz Documentation page:
 System requirements
 -------------------
 
-The only requirement to run OFBiz is to have the Java Development Kit (JDK) 
+The first requirement to run OFBiz is to have the Java Development Kit (JDK) 
 version 8 installed on your system (not just the JRE, but the full JDK) which
 you can download from the below link.
 
-[JDK download](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+[JDK download](https://adoptopenjdk.net/)
+
+[To know more about the JDK](https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244)
+
+The second requirement is to setup the Gradle wrapper files that are used
+to build the system.
+In order to fulfill this requirement, you can run the following command:
+
+MS Windows:
+`init-gradle-wrapper`
+
+Unix-like OS:
+`gradle/init-gradle-wrapper.sh`
+
+The script will download all the Gradle wrapper files required to build the system. 
+Alternatively, after you have Gradle installed:
+
+[Installing Gradle](https://docs.gradle.org/current/userguide/installation.html)
+
+you can setup the Gradle wrapper for OFBiz by executing the following from
+the command line at the OFBiz top level directory (folder):
+
+`gradle wrapper --gradle-version 2.13`
 
 >_Note_: if you are using Eclipse, make sure of running the appropriate Eclipse
 command `gradlew eclipse` before creating the project in Eclipse.
 This command will prepare OFBiz for Eclipse with the correct classpath and settings 
-by creating the.classpath and .project files.
+by creating the .classpath and .project files.
 
 Security
 -------------------
@@ -262,6 +284,14 @@ You can also offset the port, for example:
 
 `gradlew "ofbizBackground --start --portoffset 10000"`
 
+#### Passing JVM runtime options to OFBiz
+
+You can pass JVM runtime options by specifying the project property `-PjvmArgs`.
+
+`gradlew ofbiz -PjvmArgs="-Xms1024M -Xmx2048M" -Dsome.parameter=hello`
+
+If you do not specify `jvmArgs`, a default of `-Xms128M -Xmx1024M` is set.
+
 * * * * * * * * * * * *
 
 ### Data loading tasks

diff --git a/README.md.html b/README.md.html
diff --git a/applications/accounting/config/AccountingErrorUiLabels.xml b/applications/accounting/config/AccountingErrorUiLabels.xml
@@ -769,6 +769,10 @@
     <property key="AccountingValidationFailedInvalidValues">
         <value xml:lang="en">Validation Failed - invalid values</value>
     </property>
+    <property key="AccountingProcessingAuthResultEmpty">
+        <value xml:lang="en">No authentification result available. Payment preference can't be checked.</value>
+        <value xml:lang="de">Es ist kein Authentifizierungsergebnis vorhanden. Die Zahlungsmethode kann nicht überprüft werden.</value>
+    </property>
     <property key="idealEvents.failedToExecuteServiceCreatePaymentFromPreference">
         <value xml:lang="ar">فشل في تنفيذ خدمة CreatePaymentFromPreference</value>
         <value xml:lang="de">Ausführen des Service CreatePaymentFromPreference fehlgeschlagen</value>

diff --git a/applications/accounting/config/AccountingUiLabels.xml b/applications/accounting/config/AccountingUiLabels.xml
@@ -1478,6 +1478,9 @@
         <value xml:lang="zh">支付的发票明细</value>
         <value xml:lang="zh-TW">支付的發票細項</value>
     </property>
+    <property key="AccountingApprovedBy">
+        <value xml:lang="en">Approved by</value>
+    </property>
     <property key="AccountingApprovedGrandTotal">
         <value xml:lang="ar">الإجمالي الكلي الموافق عليه</value>
         <value xml:lang="de">Genehmigte Gesamtsumme</value>
@@ -4641,6 +4644,9 @@
         <value xml:lang="zh">借记</value>
         <value xml:lang="zh-TW">借記</value>
     </property>
+    <property key="AccountingDebitNotEqualCredit">
+        <value xml:lang="en">Debit not equal to credit</value>
+    </property>
     <property key="AccountingDebitOrCreditOfBalance">
         <value xml:lang="ar">المدين أو الدائن للحساب</value>
         <value xml:lang="de">Soll oder Haben der Bilanz</value>
@@ -5463,6 +5469,9 @@
         <value xml:lang="zh">从定单创建定单明细账单时出错</value>
         <value xml:lang="zh-TW">從訂單新建細項帳單時出錯</value>
     </property>
+    <property key="AccountingExchangeRate">
+        <value xml:lang="en">Exchange Rate</value>
+    </property>
     <property key="AccountingExpEndOfLifeIsEmpty">
         <value xml:lang="ar">الحقل نهاية الحياة المتوقعة فارغ في بيانات الأصل الثابت</value>
         <value xml:lang="de">Das Feld erwartetes End of Life bei den Anlage-Daten ist leer.</value>
@@ -11185,6 +11194,9 @@
         <value xml:lang="zh">会员必须是一个内部团体(在会员角色中设置)</value>
         <value xml:lang="zh-TW">團體必須是一個單位組織(在團體角色中設置)</value>
     </property>
+    <property key="AccountingPartyName">
+        <value xml:lang="en">Party Name</value>
+    </property>
     <property key="AccountingPartyRoleAdd">
         <value xml:lang="ar">إضافة دور طرف جديد</value>
         <value xml:lang="de">Neue Akteurs-Rolle hinzufügen</value>
@@ -13425,6 +13437,9 @@
         <value xml:lang="zh">卡上前缀</value>
         <value xml:lang="zh-TW">卡上字首</value>
     </property>
+    <property key="AccountingPreparedBy">
+        <value xml:lang="en">Prepared by</value>
+    </property>
     <property key="AccountingPreviousBankReconciliation">
         <value xml:lang="ar">التسوية البنكية السابقة</value>
         <value xml:lang="de">vorherige Kontenabstimmung</value>
@@ -13815,6 +13830,9 @@
         <value xml:lang="zh">税率</value>
         <value xml:lang="zh-TW">稅率</value>
     </property>
+    <property key="AccountingReceivedBy">
+        <value xml:lang="en">Received by</value>
+    </property>
     <property key="AccountingReceivePayment">
         <value xml:lang="ar">استلام دفعة</value>
         <value xml:lang="de">Zahlung erhalten</value>

diff --git a/applications/accounting/data/DemoTaxAuthority.xml b/applications/accounting/data/DemoTaxAuthority.xml
@@ -213,12 +213,12 @@
     <PartyRole partyId="ITA_ADE" roleTypeId="TAX_AUTHORITY"/>
     <TaxAuthority taxAuthPartyId="ITA_ADE" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="ITA" taxIdFormatPattern="^(IT-?)?{0,1}[0-9]{11}$"/>
 
-    <Party partyId="LVA_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="LVL" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
+    <Party partyId="LVA_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
     <PartyGroup partyId="LVA_TA" groupName="Tax Authority of Lativa"/>
     <PartyRole partyId="LVA_TA" roleTypeId="TAX_AUTHORITY"/>
     <TaxAuthority taxAuthPartyId="LVA_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="LVA" taxIdFormatPattern="^(LV-?)?{0,1}[0-9]{11}$"/>
 
-    <Party partyId="LTU_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="LTL" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
+    <Party partyId="LTU_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="EUR" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
     <PartyGroup partyId="LTU_TA" groupName="Tax Authority of Lithuania"/>
     <PartyRole partyId="LTU_TA" roleTypeId="TAX_AUTHORITY"/>
     <TaxAuthority taxAuthPartyId="LTU_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="LTU" taxIdFormatPattern="^(LT-?)?([0-9]{9}|[0-9]{12})$"/>
@@ -248,7 +248,7 @@
     <PartyRole partyId="PRT_AT" roleTypeId="TAX_AUTHORITY"/>
     <TaxAuthority taxAuthPartyId="PRT_AT" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="PRT" taxIdFormatPattern="^(PT-?)?{0,1}[0-9]{9}$"/>
 
-    <Party partyId="ROM_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="ROL" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
+    <Party partyId="ROM_TA" partyTypeId="PARTY_GROUP" preferredCurrencyUomId="RON" statusId="PARTY_ENABLED" createdDate="2013-07-12 00:00:00.000"/>
     <PartyGroup partyId="ROM_TA" groupName="Tax Authority of Romania"/>
     <PartyRole partyId="ROM_TA" roleTypeId="TAX_AUTHORITY"/>
     <TaxAuthority taxAuthPartyId="ROM_TA" includeTaxInPrice="N" requireTaxIdForExemption="Y" taxAuthGeoId="ROU" taxIdFormatPattern=""/>

diff --git a/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy b/applications/accounting/groovyScripts/reports/GlAccountTrialBalance.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import com.ibm.icu.util.Calendar
 import org.apache.ofbiz.accounting.util.UtilAccounting
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.base.util.UtilNumber

diff --git a/applications/accounting/groovyScripts/reports/InvoiceAcctgTransEntryParameters.groovy b/applications/accounting/groovyScripts/reports/InvoiceAcctgTransEntryParameters.groovy
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.entity.condition.EntityCondition
+import org.apache.ofbiz.entity.condition.EntityOperator
+import org.apache.ofbiz.entity.util.EntityUtil
+
+invoiceId = parameters.invoiceId
+userLoginId = userLogin.userLoginId
+userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), false)
+userLoginNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId", userLogin.get("partyId")), false)
+userLoginName = userLoginNameView.getString("firstName") + " " + userLoginNameView.getString("lastName")
+dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy")
+
+invoice = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", invoiceId), false)
+if (invoice) {
+    context.invoiceDescription = invoice.get("description")
+    context.invoiceTypeDescription = invoice.getRelatedOne("InvoiceType", false).get("description")
+    context.statusDescription = invoice.getRelatedOne("StatusItem", false).get("description")
+    context.invoiceDate = invoice.get("invoiceDate")
+    context.referenceNumber = invoice.get("referenceNumber")
+}
+partyId = null
+if ("PURCHASE_INVOICE".equals(invoice.get("invoiceTypeId")) || "PURCHASE_INVOICE".equals(invoice.getRelatedOne("InvoiceType", false).get("parentTypeId"))) {
+    partyId = invoice.get("partyIdFrom")
+} else {
+    partyId = invoice.get("partyId")
+}
+partyName = ""
+partyNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId", partyId), false)
+if (partyNameView.get("firstName")) {
+    partyName += partyNameView.get("firstName") + " "
+}
+if (partyNameView.get("lastName")) {
+    partyName += partyNameView.get("lastName") + " "
+}
+if (partyNameView.get("groupName")) {
+    partyName += partyNameView.get("groupName") + " "
+}
+
+orderBy = UtilMisc.toList("acctgTransId", "acctgTransEntrySeqId")
+conds = []
+conds.add(EntityCondition.makeCondition("invoiceId", EntityOperator.EQUALS, invoiceId))
+conds.add(EntityCondition.makeCondition("paymentId", EntityOperator.EQUALS, null))
+invoiceAcctgTransAndEntries = delegator.findList("AcctgTransAndEntries", EntityCondition.makeCondition(conds), null, orderBy, null, false)
+context.invoiceAcctgTransAndEntries = invoiceAcctgTransAndEntries
+context.partyName = partyName
+context.partyId = partyId
diff --git a/applications/accounting/minilang/UpgradeServices.xml b/applications/accounting/minilang/UpgradeServices.xml
@@ -53,7 +53,7 @@ under the License.
     <simple-method method-name="migrateFixedAssetMaintMeter" short-description="Copy FixedAssetMaintMeter To FixedAssetMeter">
         <entity-condition entity-name="FixedAssetMaintMeter" list="maintMeterList"/>
         <iterate list="maintMeterList" entry="maintMeter">
-            <make-value entity-name="FixedAssetMeter" value-field="newEntity"/>
+            <make-value value-field="newEntity" entity-name="FixedAssetMeter"/>
             <set-pk-fields map="maintMeter" value-field="newEntity"/>
             <set-nonpk-fields map="maintMeter" value-field="newEntity"/>
             <set field="newEntity.readingDate" from-field="maintMeter.createdStamp"/>
@@ -72,7 +72,7 @@ under the License.
     <simple-method method-name="migrateAgreementWorkEffortAppl" short-description="Copy AgreementWorkEffortAppl To AgreementWorkEffortApplic">
         <entity-condition entity-name="OldAgreementWorkEffortAppl" list="agreementWorkEffortApplList"/>
         <iterate list="agreementWorkEffortApplList" entry="agreementWorkEffortAppl">
-            <make-value entity-name="AgreementWorkEffortApplic" value-field="newEntity"/>
+            <make-value value-field="newEntity" entity-name="AgreementWorkEffortApplic"/>
             <set-pk-fields map="agreementWorkEffortAppl" value-field="newEntity"/>
             <create-value value-field="newEntity"/>
             <check-errors/>

diff --git a/applications/accounting/minilang/admin/AcctgAdminServices.xml b/applications/accounting/minilang/admin/AcctgAdminServices.xml
@@ -35,7 +35,7 @@ under the License.
         <!-- Does not check if the Party is actually a company because real people have to pay taxes too -->
 
         <!-- TODO: maybe check to make sure that all fields are not null -->
-        <make-value entity-name="PartyAcctgPreference" value-field="newEntity"/>
+        <make-value value-field="newEntity" entity-name="PartyAcctgPreference"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-field="newEntity"/>

diff --git a/applications/accounting/minilang/agreement/AgreementServices.xml b/applications/accounting/minilang/agreement/AgreementServices.xml
@@ -57,6 +57,7 @@ under the License.
                 <clear-field field="createAgreementTermInMap"/>
                 <set-service-fields service-name="createAgreementTerm" map="agreementTerm" to-map="createAgreementTermInMap"/>
                 <set from-field="agreementIdTo" field="createAgreementTermInMap.agreementId"/>
+                <set field="createAgreementTermInMap.agreementTermId" from-field="nullField"/>
                 <call-service service-name="createAgreementTerm" in-map-name="createAgreementTermInMap"/>
             </iterate>
         </if-compare>

diff --git a/applications/accounting/minilang/budget/BudgetServices.xml b/applications/accounting/minilang/budget/BudgetServices.xml
@@ -24,7 +24,7 @@ under the License.
     <!-- create a new Budget header record -->
     <simple-method method-name="createBudget" short-description="Create an Budget">
           <!-- create new entity and create all the fields -->
-        <make-value entity-name="Budget" value-field="newEntity"/>
+        <make-value value-field="newEntity" entity-name="Budget"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <!-- create a non existing ID if not supplied -->

diff --git a/applications/accounting/minilang/finaccount/FinAccountServices.xml b/applications/accounting/minilang/finaccount/FinAccountServices.xml
@@ -35,7 +35,7 @@ under the License.
             <set field="parameters.statusId" value="FNACT_ACTIVE"/>
         </if-empty>
 
-        <make-value entity-name="FinAccount" value-field="newEntity"/>
+        <make-value value-field="newEntity" entity-name="FinAccount"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
@@ -211,7 +211,7 @@ under the License.
             </add-error>
         </if-compare>
         <check-errors/>
-        <make-value entity-name="FinAccountRole" value-field="newEntity"/>
+        <make-value value-field="newEntity" entity-name="FinAccountRole"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
@@ -756,7 +756,7 @@ under the License.
                     </if-compare> 
                     <iterate list="acctgTransEntries" entry="oldAcctgTransEntry">
                         <if-compare field="oldAcctgTransEntry.debitCreditFlag" operator="equals" value="D">
-                            <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
+                            <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
                             <set field="newAcctgTransEntry.glAccountId" from-field="oldAcctgTransEntry.glAccountId"/>
                             <set field="organizationPartyId" from-field="oldAcctgTransEntry.organizationPartyId"/>
                             <set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
@@ -775,7 +775,7 @@ under the License.
                 <clear-field field="createAcctgTransAndEntriesMap.acctgTransId"/>
                 <set field="createAcctgTransAndEntriesMap.transactionDate" from-field="nowTimestamp"/>
                 <set field="createAcctgTransAndEntriesMap.postedDate" from-field="nowTimestamp"/>
-                <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
+                <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
                 <set field="newAcctgTransEntry.glAccountId" from-field="finAccount.postToGlAccountId"/>
                 <set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
                 <set field="newAcctgTransEntry.partyId" from-field="oldAcctgTransEntry.partyId"/>
@@ -839,7 +839,7 @@ under the License.
                     </if-compare> 
                     <iterate list="acctgTransEntries" entry="oldAcctgTransEntry">
                         <if-compare field="oldAcctgTransEntry.debitCreditFlag" operator="equals" value="C">
-                            <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
+                            <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
                             <set field="newAcctgTransEntry.glAccountId" from-field="oldAcctgTransEntry.glAccountId"/>
                             <set field="organizationPartyId" from-field="oldAcctgTransEntry.organizationPartyId"/>
                             <set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
@@ -858,7 +858,7 @@ under the License.
                 <clear-field field="createAcctgTransAndEntriesMap.acctgTransId"/>
                 <set field="createAcctgTransAndEntriesMap.transactionDate" from-field="nowTimestamp"/>
                 <set field="createAcctgTransAndEntriesMap.postedDate" from-field="nowTimestamp"/>
-                <make-value entity-name="AcctgTransEntry" value-field="newAcctgTransEntry"/>
+                <make-value value-field="newAcctgTransEntry" entity-name="AcctgTransEntry"/>
                 <set field="newAcctgTransEntry.glAccountId" from-field="finAccount.postToGlAccountId"/>
                 <set field="newAcctgTransEntry.organizationPartyId" from-field="organizationPartyId"/>
                 <set field="newAcctgTransEntry.partyId" from-field="oldAcctgTransEntry.partyId"/>