details: https://code.openbravo.com/erp/stable/2.50/rev/c2d278ddeb66 changeset: 9588:c2d278ddeb66 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jul 20 11:21:13 2011 +0200 summary: Fixed bug 18036: Accounting dimensions in gl items
Added Accounting Dimensions fields inside the Financial Account | Add transaction window when GL Item is selected. details: https://code.openbravo.com/erp/stable/2.50/rev/33dbe7251c11 changeset: 9589:33dbe7251c11 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jul 27 11:34:53 2011 +0200 summary: Fixed bug 18093: Added contact field inside Organization | Information details: https://code.openbravo.com/erp/stable/2.50/rev/cba8150a1b95 changeset: 9590:cba8150a1b95 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jul 27 12:19:53 2011 +0200 summary: Issue 18093: removed garbage from OB3 diffstat: src-db/database/model/tables/AD_ORGINFO.xml | 7 + src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml | 21 + src-db/database/sourcedata/AD_COLUMN.xml | 134 ++++++++++ src-db/database/sourcedata/AD_FIELD.xml | 24 + src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 18 +- 5 files changed, 200 insertions(+), 4 deletions(-) diffs (truncated from 301 to 300 lines): diff -r a4b00a7a3b4a -r cba8150a1b95 src-db/database/model/tables/AD_ORGINFO.xml --- a/src-db/database/model/tables/AD_ORGINFO.xml Thu Jul 28 08:23:57 2011 +0200 +++ b/src-db/database/model/tables/AD_ORGINFO.xml Wed Jul 27 12:19:53 2011 +0200 @@ -69,6 +69,10 @@ <default/> <onCreateDefault/> </column> + <column name="AD_USER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_ORG" name="AD_ORG_AD_ORGINFO" onDelete="cascade"> <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> </foreign-key> @@ -84,6 +88,9 @@ <foreign-key foreignTable="AD_IMAGE" name="AD_ORGINFO_IMAGEDOCUM"> <reference local="YOUR_COMPANY_DOCUMENT_IMAGE" foreign="AD_IMAGE_ID"/> </foreign-key> + <foreign-key foreignTable="AD_USER" name="AD_USER_AD_ORGINFO"> + <reference local="AD_USER_ID" foreign="AD_USER_ID"/> + </foreign-key> <foreign-key foreignTable="C_LOCATION" name="C_LOCATION_AD_ORGINFO"> <reference local="C_LOCATION_ID" foreign="C_LOCATION_ID"/> </foreign-key> diff -r a4b00a7a3b4a -r cba8150a1b95 src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml --- a/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Thu Jul 28 08:23:57 2011 +0200 +++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml Wed Jul 27 12:19:53 2011 +0200 @@ -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 -r a4b00a7a3b4a -r cba8150a1b95 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Jul 28 08:23:57 2011 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Jul 27 12:19:53 2011 +0200 @@ -267934,6 +267934,40 @@ <!--4F6FBAF242EE43B98923BAC82AB94165--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--4F6FBAF242EE43B98923BAC82AB94165--></AD_COLUMN> +<!--50C572BF5B0E46319FC8F32201A8408E--><AD_COLUMN> +<!--50C572BF5B0E46319FC8F32201A8408E--> <AD_COLUMN_ID><![CDATA[50C572BF5B0E46319FC8F32201A8408E]]></AD_COLUMN_ID> +<!--50C572BF5B0E46319FC8F32201A8408E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--50C572BF5B0E46319FC8F32201A8408E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--50C572BF5B0E46319FC8F32201A8408E--> <NAME><![CDATA[Business Partner]]></NAME> +<!--50C572BF5B0E46319FC8F32201A8408E--> <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION> +<!--50C572BF5B0E46319FC8F32201A8408E--> <HELP><![CDATA[A Business Partner is anyone with whom you transact. This can include a customer, vendor, employee or any combination of these.]]></HELP> +<!--50C572BF5B0E46319FC8F32201A8408E--> <COLUMNNAME><![CDATA[C_Bpartner_ID]]></COLUMNNAME> +<!--50C572BF5B0E46319FC8F32201A8408E--> <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> +<!--50C572BF5B0E46319FC8F32201A8408E--> <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> +<!--50C572BF5B0E46319FC8F32201A8408E--> <AD_REFERENCE_VALUE_ID><![CDATA[800057]]></AD_REFERENCE_VALUE_ID> +<!--50C572BF5B0E46319FC8F32201A8408E--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISKEY><![CDATA[N]]></ISKEY> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--50C572BF5B0E46319FC8F32201A8408E--> <SEQNO><![CDATA[350]]></SEQNO> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--50C572BF5B0E46319FC8F32201A8408E--> <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--50C572BF5B0E46319FC8F32201A8408E--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--50C572BF5B0E46319FC8F32201A8408E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--50C572BF5B0E46319FC8F32201A8408E--> <POSITION><![CDATA[34]]></POSITION> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--50C572BF5B0E46319FC8F32201A8408E--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--50C572BF5B0E46319FC8F32201A8408E--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--50C572BF5B0E46319FC8F32201A8408E--></AD_COLUMN> + <!--51459B51FC494A6D90DF9D9CE5A89653--><AD_COLUMN> <!--51459B51FC494A6D90DF9D9CE5A89653--> <AD_COLUMN_ID><![CDATA[51459B51FC494A6D90DF9D9CE5A89653]]></AD_COLUMN_ID> <!--51459B51FC494A6D90DF9D9CE5A89653--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -268002,6 +268036,40 @@ <!--515A9DFD91C243D3BECAA9D0149063C4--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--515A9DFD91C243D3BECAA9D0149063C4--></AD_COLUMN> +<!--5170629668EC427DBABD5D9A6B2C15DA--><AD_COLUMN> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <AD_COLUMN_ID><![CDATA[5170629668EC427DBABD5D9A6B2C15DA]]></AD_COLUMN_ID> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <NAME><![CDATA[Product]]></NAME> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <AD_REFERENCE_VALUE_ID><![CDATA[800060]]></AD_REFERENCE_VALUE_ID> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISKEY><![CDATA[N]]></ISKEY> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <SEQNO><![CDATA[360]]></SEQNO> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <POSITION><![CDATA[35]]></POSITION> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--5170629668EC427DBABD5D9A6B2C15DA--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--5170629668EC427DBABD5D9A6B2C15DA--></AD_COLUMN> + <!--521EA21E6E7577ABE040007F010016C0--><AD_COLUMN> <!--521EA21E6E7577ABE040007F010016C0--> <AD_COLUMN_ID><![CDATA[521EA21E6E7577ABE040007F010016C0]]></AD_COLUMN_ID> <!--521EA21E6E7577ABE040007F010016C0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -293074,6 +293142,39 @@ <!--7C4AEC0BF04F4588A2D26D46E1EE0E7B--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--7C4AEC0BF04F4588A2D26D46E1EE0E7B--></AD_COLUMN> +<!--7DBD795B18BA4B6589BAADF480BD0440--><AD_COLUMN> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <AD_COLUMN_ID><![CDATA[7DBD795B18BA4B6589BAADF480BD0440]]></AD_COLUMN_ID> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <NAME><![CDATA[Sales Region]]></NAME> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <COLUMNNAME><![CDATA[C_Salesregion_ID]]></COLUMNNAME> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISKEY><![CDATA[N]]></ISKEY> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <SEQNO><![CDATA[370]]></SEQNO> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <AD_ELEMENT_ID><![CDATA[210]]></AD_ELEMENT_ID> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <POSITION><![CDATA[36]]></POSITION> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--7DBD795B18BA4B6589BAADF480BD0440--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--7DBD795B18BA4B6589BAADF480BD0440--></AD_COLUMN> + <!--7DC33C4275593636E040007F01001C0B--><AD_COLUMN> <!--7DC33C4275593636E040007F01001C0B--> <AD_COLUMN_ID><![CDATA[7DC33C4275593636E040007F01001C0B]]></AD_COLUMN_ID> <!--7DC33C4275593636E040007F01001C0B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -312663,6 +312764,39 @@ <!--A8577512171B4D3781C6A49BD3A8370A--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> <!--A8577512171B4D3781C6A49BD3A8370A--></AD_COLUMN> +<!--A908EA6CF218F9C9E040007F01011582--><AD_COLUMN> +<!--A908EA6CF218F9C9E040007F01011582--> <AD_COLUMN_ID><![CDATA[A908EA6CF218F9C9E040007F01011582]]></AD_COLUMN_ID> +<!--A908EA6CF218F9C9E040007F01011582--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A908EA6CF218F9C9E040007F01011582--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A908EA6CF218F9C9E040007F01011582--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A908EA6CF218F9C9E040007F01011582--> <NAME><![CDATA[User/Contact]]></NAME> +<!--A908EA6CF218F9C9E040007F01011582--> <DESCRIPTION><![CDATA[An acquaintance to reach for information related to the business partner.]]></DESCRIPTION> +<!--A908EA6CF218F9C9E040007F01011582--> <HELP><![CDATA[The User identifies a unique user in the system. This could be an internal user or a business partner contact]]></HELP> +<!--A908EA6CF218F9C9E040007F01011582--> <COLUMNNAME><![CDATA[AD_User_ID]]></COLUMNNAME> +<!--A908EA6CF218F9C9E040007F01011582--> <AD_TABLE_ID><![CDATA[228]]></AD_TABLE_ID> +<!--A908EA6CF218F9C9E040007F01011582--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--A908EA6CF218F9C9E040007F01011582--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--A908EA6CF218F9C9E040007F01011582--> <ISKEY><![CDATA[N]]></ISKEY> +<!--A908EA6CF218F9C9E040007F01011582--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--A908EA6CF218F9C9E040007F01011582--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--A908EA6CF218F9C9E040007F01011582--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--A908EA6CF218F9C9E040007F01011582--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--A908EA6CF218F9C9E040007F01011582--> <SEQNO><![CDATA[91]]></SEQNO> +<!--A908EA6CF218F9C9E040007F01011582--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--A908EA6CF218F9C9E040007F01011582--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--A908EA6CF218F9C9E040007F01011582--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--A908EA6CF218F9C9E040007F01011582--> <AD_ELEMENT_ID><![CDATA[138]]></AD_ELEMENT_ID> +<!--A908EA6CF218F9C9E040007F01011582--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--A908EA6CF218F9C9E040007F01011582--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--A908EA6CF218F9C9E040007F01011582--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--A908EA6CF218F9C9E040007F01011582--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--A908EA6CF218F9C9E040007F01011582--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--A908EA6CF218F9C9E040007F01011582--> <POSITION><![CDATA[18]]></POSITION> +<!--A908EA6CF218F9C9E040007F01011582--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--A908EA6CF218F9C9E040007F01011582--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--A908EA6CF218F9C9E040007F01011582--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--A908EA6CF218F9C9E040007F01011582--></AD_COLUMN> + <!--A9AD9098307E46ECBB9CC712DA6E0302--><AD_COLUMN> <!--A9AD9098307E46ECBB9CC712DA6E0302--> <AD_COLUMN_ID><![CDATA[A9AD9098307E46ECBB9CC712DA6E0302]]></AD_COLUMN_ID> <!--A9AD9098307E46ECBB9CC712DA6E0302--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r a4b00a7a3b4a -r cba8150a1b95 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Thu Jul 28 08:23:57 2011 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Wed Jul 27 12:19:53 2011 +0200 @@ -205171,6 +205171,30 @@ <!--A8B23A0E8C3E428F90882F96159274C4--> <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO> <!--A8B23A0E8C3E428F90882F96159274C4--></AD_FIELD> +<!--A908E57D081C6863E040007F01011588--><AD_FIELD> +<!--A908E57D081C6863E040007F01011588--> <AD_FIELD_ID><![CDATA[A908E57D081C6863E040007F01011588]]></AD_FIELD_ID> +<!--A908E57D081C6863E040007F01011588--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A908E57D081C6863E040007F01011588--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A908E57D081C6863E040007F01011588--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A908E57D081C6863E040007F01011588--> <NAME><![CDATA[Contact]]></NAME> +<!--A908E57D081C6863E040007F01011588--> <DESCRIPTION><![CDATA[An acquaintance to reach for information related to the organization.]]></DESCRIPTION> +<!--A908E57D081C6863E040007F01011588--> <HELP><![CDATA[The User identifies a unique user in the system. This could be an internal user or a business partner/organization contact]]></HELP> +<!--A908E57D081C6863E040007F01011588--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED> +<!--A908E57D081C6863E040007F01011588--> <AD_TAB_ID><![CDATA[170]]></AD_TAB_ID> +<!--A908E57D081C6863E040007F01011588--> <AD_COLUMN_ID><![CDATA[A908EA6CF218F9C9E040007F01011582]]></AD_COLUMN_ID> +<!--A908E57D081C6863E040007F01011588--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--A908E57D081C6863E040007F01011588--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> +<!--A908E57D081C6863E040007F01011588--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--A908E57D081C6863E040007F01011588--> <SEQNO><![CDATA[55]]></SEQNO> +<!--A908E57D081C6863E040007F01011588--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--A908E57D081C6863E040007F01011588--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--A908E57D081C6863E040007F01011588--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--A908E57D081C6863E040007F01011588--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--A908E57D081C6863E040007F01011588--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--A908E57D081C6863E040007F01011588--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--A908E57D081C6863E040007F01011588--> <GRID_SEQNO><![CDATA[55]]></GRID_SEQNO> +<!--A908E57D081C6863E040007F01011588--></AD_FIELD> + <!--ABA8AFDB0CDD49B9B20A24D2D8127B38--><AD_FIELD> <!--ABA8AFDB0CDD49B9B20A24D2D8127B38--> <AD_FIELD_ID><![CDATA[ABA8AFDB0CDD49B9B20A24D2D8127B38]]></AD_FIELD_ID> <!--ABA8AFDB0CDD49B9B20A24D2D8127B38--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r a4b00a7a3b4a -r cba8150a1b95 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java --- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Thu Jul 28 08:23:57 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Wed Jul 27 12:19:53 2011 +0200 @@ -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() ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
