details: /erp/devel/pi-engdev/rev/c53b04c85dd4
changeset: 6454:c53b04c85dd4
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Feb 18 16:37:58 2010 +0100
summary: Invoice accounting + procedure+ ...
diffstat:
src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml | 3 +-
src-db/database/sourcedata/AD_COLUMN.xml | 16 +-
src-db/database/sourcedata/AD_ELEMENT.xml | 8 +-
src-db/database/sourcedata/AD_EP_PROCEDURES.xml | 4 +-
src-db/database/sourcedata/AD_TABLE.xml | 2 +
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 48 +
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 286
+++++----
src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql | 14 +-
src/org/openbravo/erpCommon/ad_forms/DocLine_FinPaymentSchedule.java | 117
++++
9 files changed, 372 insertions(+), 126 deletions(-)
diffs (truncated from 767 to 300 lines):
diff -r 440d5e854333 -r c53b04c85dd4
src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml
--- a/src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml Wed Feb
17 17:00:12 2010 +0100
+++ b/src-db/database/model/functions/FIN_GEN_PAYMENTSCHEDULE_INV.xml Thu Feb
18 16:37:58 2010 +0100
@@ -157,7 +157,7 @@
v_paidamt := 0;
v_ResultStr:='Inserting in FIN_PAYMENT_SCHEDULE table';
- v_pendingAmount:=v_pendingAmount - v_paymentAmount;
+ --v_pendingAmount:=v_pendingAmount - v_paymentAmount;
INSERT INTO fin_payment_schedule
(
fin_payment_schedule_id, ad_client_id, ad_org_id, isactive,
@@ -193,6 +193,7 @@
IF (v_count <> 0) THEN
RAISE_APPLICATION_ERROR(-20000, '@InvoiceWithPayments@' || ' ' ||
v_paymentno);
END IF;
+ DELETE FROM fin_payment_schedule WHERE c_invoice_id = p_record_id;
END;
END IF;
diff -r 440d5e854333 -r c53b04c85dd4 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Feb 17 17:00:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Feb 18 16:37:58 2010 +0100
@@ -249109,6 +249109,8 @@
<!--386B15D6252B4CA4A64A0B086A6573B2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--386B15D6252B4CA4A64A0B086A6573B2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--386B15D6252B4CA4A64A0B086A6573B2-->
<NAME><![CDATA[Fin_Payment_Schedule_V_ID]]></NAME>
+<!--386B15D6252B4CA4A64A0B086A6573B2--> <DESCRIPTION><![CDATA[Set of payments
planned to be collected/paid]]></DESCRIPTION>
+<!--386B15D6252B4CA4A64A0B086A6573B2--> <HELP><![CDATA[Set of payments
planned to be collected/paid]]></HELP>
<!--386B15D6252B4CA4A64A0B086A6573B2-->
<COLUMNNAME><![CDATA[Fin_Payment_Schedule_V_ID]]></COLUMNNAME>
<!--386B15D6252B4CA4A64A0B086A6573B2-->
<AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
<!--386B15D6252B4CA4A64A0B086A6573B2-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -269606,6 +269608,8 @@
<!--7891269C83D0655DE040007F010155CE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7891269C83D0655DE040007F010155CE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7891269C83D0655DE040007F010155CE--> <NAME><![CDATA[Payment]]></NAME>
+<!--7891269C83D0655DE040007F010155CE--> <DESCRIPTION><![CDATA[Payment
event]]></DESCRIPTION>
+<!--7891269C83D0655DE040007F010155CE--> <HELP><![CDATA[Payment event]]></HELP>
<!--7891269C83D0655DE040007F010155CE-->
<COLUMNNAME><![CDATA[Fin_Payment_ID]]></COLUMNNAME>
<!--7891269C83D0655DE040007F010155CE-->
<AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
<!--7891269C83D0655DE040007F010155CE-->
<AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -269674,9 +269678,8 @@
<!--7891269C83D2655DE040007F010155CE-->
<COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
<!--7891269C83D2655DE040007F010155CE-->
<AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
<!--7891269C83D2655DE040007F010155CE-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--7891269C83D2655DE040007F010155CE-->
<AD_VAL_RULE_ID><![CDATA[104]]></AD_VAL_RULE_ID>
<!--7891269C83D2655DE040007F010155CE-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--7891269C83D2655DE040007F010155CE-->
<DEFAULTVALUE><![cda...@ad_org_id@]]></DEFAULTVALUE>
+<!--7891269C83D2655DE040007F010155CE-->
<DEFAULTVALUE><![cda...@#ad_org_id@]]></DEFAULTVALUE>
<!--7891269C83D2655DE040007F010155CE--> <ISKEY><![CDATA[N]]></ISKEY>
<!--7891269C83D2655DE040007F010155CE--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--7891269C83D2655DE040007F010155CE-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -270029,6 +270032,7 @@
<!--7891269C83DE655DE040007F010155CE--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--7891269C83DE655DE040007F010155CE-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--7891269C83DE655DE040007F010155CE-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7891269C83DE655DE040007F010155CE-->
<READONLYLOGIC><![cda...@status@!'U']]></READONLYLOGIC>
<!--7891269C83DE655DE040007F010155CE-->
<ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--7891269C83DE655DE040007F010155CE--> <SEQNO><![CDATA[150]]></SEQNO>
<!--7891269C83DE655DE040007F010155CE-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -270464,6 +270468,8 @@
<!--7891269C83F9655DE040007F010155CE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7891269C83F9655DE040007F010155CE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7891269C83F9655DE040007F010155CE-->
<NAME><![CDATA[Fin_Payment_ID]]></NAME>
+<!--7891269C83F9655DE040007F010155CE--> <DESCRIPTION><![CDATA[Payment
event]]></DESCRIPTION>
+<!--7891269C83F9655DE040007F010155CE--> <HELP><![CDATA[Payment event]]></HELP>
<!--7891269C83F9655DE040007F010155CE-->
<COLUMNNAME><![CDATA[Fin_Payment_ID]]></COLUMNNAME>
<!--7891269C83F9655DE040007F010155CE-->
<AD_TABLE_ID><![CDATA[5C77283492354D759049C14C9D4B7769]]></AD_TABLE_ID>
<!--7891269C83F9655DE040007F010155CE-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -271280,6 +271286,8 @@
<!--7891269C8418655DE040007F010155CE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7891269C8418655DE040007F010155CE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7891269C8418655DE040007F010155CE-->
<NAME><![CDATA[Fin_Payment_ID]]></NAME>
+<!--7891269C8418655DE040007F010155CE--> <DESCRIPTION><![CDATA[Payment
event]]></DESCRIPTION>
+<!--7891269C8418655DE040007F010155CE--> <HELP><![CDATA[Payment event]]></HELP>
<!--7891269C8418655DE040007F010155CE-->
<COLUMNNAME><![CDATA[Fin_Payment_ID]]></COLUMNNAME>
<!--7891269C8418655DE040007F010155CE-->
<AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID>
<!--7891269C8418655DE040007F010155CE-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -271528,6 +271536,8 @@
<!--78D10D5CC289A0ADE040007F010152E6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--78D10D5CC289A0ADE040007F010152E6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--78D10D5CC289A0ADE040007F010152E6-->
<NAME><![CDATA[Fin_Payment_Schedule_V_ID]]></NAME>
+<!--78D10D5CC289A0ADE040007F010152E6--> <DESCRIPTION><![CDATA[Set of payments
planned to be collected/paid]]></DESCRIPTION>
+<!--78D10D5CC289A0ADE040007F010152E6--> <HELP><![CDATA[Set of payments
planned to be collected/paid]]></HELP>
<!--78D10D5CC289A0ADE040007F010152E6-->
<COLUMNNAME><![CDATA[Fin_Payment_Schedule_V_ID]]></COLUMNNAME>
<!--78D10D5CC289A0ADE040007F010152E6-->
<AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
<!--78D10D5CC289A0ADE040007F010152E6-->
<AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -271871,7 +271881,7 @@
<!--78D10D5CC297A0ADE040007F010152E6--> <NAME><![CDATA[Number of
Payments]]></NAME>
<!--78D10D5CC297A0ADE040007F010152E6-->
<COLUMNNAME><![CDATA[Numberofpayments]]></COLUMNNAME>
<!--78D10D5CC297A0ADE040007F010152E6-->
<AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
-<!--78D10D5CC297A0ADE040007F010152E6-->
<AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--78D10D5CC297A0ADE040007F010152E6-->
<AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
<!--78D10D5CC297A0ADE040007F010152E6-->
<FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
<!--78D10D5CC297A0ADE040007F010152E6--> <ISKEY><![CDATA[N]]></ISKEY>
<!--78D10D5CC297A0ADE040007F010152E6--> <ISPARENT><![CDATA[N]]></ISPARENT>
diff -r 440d5e854333 -r c53b04c85dd4 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Feb 17 17:00:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Thu Feb 18 16:37:58 2010 +0100
@@ -25105,6 +25105,8 @@
<!--7891269C83EA655DE040007F010155CE-->
<COLUMNNAME><![CDATA[Fin_Payment_ID]]></COLUMNNAME>
<!--7891269C83EA655DE040007F010155CE--> <NAME><![CDATA[Payment]]></NAME>
<!--7891269C83EA655DE040007F010155CE-->
<PRINTNAME><![CDATA[Payment]]></PRINTNAME>
+<!--7891269C83EA655DE040007F010155CE--> <DESCRIPTION><![CDATA[Payment
event]]></DESCRIPTION>
+<!--7891269C83EA655DE040007F010155CE--> <HELP><![CDATA[Payment event]]></HELP>
<!--7891269C83EA655DE040007F010155CE-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--7891269C83EA655DE040007F010155CE--></AD_ELEMENT>
@@ -25215,8 +25217,10 @@
<!--78B98ED04531560FE040007F0101777C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--78B98ED04531560FE040007F0101777C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--78B98ED04531560FE040007F0101777C-->
<COLUMNNAME><![CDATA[Fin_Payment_Schedule_V_ID]]></COLUMNNAME>
-<!--78B98ED04531560FE040007F0101777C-->
<NAME><![CDATA[Fin_Payment_Schedule_V_ID]]></NAME>
-<!--78B98ED04531560FE040007F0101777C-->
<PRINTNAME><![CDATA[Fin_Payment_Schedule_V_ID]]></PRINTNAME>
+<!--78B98ED04531560FE040007F0101777C--> <NAME><![CDATA[Payment Plan]]></NAME>
+<!--78B98ED04531560FE040007F0101777C--> <PRINTNAME><![CDATA[Payment
Plan]]></PRINTNAME>
+<!--78B98ED04531560FE040007F0101777C--> <DESCRIPTION><![CDATA[Set of payments
planned to be collected/paid]]></DESCRIPTION>
+<!--78B98ED04531560FE040007F0101777C--> <HELP><![CDATA[Set of payments
planned to be collected/paid]]></HELP>
<!--78B98ED04531560FE040007F0101777C-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--78B98ED04531560FE040007F0101777C--></AD_ELEMENT>
diff -r 440d5e854333 -r c53b04c85dd4
src-db/database/sourcedata/AD_EP_PROCEDURES.xml
--- a/src-db/database/sourcedata/AD_EP_PROCEDURES.xml Wed Feb 17 17:00:12
2010 +0100
+++ b/src-db/database/sourcedata/AD_EP_PROCEDURES.xml Thu Feb 18 16:37:58
2010 +0100
@@ -4,7 +4,7 @@
<!--085572AE363342A9B5D10CB91F146217-->
<AD_EP_PROCEDURES_ID><![CDATA[085572AE363342A9B5D10CB91F146217]]></AD_EP_PROCEDURES_ID>
<!--085572AE363342A9B5D10CB91F146217-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--085572AE363342A9B5D10CB91F146217--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--085572AE363342A9B5D10CB91F146217--> <ISACTIVE><![CDATA[N]]></ISACTIVE>
+<!--085572AE363342A9B5D10CB91F146217--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--085572AE363342A9B5D10CB91F146217-->
<AD_EXTENSION_POINTS_ID><![CDATA[CBE7DD2E561E4D3D8257ECEA5F19687F]]></AD_EXTENSION_POINTS_ID>
<!--085572AE363342A9B5D10CB91F146217-->
<PROCEDURENAME><![CDATA[FIN_GEN_PAYMENTSCHEDULE_INV]]></PROCEDURENAME>
<!--085572AE363342A9B5D10CB91F146217-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -14,7 +14,7 @@
<!--E7D138940ABF4EC7B0C3DAF79FE52550-->
<AD_EP_PROCEDURES_ID><![CDATA[E7D138940ABF4EC7B0C3DAF79FE52550]]></AD_EP_PROCEDURES_ID>
<!--E7D138940ABF4EC7B0C3DAF79FE52550-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--E7D138940ABF4EC7B0C3DAF79FE52550--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--E7D138940ABF4EC7B0C3DAF79FE52550--> <ISACTIVE><![CDATA[N]]></ISACTIVE>
+<!--E7D138940ABF4EC7B0C3DAF79FE52550--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--E7D138940ABF4EC7B0C3DAF79FE52550-->
<AD_EXTENSION_POINTS_ID><![CDATA[CB68FC0E8A4547D9943C785761977E77]]></AD_EXTENSION_POINTS_ID>
<!--E7D138940ABF4EC7B0C3DAF79FE52550-->
<PROCEDURENAME><![CDATA[FIN_GEN_PAYMENTSCHEDULE_ORD]]></PROCEDURENAME>
<!--E7D138940ABF4EC7B0C3DAF79FE52550-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
diff -r 440d5e854333 -r c53b04c85dd4 src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml Wed Feb 17 17:00:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml Thu Feb 18 16:37:58 2010 +0100
@@ -10773,6 +10773,8 @@
<!--D1A97202E832470285C9B1EB026D54E2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--D1A97202E832470285C9B1EB026D54E2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--D1A97202E832470285C9B1EB026D54E2--> <NAME><![CDATA[FIN_Payment]]></NAME>
+<!--D1A97202E832470285C9B1EB026D54E2--> <DESCRIPTION><![CDATA[Payment
events]]></DESCRIPTION>
+<!--D1A97202E832470285C9B1EB026D54E2--> <HELP><![CDATA[Payment
events]]></HELP>
<!--D1A97202E832470285C9B1EB026D54E2-->
<TABLENAME><![CDATA[FIN_Payment]]></TABLENAME>
<!--D1A97202E832470285C9B1EB026D54E2-->
<CLASSNAME><![CDATA[FIN_Payment]]></CLASSNAME>
<!--D1A97202E832470285C9B1EB026D54E2--> <ISVIEW><![CDATA[N]]></ISVIEW>
diff -r 440d5e854333 -r c53b04c85dd4
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Wed Feb 17
17:00:12 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Thu Feb 18
16:37:58 2010 +0100
@@ -21,18 +21,23 @@
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.List;
import java.util.Vector;
import javax.servlet.ServletException;
import org.apache.log4j.Logger;
import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.dal.service.OBQuery;
import org.openbravo.data.FieldProvider;
import org.openbravo.database.ConnectionProvider;
import org.openbravo.erpCommon.utility.DateTimeData;
import org.openbravo.erpCommon.utility.SequenceIdData;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.exception.NoConnectionAvailableException;
+import org.openbravo.model.common.businesspartner.CustomerAccounts;
+import org.openbravo.model.common.businesspartner.VendorAccounts;
public abstract class AcctServer {
static Logger log4j = Logger.getLogger(AcctServer.class);
@@ -1429,6 +1434,49 @@
return acct;
} // getAccount
+ /**
+ * Get the account for Accounting Schema
+ *
+ * @param cBPartnerId
+ * business partner id
+ * @param as
+ * accounting schema
+ * @return Account
+ */
+ public final Account getAccountBPartner(String cBPartnerId, AcctSchema as,
boolean isReceipt,
+ ConnectionProvider conn) throws ServletException {
+
+ String strValidCombination = "";
+ if (isReceipt) {
+ final StringBuilder whereClause = new StringBuilder();
+
+ whereClause.append(" as cusa ");
+ whereClause.append(" where cusa.businessPartner.id = '" + cBPartnerId +
"'");
+ whereClause.append(" and cusa.accountingSchema.id = '" +
as.m_C_AcctSchema_ID + "'");
+
+ final OBQuery<CustomerAccounts> obqParameters =
OBDal.getInstance().createQuery(
+ CustomerAccounts.class, whereClause.toString());
+ final List<CustomerAccounts> customerAccounts = obqParameters.list();
+ if (customerAccounts != null && customerAccounts.size() > 0
+ && customerAccounts.get(0).getCustomerReceivablesNo() != null)
+ strValidCombination =
customerAccounts.get(0).getCustomerReceivablesNo().getId();
+ } else {
+ final StringBuilder whereClause = new StringBuilder();
+
+ whereClause.append(" as cusa ");
+ whereClause.append(" where cusa.businessPartner.id = '" + cBPartnerId +
"'");
+ whereClause.append(" and cusa.accountingSchema.id = '" +
as.m_C_AcctSchema_ID + "'");
+
+ final OBQuery<VendorAccounts> obqParameters =
OBDal.getInstance().createQuery(
+ VendorAccounts.class, whereClause.toString());
+ final List<VendorAccounts> vendorAccounts = obqParameters.list();
+ if (vendorAccounts != null && vendorAccounts.size() > 0
+ && vendorAccounts.get(0).getVendorLiability() != null)
+ strValidCombination =
vendorAccounts.get(0).getVendorLiability().getId();
+ }
+ return new Account(conn, strValidCombination);
+ } // getAccount
+
public FieldProvider[] getObjectFieldProvider() {
return objectFieldProvider;
}
diff -r 440d5e854333 -r c53b04c85dd4
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Wed Feb 17
17:00:12 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Thu Feb 18
16:37:58 2010 +0100
@@ -33,6 +33,7 @@
static Logger log4jDocInvoice = Logger.getLogger(DocInvoice.class);
DocTax[] m_taxes = null;
+ DocLine_FinPaymentSchedule[] m_payments = null;
String SeqNo = "0";
/**
@@ -45,9 +46,9 @@
super(AD_Client_ID, AD_Org_ID, connectionProvider);
}
- public void loadObjectFieldProvider(ConnectionProvider conn, String
AD_Client_ID, String Id)
+ public void loadObjectFieldProvider(ConnectionProvider conn, String
stradClientId, String Id)
throws ServletException {
- setObjectFieldProvider(DocInvoiceData.selectRegistro(conn, AD_Client_ID,
Id));
+ setObjectFieldProvider(DocInvoiceData.selectRegistro(conn, stradClientId,
Id));
}
public boolean loadDocumentDetails(FieldProvider[] data, ConnectionProvider
conn) {
@@ -69,6 +70,7 @@
// Contained Objects
p_lines = loadLines();
m_taxes = loadTaxes();
+ m_payments = loadPayments();
m_debt_payments = loadDebtPayments();
return true;
@@ -92,11 +94,11 @@
String Line_ID = data[i].cInvoicelineId;
DocLine_Invoice docLine = new DocLine_Invoice(DocumentType, Record_ID,
Line_ID);
docLine.loadAttributes(data[i], this);
- String Qty = data[i].qtyinvoiced;
- docLine.setQty(Qty);
+ String strQty = data[i].qtyinvoiced;
+ docLine.setQty(strQty);
String LineNetAmt = data[i].linenetamt;
String PriceList = data[i].pricelist;
- docLine.setAmount(LineNetAmt, PriceList, Qty);
+ docLine.setAmount(LineNetAmt, PriceList, strQty);
list.add(docLine);
}
@@ -106,58 +108,6 @@
return dl;
} // loadLines
- /**
- * @return the log4jDocInvoice
- */
- public static Logger getLog4jDocInvoice() {
- return log4jDocInvoice;
- }
-
- /**
- * @param log4jDocInvoice
- * the log4jDocInvoice to set
- */
- public static void setLog4jDocInvoice(Logger log4jDocInvoice) {
- DocInvoice.log4jDocInvoice = log4jDocInvoice;
- }
-
- /**
- * @return the m_taxes
- */
- public DocTax[] getM_taxes() {
------------------------------------------------------------------------------
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
