details: /erp/stable/2.50/rev/61990feba027
changeset: 9271:61990feba027
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Wed Mar 09 11:44:26 2011 +0100
summary: Allow reversal document type definition.
New column has been added to Document Type for setting it as reversal.
The column has on create default 'N' and a modulescript has been included
to update existing document types.
Document Types with 'ARC' and 'APC' are considered as reversal.
diffstat:
referencedata/standard/Initial_Setup.xml
| 31 +++++++
src-db/database/model/functions/C_INVOICE_POST.xml
| 10 +-
src-db/database/model/tables/C_DOCTYPE.xml
| 5 +
src-db/database/sourcedata/AD_COLUMN.xml
| 34 +++++++
src-db/database/sourcedata/AD_FIELD.xml
| 23 +++++
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateReversalDocumentTypes.class
| 0
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateReversalDocumentTypesData.class
| 0
src-util/modulescript/src/org/openbravo/modulescript/UpdateReversalDocumentTypes.java
| 43 ++++++++++
src-util/modulescript/src/org/openbravo/modulescript/UpdateReversalDocumentTypes_Data.xsql
| 38 ++++++++
9 files changed, 180 insertions(+), 4 deletions(-)
diffs (truncated from 484 to 300 lines):
diff -r d276a24c4ada -r 61990feba027 referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Wed Mar 09 10:41:27 2011 +0100
+++ b/referencedata/standard/Initial_Setup.xml Wed Mar 09 11:44:26 2011 +0100
@@ -357,6 +357,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="0CD50184705A42CCBECA4EC967646440" identifier="MM Shipment">
<id>0CD50184705A42CCBECA4EC967646440</id>
@@ -379,6 +380,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="15C8DCE82DA841968ABCD614FED68576" identifier="Proposal">
<id>15C8DCE82DA841968ABCD614FED68576</id>
@@ -401,6 +403,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="15F495A6290040F194A9AA4622FE0C01" identifier="Prepay
Order">
<id>15F495A6290040F194A9AA4622FE0C01</id>
@@ -423,6 +426,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="2030AD7DD4284E2B936E261662EF735A" identifier="MM Receipt">
<id>2030AD7DD4284E2B936E261662EF735A</id>
@@ -445,6 +449,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="2D7C15F0F44E4F289A729415EFD700C1" identifier="Return
Material">
<id>2D7C15F0F44E4F289A729415EFD700C1</id>
@@ -467,6 +472,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="3DDDC41E36534A79B7CC1B725472882D" identifier="Inventory
Move">
<id>3DDDC41E36534A79B7CC1B725472882D</id>
@@ -489,6 +495,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="40EE9B1CD3B345FABEFDA62B407B407F" identifier="AR Invoice">
<id>40EE9B1CD3B345FABEFDA62B407B407F</id>
@@ -511,6 +518,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="42B7DE94BC324C3F9CC0934375E90FFF" identifier="AP
CreditMemo">
<id>42B7DE94BC324C3F9CC0934375E90FFF</id>
@@ -533,6 +541,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>true</reversal>
</DocumentType>
<DocumentType id="51005B2C07EB41C5A2E7C25A4640ACD7" identifier="GL Journal">
<id>51005B2C07EB41C5A2E7C25A4640ACD7</id>
@@ -555,6 +564,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="511A9371A0F74195AA3F6D66C722729D" identifier="POS Order">
<id>511A9371A0F74195AA3F6D66C722729D</id>
@@ -577,6 +587,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="5C6E02993E9B4FCA81C07955EF676C62" identifier="AP Invoice">
<id>5C6E02993E9B4FCA81C07955EF676C62</id>
@@ -599,6 +610,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="5EA6556D24034412B5F26F6BA7245318" identifier="Matched
Invoices">
<id>5EA6556D24034412B5F26F6BA7245318</id>
@@ -621,6 +633,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="6543EB94DC664371BAF61B8E8AC121F3" identifier="Bank
Statement">
<id>6543EB94DC664371BAF61B8E8AC121F3</id>
@@ -643,6 +656,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="6B13D02AD3C44C4CB0CFBD1288E0CB10" identifier="Physical
Inventory">
<id>6B13D02AD3C44C4CB0CFBD1288E0CB10</id>
@@ -665,6 +679,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="6F3BBCA488F6474A806C59FD1137CBF5" identifier="Purchase
Requisition">
<id>6F3BBCA488F6474A806C59FD1137CBF5</id>
@@ -687,6 +702,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="76E7C671FCE34556908E563F825C2937" identifier="Warehouse
Order">
<id>76E7C671FCE34556908E563F825C2937</id>
@@ -709,6 +725,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="808F8818F724497D94282AC83493F394" identifier="Purchase
Order">
<id>808F8818F724497D94282AC83493F394</id>
@@ -731,6 +748,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="857F464FDEE34F6DB5AEC50981419FBF" identifier="Settlement">
<id>857F464FDEE34F6DB5AEC50981419FBF</id>
@@ -753,6 +771,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="8F343D831EA6434D9720FECAF5FB957E" identifier="Debt Payment
Management">
<id>8F343D831EA6434D9720FECAF5FB957E</id>
@@ -775,6 +794,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="9883CB89E41E496D987D8838C3CE0DC7" identifier="Matched
Purchase Orders">
<id>9883CB89E41E496D987D8838C3CE0DC7</id>
@@ -797,6 +817,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="A0C72093D5614867906A6E878F96FBBD"
identifier="Depreciation">
<id>A0C72093D5614867906A6E878F96FBBD</id>
@@ -819,6 +840,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="A58B8296E0ED42E386468D4527DE8F30" identifier="Cash
Journal">
<id>A58B8296E0ED42E386468D4527DE8F30</id>
@@ -841,6 +863,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="B476CFAE109047DEB5BC9AC80A03297A" identifier="AR Credit
Memo">
<id>B476CFAE109047DEB5BC9AC80A03297A</id>
@@ -863,6 +886,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>true</reversal>
</DocumentType>
<DocumentType id="B968C737ED3E4C808E425A72CC445DFE" identifier="Manual
Settlement">
<id>B968C737ED3E4C808E425A72CC445DFE</id>
@@ -885,6 +909,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="CB6EEA256BBC41109911215C5A14D39B" identifier="Standard
Order">
<id>CB6EEA256BBC41109911215C5A14D39B</id>
@@ -907,6 +932,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="D132517AE775435B8EB2832CC61FCAB1" identifier="AR Receipt">
<id>D132517AE775435B8EB2832CC61FCAB1</id>
@@ -929,6 +955,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="E7F4802D902A42A59143DCCBEDE4DE85" identifier="Credit
Order">
<id>E7F4802D902A42A59143DCCBEDE4DE85</id>
@@ -951,6 +978,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="EC0B46C525A0417DA286823864620991" identifier="Production">
<id>EC0B46C525A0417DA286823864620991</id>
@@ -973,6 +1001,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="ED1E059C9CF54062BA43B79F3EB89C77" identifier="AP Payment">
<id>ED1E059C9CF54062BA43B79F3EB89C77</id>
@@ -995,6 +1024,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<DocumentType id="F8CC92C7234644DEAD9F63174F45B2BF" identifier="MM Shipment
Indirect">
<id>F8CC92C7234644DEAD9F63174F45B2BF</id>
@@ -1017,6 +1047,7 @@
<filterByOrganization>false</filterByOrganization>
<documentCancelled xsi:nil="true"/>
<expense>false</expense>
+ <reversal>false</reversal>
</DocumentType>
<ADSequence id="01A4350CC9044517BA7B1B05EEF065FF" identifier="MM Shipment
Indirect">
<id>01A4350CC9044517BA7B1B05EEF065FF</id>
diff -r d276a24c4ada -r 61990feba027
src-db/database/model/functions/C_INVOICE_POST.xml
--- a/src-db/database/model/functions/C_INVOICE_POST.xml Wed Mar 09
10:41:27 2011 +0100
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml Wed Mar 09
11:44:26 2011 +0100
@@ -130,6 +130,7 @@
FINISH_PROCESS BOOLEAN:=FALSE;
END_PROCESSING BOOLEAN:=FALSE;
v_TargetDocBaseType C_DOCTYPE.DocBaseType%TYPE;
+ v_isReversal C_DOCTYPE.IsReversal%TYPE;
v_MultiplierARC NUMBER:=1;
v_is_included NUMBER:=0;
v_available_period NUMBER:=0;
@@ -634,12 +635,13 @@
*************************************************************************/
DECLARE
v_DocBaseType C_DOCTYPE.DocBaseType%TYPE;
+ v_DocTypeIsSOtrx C_DOCTYPE.IsSOtrx%TYPE;
BEGIN
-- Is it a Credit Memo?
- SELECT DocBaseType INTO v_DocBaseType
+ SELECT DocBaseType, IsReversal, issotrx INTO v_DocBaseType,
v_isReversal, v_DocTypeIsSOtrx
FROM C_DOCTYPE
WHERE C_DocType_ID=v_DocType_ID;
- IF (v_DocBaseType IN('ARC', 'API')) THEN
+ IF (v_DocBaseType IN('ARC', 'API') or (v_isReversal='Y' and
v_DocTypeIsSOtrx='Y') or (v_isReversal='N' and v_DocTypeIsSOtrx='N')) THEN
v_Multiplier:=-1;
END IF;
END;
@@ -1437,10 +1439,10 @@
AND IsValid!='Y';
-- Is it a Credit Memo:4
- SELECT DocBaseType INTO v_TargetDocBaseType
+ SELECT DocBaseType, isreversal INTO v_TargetDocBaseType, v_isReversal
FROM C_DOCTYPE
WHERE C_DocType_ID=v_DocTypeTarget_ID;
- IF (v_TargetDocBaseType in ('ARC','APC')) THEN
+ IF (v_TargetDocBaseType in ('ARC','APC') or v_isReversal='Y') THEN
v_MultiplierARC:=-1;
END IF;
diff -r d276a24c4ada -r 61990feba027 src-db/database/model/tables/C_DOCTYPE.xml
--- a/src-db/database/model/tables/C_DOCTYPE.xml Wed Mar 09 10:41:27
2011 +0100
+++ b/src-db/database/model/tables/C_DOCTYPE.xml Wed Mar 09 11:44:26
2011 +0100
@@ -105,6 +105,10 @@
<default><![CDATA[N]]></default>
<onCreateDefault/>
</column>
+ <column name="ISREVERSAL" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
