details: https://code.openbravo.com/erp/stable/2.50/rev/0ff94ddb6520
changeset: 9706:0ff94ddb6520
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Mon Oct 24 09:24:36 2011 +0200
summary: Fixes issue 18843. Fixes issue 18844. Reversal document types
changes.
Reversal checkbox has been renamed to Credit Memo, because it was behaving as a
Credit Memo.
Reversal label was confusing. The element has been documented properly.
Reversal Sales/Purchase Invoice documents have now printing templates
diffstat:
referencedata/standard/Initial_Setup.xml | 46 +++++++++++++++++++++++++++++-
src-db/database/sourcedata/AD_COLUMN.xml | 10 ++++--
src-db/database/sourcedata/AD_DATASET.xml | 2 +-
src-db/database/sourcedata/AD_ELEMENT.xml | 17 +++++++++++
src-db/database/sourcedata/AD_FIELD.xml | 10 ++++--
5 files changed, 76 insertions(+), 9 deletions(-)
diffs (175 lines):
diff -r b886ec9c54c5 -r 0ff94ddb6520 referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Mon Oct 24 09:21:59 2011 +0200
+++ b/referencedata/standard/Initial_Setup.xml Mon Oct 24 09:24:36 2011 +0200
@@ -9,6 +9,15 @@
<default>true</default>
<language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
</EmailTemplate>
+ <EmailTemplate id="332DFC42BF074CC191FC2E44535636E5" identifier="Reversed
Purchase Invoice Report template - ">
+ <id>332DFC42BF074CC191FC2E44535636E5</id>
+ <active>true</active>
+ <pocDocumentType id="F4C40949C5F84BB3B605ADE66FEC65C3"
entity-name="DocumentTemplate" identifier="Reversed Purchase Invoice Report
template"/>
+ <subject xsi:nil="true"/>
+ <body xsi:nil="true"/>
+ <default>true</default>
+ <language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
+ </EmailTemplate>
<EmailTemplate id="878ECF0D5A238C7BE040007F010129BA" identifier="AR Invoice
Report template - ">
<id>878ECF0D5A238C7BE040007F010129BA</id>
<active>true</active>
@@ -162,6 +171,15 @@
<default>true</default>
<language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
</EmailTemplate>
+ <EmailTemplate id="EB5CE0CBBC484FCD80471053C65D7BC7" identifier="Reversed
Sales Invoice Report template - ">
+ <id>EB5CE0CBBC484FCD80471053C65D7BC7</id>
+ <active>true</active>
+ <pocDocumentType id="FAE52F6C0790454DBD58FBF0CDDDCB81"
entity-name="DocumentTemplate" identifier="Reversed Sales Invoice Report
template"/>
+ <subject xsi:nil="true"/>
+ <body xsi:nil="true"/>
+ <default>true</default>
+ <language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
+ </EmailTemplate>
<FinancialMgmtGLCategory id="102C08DF5D4341D5B7FDF758632503D2"
identifier="AR Invoice">
<id>102C08DF5D4341D5B7FDF758632503D2</id>
<active>true</active>
@@ -679,7 +697,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
- <reversal>true</reversal>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="6B13D02AD3C44C4CB0CFBD1288E0CB10" identifier="Physical
Inventory">
<id>6B13D02AD3C44C4CB0CFBD1288E0CB10</id>
@@ -909,7 +927,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
- <reversal>true</reversal>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="B476CFAE109047DEB5BC9AC80A03297A" identifier="AR Credit
Memo">
<id>B476CFAE109047DEB5BC9AC80A03297A</id>
@@ -1659,6 +1677,18 @@
<showlogo>true</showlogo>
<headermargin xsi:nil="true"/>
</DocumentTemplate>
+ <DocumentTemplate id="F4C40949C5F84BB3B605ADE66FEC65C3" identifier="Reversed
Purchase Invoice Report template">
+ <id>F4C40949C5F84BB3B605ADE66FEC65C3</id>
+ <active>true</active>
+ <documentType id="AFFD4594FB734E9682D5769669A9D471"
entity-name="DocumentType" identifier="Reversed Purchase Invoice"/>
+ <name>Reversed Purchase Invoice Report template</name>
+ <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
+ <reportFilename>Reversed Invoice-@our_ref@</reportFilename>
+ <templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
+ </DocumentTemplate>
<DocumentTemplate id="FA45DFAC61A542658CC02B64E476F4C0" identifier="AP
Payment Report template">
<id>FA45DFAC61A542658CC02B64E476F4C0</id>
<active>true</active>
@@ -1671,4 +1701,16 @@
<showlogo>true</showlogo>
<headermargin xsi:nil="true"/>
</DocumentTemplate>
+ <DocumentTemplate id="FAE52F6C0790454DBD58FBF0CDDDCB81" identifier="Reversed
Sales Invoice Report template">
+ <id>FAE52F6C0790454DBD58FBF0CDDDCB81</id>
+ <active>true</active>
+ <documentType id="67C3266D11A04078B7A14AC21E91C711"
entity-name="DocumentType" identifier="Reversed Sales Invoice"/>
+ <name>Reversed Sales Invoice Report template</name>
+ <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
+ <reportFilename>Reversed Sales Invoice-@our_ref@</reportFilename>
+ <templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
+ </DocumentTemplate>
</ob:Openbravo>
diff -r b886ec9c54c5 -r 0ff94ddb6520 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Oct 24 09:21:59 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Oct 24 09:24:36 2011 +0200
@@ -311837,8 +311837,12 @@
<!--9DA88EFA815811C8E040007F01002646--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9DA88EFA815811C8E040007F01002646--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9DA88EFA815811C8E040007F01002646--> <NAME><![CDATA[Reversal]]></NAME>
-<!--9DA88EFA815811C8E040007F01002646--> <DESCRIPTION><![CDATA[This is a
reversing transaction]]></DESCRIPTION>
-<!--9DA88EFA815811C8E040007F01002646--> <HELP><![CDATA[The Reversal check box
indicates if this is a reversal of a prior transaction.]]></HELP>
+<!--9DA88EFA815811C8E040007F01002646--> <DESCRIPTION><![CDATA[Credit Memo
checkbox only applies to Invoice document types. Invoices marked as Credit Memo
will behave as Credit Memos, which implies that: "Total gross amount" must
always be positive. "Payment Plan" will be negative.]]></DESCRIPTION>
+<!--9DA88EFA815811C8E040007F01002646--> <HELP><![CDATA[Credit Memo checkbox
only applies to Invoice document types.
+Invoices marked as Credit Memo will behave as Credit Memos, which implies that:
+- "Total gross amount" must always be positive.
+- "Payment Plan" will be negative.
+- Accounting will be opposite than Invoice accounting.]]></HELP>
<!--9DA88EFA815811C8E040007F01002646-->
<COLUMNNAME><![CDATA[Isreversal]]></COLUMNNAME>
<!--9DA88EFA815811C8E040007F01002646-->
<AD_TABLE_ID><![CDATA[217]]></AD_TABLE_ID>
<!--9DA88EFA815811C8E040007F01002646-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -311853,7 +311857,7 @@
<!--9DA88EFA815811C8E040007F01002646-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--9DA88EFA815811C8E040007F01002646-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--9DA88EFA815811C8E040007F01002646-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--9DA88EFA815811C8E040007F01002646-->
<AD_ELEMENT_ID><![CDATA[1476]]></AD_ELEMENT_ID>
+<!--9DA88EFA815811C8E040007F01002646-->
<AD_ELEMENT_ID><![CDATA[D64E15EA1CC94337B81175F770CF7E33]]></AD_ELEMENT_ID>
<!--9DA88EFA815811C8E040007F01002646-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--9DA88EFA815811C8E040007F01002646-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--9DA88EFA815811C8E040007F01002646-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
diff -r b886ec9c54c5 -r 0ff94ddb6520 src-db/database/sourcedata/AD_DATASET.xml
--- a/src-db/database/sourcedata/AD_DATASET.xml Mon Oct 24 09:21:59 2011 +0200
+++ b/src-db/database/sourcedata/AD_DATASET.xml Mon Oct 24 09:24:36 2011 +0200
@@ -40,7 +40,7 @@
<!--10C9DA9D9A6345DC9080E0102492FF1B--> <EXPORT><![CDATA[N]]></EXPORT>
<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
-<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<CHECKSUM><![CDATA[254195407662840758973998080203970590727]]></CHECKSUM>
+<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<CHECKSUM><![CDATA[275753458731816972140710927764192655792]]></CHECKSUM>
<!--10C9DA9D9A6345DC9080E0102492FF1B--></AD_DATASET>
<!--D81C5C810AEF47C690E4F688ABC8AAC8--><AD_DATASET>
diff -r b886ec9c54c5 -r 0ff94ddb6520 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Oct 24 09:21:59 2011 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Oct 24 09:24:36 2011 +0200
@@ -28018,6 +28018,23 @@
<!--D53F04776DA948AAA14F7CDCB38795D2-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--D53F04776DA948AAA14F7CDCB38795D2--></AD_ELEMENT>
+<!--D64E15EA1CC94337B81175F770CF7E33--><AD_ELEMENT>
+<!--D64E15EA1CC94337B81175F770CF7E33-->
<AD_ELEMENT_ID><![CDATA[D64E15EA1CC94337B81175F770CF7E33]]></AD_ELEMENT_ID>
+<!--D64E15EA1CC94337B81175F770CF7E33-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D64E15EA1CC94337B81175F770CF7E33--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D64E15EA1CC94337B81175F770CF7E33--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D64E15EA1CC94337B81175F770CF7E33-->
<COLUMNNAME><![CDATA[Isreversal]]></COLUMNNAME>
+<!--D64E15EA1CC94337B81175F770CF7E33--> <NAME><![CDATA[Credit Memo]]></NAME>
+<!--D64E15EA1CC94337B81175F770CF7E33--> <PRINTNAME><![CDATA[Credit
Memo]]></PRINTNAME>
+<!--D64E15EA1CC94337B81175F770CF7E33--> <DESCRIPTION><![CDATA[Credit Memo
checkbox only applies to Invoice document types. Invoices marked as Credit Memo
will behave as Credit Memos, which implies that: "Total gross amount" must
always be positive. "Payment Plan" will be negative.]]></DESCRIPTION>
+<!--D64E15EA1CC94337B81175F770CF7E33--> <HELP><![CDATA[Credit Memo checkbox
only applies to Invoice document types.
+Invoices marked as Credit Memo will behave as Credit Memos, which implies that:
+- "Total gross amount" must always be positive.
+- "Payment Plan" will be negative.
+- Accounting will be opposite than Invoice accounting.]]></HELP>
+<!--D64E15EA1CC94337B81175F770CF7E33-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D64E15EA1CC94337B81175F770CF7E33--></AD_ELEMENT>
+
<!--D6B8F4BF589745C2BFC0E41C36E47FDF--><AD_ELEMENT>
<!--D6B8F4BF589745C2BFC0E41C36E47FDF-->
<AD_ELEMENT_ID><![CDATA[D6B8F4BF589745C2BFC0E41C36E47FDF]]></AD_ELEMENT_ID>
<!--D6B8F4BF589745C2BFC0E41C36E47FDF-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r b886ec9c54c5 -r 0ff94ddb6520 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Oct 24 09:21:59 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Oct 24 09:24:36 2011 +0200
@@ -204709,9 +204709,13 @@
<!--9DA88EFA815E11C8E040007F01002646-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--9DA88EFA815E11C8E040007F01002646--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9DA88EFA815E11C8E040007F01002646--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9DA88EFA815E11C8E040007F01002646--> <NAME><![CDATA[Reversal]]></NAME>
-<!--9DA88EFA815E11C8E040007F01002646--> <DESCRIPTION><![CDATA[This is a
reversing transaction]]></DESCRIPTION>
-<!--9DA88EFA815E11C8E040007F01002646--> <HELP><![CDATA[The Reversal check box
indicates if this is a reversal of a prior transaction.]]></HELP>
+<!--9DA88EFA815E11C8E040007F01002646--> <NAME><![CDATA[Credit Memo]]></NAME>
+<!--9DA88EFA815E11C8E040007F01002646--> <DESCRIPTION><![CDATA[Credit Memo
checkbox only applies to Invoice document types. Invoices marked as Credit Memo
will behave as Credit Memos, which implies that: "Total gross amount" must
always be positive. "Payment Plan" will be negative.]]></DESCRIPTION>
+<!--9DA88EFA815E11C8E040007F01002646--> <HELP><![CDATA[Credit Memo checkbox
only applies to Invoice document types.
+Invoices marked as Credit Memo will behave as Credit Memos, which implies that:
+- "Total gross amount" must always be positive.
+- "Payment Plan" will be negative.
+- Accounting will be opposite than Invoice accounting.]]></HELP>
<!--9DA88EFA815E11C8E040007F01002646-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--9DA88EFA815E11C8E040007F01002646--> <AD_TAB_ID><![CDATA[167]]></AD_TAB_ID>
<!--9DA88EFA815E11C8E040007F01002646-->
<AD_COLUMN_ID><![CDATA[9DA88EFA815811C8E040007F01002646]]></AD_COLUMN_ID>
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
