details: https://code.openbravo.com/erp/devel/pi/rev/1b61503d7d6a
changeset: 16591:1b61503d7d6a
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Mon May 21 16:57:34 2012 +0200
summary: Fixes issue 20354: Added the possibility to define specific accounts
for COGS return and Revenue return.
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
| 9 +-
referencedata/sampledata/F_B_International_Group.xml
| 120 ++++-
referencedata/standard/Initial_Setup.xml
| 50 +-
src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml
| 10 +-
src-db/database/model/functions/M_PRODUCT_CATEGORY_ACCT_COPY.xml
| 8 +-
src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml
| 14 +
src-db/database/model/tables/M_PRODUCT_ACCT.xml
| 14 +
src-db/database/model/tables/M_PRODUCT_CATEGORY_ACCT.xml
| 14 +
src-db/database/sourcedata/AD_COLUMN.xml
| 210 +++++++
src-db/database/sourcedata/AD_DATASET.xml
| 2 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 28 +
src-db/database/sourcedata/AD_FIELD.xml
| 183 ++++++-
src-db/database/sourcedata/AD_REF_LIST.xml
| 11 +
src-db/database/sourcedata/AD_VAL_RULE.xml
| 6 +-
src-util/modulescript/src/org/openbravo/modulescript/UpdateReversalDocumentTypes_Data.xsql
| 2 +-
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
| 5 +
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_forms/DocInOut.java
| 44 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
| 36 +-
src/org/openbravo/erpCommon/ad_forms/ProductInfo.java
| 18 +-
src/org/openbravo/erpCommon/ad_forms/ProductInfo_data.xsql
| 11 +-
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
| 271 +++++----
22 files changed, 886 insertions(+), 184 deletions(-)
diffs (truncated from 1808 to 300 lines):
diff -r 18b1476f9aab -r 1b61503d7d6a
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
Mon May 21 16:00:24 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
Mon May 21 16:57:34 2012 +0200
@@ -45,6 +45,7 @@
import org.openbravo.dal.service.OBDao;
import org.openbravo.data.FieldProvider;
import org.openbravo.erpCommon.ad_actionButton.ActionButtonUtility;
+import org.openbravo.erpCommon.ad_forms.AcctServer;
import org.openbravo.erpCommon.reference.PInstanceProcessData;
import org.openbravo.erpCommon.utility.FieldProviderFactory;
import org.openbravo.erpCommon.utility.OBError;
@@ -195,8 +196,10 @@
// account defined or invoice's payment method is not inside BP's
financial
// account do not cancel credit
if (BigDecimal.ZERO.compareTo(invoice.getGrandTotalAmount()) != 0
- && isPaymentMethodConfigured(invoice) &&
!isInvoiceWithPayments(invoice)
- && ("API".equals(invoiceDocCategory) ||
"ARI".equals(invoiceDocCategory))) {
+ && isPaymentMethodConfigured(invoice)
+ && !isInvoiceWithPayments(invoice)
+ && (AcctServer.DOCTYPE_ARInvoice.equals(invoiceDocCategory) ||
AcctServer.DOCTYPE_APInvoice
+ .equals(invoiceDocCategory))) {
creditPayments =
dao.getCustomerPaymentsWithCredit(invoice.getOrganization(),
invoice.getBusinessPartner(), invoice.isSalesTransaction());
if (creditPayments != null && !creditPayments.isEmpty()) {
@@ -301,7 +304,7 @@
// Create new Payment
final boolean isSalesTransaction = invoice.isSalesTransaction();
final DocumentType docType =
FIN_Utility.getDocumentType(invoice.getOrganization(),
- isSalesTransaction ? "ARR" : "APP");
+ isSalesTransaction ? AcctServer.DOCTYPE_ARReceipt :
AcctServer.DOCTYPE_APPayment);
final String strPaymentDocumentNo =
FIN_Utility.getDocumentNo(docType,
docType.getTable() != null ? docType.getTable().getDBTableName()
: "");
final FIN_FinancialAccount bpFinAccount = isSalesTransaction ?
invoice
diff -r 18b1476f9aab -r 1b61503d7d6a
referencedata/sampledata/F_B_International_Group.xml
--- a/referencedata/sampledata/F_B_International_Group.xml Mon May 21
16:00:24 2012 +0200
+++ b/referencedata/sampledata/F_B_International_Group.xml Mon May 21
16:57:34 2012 +0200
@@ -83625,6 +83625,24 @@
<suffix xsi:nil="true"/>
<restartSequenceEveryYear>false</restartSequenceEveryYear>
</ADSequence>
+ <ADSequence id="5340EE6259034C45BA32A1933F4DD42E">
+ <id>5340EE6259034C45BA32A1933F4DD42E</id>
+ <client id="23C59575B9CF467C9620760EB255B389"/>
+ <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+ <active>true</active>
+ <name>ES Return Material Sales Invoice</name>
+ <description xsi:nil="true"/>
+ <valueFormat xsi:nil="true"/>
+ <autoNumbering>true</autoNumbering>
+ <incrementBy>1</incrementBy>
+ <startingNo>100000</startingNo>
+ <nextAssignedNumber>1000001</nextAssignedNumber>
+ <currentNextSystem>100</currentNextSystem>
+ <usedForRecordID>false</usedForRecordID>
+ <prefix xsi:nil="true"/>
+ <suffix xsi:nil="true"/>
+ <restartSequenceEveryYear>false</restartSequenceEveryYear>
+ </ADSequence>
<ADSequence id="8479B918DBAE4CCA944506AD855762A9">
<id>8479B918DBAE4CCA944506AD855762A9</id>
<client id="23C59575B9CF467C9620760EB255B389"/>
@@ -84201,6 +84219,24 @@
<suffix xsi:nil="true"/>
<restartSequenceEveryYear>false</restartSequenceEveryYear>
</ADSequence>
+ <ADSequence id="CD179732385848B09607674D35D1C447">
+ <id>CD179732385848B09607674D35D1C447</id>
+ <client id="23C59575B9CF467C9620760EB255B389"/>
+ <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+ <active>true</active>
+ <name>Return Material Sales Invoice</name>
+ <description>Return Material Sales Invoice</description>
+ <valueFormat xsi:nil="true"/>
+ <autoNumbering>true</autoNumbering>
+ <incrementBy>1</incrementBy>
+ <startingNo>1000000</startingNo>
+ <nextAssignedNumber>1000001</nextAssignedNumber>
+ <currentNextSystem>100</currentNextSystem>
+ <usedForRecordID>false</usedForRecordID>
+ <prefix xsi:nil="true"/>
+ <suffix xsi:nil="true"/>
+ <restartSequenceEveryYear>false</restartSequenceEveryYear>
+ </ADSequence>
<ADSequence id="CA5B25F1F5964772982AB2EF625DFAF0">
<id>CA5B25F1F5964772982AB2EF625DFAF0</id>
<client id="23C59575B9CF467C9620760EB255B389"/>
@@ -191163,6 +191199,32 @@
<reversal>false</reversal>
<return>false</return>
</DocumentType>
+ <DocumentType id="56AA9305B32C44A08554D3DB16E2B4E2">
+ <id>56AA9305B32C44A08554D3DB16E2B4E2</id>
+ <client id="23C59575B9CF467C9620760EB255B389"/>
+ <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+ <active>true</active>
+ <name>Return Material Sales Invoice</name>
+ <printText>Return Material Sales Invoice</printText>
+ <description xsi:nil="true"/>
+ <documentCategory>ARI_RM</documentCategory>
+ <salesTransaction>true</salesTransaction>
+ <sOSubType xsi:nil="true"/>
+ <documentTypeForShipment id="0"/>
+ <documentTypeForInvoice id="0"/>
+ <sequencedDocument>true</sequencedDocument>
+ <documentSequence id="CD179732385848B09607674D35D1C447"/>
+ <gLCategory id="D8EBFF2A790C458B997DF8EEA23C6A16"/>
+ <comments xsi:nil="true"/>
+ <default>false</default>
+ <numberOfCopies>0</numberOfCopies>
+ <table id="318"/>
+ <filterByOrganization>false</filterByOrganization>
+ <documentCancelled xsi:nil="true"/>
+ <expense>false</expense>
+ <reversal>false</reversal>
+ <return>false</return>
+ </DocumentType>
<DocumentType id="687F3FA836714A989AD42ACBDB89FD9D">
<id>687F3FA836714A989AD42ACBDB89FD9D</id>
<client id="23C59575B9CF467C9620760EB255B389"/>
@@ -191305,7 +191367,7 @@
<salesTransaction>true</salesTransaction>
<sOSubType>SO</sOSubType>
<documentTypeForShipment id="885D9A428B384416837403CBDB4C978C"/>
- <documentTypeForInvoice id="9921B07BA4B6475BBA5AEB445E8C6921"/>
+ <documentTypeForInvoice id="56AA9305B32C44A08554D3DB16E2B4E2"/>
<sequencedDocument>true</sequencedDocument>
<documentSequence id="834AD690EC0D4224A91C8498A89B6084"/>
<gLCategory id="55B3D8CD82A24C4189F1A13E4B647E8D"/>
@@ -191501,6 +191563,32 @@
<reversal>false</reversal>
<return>false</return>
</DocumentType>
+ <DocumentType id="9CEA33630D3A4E1DA94A2E017C07B914">
+ <id>9CEA33630D3A4E1DA94A2E017C07B914</id>
+ <client id="23C59575B9CF467C9620760EB255B389"/>
+ <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+ <active>true</active>
+ <name>ES Return Material Sales Invoice</name>
+ <printText>ES Return Material Sales Invoice</printText>
+ <description xsi:nil="true"/>
+ <documentCategory>ARI_RM</documentCategory>
+ <salesTransaction>true</salesTransaction>
+ <sOSubType xsi:nil="true"/>
+ <documentTypeForShipment id="0"/>
+ <documentTypeForInvoice id="0"/>
+ <sequencedDocument>true</sequencedDocument>
+ <documentSequence id="5340EE6259034C45BA32A1933F4DD42E"/>
+ <gLCategory id="F1AB0492C7FB480DB74E4C22670D5DF1"/>
+ <comments xsi:nil="true"/>
+ <default>false</default>
+ <numberOfCopies>0</numberOfCopies>
+ <table id="318"/>
+ <filterByOrganization>false</filterByOrganization>
+ <documentCancelled xsi:nil="true"/>
+ <expense>false</expense>
+ <reversal>false</reversal>
+ <return>false</return>
+ </DocumentType>
<DocumentType id="834E3EEC1139456383E461C1DBBA206C">
<id>834E3EEC1139456383E461C1DBBA206C</id>
<client id="23C59575B9CF467C9620760EB255B389"/>
@@ -192397,7 +192485,7 @@
<salesTransaction>true</salesTransaction>
<sOSubType>SO</sOSubType>
<documentTypeForShipment id="39F6752CDFCE4325BF51E473EE973AE7"/>
- <documentTypeForInvoice id="3FBA242B1533465D9C626E94674F1A42"/>
+ <documentTypeForInvoice id="9CEA33630D3A4E1DA94A2E017C07B914"/>
<sequencedDocument>true</sequencedDocument>
<documentSequence id="8317E6BC778C418582A6E4BB312E7F2E"/>
<gLCategory id="0C44A45CD56B4E2782834C0B69815CF0"/>
@@ -922131,6 +922219,34 @@
<showlogo>true</showlogo>
<headermargin xsi:nil="true"/>
</DocumentTemplate>
+ <DocumentTemplate id="B1D6986BD45E4E108B0C3121FC90D3B5">
+ <id>B1D6986BD45E4E108B0C3121FC90D3B5</id>
+ <client id="23C59575B9CF467C9620760EB255B389"/>
+ <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+ <active>true</active>
+ <documentType id="9CEA33630D3A4E1DA94A2E017C07B914"/>
+ <name>ES Return Material Sales Invoice Report template</name>
+ <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
+ <reportFilename>Sales Invoice-@our_ref@</reportFilename>
+ <templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
+ </DocumentTemplate>
+ <DocumentTemplate id="FC1E3227636B413ABC81153D1E60E6EA">
+ <id>FC1E3227636B413ABC81153D1E60E6EA</id>
+ <client id="23C59575B9CF467C9620760EB255B389"/>
+ <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+ <active>true</active>
+ <documentType id="56AA9305B32C44A08554D3DB16E2B4E2"/>
+ <name>Return Material Sales Invoice Report template</name>
+ <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
+ <reportFilename>Sales Invoice-@our_ref@</reportFilename>
+ <templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
+ </DocumentTemplate>
<DocumentTemplate id="397C0B6E9AE646C0BFCF46E3D9CDF4C3">
<id>397C0B6E9AE646C0BFCF46E3D9CDF4C3</id>
<client id="23C59575B9CF467C9620760EB255B389"/>
diff -r 18b1476f9aab -r 1b61503d7d6a referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Mon May 21 16:00:24 2012 +0200
+++ b/referencedata/standard/Initial_Setup.xml Mon May 21 16:57:34 2012 +0200
@@ -519,6 +519,30 @@
<reversal>false</reversal>
<return>false</return>
</DocumentType>
+<DocumentType id="56AA9305B32C44A08554D3DB16E2B4E2" identifier="Return
Material Sales Invoice">
+ <id>56AA9305B32C44A08554D3DB16E2B4E2</id>
+ <active>true</active>
+ <name>Return Material Sales Invoice</name>
+ <printText>Return Material Sales Invoice</printText>
+ <description xsi:nil="true"/>
+ <documentCategory>ARI_RM</documentCategory>
+ <salesTransaction>true</salesTransaction>
+ <sOSubType xsi:nil="true"/>
+ <documentTypeForShipment xsi:nil="true"/>
+ <documentTypeForInvoice xsi:nil="true"/>
+ <sequencedDocument>true</sequencedDocument>
+ <documentSequence id="CD179732385848B09607674D35D1C447"
entity-name="ADSequence" identifier="Return Material Sales Invoice"/>
+ <gLCategory id="102C08DF5D4341D5B7FDF758632503D2"
entity-name="FinancialMgmtGLCategory" identifier="AR Invoice"/>
+ <comments xsi:nil="true"/>
+ <default>false</default>
+ <numberOfCopies>1</numberOfCopies>
+ <table id="318" entity-name="ADTable" identifier="C_Invoice"/>
+ <filterByOrganization>false</filterByOrganization>
+ <documentCancelled xsi:nil="true"/>
+ <expense>false</expense>
+ <reversal>false</reversal>
+ <return>true</return>
+ </DocumentType>
<DocumentType id="3DDDC41E36534A79B7CC1B725472882D" identifier="Inventory
Move">
<id>3DDDC41E36534A79B7CC1B725472882D</id>
<active>true</active>
@@ -1033,7 +1057,7 @@
<salesTransaction>true</salesTransaction>
<sOSubType>SO</sOSubType>
<documentTypeForShipment id="6FC1637EEE784A368157D86E0BDD852A"
entity-name="DocumentType" identifier="RFC Receipt"/>
- <documentTypeForInvoice id="67C3266D11A04078B7A14AC21E91C711"
entity-name="DocumentType" identifier="Reversed Sales Invoice"/>
+ <documentTypeForInvoice id="56AA9305B32C44A08554D3DB16E2B4E2"
entity-name="DocumentType" identifier="Return Material Sales Invoice"/>
<sequencedDocument>true</sequencedDocument>
<documentSequence id="78E54919CD7742EEA66B2CA1AD41C87E"
entity-name="ADSequence" identifier="RFC Order"/>
<gLCategory id="745A2B441A2644DF934D1B1E462292E9"
entity-name="FinancialMgmtGLCategory" identifier="None"/>
@@ -1323,6 +1347,18 @@
<usedForRecordID>false</usedForRecordID>
<restartSequenceEveryYear>false</restartSequenceEveryYear>
</ADSequence>
+<ADSequence id="CD179732385848B09607674D35D1C447" identifier="Return Material
Sales Invoice">
+ <id>CD179732385848B09607674D35D1C447</id>
+ <active>true</active>
+ <name>Return Material Sales Invoice</name>
+ <description>Return Material Sales Invoice</description>
+ <valueFormat xsi:nil="true"/>
+ <autoNumbering>true</autoNumbering>
+ <incrementBy>1</incrementBy>
+ <startingNo>1000000</startingNo>
+ <usedForRecordID>false</usedForRecordID>
+ <restartSequenceEveryYear>false</restartSequenceEveryYear>
+ </ADSequence>
<ADSequence id="4D72691638A24A0194882A302FCF9494" identifier="AP Payment">
<id>4D72691638A24A0194882A302FCF9494</id>
<active>true</active>
@@ -1719,6 +1755,18 @@
<showlogo>true</showlogo>
<headermargin xsi:nil="true"/>
</DocumentTemplate>
+<DocumentTemplate id="B1D6986BD45E4E108B0C3121FC90D3B5" identifier="Return
Material Sales Invoice Report template">
+ <id>B1D6986BD45E4E108B0C3121FC90D3B5</id>
+ <active>true</active>
+ <documentType id="56AA9305B32C44A08554D3DB16E2B4E2"
entity-name="DocumentType" identifier="Return Material Sales Invoice"/>
+ <name>Return Material Sales Invoice Report template</name>
+ <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
+ <reportFilename>Return Material Invoice-@our_ref@</reportFilename>
+ <templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
+ </DocumentTemplate>
<DocumentTemplate id="70AEA0C77DB743A4A89058BFE091FEEA" identifier="Standard
order report template">
<id>70AEA0C77DB743A4A89058BFE091FEEA</id>
<active>true</active>
diff -r 18b1476f9aab -r 1b61503d7d6a
src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml
--- a/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml Mon May
21 16:00:24 2012 +0200
+++ b/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml Mon May
21 16:57:34 2012 +0200
@@ -107,9 +107,11 @@
-- Update existing Product Category
UPDATE M_Product_Category_Acct
SET P_Revenue_Acct=Cur_Acct.P_Revenue_Acct,
+ P_Revenue_Return_Acct=Cur_Acct.P_Revenue_Return_Acct,
P_Expense_Acct=Cur_Acct.P_Expense_Acct,
P_Asset_Acct=Cur_Acct.P_Asset_Acct,
P_CoGs_Acct=Cur_Acct.P_CoGs_Acct,
+ P_CoGs_Return_Acct=Cur_Acct.P_CoGs_Return_Acct,
P_PurchasePriceVariance_Acct=Cur_Acct.P_PurchasePriceVariance_Acct,
P_InvoicePriceVariance_Acct=Cur_Acct.P_InvoicePriceVariance_Acct,
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
