0018036: Accounting dimensions in gl items - Openbravo Issue Tracking System

# HG changeset patch # User Víctor Martínez Romanos <victor.martinez@openbravo.com> # Date 1311153673 -7200 # Node ID b61101e973a9fb141d6582e3aa808bf782deaea1 # Parent daf35b0bbbe1ac5d207c16b6d72da0da77e27e2e Fixed bug 18036: Accounting dimensions in gl items Added Accounting Dimensions fields inside the Financial Account | Add transaction window when GL Item is selected. diff --git a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml --- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml +++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml @@ -121,6 +121,18 @@ <default><![CDATA[N]]></default> <onCreateDefault/> </column> + <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_TRANSACTION"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> @@ -136,12 +148,21 @@ <foreign-key foreignTable="C_ACTIVITY" name="FIN_FINACC_TRANS_ACTIVITY"> <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/> </foreign-key> + <foreign-key foreignTable="C_BPARTNER" name="FIN_FINACC_TRANS_C_BPARTNER"> + <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/> + </foreign-key> + <foreign-key foreignTable="C_SALESREGION" name="FIN_FINACC_TRANS_C_SALESREGION"> + <reference local="C_SALESREGION_ID" foreign="C_SALESREGION_ID"/> + </foreign-key> <foreign-key foreignTable="C_CAMPAIGN" name="FIN_FINACC_TRANS_CAMPAIGN"> <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/> </foreign-key> <foreign-key foreignTable="FIN_RECONCILIATION" name="FIN_FINACC_TRANS_FIN_RECONCILE"> <reference local="FIN_RECONCILIATION_ID" foreign="FIN_RECONCILIATION_ID"/> </foreign-key> + <foreign-key foreignTable="M_PRODUCT" name="FIN_FINACC_TRANS_M_PRODUCT"> + <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/> + </foreign-key> <foreign-key foreignTable="C_PROJECT" name="FIN_FINACC_TRANS_PROJECT"> <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/> </foreign-key> # HG changeset patch # User Víctor Martínez Romanos <victor.martinez@openbravo.com> # Date 1311153673 -7200 # Node ID b61101e973a9fb141d6582e3aa808bf782deaea1 # Parent daf35b0bbbe1ac5d207c16b6d72da0da77e27e2e Fixed bug 18036: Accounting dimensions in gl items Added Accounting Dimensions fields inside the Financial Account | Add transaction window when GL Item is selected. diff --git a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml --- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml +++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml @@ -121,6 +121,18 @@ <default><![CDATA[N]]></default> <onCreateDefault/> </column> + <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_TRANSACTION"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> @@ -136,12 +148,21 @@ <foreign-key foreignTable="C_ACTIVITY" name="FIN_FINACC_TRANS_ACTIVITY"> <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/> </foreign-key> + <foreign-key foreignTable="C_BPARTNER" name="FIN_FINACC_TRANS_C_BPARTNER"> + <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/> + </foreign-key> + <foreign-key foreignTable="C_SALESREGION" name="FIN_FINACC_TRANS_C_SALESREGION"> + <reference local="C_SALESREGION_ID" foreign="C_SALESREGION_ID"/> + </foreign-key> <foreign-key foreignTable="C_CAMPAIGN" name="FIN_FINACC_TRANS_CAMPAIGN"> <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/> </foreign-key> <foreign-key foreignTable="FIN_RECONCILIATION" name="FIN_FINACC_TRANS_FIN_RECONCILE"> <reference local="FIN_RECONCILIATION_ID" foreign="FIN_RECONCILIATION_ID"/> </foreign-key> + <foreign-key foreignTable="M_PRODUCT" name="FIN_FINACC_TRANS_M_PRODUCT"> + <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/> + </foreign-key> <foreign-key foreignTable="C_PROJECT" name="FIN_FINACC_TRANS_PROJECT"> <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/> </foreign-key> diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -267934,6 +267934,40 @@  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[50C572BF5B0E46319FC8F32201A8408E]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Business Partner]]></NAME> + <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION> + <HELP><![CDATA[A Business Partner is anyone with whom you transact. This can include a customer, vendor, employee or any combination of these.]]></HELP> + <COLUMNNAME><![CDATA[C_Bpartner_ID]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> + <AD_REFERENCE_VALUE_ID><![CDATA[800057]]></AD_REFERENCE_VALUE_ID> + <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[350]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[34]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[51459B51FC494A6D90DF9D9CE5A89653]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -268002,6 +268036,40 @@  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[5170629668EC427DBABD5D9A6B2C15DA]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Product]]></NAME> + <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION> + <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP> + <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> + <AD_REFERENCE_VALUE_ID><![CDATA[800060]]></AD_REFERENCE_VALUE_ID> + <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[360]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[35]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[521EA21E6E7577ABE040007F010016C0]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -293074,6 +293142,39 @@  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[7DBD795B18BA4B6589BAADF480BD0440]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Sales Region]]></NAME> + <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION> + <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP> + <COLUMNNAME><![CDATA[C_Salesregion_ID]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[370]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[210]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[36]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[7DC33C4275593636E040007F01001C0B]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java --- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java +++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java @@ -752,16 +752,26 @@ transaction.getProject() != null ? transaction.getProject().getId() : ""); FieldProviderFactory.setField(data[0], "C_Campaign_ID", transaction.getSalesCampaign() != null ? transaction.getSalesCampaign().getId() : ""); + FieldProviderFactory.setField(data[0], "M_Product_ID", + transaction.getProduct() != null ? transaction.getProduct().getId() : ""); + FieldProviderFactory.setField(data[0], "C_SalesRegion_ID", + transaction.getSalesRegion() != null ? transaction.getSalesRegion().getId() : ""); FieldProviderFactory.setField(data[0], "lineno", transaction.getLineNo().toString()); // This lines can be uncommented when User1 and User2 are implemented // FieldProviderFactory.setField(data[0], "User1_ID", transaction.getNdDimension().getId()); // FieldProviderFactory.setField(data[0], "User2_ID", transaction.getNdDimension().getId()); FieldProviderFactory.setField(data[0], "FIN_Payment_ID", transaction.getFinPayment() != null ? transaction.getFinPayment().getId() : ""); - FieldProviderFactory - .setField(data[0], "C_BPartner_ID", (transaction.getFinPayment() != null && transaction - .getFinPayment().getBusinessPartner() != null) ? transaction.getFinPayment() - .getBusinessPartner().getId() : ""); + final String cBPartnerId; + if (transaction.getFinPayment() != null + && transaction.getFinPayment().getBusinessPartner() != null) { + cBPartnerId = transaction.getFinPayment().getBusinessPartner().getId(); + } else if (transaction.getBusinessPartner() != null) { + cBPartnerId = transaction.getBusinessPartner().getId(); + } else { + cBPartnerId = ""; + } + FieldProviderFactory.setField(data[0], "C_BPartner_ID", cBPartnerId); FieldProviderFactory.setField(data[0], "UsedCredit", transaction.getFinPayment() != null ? transaction.getFinPayment().getUsedCredit() .toString() : ""); # HG changeset patch # User Víctor Martínez Romanos <victor.martinez@openbravo.com> # Date 1311153673 -7200 # Node ID 064f705b40376ed4d4db0638d3f419319e97080e # Parent b0d4cb84321c797b6e1060de99f39c857199d0c6 Fixed bug 18036: Accounting dimensions in gl items Added Accounting Dimensions fields inside the Financial Account | Add transaction window when GL Item is selected. diff --git a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml --- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml +++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml @@ -121,6 +121,18 @@ <default><![CDATA[N]]></default> <onCreateDefault/> </column> + <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_TRANSACTION"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> @@ -136,12 +148,21 @@ <foreign-key foreignTable="C_ACTIVITY" name="FIN_FINACC_TRANS_ACTIVITY"> <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/> </foreign-key> + <foreign-key foreignTable="C_BPARTNER" name="FIN_FINACC_TRANS_C_BPARTNER"> + <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/> + </foreign-key> + <foreign-key foreignTable="C_SALESREGION" name="FIN_FINACC_TRANS_C_SALESREGION"> + <reference local="C_SALESREGION_ID" foreign="C_SALESREGION_ID"/> + </foreign-key> <foreign-key foreignTable="C_CAMPAIGN" name="FIN_FINACC_TRANS_CAMPAIGN"> <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/> </foreign-key> <foreign-key foreignTable="FIN_RECONCILIATION" name="FIN_FINACC_TRANS_FIN_RECONCILE"> <reference local="FIN_RECONCILIATION_ID" foreign="FIN_RECONCILIATION_ID"/> </foreign-key> + <foreign-key foreignTable="M_PRODUCT" name="FIN_FINACC_TRANS_M_PRODUCT"> + <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/> + </foreign-key> <foreign-key foreignTable="C_PROJECT" name="FIN_FINACC_TRANS_PROJECT"> <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/> </foreign-key> diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -267934,6 +267934,40 @@  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[50C572BF5B0E46319FC8F32201A8408E]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Business Partner]]></NAME> + <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION> + <HELP><![CDATA[A Business Partner is anyone with whom you transact. This can include a customer, vendor, employee or any combination of these.]]></HELP> + <COLUMNNAME><![CDATA[C_Bpartner_ID]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> + <AD_REFERENCE_VALUE_ID><![CDATA[800057]]></AD_REFERENCE_VALUE_ID> + <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[350]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[34]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[51459B51FC494A6D90DF9D9CE5A89653]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -268002,6 +268036,40 @@  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[5170629668EC427DBABD5D9A6B2C15DA]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Product]]></NAME> + <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION> + <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP> + <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> + <AD_REFERENCE_VALUE_ID><![CDATA[800060]]></AD_REFERENCE_VALUE_ID> + <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[360]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[35]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[521EA21E6E7577ABE040007F010016C0]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -293074,6 +293142,39 @@  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[7DBD795B18BA4B6589BAADF480BD0440]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Sales Region]]></NAME> + <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION> + <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP> + <COLUMNNAME><![CDATA[C_Salesregion_ID]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[370]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[210]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[36]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[7DC33C4275593636E040007F01001C0B]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java --- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java +++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java @@ -752,16 +752,26 @@ transaction.getProject() != null ? transaction.getProject().getId() : ""); FieldProviderFactory.setField(data[0], "C_Campaign_ID", transaction.getSalesCampaign() != null ? transaction.getSalesCampaign().getId() : ""); + FieldProviderFactory.setField(data[0], "M_Product_ID", + transaction.getProduct() != null ? transaction.getProduct().getId() : ""); + FieldProviderFactory.setField(data[0], "C_SalesRegion_ID", + transaction.getSalesRegion() != null ? transaction.getSalesRegion().getId() : ""); FieldProviderFactory.setField(data[0], "lineno", transaction.getLineNo().toString()); // This lines can be uncommented when User1 and User2 are implemented // FieldProviderFactory.setField(data[0], "User1_ID", transaction.getNdDimension().getId()); // FieldProviderFactory.setField(data[0], "User2_ID", transaction.getNdDimension().getId()); FieldProviderFactory.setField(data[0], "FIN_Payment_ID", transaction.getFinPayment() != null ? transaction.getFinPayment().getId() : ""); - FieldProviderFactory - .setField(data[0], "C_BPartner_ID", (transaction.getFinPayment() != null && transaction - .getFinPayment().getBusinessPartner() != null) ? transaction.getFinPayment() - .getBusinessPartner().getId() : ""); + final String cBPartnerId; + if (transaction.getFinPayment() != null + && transaction.getFinPayment().getBusinessPartner() != null) { + cBPartnerId = transaction.getFinPayment().getBusinessPartner().getId(); + } else if (transaction.getBusinessPartner() != null) { + cBPartnerId = transaction.getBusinessPartner().getId(); + } else { + cBPartnerId = ""; + } + FieldProviderFactory.setField(data[0], "C_BPartner_ID", cBPartnerId); FieldProviderFactory.setField(data[0], "UsedCredit", transaction.getFinPayment() != null ? transaction.getFinPayment().getUsedCredit() .toString() : "");

Notes
(0039257) hgbot (developer) 2011-07-20 11:18	Repository: erp/pmods/org.openbravo.advpaymentmngt Changeset: 507288f370d535f439947ed95ec4b67783986043 Author: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> Date: Wed Jul 20 11:18:41 2011 +0200 URL: http://code.openbravo.com/erp/pmods/org.openbravo.advpaymentmngt/rev/507288f370d535f439947ed95ec4b67783986043 [^] Issue 18036: Accounting dimensions in gl items Added Accounting Dimensions fields inside the Financial Account \| Add transaction window when GL Item is selected. --- M src-db/database/sourcedata/AD_REFERENCE.xml M src-db/database/sourcedata/AD_TEXTINTERFACES.xml M src-db/database/sourcedata/OBUISEL_SELECTOR.xml M src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml M src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html M src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java M src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml M src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java ---

(0039258) vmromanos (viewer) 2011-07-20 11:19	Pending to push to 2.50 because the repo is currently frozen

(0039467) hgbot (developer) 2011-07-28 09:44	Repository: erp/stable/2.50 Changeset: c2d278ddeb669bd2b36b05bcc4c6aad17d563133 Author: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> Date: Wed Jul 20 11:21:13 2011 +0200 URL: http://code.openbravo.com/erp/stable/2.50/rev/c2d278ddeb669bd2b36b05bcc4c6aad17d563133 [^] Fixed bug 18036: Accounting dimensions in gl items Added Accounting Dimensions fields inside the Financial Account \| Add transaction window when GL Item is selected. --- M src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml M src-db/database/sourcedata/AD_COLUMN.xml M src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java ---

(0039478) psanjuan (viewer) 2011-07-28 11:09	this is not properly working because Activity element is not $Element_AC but $Element_AY. Please change that. See screen attached. Same applies to 3.0 code.

(0039884) hgbot (developer) 2011-08-05 09:31	Repository: erp/pmods/org.openbravo.advpaymentmngt Changeset: e82e8a4acb80e3ec227cb3f4800da0e8d1dc7824 Author: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> Date: Fri Aug 05 09:32:59 2011 +0200 URL: http://code.openbravo.com/erp/pmods/org.openbravo.advpaymentmngt/rev/e82e8a4acb80e3ec227cb3f4800da0e8d1dc7824 [^] Fixed bug 18036: $Element_AY represents activity and not _AC --- M src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html M src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java M src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml ---

(0040351) psanjuan (viewer) 2011-08-19 11:17	fixed and working

Issue History
Date Modified	Username	Field	Change
2011-07-20 10:08	vmromanos	Type	defect => backport
2011-07-20 10:08	vmromanos	fix_in_branch	=> 2.50
2011-07-20 11:15	vmromanos	Assigned To	eduardo_Argal => vmromanos
2011-07-20 11:18	hgbot	Checkin
2011-07-20 11:18	hgbot	Note Added: 0039257
2011-07-20 11:19	vmromanos	Note Added: 0039258
2011-07-20 11:23	vmromanos	File Added: 18036_core.diff
2011-07-28 09:44	hgbot	Checkin
2011-07-28 09:44	hgbot	Note Added: 0039467
2011-07-28 09:44	hgbot	Status	scheduled => resolved
2011-07-28 09:44	hgbot	Resolution	open => fixed
2011-07-28 09:44	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/stable/2.50/rev/c2d278ddeb669bd2b36b05bcc4c6aad17d563133 [^]
2011-07-28 11:09	psanjuan	Note Added: 0039478
2011-07-28 11:09	psanjuan	Status	resolved => new
2011-07-28 11:11	psanjuan	File Added: 18036.png
2011-08-05 09:30	vmromanos	Status	new => scheduled
2011-08-05 09:30	vmromanos	fix_in_branch	2.50 => pi
2011-08-05 09:31	hgbot	Checkin
2011-08-05 09:31	hgbot	Note Added: 0039884
2011-08-05 09:31	hgbot	Status	scheduled => resolved
2011-08-05 09:31	hgbot	Fixed in SCM revision	http://code.openbravo.com/erp/stable/2.50/rev/c2d278ddeb669bd2b36b05bcc4c6aad17d563133 [^] => http://code.openbravo.com/erp/pmods/org.openbravo.advpaymentmngt/rev/e82e8a4acb80e3ec227cb3f4800da0e8d1dc7824 [^]
2011-08-19 11:17	psanjuan	Note Added: 0040351
2011-08-19 11:17	psanjuan	Status	resolved => closed
2011-08-19 11:17	psanjuan	fix_in_branch	pi =>
2011-08-29 12:28	psanjuan	Description Updated	View Revisions