details: https://code.openbravo.com/erp/devel/pi/rev/3fbb751a88c0
changeset: 19797:3fbb751a88c0
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Feb 26 12:46:18 2013 +0100
summary: Fixes issue 23030
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
| 6 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml
| 63 ++++++++++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionModify.java
| 21 +++
3 files changed, 87 insertions(+), 3 deletions(-)
diffs (162 lines):
diff -r 6fd3af354f15 -r 3fbb751a88c0
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Tue Feb 26 12:42:36 2013 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Tue Feb 26 12:46:18 2013 +0100
@@ -1182,7 +1182,7 @@
<!--38816E45B3B3435BA5A9D7469352D5CE-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--38816E45B3B3435BA5A9D7469352D5CE-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
<!--38816E45B3B3435BA5A9D7469352D5CE-->
<AD_ELEMENT_ID><![CDATA[BB1B0593596A4F63B2553183B11B0D28]]></AD_ELEMENT_ID>
-<!--38816E45B3B3435BA5A9D7469352D5CE-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--38816E45B3B3435BA5A9D7469352D5CE-->
<ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
<!--38816E45B3B3435BA5A9D7469352D5CE-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--38816E45B3B3435BA5A9D7469352D5CE-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--38816E45B3B3435BA5A9D7469352D5CE-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -6628,7 +6628,7 @@
<!--A37C6F84AA383F50E040007F01006E35-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--A37C6F84AA383F50E040007F01006E35-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
<!--A37C6F84AA383F50E040007F01006E35-->
<AD_ELEMENT_ID><![CDATA[613]]></AD_ELEMENT_ID>
-<!--A37C6F84AA383F50E040007F01006E35-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A37C6F84AA383F50E040007F01006E35-->
<ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
<!--A37C6F84AA383F50E040007F01006E35-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--A37C6F84AA383F50E040007F01006E35-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A37C6F84AA383F50E040007F01006E35-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -6664,7 +6664,7 @@
<!--A37C6F84AA393F50E040007F01006E35-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--A37C6F84AA393F50E040007F01006E35-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
<!--A37C6F84AA393F50E040007F01006E35-->
<AD_ELEMENT_ID><![CDATA[614]]></AD_ELEMENT_ID>
-<!--A37C6F84AA393F50E040007F01006E35-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A37C6F84AA393F50E040007F01006E35-->
<ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
<!--A37C6F84AA393F50E040007F01006E35-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--A37C6F84AA393F50E040007F01006E35-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A37C6F84AA393F50E040007F01006E35-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
diff -r 6fd3af354f15 -r 3fbb751a88c0
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml
Tue Feb 26 12:42:36 2013 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml
Tue Feb 26 12:46:18 2013 +0100
@@ -1,5 +1,26 @@
<?xml version='1.0' encoding='UTF-8'?>
<data>
+<!--0F62C351CBE74F9F856E8383AF932DD6--><AD_PROCESS_PARA>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<AD_PROCESS_PARA_ID><![CDATA[0F62C351CBE74F9F856E8383AF932DD6]]></AD_PROCESS_PARA_ID>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0F62C351CBE74F9F856E8383AF932DD6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0F62C351CBE74F9F856E8383AF932DD6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0F62C351CBE74F9F856E8383AF932DD6--> <NAME><![CDATA[1st Dimension]]></NAME>
+<!--0F62C351CBE74F9F856E8383AF932DD6--> <DESCRIPTION><![CDATA[A display of
optional elements that are previously defined for this account
combination.]]></DESCRIPTION>
+<!--0F62C351CBE74F9F856E8383AF932DD6--> <HELP><![CDATA[The user defined
element displays the optional elements that have been defined for this account
combination.]]></HELP>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--0F62C351CBE74F9F856E8383AF932DD6--> <SEQNO><![CDATA[90]]></SEQNO>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<AD_REFERENCE_VALUE_ID><![CDATA[0E0D1661E18E4E05A118785A7CF146B8]]></AD_REFERENCE_VALUE_ID>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<COLUMNNAME><![CDATA[User1_ID]]></COLUMNNAME>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0F62C351CBE74F9F856E8383AF932DD6--> <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<DEFAULTVALUE><![CDATA[@User1_ID@]]></DEFAULTVALUE>
+<!--0F62C351CBE74F9F856E8383AF932DD6-->
<AD_ELEMENT_ID><![CDATA[5491745132934260A5F00EF178EBC04B]]></AD_ELEMENT_ID>
+<!--0F62C351CBE74F9F856E8383AF932DD6--></AD_PROCESS_PARA>
+
<!--1913962D2952412B84B8CDD3BC17026F--><AD_PROCESS_PARA>
<!--1913962D2952412B84B8CDD3BC17026F-->
<AD_PROCESS_PARA_ID><![CDATA[1913962D2952412B84B8CDD3BC17026F]]></AD_PROCESS_PARA_ID>
<!--1913962D2952412B84B8CDD3BC17026F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -42,6 +63,27 @@
<!--29603F2454644A24997830BB4F30C6C1-->
<AD_ELEMENT_ID><![CDATA[152]]></AD_ELEMENT_ID>
<!--29603F2454644A24997830BB4F30C6C1--></AD_PROCESS_PARA>
+<!--3B379D35276D40B490131C3A8A000758--><AD_PROCESS_PARA>
+<!--3B379D35276D40B490131C3A8A000758-->
<AD_PROCESS_PARA_ID><![CDATA[3B379D35276D40B490131C3A8A000758]]></AD_PROCESS_PARA_ID>
+<!--3B379D35276D40B490131C3A8A000758-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3B379D35276D40B490131C3A8A000758--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3B379D35276D40B490131C3A8A000758--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3B379D35276D40B490131C3A8A000758--> <NAME><![CDATA[2nd Dimension]]></NAME>
+<!--3B379D35276D40B490131C3A8A000758--> <DESCRIPTION><![CDATA[A display of
optional elements that are previously defined for this account
combination.]]></DESCRIPTION>
+<!--3B379D35276D40B490131C3A8A000758--> <HELP><![CDATA[The user defined
element displays the optional elements that have been defined for this account
combination.]]></HELP>
+<!--3B379D35276D40B490131C3A8A000758-->
<AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--3B379D35276D40B490131C3A8A000758--> <SEQNO><![CDATA[100]]></SEQNO>
+<!--3B379D35276D40B490131C3A8A000758-->
<AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--3B379D35276D40B490131C3A8A000758-->
<AD_REFERENCE_VALUE_ID><![CDATA[1850A5390D97470EBB35A3A5F43AB533]]></AD_REFERENCE_VALUE_ID>
+<!--3B379D35276D40B490131C3A8A000758-->
<COLUMNNAME><![CDATA[User2_ID]]></COLUMNNAME>
+<!--3B379D35276D40B490131C3A8A000758-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3B379D35276D40B490131C3A8A000758-->
<FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--3B379D35276D40B490131C3A8A000758-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3B379D35276D40B490131C3A8A000758--> <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--3B379D35276D40B490131C3A8A000758-->
<DEFAULTVALUE><![CDATA[@User2_ID@]]></DEFAULTVALUE>
+<!--3B379D35276D40B490131C3A8A000758-->
<AD_ELEMENT_ID><![CDATA[614]]></AD_ELEMENT_ID>
+<!--3B379D35276D40B490131C3A8A000758--></AD_PROCESS_PARA>
+
<!--4F5EE1017087464EAD95F3CCA4C5AFA5--><AD_PROCESS_PARA>
<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->
<AD_PROCESS_PARA_ID><![CDATA[4F5EE1017087464EAD95F3CCA4C5AFA5]]></AD_PROCESS_PARA_ID>
<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -249,6 +291,27 @@
<!--D04309BB0DA14B5789FB76C141ED464C-->
<AD_ELEMENT_ID><![CDATA[152]]></AD_ELEMENT_ID>
<!--D04309BB0DA14B5789FB76C141ED464C--></AD_PROCESS_PARA>
+<!--DBCE2E15DB754530B9B039AFD40203DE--><AD_PROCESS_PARA>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<AD_PROCESS_PARA_ID><![CDATA[DBCE2E15DB754530B9B039AFD40203DE]]></AD_PROCESS_PARA_ID>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DBCE2E15DB754530B9B039AFD40203DE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DBCE2E15DB754530B9B039AFD40203DE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DBCE2E15DB754530B9B039AFD40203DE--> <NAME><![CDATA[Cost Center]]></NAME>
+<!--DBCE2E15DB754530B9B039AFD40203DE--> <DESCRIPTION><![CDATA[Division that
adds to the cost of an organization]]></DESCRIPTION>
+<!--DBCE2E15DB754530B9B039AFD40203DE--> <HELP><![CDATA[Division that adds to
the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--DBCE2E15DB754530B9B039AFD40203DE--> <SEQNO><![CDATA[80]]></SEQNO>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<AD_REFERENCE_VALUE_ID><![CDATA[DEE6B917B36D4648B2DA729FC2872CF4]]></AD_REFERENCE_VALUE_ID>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<COLUMNNAME><![CDATA[C_Costcenter_ID]]></COLUMNNAME>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--DBCE2E15DB754530B9B039AFD40203DE--> <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<DEFAULTVALUE><![CDATA[@C_Costcenter_ID@]]></DEFAULTVALUE>
+<!--DBCE2E15DB754530B9B039AFD40203DE-->
<AD_ELEMENT_ID><![CDATA[BB1B0593596A4F63B2553183B11B0D28]]></AD_ELEMENT_ID>
+<!--DBCE2E15DB754530B9B039AFD40203DE--></AD_PROCESS_PARA>
+
<!--E2EB0EFA3CE741C1848590D270CEBE2B--><AD_PROCESS_PARA>
<!--E2EB0EFA3CE741C1848590D270CEBE2B-->
<AD_PROCESS_PARA_ID><![CDATA[E2EB0EFA3CE741C1848590D270CEBE2B]]></AD_PROCESS_PARA_ID>
<!--E2EB0EFA3CE741C1848590D270CEBE2B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6fd3af354f15 -r 3fbb751a88c0
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionModify.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionModify.java
Tue Feb 26 12:42:36 2013 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionModify.java
Tue Feb 26 12:46:18 2013 +0100
@@ -30,7 +30,10 @@
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.common.businesspartner.BusinessPartner;
import org.openbravo.model.common.plm.Product;
+import org.openbravo.model.financialmgmt.accounting.Costcenter;
import
org.openbravo.model.financialmgmt.accounting.FIN_FinancialAccountAccounting;
+import org.openbravo.model.financialmgmt.accounting.UserDimension1;
+import org.openbravo.model.financialmgmt.accounting.UserDimension2;
import org.openbravo.model.financialmgmt.gl.GLItem;
import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
import org.openbravo.model.financialmgmt.payment.FIN_Payment;
@@ -90,6 +93,9 @@
final String strCampaignId = (String)
bundle.getParams().get("cCampaignId");
final String strActivityId = (String)
bundle.getParams().get("cActivityId");
final String strSalesRegionId = (String)
bundle.getParams().get("cSalesregionId");
+ final String strCostCenterId = (String)
bundle.getParams().get("cCostcenterId");
+ final String strUser1Id = (String) bundle.getParams().get("user1Id");
+ final String strUser2Id = (String) bundle.getParams().get("user2Id");
transaction.setProcessed(false);
OBDal.getInstance().save(transaction);
OBDal.getInstance().flush();
@@ -130,6 +136,21 @@
} else {
transaction.setSalesRegion(null);
}
+ if (strCostCenterId != null && !"".equals(strCostCenterId)) {
+ transaction.setCostCenter(OBDal.getInstance().get(Costcenter.class,
strCostCenterId));
+ } else {
+ transaction.setCostCenter(null);
+ }
+ if (strUser1Id != null && !"".equals(strUser1Id)) {
+
transaction.setStDimension(OBDal.getInstance().get(UserDimension1.class,
strUser1Id));
+ } else {
+ transaction.setStDimension(null);
+ }
+ if (strUser2Id != null && !"".equals(strUser2Id)) {
+
transaction.setNdDimension(OBDal.getInstance().get(UserDimension2.class,
strUser2Id));
+ } else {
+ transaction.setNdDimension(null);
+ }
String description = transaction.getDescription();
String oldGlItemString = Utility.messageBD(bundle.getConnection(),
"APRM_GLItem", bundle
.getContext().getLanguage())
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
