svn commit: r1844976 - in /ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc: _include/acc-financial-accounts.adoc accounting.adoc
Author: sharan Date: Sat Oct 27 16:05:17 2018 New Revision: 1844976 URL: http://svn.apache.org/viewvc?rev=1844976=rev Log: Improved: Added documentation content for Financial Accounts in Accounting (OFBIZ-10296). Thanks Viabhav Jain for the patch. Added: ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc (with props) Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/accounting.adoc Added: ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc?rev=1844976=auto == --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc (added) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc Sat Oct 27 16:05:17 2018 @@ -0,0 +1,75 @@ + +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. + += Financial Accounts + +A "Financial Account" is a tool (similar to bank account statement) that is used for monitoring monetary transactions. +Normally it will be linked to a party and the various transactions details (e.g. payments or receipts) will be shown as entries. + + +At the time of writing, OFBiz allows you to create the following type of financial accounts + + * Bank Account + * Credit Card Account + * Deposit Account + * Equity Line Account + * Gift Certificate + * Investment Account + * Loan Account + * Replenish Account + * Service Credit Account + * Store Credit Account + +== Bank Account + +A "Bank Account" is a financial account between a bank and their customer. +By default this type of financial account will post to 213500 CUSTOMER DEPOSIT ACCOUNTS. + +If you have installed OFBiz with the demo data then there are already examples +of Bank Accounts created for you. + +== Credit Card Account + +== Deposit Account + +A "Deposit Account" is a financial account which allows money to be deposited and withdrawn by the account holder. +By default this type of financial account will post to 213500 CUSTOMER DEPOSIT ACCOUNTS. + +== Equity Line Account + +== Gift Certificate + +A "Gift Certificate" is something that entitles the recipient to select merchandise up to a specified value from a store. It is usually presented as a gift. +By default this type of financial account will post to 213200 GIFT CERTIFICATES UNREDEEMED. + +== Investment Account + +An "Investment Account" is a financial account that contains deposits of funds and/or securities that are held at a at a bank, stock exchange or other financial Institution. +By default this type of financial account will post to 213500 CUSTOMER DEPOSIT ACCOUNTS. + +== Loan Account + +== Replenish Account + +== Service Credit Account + +== Store Credit Account + +A "Store Credit Account" is a financial account that is used to to maintain the refund amount +Specify the type (Billing Account or Financial Account) of Store Credit Account used for refund return. Default to Financial Account. + Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc -- svn:eol-style = native Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc -- svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/_include/acc-financial-accounts.adoc -- svn:mime-type = text/plain Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/accounting.adoc URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/docs/asciidoc/accounting.adoc?rev=1844976=1844975=1844976=diff
buildbot success in on ofbizBranch16
The Buildbot has detected a restored build on builder ofbizBranch16 while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch16/builds/96 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: lares_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onOfbizR16Commit' triggered this build Build Source Stamp: [branch ofbiz/branches/release16.11] 1844968 Blamelist: surajk Build succeeded! Sincerely, -The Buildbot
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/473 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: orcus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/trunk] 1844966 Blamelist: surajk Build succeeded! Sincerely, -The Buildbot
buildbot success in on ofbizBranch17FrameworkPlugins
The Buildbot has detected a restored build on builder ofbizBranch17FrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/152 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: orcus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch17PluginsCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/branches/release17.12] 1844967 Blamelist: surajk Build succeeded! Sincerely, -The Buildbot
svn commit: r1844968 - /ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java
Author: surajk Date: Sat Oct 27 13:44:43 2018 New Revision: 1844968 URL: http://svn.apache.org/viewvc?rev=1844968=rev Log: Fixed: Added missing import. (OFBIZ-10314) Modified: ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Modified: ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java?rev=1844968=1844967=1844968=diff == --- ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java (original) +++ ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Sat Oct 27 13:44:43 2018 @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue;
svn commit: r1844967 - /ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java
Author: surajk Date: Sat Oct 27 13:28:29 2018 New Revision: 1844967 URL: http://svn.apache.org/viewvc?rev=1844967=rev Log: Fixed: Added missing import. (OFBIZ-10314) Modified: ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Modified: ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java?rev=1844967=1844966=1844967=diff == --- ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java (original) +++ ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Sat Oct 27 13:28:29 2018 @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue;
svn commit: r1844966 - /ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java
Author: surajk Date: Sat Oct 27 13:21:20 2018 New Revision: 1844966 URL: http://svn.apache.org/viewvc?rev=1844966=rev Log: Fixed: Added missing import. (OFBIZ-10314) Modified: ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Modified: ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java?rev=1844966=1844965=1844966=diff == --- ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Sat Oct 27 13:21:20 2018 @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue;
buildbot exception in on ofbizBranch16
The Buildbot has detected a build exception on builder ofbizBranch16 while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch16/builds/95 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: orcus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onOfbizR16Commit' triggered this build Build Source Stamp: [branch ofbiz/branches/release16.11] 1844965 Blamelist: surajk BUILD FAILED: exception shell upload Sincerely, -The Buildbot
svn commit: r1844965 - in /ofbiz/branches/release16.11/specialpurpose/webpos: src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java template/search/SearchPartiesResults.ftl webapp/webpos/imag
Author: surajk Date: Sat Oct 27 13:02:13 2018 New Revision: 1844965 URL: http://svn.apache.org/viewvc?rev=1844965=rev Log: Fixed: Multiple records are shown in search modal in webpos. (OFBIZ-10314) Thanks Archana Asthana for reporting and Shikha Jaiswal for providing the patch. Modified: ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java ofbiz/branches/release16.11/specialpurpose/webpos/template/search/SearchPartiesResults.ftl ofbiz/branches/release16.11/specialpurpose/webpos/webapp/webpos/images/js/SearchPartiesResults.js Modified: ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java?rev=1844965=1844964=1844965=diff == --- ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java (original) +++ ofbiz/branches/release16.11/specialpurpose/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Sat Oct 27 13:02:13 2018 @@ -145,7 +145,10 @@ public class WebPosSearch { } andExprs.add(EntityCondition.makeCondition("partyTypeId", EntityOperator.EQUALS, "PERSON")); andExprs.add(EntityCondition.makeCondition("contactMechTypeId", EntityOperator.EQUALS, "POSTAL_ADDRESS")); - + +if (UtilValidate.isNotEmpty(shippingLocation) && "N".equalsIgnoreCase(shippingLocation) && UtilValidate.isNotEmpty(billingLocation) && "N".equalsIgnoreCase(billingLocation)) { + andExprs.add(EntityCondition.makeCondition("contactMechPurposeTypeId", EntityOperator.IN, UtilMisc.toList("SHIPPING_LOCATION", "BILLING_LOCATION"))); +} mainCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND); orderBy.add("lastName"); Modified: ofbiz/branches/release16.11/specialpurpose/webpos/template/search/SearchPartiesResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/template/search/SearchPartiesResults.ftl?rev=1844965=1844964=1844965=diff == --- ofbiz/branches/release16.11/specialpurpose/webpos/template/search/SearchPartiesResults.ftl (original) +++ ofbiz/branches/release16.11/specialpurpose/webpos/template/search/SearchPartiesResults.ftl Sat Oct 27 13:02:13 2018 @@ -67,6 +67,7 @@ under the License. ${uiLabelMap.PartyPartyId} ${uiLabelMap.PartyLastName} ${uiLabelMap.PartyFirstName} + ${uiLabelMap.PartyPartyIdentification} ${uiLabelMap.PartyAddressLine1} ${uiLabelMap.PartyCity} ${uiLabelMap.PartyPostalCode} Modified: ofbiz/branches/release16.11/specialpurpose/webpos/webapp/webpos/images/js/SearchPartiesResults.js URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/webpos/webapp/webpos/images/js/SearchPartiesResults.js?rev=1844965=1844964=1844965=diff == --- ofbiz/branches/release16.11/specialpurpose/webpos/webapp/webpos/images/js/SearchPartiesResults.js (original) +++ ofbiz/branches/release16.11/specialpurpose/webpos/webapp/webpos/images/js/SearchPartiesResults.js Sat Oct 27 13:02:13 2018 @@ -77,6 +77,7 @@ function buildPartiesResults(parties, fr } lastName = checkNull(party.lastName); firstName = checkNull(party.firstName); +partyIdentificationNumber = checkNull(party.idValue); address1 = checkNull(party.address1); city = checkNull(party.city); postalCode = checkNull(party.postalCode); @@ -99,6 +100,7 @@ function buildPartiesResults(parties, fr tableList = tableList + "" + party.partyId + ""; tableList = tableList + "" + lastName + ""; tableList = tableList + "" + firstName + ""; +tableList = tableList + "" + partyIdentificationNumber + ""; tableList = tableList + "" + address1 + ""; tableList = tableList + "" + city + ""; tableList = tableList + "" + postalCode + "";
buildbot exception in on ofbizBranch17FrameworkPlugins
The Buildbot has detected a build exception on builder ofbizBranch17FrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/151 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: orcus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch17PluginsCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/branches/release17.12] 1844959 Blamelist: surajk BUILD FAILED: exception shell_1 upload Sincerely, -The Buildbot
buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/472 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: orcus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/trunk] 1844957 Blamelist: surajk BUILD FAILED: exception shell_1 upload_1 Sincerely, -The Buildbot
svn commit: r1844959 - in /ofbiz/ofbiz-plugins/branches/release17.12/webpos: src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java template/search/SearchPartiesResults.ftl webapp/webpos/image
Author: surajk Date: Sat Oct 27 12:51:03 2018 New Revision: 1844959 URL: http://svn.apache.org/viewvc?rev=1844959=rev Log: Fixed: Multiple records are shown in search modal in webpos. (OFBIZ-10314) Thanks Archana Asthana for reporting and Shikha Jaiswal for providing the patch. Modified: ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/search/SearchPartiesResults.ftl ofbiz/ofbiz-plugins/branches/release17.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js Modified: ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java?rev=1844959=1844958=1844959=diff == --- ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java (original) +++ ofbiz/ofbiz-plugins/branches/release17.12/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Sat Oct 27 12:51:03 2018 @@ -146,6 +146,9 @@ public class WebPosSearch { andExprs.add(EntityCondition.makeCondition("partyTypeId", EntityOperator.EQUALS, "PERSON")); andExprs.add(EntityCondition.makeCondition("contactMechTypeId", EntityOperator.EQUALS, "POSTAL_ADDRESS")); +if (UtilValidate.isNotEmpty(shippingLocation) && "N".equalsIgnoreCase(shippingLocation) && UtilValidate.isNotEmpty(billingLocation) && "N".equalsIgnoreCase(billingLocation)) { + andExprs.add(EntityCondition.makeCondition("contactMechPurposeTypeId", EntityOperator.IN, UtilMisc.toList("SHIPPING_LOCATION", "BILLING_LOCATION"))); +} mainCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND); orderBy.add("lastName"); Modified: ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/search/SearchPartiesResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/search/SearchPartiesResults.ftl?rev=1844959=1844958=1844959=diff == --- ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/search/SearchPartiesResults.ftl (original) +++ ofbiz/ofbiz-plugins/branches/release17.12/webpos/template/search/SearchPartiesResults.ftl Sat Oct 27 12:51:03 2018 @@ -67,6 +67,7 @@ under the License. ${uiLabelMap.PartyPartyId} ${uiLabelMap.PartyLastName} ${uiLabelMap.PartyFirstName} + ${uiLabelMap.PartyPartyIdentification} ${uiLabelMap.PartyAddressLine1} ${uiLabelMap.PartyCity} ${uiLabelMap.PartyPostalCode} Modified: ofbiz/ofbiz-plugins/branches/release17.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js?rev=1844959=1844958=1844959=diff == --- ofbiz/ofbiz-plugins/branches/release17.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js (original) +++ ofbiz/ofbiz-plugins/branches/release17.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js Sat Oct 27 12:51:03 2018 @@ -77,6 +77,7 @@ function buildPartiesResults(parties, fr } lastName = checkNull(party.lastName); firstName = checkNull(party.firstName); +partyIdentificationNumber = checkNull(party.idValue); address1 = checkNull(party.address1); city = checkNull(party.city); postalCode = checkNull(party.postalCode); @@ -99,6 +100,7 @@ function buildPartiesResults(parties, fr tableList = tableList + "" + party.partyId + ""; tableList = tableList + "" + lastName + ""; tableList = tableList + "" + firstName + ""; +tableList = tableList + "" + partyIdentificationNumber + ""; tableList = tableList + "" + address1 + ""; tableList = tableList + "" + city + ""; tableList = tableList + "" + postalCode + "";
svn commit: r1844957 - in /ofbiz/ofbiz-plugins/trunk/webpos: src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java template/search/SearchPartiesResults.ftl webapp/webpos/images/js/SearchParti
Author: surajk Date: Sat Oct 27 12:47:45 2018 New Revision: 1844957 URL: http://svn.apache.org/viewvc?rev=1844957=rev Log: Fixed: Multiple records are shown in search modal in webpos. (OFBIZ-10314) Thanks Archana Asthana for reporting and Shikha Jaiswal for providing the patch. Modified: ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java ofbiz/ofbiz-plugins/trunk/webpos/template/search/SearchPartiesResults.ftl ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchPartiesResults.js Modified: ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java?rev=1844957=1844956=1844957=diff == --- ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Sat Oct 27 12:47:45 2018 @@ -146,6 +146,9 @@ public class WebPosSearch { andExprs.add(EntityCondition.makeCondition("partyTypeId", EntityOperator.EQUALS, "PERSON")); andExprs.add(EntityCondition.makeCondition("contactMechTypeId", EntityOperator.EQUALS, "POSTAL_ADDRESS")); +if (UtilValidate.isNotEmpty(shippingLocation) && "N".equalsIgnoreCase(shippingLocation) && UtilValidate.isNotEmpty(billingLocation) && "N".equalsIgnoreCase(billingLocation)) { + andExprs.add(EntityCondition.makeCondition("contactMechPurposeTypeId", EntityOperator.IN, UtilMisc.toList("SHIPPING_LOCATION", "BILLING_LOCATION"))); +} mainCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND); orderBy.add("lastName"); Modified: ofbiz/ofbiz-plugins/trunk/webpos/template/search/SearchPartiesResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/template/search/SearchPartiesResults.ftl?rev=1844957=1844956=1844957=diff == --- ofbiz/ofbiz-plugins/trunk/webpos/template/search/SearchPartiesResults.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/template/search/SearchPartiesResults.ftl Sat Oct 27 12:47:45 2018 @@ -67,6 +67,7 @@ under the License. ${uiLabelMap.PartyPartyId} ${uiLabelMap.PartyLastName} ${uiLabelMap.PartyFirstName} + ${uiLabelMap.PartyPartyIdentification} ${uiLabelMap.PartyAddressLine1} ${uiLabelMap.PartyCity} ${uiLabelMap.PartyPostalCode} Modified: ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchPartiesResults.js URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchPartiesResults.js?rev=1844957=1844956=1844957=diff == --- ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchPartiesResults.js (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchPartiesResults.js Sat Oct 27 12:47:45 2018 @@ -77,6 +77,7 @@ function buildPartiesResults(parties, fr } lastName = checkNull(party.lastName); firstName = checkNull(party.firstName); +partyIdentificationNumber = checkNull(party.idValue); address1 = checkNull(party.address1); city = checkNull(party.city); postalCode = checkNull(party.postalCode); @@ -99,6 +100,7 @@ function buildPartiesResults(parties, fr tableList = tableList + "" + party.partyId + ""; tableList = tableList + "" + lastName + ""; tableList = tableList + "" + firstName + ""; +tableList = tableList + "" + partyIdentificationNumber + ""; tableList = tableList + "" + address1 + ""; tableList = tableList + "" + city + ""; tableList = tableList + "" + postalCode + "";
svn commit: r1844954 - in /ofbiz/ofbiz-framework/branches/release17.12/applications/content: config/ContentUiLabels.xml minilang/content/ContentServices.xml
Author: adityasharma Date: Sat Oct 27 11:39:45 2018 New Revision: 1844954 URL: http://svn.apache.org/viewvc?rev=1844954=rev Log: Fixed: updateContent service does not return an error/success message (OFBIZ-9743) Additional change: Added success message to createContent and removeContent service too. Thanks Rohit Rai for reporting the issue. Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/content/config/ContentUiLabels.xml ofbiz/ofbiz-framework/branches/release17.12/applications/content/minilang/content/ContentServices.xml Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/content/config/ContentUiLabels.xml?rev=1844954=1844953=1844954=diff == --- ofbiz/ofbiz-framework/branches/release17.12/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/ofbiz-framework/branches/release17.12/applications/content/config/ContentUiLabels.xml Sat Oct 27 11:39:45 2018 @@ -955,6 +955,9 @@ å 容 å §å®¹ + +Content created successfully. + Error creating content in ${serviceName} Erreur de création du document dans le service ${serviceName} @@ -965,6 +968,9 @@ å¨${serviceName}ä¸å建å 容æ¶åºé å¨${serviceName}ä¸æ°å»ºå §å®¹æåºé¯ + +Content deleted successfully. + Content Id or Upload file is missing. La référence du document ou le fichier à charger est manquant. @@ -1061,6 +1067,9 @@ å 容å°ï¼contentToï¼ ${contentTo}/å 容èªï¼contentFromï¼ ${contentFrom} æ¯ç©ºçï¼nullï¼ å §å®¹_è¿(contentTo) ${contentTo}/å §å®¹_èµ·(contentFrom) ${contentFrom} æ¯ç©ºç(null) + +Content updated successfully. + Error updating content in ${serviceName} Erreur lors de la mise à jour du document ${serviceName} Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/content/minilang/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/content/minilang/content/ContentServices.xml?rev=1844954=1844953=1844954=diff == --- ofbiz/ofbiz-framework/branches/release17.12/applications/content/minilang/content/ContentServices.xml (original) +++ ofbiz/ofbiz-framework/branches/release17.12/applications/content/minilang/content/ContentServices.xml Sat Oct 27 11:39:45 2018 @@ -50,6 +50,8 @@ + + @@ -61,6 +63,8 @@ + + @@ -68,6 +72,8 @@ + +
svn commit: r1844953 - in /ofbiz/branches/release16.11/applications/content: config/ContentUiLabels.xml minilang/content/ContentServices.xml
Author: adityasharma Date: Sat Oct 27 11:09:48 2018 New Revision: 1844953 URL: http://svn.apache.org/viewvc?rev=1844953=rev Log: Fixed: updateContent service does not return an error/success message (OFBIZ-9743) Additional change: Added success message to createContent and removeContent service too. Thanks Rohit Rai for reporting the issue. Modified: ofbiz/branches/release16.11/applications/content/config/ContentUiLabels.xml ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml Modified: ofbiz/branches/release16.11/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/config/ContentUiLabels.xml?rev=1844953=1844952=1844953=diff == --- ofbiz/branches/release16.11/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/branches/release16.11/applications/content/config/ContentUiLabels.xml Sat Oct 27 11:09:48 2018 @@ -955,6 +955,9 @@ å 容 å §å®¹ + +Content created successfully. + Error creating content in ${serviceName} Erreur de création du document dans le service ${serviceName} @@ -965,6 +968,9 @@ å¨${serviceName}ä¸å建å 容æ¶åºé å¨${serviceName}ä¸æ°å»ºå §å®¹æåºé¯ + +Content deleted successfully. + Content Id or Upload file is missing. La référence du document ou le fichier à charger est manquant. @@ -1061,6 +1067,9 @@ å 容å°ï¼contentToï¼ ${contentTo}/å 容èªï¼contentFromï¼ ${contentFrom} æ¯ç©ºçï¼nullï¼ å §å®¹_è¿(contentTo) ${contentTo}/å §å®¹_èµ·(contentFrom) ${contentFrom} æ¯ç©ºç(null) + +Content updated successfully. + Error updating content in ${serviceName} Erreur lors de la mise à jour du document ${serviceName} Modified: ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml?rev=1844953=1844952=1844953=diff == --- ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml (original) +++ ofbiz/branches/release16.11/applications/content/minilang/content/ContentServices.xml Sat Oct 27 11:09:48 2018 @@ -50,6 +50,8 @@ + + @@ -61,6 +63,8 @@ + + @@ -68,6 +72,8 @@ + +
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/470 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: downstream Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1844950 Blamelist: deepak Build succeeded! Sincerely, -The Buildbot
buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/469 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: lares_ubuntu Build Reason: downstream Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1844945 Blamelist: deepak BUILD FAILED: exception shell_3 upload_1 Sincerely, -The Buildbot
svn propchange: r1844950 - svn:log
Author: deepak Revision: 1844950 Modified property: svn:log Modified: svn:log at Sat Oct 27 09:42:52 2018 -- --- svn:log (original) +++ svn:log Sat Oct 27 09:42:52 2018 @@ -1,2 +1,2 @@ -Fixed: Fox typo (ignorease => ignoreCase) done at r#1825350 +Fixed: Fix typo (ignorease => ignoreCase) done at r#1825350 (OFBIZ-10195)
svn commit: r1844952 - /ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/EventForms.xml
Author: surajk Date: Sat Oct 27 09:27:18 2018 New Revision: 1844952 URL: http://svn.apache.org/viewvc?rev=1844952=rev Log: Fixed: Issue while creating any new event. (OFBIZ-10583) Thanks Sonal Patwari for reporting the issue and Praveen Sharma for providing the patch. Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/EventForms.xml Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/EventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/EventForms.xml?rev=1844952=1844951=1844952=diff == --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/EventForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/sfa/forms/EventForms.xml Sat Oct 27 09:27:18 2018 @@ -73,7 +73,6 @@ under the License. -
svn commit: r1844950 - /ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
Author: deepak Date: Sat Oct 27 08:34:50 2018 New Revision: 1844950 URL: http://svn.apache.org/viewvc?rev=1844950=rev Log: Fixed: Fox typo (ignorease => ignoreCase) done at r#1825350 (OFBIZ-10195) Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl?rev=1844950=1844949=1844950=diff == --- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl Sat Oct 27 08:34:50 2018 @@ -57,7 +57,7 @@ under the License. <#macro renderDateTimeField name className alert title value size maxlength step timeValues id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName mask="" event="" action="" step="" timeValues="" tabindex=""><@makeBlock className value /> -<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignorease fullSearch conditionGroup tabindex firstInList="" currentValue=""> +<#macro renderDropDownField name className alert id multiple formName otherFieldName event action size explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch conditionGroup tabindex firstInList="" currentValue=""> <#if currentValue?has_content && firstInList?has_content> <@makeBlock "" explicitDescription /> <#else>
svn commit: r1844947 - /ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ShowBestSellingCategory.ftl
Author: ashish Date: Sat Oct 27 08:27:27 2018 New Revision: 1844947 URL: http://svn.apache.org/viewvc?rev=1844947=rev Log: Applied fix from trunk for revision: 1844946 === Fixed: ECommerce landing page breaks if popular category does not exists. (OFBIZ-10617) Thanks Rehan for reporting the issue and providing the patch. Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ShowBestSellingCategory.ftl Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ShowBestSellingCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ShowBestSellingCategory.ftl?rev=1844947=1844946=1844947=diff == --- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ShowBestSellingCategory.ftl (original) +++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ShowBestSellingCategory.ftl Sat Oct 27 08:27:27 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - +<#if productCategoryList?has_content> Popular Categories @@ -101,4 +101,4 @@ under the License. - +
svn commit: r1844946 - /ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl
Author: ashish Date: Sat Oct 27 08:21:09 2018 New Revision: 1844946 URL: http://svn.apache.org/viewvc?rev=1844946=rev Log: Fixed: ECommerce landing page breaks if popular category does not exists. (OFBIZ-10617) Thanks Rehan for reporting the issue and providing the patch. Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl?rev=1844946=1844945=1844946=diff == --- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ShowBestSellingCategory.ftl Sat Oct 27 08:21:09 2018 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - +<#if productCategoryList?has_content> Popular Categories @@ -101,4 +101,4 @@ under the License. - +
svn propchange: r1844944 - svn:log
Author: deepak Revision: 1844944 Modified property: svn:log Modified: svn:log at Sat Oct 27 08:19:05 2018 -- --- svn:log (original) +++ svn:log Sat Oct 27 08:19:05 2018 @@ -1,5 +1,5 @@ Applied fix from trunk for revision: 1844943 === -Updated google libphonenumber to v8.9.16 +Improved: Updated google libphonenumber to v8.9.16 (OFBIZ-10618)
svn propchange: r1844943 - svn:log
Author: deepak Revision: 1844943 Modified property: svn:log Modified: svn:log at Sat Oct 27 08:17:57 2018 -- --- svn:log (original) +++ svn:log Sat Oct 27 08:17:57 2018 @@ -1,2 +1,3 @@ -Updated google libphonenumber to v8.9.16 +Improved: Updated google libphonenumber to v8.9.16 (OFBIZ-10618) +
svn commit: r1844945 - /ofbiz/ofbiz-framework/trunk/build.gradle
Author: deepak Date: Sat Oct 27 08:15:37 2018 New Revision: 1844945 URL: http://svn.apache.org/viewvc?rev=1844945=rev Log: Improved: Updated Apache FOP jar to 2.3 (OFBIZ-10619) Modified: ofbiz/ofbiz-framework/trunk/build.gradle Modified: ofbiz/ofbiz-framework/trunk/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1844945=1844944=1844945=diff == --- ofbiz/ofbiz-framework/trunk/build.gradle (original) +++ ofbiz/ofbiz-framework/trunk/build.gradle Sat Oct 27 08:15:37 2018 @@ -150,7 +150,7 @@ dependencies { compile 'org.apache.tomcat:tomcat-catalina:9.0.10' compile 'org.apache.tomcat:tomcat-jasper:9.0.10' compile 'org.apache.tomcat:tomcat-tribes:9.0.10' -compile 'org.apache.xmlgraphics:fop:2.2' +compile 'org.apache.xmlgraphics:fop:2.3' compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3' compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3' compile 'org.codehaus.groovy:groovy-all:2.4.13'
svn commit: r1844944 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ build.gradle
Author: deepak Date: Sat Oct 27 07:56:40 2018 New Revision: 1844944 URL: http://svn.apache.org/viewvc?rev=1844944=rev Log: Applied fix from trunk for revision: 1844943 === Updated google libphonenumber to v8.9.16 (OFBIZ-10618) Modified: ofbiz/ofbiz-framework/branches/release17.12/ (props changed) ofbiz/ofbiz-framework/branches/release17.12/build.gradle Propchange: ofbiz/ofbiz-framework/branches/release17.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 27 07:56:40 2018 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893 +/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943 Modified: ofbiz/ofbiz-framework/branches/release17.12/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/build.gradle?rev=1844944=1844943=1844944=diff == --- ofbiz/ofbiz-framework/branches/release17.12/build.gradle (original) +++ ofbiz/ofbiz-framework/branches/release17.12/build.gradle Sat Oct 27 07:56:40 2018 @@ -107,7 +107,7 @@ dependencies { compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2' compile 'com.googlecode.ez-vcard:ez-vcard:0.9.10' compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20170515.1' -compile 'com.googlecode.libphonenumber:libphonenumber:8.8.7' +compile 'com.googlecode.libphonenumber:libphonenumber:8.9.16' compile 'com.ibm.icu:icu4j:60.2' compile 'com.lowagie:itext:2.1.7' // Don't update due to license change in newer versions, see OFBIZ-10455 compile 'com.sun.mail:javax.mail:1.6.0'
svn commit: r1844943 - /ofbiz/ofbiz-framework/trunk/build.gradle
Author: deepak Date: Sat Oct 27 07:55:25 2018 New Revision: 1844943 URL: http://svn.apache.org/viewvc?rev=1844943=rev Log: Updated google libphonenumber to v8.9.16 (OFBIZ-10618) Modified: ofbiz/ofbiz-framework/trunk/build.gradle Modified: ofbiz/ofbiz-framework/trunk/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1844943=1844942=1844943=diff == --- ofbiz/ofbiz-framework/trunk/build.gradle (original) +++ ofbiz/ofbiz-framework/trunk/build.gradle Sat Oct 27 07:55:25 2018 @@ -117,7 +117,7 @@ dependencies { compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2' compile 'com.googlecode.ez-vcard:ez-vcard:0.9.10' compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20170515.1' -compile 'com.googlecode.libphonenumber:libphonenumber:8.8.7' +compile 'com.googlecode.libphonenumber:libphonenumber:8.9.16' compile 'com.ibm.icu:icu4j:60.2' compile 'com.lowagie:itext:2.1.7' // Don't update due to license change in newer versions, see OFBIZ-10455 compile 'com.sun.mail:javax.mail:1.6.0'