details: https://code.openbravo.com/erp/devel/pi/rev/e9903c314e23
changeset: 14071:e9903c314e23
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Mon Oct 24 09:19:12 2011 +0200
summary: Fixes issue 18635. Fixes issue 18636. 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/sampledata/F_B_International_Group.xml | 54 +++++++++++++++++++-
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 ++-
6 files changed, 128 insertions(+), 11 deletions(-)
diffs (260 lines):
diff -r 56c00ac0c55b -r e9903c314e23
referencedata/sampledata/F_B_International_Group.xml
--- a/referencedata/sampledata/F_B_International_Group.xml Mon Oct 24
00:48:18 2011 +0200
+++ b/referencedata/sampledata/F_B_International_Group.xml Mon Oct 24
09:19:12 2011 +0200
@@ -131297,7 +131297,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
- <reversal>true</reversal>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="FF8081812F539E8E012F53BB1BD10012">
<id>FF8081812F539E8E012F53BB1BD10012</id>
@@ -131322,7 +131322,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
- <reversal>true</reversal>
+ <reversal>false</reversal>
</DocumentType>
<FinancialMgmtGLCategory id="0881F8B0B3134347AD537E83E737B9EF">
<id>0881F8B0B3134347AD537E83E737B9EF</id>
@@ -372700,6 +372700,20 @@
<showlogo>true</showlogo>
<headermargin xsi:nil="true"/>
</DocumentTemplate>
+ <DocumentTemplate id="3C11951A7BCD4F49BDA8542EA8267FE9">
+ <id>3C11951A7BCD4F49BDA8542EA8267FE9</id>
+ <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+ <organization id="0"/>
+ <active>true</active>
+ <documentType id="FF8081812F539E8E012F53B780DB000C"/>
+ <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>
<DocumentTemplate id="4C1C0434D8F64091A352AAE81928FBF8">
<id>4C1C0434D8F64091A352AAE81928FBF8</id>
<client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -372784,6 +372798,20 @@
<showlogo>true</showlogo>
<headermargin xsi:nil="true"/>
</DocumentTemplate>
+ <DocumentTemplate id="9A4C5B0E08B94ABE8386AA882EE192BB">
+ <id>9A4C5B0E08B94ABE8386AA882EE192BB</id>
+ <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+ <organization id="0"/>
+ <active>true</active>
+ <documentType id="FF8081812F539E8E012F53BB1BD10012"/>
+ <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="9FB97CCA66EA49F29A0EF5080E2AFF29">
<id>9FB97CCA66EA49F29A0EF5080E2AFF29</id>
<client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -373276,6 +373304,17 @@
<default>true</default>
<language id="192"/>
</EmailTemplate>
+ <EmailTemplate id="40196BDEB46A4F47895010382CAC7E5C">
+ <id>40196BDEB46A4F47895010382CAC7E5C</id>
+ <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+ <organization id="0"/>
+ <active>true</active>
+ <pocDocumentType id="3C11951A7BCD4F49BDA8542EA8267FE9"/>
+ <subject xsi:nil="true"/>
+ <body xsi:nil="true"/>
+ <default>true</default>
+ <language id="192"/>
+ </EmailTemplate>
<EmailTemplate id="492A63FE257449528E7635AEFD8964F3">
<id>492A63FE257449528E7635AEFD8964F3</id>
<client id="FF8080812AFBCB14012AFBD3E373001F"/>
@@ -373797,6 +373836,17 @@
<default>false</default>
<language id="140"/>
</EmailTemplate>
+ <EmailTemplate id="DAD4C3171B154396BB931576D3F5805A">
+ <id>DAD4C3171B154396BB931576D3F5805A</id>
+ <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+ <organization id="0"/>
+ <active>true</active>
+ <pocDocumentType id="9A4C5B0E08B94ABE8386AA882EE192BB"/>
+ <subject xsi:nil="true"/>
+ <body xsi:nil="true"/>
+ <default>true</default>
+ <language id="192"/>
+ </EmailTemplate>
<EmailTemplate id="DD910B77FA0643379070304B72F53E7C">
<id>DD910B77FA0643379070304B72F53E7C</id>
<client id="FF8080812AFBCB14012AFBD3E373001F"/>
diff -r 56c00ac0c55b -r e9903c314e23 referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Mon Oct 24 00:48:18 2011 +0200
+++ b/referencedata/standard/Initial_Setup.xml Mon Oct 24 09:19:12 2011 +0200
@@ -162,6 +162,24 @@
<default>true</default>
<language id="192" entity-name="ADLanguage" identifier="English (USA)"/>
</EmailTemplate>
+ <EmailTemplate id="FF808081332C7C9101332C86F756002C" identifier="Reversed
Purchase Invoice Report template - ">
+ <id>FF808081332C7C9101332C86F756002C</id>
+ <active>true</active>
+ <pocDocumentType id="FF808081332C7C9101332C86C35D0027"
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="FF808081332C7C9101332C88789F003B" identifier="Reversed
Sales Invoice Report template - ">
+ <id>FF808081332C7C9101332C88789F003B</id>
+ <active>true</active>
+ <pocDocumentType id="FF808081332C7C9101332C87DBBE0034"
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>
@@ -664,7 +682,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>
@@ -894,7 +912,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>
@@ -1656,4 +1674,28 @@
<showlogo>true</showlogo>
<headermargin xsi:nil="true"/>
</DocumentTemplate>
+ <DocumentTemplate id="FF808081332C7C9101332C86C35D0027" identifier="Reversed
Purchase Invoice Report template">
+ <id>FF808081332C7C9101332C86C35D0027</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="FF808081332C7C9101332C87DBBE0034" identifier="Reversed
Sales Invoice Report template">
+ <id>FF808081332C7C9101332C87DBBE0034</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 56c00ac0c55b -r e9903c314e23 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Oct 24 00:48:18 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Oct 24 09:19:12 2011 +0200
@@ -265096,8 +265096,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>
@@ -265112,7 +265116,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[FF808081332C7C9101332C82187A0015]]></AD_ELEMENT_ID>
<!--9DA88EFA815811C8E040007F01002646-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--9DA88EFA815811C8E040007F01002646-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--9DA88EFA815811C8E040007F01002646-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
diff -r 56c00ac0c55b -r e9903c314e23 src-db/database/sourcedata/AD_DATASET.xml
--- a/src-db/database/sourcedata/AD_DATASET.xml Mon Oct 24 00:48:18 2011 +0200
+++ b/src-db/database/sourcedata/AD_DATASET.xml Mon Oct 24 09:19:12 2011 +0200
@@ -40,7 +40,7 @@
<!--10C9DA9D9A6345DC9080E0102492FF1B--> <EXPORT><![CDATA[N]]></EXPORT>
<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
-<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<CHECKSUM><![CDATA[204303149172035464319244074964864775026]]></CHECKSUM>
+<!--10C9DA9D9A6345DC9080E0102492FF1B-->
<CHECKSUM><![CDATA[158884290263377950987983547047601267044]]></CHECKSUM>
<!--10C9DA9D9A6345DC9080E0102492FF1B--></AD_DATASET>
<!--D81C5C810AEF47C690E4F688ABC8AAC8--><AD_DATASET>
diff -r 56c00ac0c55b -r e9903c314e23 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Mon Oct 24 00:48:18 2011 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Oct 24 09:19:12 2011 +0200
@@ -25637,6 +25637,23 @@
<!--FF8080812EC85BDE012EC8B056D20017-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--FF8080812EC85BDE012EC8B056D20017--></AD_ELEMENT>
+<!--FF808081332C7C9101332C82187A0015--><AD_ELEMENT>
+<!--FF808081332C7C9101332C82187A0015-->
<AD_ELEMENT_ID><![CDATA[FF808081332C7C9101332C82187A0015]]></AD_ELEMENT_ID>
+<!--FF808081332C7C9101332C82187A0015-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF808081332C7C9101332C82187A0015--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF808081332C7C9101332C82187A0015--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF808081332C7C9101332C82187A0015-->
<COLUMNNAME><![CDATA[Isreversal]]></COLUMNNAME>
+<!--FF808081332C7C9101332C82187A0015--> <NAME><![CDATA[Credit Memo]]></NAME>
+<!--FF808081332C7C9101332C82187A0015--> <PRINTNAME><![CDATA[Credit
Memo]]></PRINTNAME>
+<!--FF808081332C7C9101332C82187A0015--> <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>
+<!--FF808081332C7C9101332C82187A0015--> <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>
+<!--FF808081332C7C9101332C82187A0015-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FF808081332C7C9101332C82187A0015--></AD_ELEMENT>
+
<!--FF8081813021C3180130226601410050--><AD_ELEMENT>
<!--FF8081813021C3180130226601410050-->
<AD_ELEMENT_ID><![CDATA[FF8081813021C3180130226601410050]]></AD_ELEMENT_ID>
<!--FF8081813021C3180130226601410050-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 56c00ac0c55b -r e9903c314e23 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Oct 24 00:48:18 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Oct 24 09:19:12 2011 +0200
@@ -188897,9 +188897,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
