[OpenbravoERP-commits] devel/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/5dbcb5394a22 changeset: 33639:5dbcb5394a22 user: Mark gmail.com> date: Thu Mar 01 18:45:40 2018 -0500 summary: Fixes issue 37960: When not stocked product is exploded before booking the order and price includes taxes, Gross Unit Price is updated to 0. When the it is exploded a BOM line with not stock and the price list includes taxes then the M_EXPLODEBOMNOTSTOCK function was creating lines with the gross_unit_price, grosspricelist and line_gross_amount values, but it wasn't copying the grosspricestd column and it was taking 0 as default value. For this reason, when the order was booked, as the Explode process sets the grosspricestd to 0, M_PROMOTION_CALCULATE function uses and transfers it for the gross_unit_price column. To fix this issue, the grosspricestd is also inserted into the exploded lines at line insertion in M_EXPLODEBOMNOTSTOCK PL. details: https://code.openbravo.com/erp/devel/main/rev/6fa4003bddbe changeset: 33640:6fa4003bddbe user: Mark gmail.com> date: Mon Mar 05 12:10:20 2018 -0500 summary: Fixes issue 37963: Payment in Awaiting payment status is created when an invoice cannot be voided because document cancelled is a return A commit and close was performed at the end of the invoice processing to get the error message from the database, but it left all previously created data into the database just like the dummy payment when it is needed is to rollback the changes. If at the end of processing there is some error then a rollback is performed. Also the message is created from the pinstance object instead of retrieve the Instance data from the database. details: https://code.openbravo.com/erp/devel/main/rev/66d4469fe6c4 changeset: 33641:66d4469fe6c4 user: RM packaging bot openbravo.com> date: Tue Mar 06 14:39:25 2018 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/f71fb18c4538 changeset: 33642:f71fb18c4538 user: David Miguelez openbravo.com> date: Tue Mar 06 16:55:15 2018 +0100 summary: Related to Issue 37827: [ri][cr] Changed "x" expression for one that explains why we compare an id to a literal that is not going to match any Id details: https://code.openbravo.com/erp/devel/main/rev/8e42c27f5269 changeset: 33643:8e42c27f5269 user: Mark gmail.com> date: Thu Mar 01 09:53:36 2018 -0500 summary: Fixes issue 37977: Sales Invoice dimensional report showing merged cell Rearranged columns in subreport causing cells were merged details: https://code.openbravo.com/erp/devel/main/rev/14b1dec19bfc changeset: 33644:14b1dec19bfc user: RM packaging bot openbravo.com> date: Tue Mar 06 23:45:19 2018 + summary: CI: update AD_MODULE to version 33643 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 12 ++-- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/14b1dec19bfc changeset: 33644:14b1dec19bfc user: RM packaging bot openbravo.com> date: Tue Mar 06 23:45:19 2018 + summary: CI: update AD_MODULE to version 33643 details: https://code.openbravo.com/erp/devel/pi/rev/19b8956cb77e changeset: 33645:19b8956cb77e user: RM packaging bot openbravo.com> date: Tue Mar 06 23:59:15 2018 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +-
[OpenbravoERP-commits] devel/pi: Related to Issue 37827: [ri][cr] Changed "x" expressio...
details: https://code.openbravo.com/erp/devel/pi/rev/f71fb18c4538
changeset: 33642:f71fb18c4538
user: David Miguelez openbravo.com>
date: Tue Mar 06 16:55:15 2018 +0100
summary: Related to Issue 37827: [ri][cr] Changed "x" expression for one that
explains
why we compare an id to a literal that is not going to match any Id
diffstat:
src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryUtil.java | 3
++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r 66d4469fe6c4 -r f71fb18c4538
src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryUtil.java
--- a/src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryUtil.java
Tue Mar 06 14:39:25 2018 +
+++ b/src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryUtil.java
Tue Mar 06 16:55:15 2018 +0100
@@ -238,7 +238,8 @@
final Session session = OBDal.getInstance().getSession();
final Query sdQuery = session.createQuery(olHql);
sdQuery.setParameter("sdBinId", storageDetail.getStorageBin().getId());
-sdQuery.setParameter("toBindId", newStorageBin == null ? "x" :
newStorageBin.getId());
+sdQuery.setParameter("toBindId", newStorageBin != null ?
newStorageBin.getId()
+: "noStorageBinToIDShouldMatch");
sdQuery.setParameter("sdAttributeSetId",
storageDetail.getAttributeSetValue().getId());
sdQuery.setParameter("productId", storageDetail.getProduct().getId());
sdQuery.setParameter("uomId", storageDetail.getUOM().getId());
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 37977: Sales Invoice dimensional report sh...
details: https://code.openbravo.com/erp/devel/pi/rev/8e42c27f5269 changeset: 33643:8e42c27f5269 user: Mark gmail.com> date: Thu Mar 01 09:53:36 2018 -0500 summary: Fixes issue 37977: Sales Invoice dimensional report showing merged cell Rearranged columns in subreport causing cells were merged diffstat: src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses_srpt_doctypecount.jrxml | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (47 lines): diff -r f71fb18c4538 -r 8e42c27f5269 src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses_srpt_doctypecount.jrxml --- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses_srpt_doctypecount.jrxml Tue Mar 06 16:55:15 2018 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses_srpt_doctypecount.jrxml Thu Mar 01 09:53:36 2018 -0500 @@ -1,6 +1,6 @@ - + http://jasperreports.sourceforge.net/jasperreports; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd; name="ReportInvoiceCustomerDimensionalAnalyses_srpt_doctypecount" pageWidth="400" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="400" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" whenResourceMissingType="Error" uuid="dcc54a6a-4fa7-4363-918c-1e721f63d8f0"> @@ -97,7 +97,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -149,7 +149,7 @@ - + -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/d78a1c4c6616 changeset: 33640:d78a1c4c6616 user: RM packaging bot openbravo.com> date: Tue Mar 06 14:25:26 2018 + summary: CI: update AD_MODULE to version 33637 details: https://code.openbravo.com/erp/devel/pi/rev/66d4469fe6c4 changeset: 33641:66d4469fe6c4 user: RM packaging bot openbravo.com> date: Tue Mar 06 14:39:25 2018 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 12 ++-- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +-
[OpenbravoERP-commits] devel/main: 4 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/c6c43abf22f1 changeset: 33635:c6c43abf22f1 user: RM packaging bot openbravo.com> date: Mon Mar 05 22:40:08 2018 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/a477b160f8d7 changeset: 33636:a477b160f8d7 user: Atul Gaware openbravo.com> date: Fri Mar 02 14:03:45 2018 +0530 summary: Fixes Issue 37932: "Funds Transfer" process should have same behavior than manual creation of transactions When we create manual transaction default value of the organization is the financial account's organization. Funds Transfer Handler implements same logic to pick organization from financial account without doing a check whether current role has write access to the organization being used for the transaction. A writable check is done before using financial account organization in the transaction. If not current organization from the OBContext is used. details: https://code.openbravo.com/erp/devel/main/rev/ce890b7032d4 changeset: 33637:ce890b7032d4 user: David Miguelez openbravo.com> date: Tue Mar 06 09:07:37 2018 +0100 summary: Related to Issue 37932. Code Review changes. Added comment to explain the situation details: https://code.openbravo.com/erp/devel/main/rev/d78a1c4c6616 changeset: 33638:d78a1c4c6616 user: RM packaging bot openbravo.com> date: Tue Mar 06 14:25:26 2018 + summary: CI: update AD_MODULE to version 33637 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java | 10 +++- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/a477b160f8d7
changeset: 33636:a477b160f8d7
user: Atul Gaware openbravo.com>
date: Fri Mar 02 14:03:45 2018 +0530
summary: Fixes Issue 37932: "Funds Transfer" process should have same behavior
than manual creation of transactions
When we create manual transaction default value of the organization
is the financial account's organization. Funds Transfer Handler
implements same logic to pick organization from financial account
without doing a check whether current role has write access to the
organization being used for the transaction.
A writable check is done before using financial account organization
in the transaction. If not current organization from the OBContext
is used.
details: https://code.openbravo.com/erp/devel/pi/rev/ce890b7032d4
changeset: 33637:ce890b7032d4
user: David Miguelez openbravo.com>
date: Tue Mar 06 09:07:37 2018 +0100
summary: Related to Issue 37932. Code Review changes.
Added comment to explain the situation
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java
| 10 +-
1 files changed, 9 insertions(+), 1 deletions(-)
diffs (27 lines):
diff -r c6c43abf22f1 -r ce890b7032d4
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java
Mon Mar 05 22:40:08 2018 +
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java
Tue Mar 06 09:07:37 2018 +0100
@@ -35,6 +35,7 @@
import org.openbravo.base.weld.WeldUtils;
import org.openbravo.client.application.process.BaseProcessActionHandler;
import
org.openbravo.client.application.process.ResponseActionsBuilder.MessageType;
+import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.financial.FinancialUtils;
@@ -261,7 +262,14 @@
} else {
trx.setPaymentAmount(amount);
}
-trx.setOrganization(account.getOrganization());
+// If the user has access to the Organization of the Financial Account,
the Transaction is
+// created for it. If not, the Organization of the context is used instead
+if (OBContext.getOBContext().getWritableOrganizations()
+.contains(account.getOrganization().getId())) {
+ trx.setOrganization(account.getOrganization());
+} else {
+ trx.setOrganization(OBContext.getOBContext().getCurrentOrganization());
+}
Long line = lineNoUtil.getNextLineNumber(account);
trx.setLineNo(line);
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 37960: When not stocked product is explode...
details: https://code.openbravo.com/erp/devel/pi/rev/5dbcb5394a22 changeset: 33638:5dbcb5394a22 user: Mark gmail.com> date: Thu Mar 01 18:45:40 2018 -0500 summary: Fixes issue 37960: When not stocked product is exploded before booking the order and price includes taxes, Gross Unit Price is updated to 0. When the it is exploded a BOM line with not stock and the price list includes taxes then the M_EXPLODEBOMNOTSTOCK function was creating lines with the gross_unit_price, grosspricelist and line_gross_amount values, but it wasn't copying the grosspricestd column and it was taking 0 as default value. For this reason, when the order was booked, as the Explode process sets the grosspricestd to 0, M_PROMOTION_CALCULATE function uses and transfers it for the gross_unit_price column. To fix this issue, the grosspricestd is also inserted into the exploded lines at line insertion in M_EXPLODEBOMNOTSTOCK PL. diffstat: src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml | 7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (31 lines): diff -r ce890b7032d4 -r 5dbcb5394a22 src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml --- a/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml Tue Mar 06 09:07:37 2018 +0100 +++ b/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml Thu Mar 01 18:45:40 2018 -0500 @@ -19,7 +19,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2013-2017 Openbravo SLU +* All portions are Copyright (C) 2013-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): __. / @@ -193,7 +193,7 @@ QuantityOrder, M_Product_Uom_ID, PriceStd, c_project_id, a_asset_id, c_costcenter_id, user1_id, user2_id, bom_parent_id, -gross_unit_price, grosspricelist, line_gross_amount, +gross_unit_price, grosspricelist, line_gross_amount, grosspricestd, c_aum, aumqty ) VALUES @@ -212,7 +212,8 @@ CUR_BOM_Line.QuantityOrder, CUR_BOM_Line.M_Product_UOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID), CUR_BOM_Line.c_project_id, CUR_BOM_Line.a_asset_id, CUR_BOM_Line.c_costcenter_id, CUR_BOM_Line.user1_id, CUR_BOM_Line.user2_id, v_Record_ID, -v_gross_unit_price, v_gross_price_list, v_line_gross_amount, v_aum, v_aumqty*CUR_BOM.BOMQty +v_gross_unit_price, v_gross_price_list, v_line_gross_amount, v_gross_unit_price, +v_aum, v_aumqty*CUR_BOM.BOMQty ); SELECT BASEAMOUNT INTO v_BaseAmount -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixes issue 37963: Payment in Awaiting payment status ...
details: https://code.openbravo.com/erp/devel/pi/rev/6fa4003bddbe
changeset: 33639:6fa4003bddbe
user: Mark gmail.com>
date: Mon Mar 05 12:10:20 2018 -0500
summary: Fixes issue 37963: Payment in Awaiting payment status is created
when an invoice
cannot be voided because document cancelled is a return
A commit and close was performed at the end of the invoice processing to get the
error message from the database, but it left all previously created data into
the
database just like the dummy payment when it is needed is to rollback the
changes.
If at the end of processing there is some error then a rollback is performed.
Also the message is created from the pinstance object instead of retrieve the
Instance
data from the database.
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
| 12 +-
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (37 lines):
diff -r 5dbcb5394a22 -r 6fa4003bddbe
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
Thu Mar 01 18:45:40 2018 -0500
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
Mon Mar 05 12:10:20 2018 -0500
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2017 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
*
@@ -544,12 +544,11 @@
OBContext.setAdminMode();
try {
- // on error close popup
+ // on error close popup and rollback
if (pinstance.getResult() == 0L) {
-OBDal.getInstance().commitAndClose();
-final PInstanceProcessData[] pinstanceData =
PInstanceProcessData.select(this,
-pinstance.getId());
-myMessage = Utility.getProcessInstanceMessage(this, vars,
pinstanceData);
+OBDal.getInstance().rollbackAndClose();
+myMessage = Utility.translateError(this, vars, vars.getLanguage(),
pinstance
+.getErrorMsg().replaceFirst("@ERROR=", ""));
log4j.debug(myMessage.getMessage());
vars.setMessage(strTabId, myMessage);
@@ -557,6 +556,7 @@
if (strWindowPath.equals(""))
strWindowPath = strDefaultServlet;
printPageClosePopUp(response, vars, strWindowPath);
+
return;
}
} finally {
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
