details: /erp/devel/int/rev/329cd267250a
changeset: 7086:329cd267250a
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Apr 19 13:15:58 2010 +0200
summary: Fixes issue 0012941: When invoice amount is under paid
details: /erp/devel/int/rev/a6d4fe2cf068
changeset: 7087:a6d4fe2cf068
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Apr 19 13:22:19 2010 +0200
summary: Fixes bug 0012721: Not able to unpost
diffstat:
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 4 +-
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java | 15 +++++++----
2 files changed, 11 insertions(+), 8 deletions(-)
diffs (60 lines):
diff -r 6518e2183d04 -r a6d4fe2cf068
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Mon Apr 19
10:55:58 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java Mon Apr 19
13:22:19 2010 +0200
@@ -116,6 +116,7 @@
docLine.loadAttributes(data[i], this);
docLine.setAmount(data[i].getField("Amount"));
docLine.setIsPrepayment(data[i].getField("isprepayment"));
+ docLine.setWriteOffAmt(data[i].getField("WriteOffAmt"));
list.add(docLine);
}
// Return Array
@@ -164,8 +165,7 @@
.newInstance();
return newTemplate.createFact(this, as, conn, con, vars);
} catch (Exception e) {
- log4j.error(
- "Error while creating new instance for DocFINPaymentTemplate -
", e);
+ log4j.error("Error while creating new instance for
DocFINPaymentTemplate - ", e);
}
}
} finally {
diff -r 6518e2183d04 -r a6d4fe2cf068
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java
--- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java Mon Apr
19 10:55:58 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.java Mon Apr
19 13:22:19 2010 +0200
@@ -1266,18 +1266,20 @@
createDocTypeTemplate(vars, arcDoctypeId, "AR Credit Memo Report template",
"@basedesign@/org/openbravo/erpReports", "Sales invoi...@our_ref@",
"RptC_Invoice.jrxml");
- createDocType(vars, "AR Receipt", "Receipt", "ARR", "", "0", "0",
"400000", GL_ARR, "");
+ createDocType(vars, "AR Receipt", "Receipt", "ARR", "", "0", "0",
"400000", GL_ARR,
+ "D1A97202E832470285C9B1EB026D54E2");
String DT_S = createDocType(vars, "MM Shipment", "Delivery Note", "MMS",
"", "0", "0",
"500000", GL_MM, "319");
createDocTypeTemplate(vars, DT_S, "MM Shipment Report template",
- "@basedesign@/org/openbravo/erpReports", "Goods
shipme...@our_ref@", "RptM_InOut.jrxml");
+ "@basedesign@/org/openbravo/erpReports", "Goods shipme...@our_ref@",
"RptM_InOut.jrxml");
String DT_SI = createDocType(vars, "MM Shipment Indirect", "Delivery
Note", "MMS", "", "0",
"0", "600000", GL_MM, "319");
createDocTypeTemplate(vars, DT_SI, "MM Shipment Indirect Report template",
- "@basedesign@/org/openbravo/erpReports", "Goods
shipme...@our_ref@", "RptM_InOut.jrxml");
- String mmReceipt=createDocType(vars, "MM Receipt", "Vendor Delivery",
"MMR", "", "0", "0", "0", GL_MM, "319");
+ "@basedesign@/org/openbravo/erpReports", "Goods shipme...@our_ref@",
"RptM_InOut.jrxml");
+ String mmReceipt = createDocType(vars, "MM Receipt", "Vendor Delivery",
"MMR", "", "0", "0",
+ "0", GL_MM, "319");
createDocTypeTemplate(vars, mmReceipt, "MM Receipt Report template",
- "@basedesign@/org/openbravo/erpReports", "Goods
recei...@our_ref@", "RptM_InOut.jrxml");
+ "@basedesign@/org/openbravo/erpReports", "Goods recei...@our_ref@",
"RptM_InOut.jrxml");
String apiDoctypeId = createDocType(vars, "AP Invoice", "Vendor Invoice",
"API", "", "0", "0",
"0", GL_API, "318");
createDocTypeTemplate(vars, apiDoctypeId, "AP Invoice Report template",
@@ -1288,7 +1290,8 @@
createDocTypeTemplate(vars, apcDoctypeId, "AP Credit Report template",
"@basedesign@/org/openbravo/erpReports", "Purchase invoi...@our_ref@",
"RptC_Invoice.jrxml");
- createDocType(vars, "AP Payment", "Vendor Payment", "APP", "", "0", "0",
"700000", GL_APP, "");
+ createDocType(vars, "AP Payment", "Vendor Payment", "APP", "", "0", "0",
"700000", GL_APP,
+ "D1A97202E832470285C9B1EB026D54E2");
String pooDoctypeId = createDocType(vars, "Purchase Order", "Purchase
Order", "POO", "", "0",
"0", "800000", GL_None, "259");
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
