details: /erp/devel/pi/rev/e16b5418ddad
changeset: 7432:e16b5418ddad
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Thu May 27 09:43:16 2010 +0200
summary: Fixes issue 13088: Project dimension is not taken into account
diffstat:
src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 11 ++++++++---
src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql | 6 ++++--
2 files changed, 12 insertions(+), 5 deletions(-)
diffs (59 lines):
diff -r 693e335d4298 -r e16b5418ddad
src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java Wed May 26
12:57:16 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java Thu May 27
09:43:16 2010 +0200
@@ -160,7 +160,10 @@
BigDecimal bdDifference = bdExpenses.subtract(bdCost);
- dr = fact.createLine(null,
getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn), as
+ DocLine docLine = new DocLine(DocumentType, Record_ID, "");
+ docLine.m_C_Project_ID = data[0].getField("INOUTPROJECT");
+
+ dr = fact.createLine(docLine,
getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn), as
.getC_Currency_ID(), bdCost.toString(), Fact_Acct_Group_ID,
nextSeqNo(SeqNo), DocumentType,
conn);
@@ -170,8 +173,10 @@
return null;
}
+ docLine.m_C_Project_ID = data[0].getField("INVOICEPROJECT");
+
ProductInfo p = new ProductInfo(data[0].getField("M_Product_Id"), conn);
- cr = fact.createLine(null, p.getAccount(ProductInfo.ACCTTYPE_P_Expense,
as, conn), as
+ cr = fact.createLine(docLine, p.getAccount(ProductInfo.ACCTTYPE_P_Expense,
as, conn), as
.getC_Currency_ID(), "0", bdExpenses.toString(), Fact_Acct_Group_ID,
nextSeqNo(SeqNo),
DocumentType, conn);
@@ -181,7 +186,7 @@
return null;
}
if (!bdCost.equals(bdExpenses)) {
- diff = fact.createLine(null, p.getAccount(ProductInfo.ACCTTYPE_P_IPV,
as, conn), as
+ diff = fact.createLine(docLine, p.getAccount(ProductInfo.ACCTTYPE_P_IPV,
as, conn), as
.getC_Currency_ID(), (bdDifference.compareTo(BigDecimal.ZERO) == 1)
? bdDifference.abs()
.toString() : "0", (bdDifference.compareTo(BigDecimal.ZERO) < 1) ?
bdDifference.abs()
.toString() : "0", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
DocumentType, conn);
diff -r 693e335d4298 -r e16b5418ddad
src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql Wed May
26 12:57:16 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql Thu May
27 09:43:16 2010 +0200
@@ -27,7 +27,8 @@
'' AS C_INVOICELINE_ID, '' AS M_PRODUCT_ID, '' AS DATETRX, '' AS
QTY, '' AS PROCESSING,
'' AS PROCESSED, '' AS POSTED, '' AS DATEACCT, '' AS DATEDOC, '' AS
C_BPARTNER_ID,
'' AS LINENETAMT, '' AS C_CURRENCY_ID, '' AS stdprecision, '' as
orderAcctDate,
- '' AS INVOICESTATUS, '' AS INOUTSTATUS, '' AS MOVEMENTQTY, '' AS
QTYINVOICED
+ '' AS INVOICESTATUS, '' AS INOUTSTATUS, '' AS MOVEMENTQTY, '' AS
QTYINVOICED,
+ '' AS INVOICEPROJECT, '' AS INOUTPROJECT
FROM DUAL
]]>
</Sql>
@@ -39,7 +40,8 @@
SELECT M.M_MATCHINV_ID, M.AD_CLIENT_ID, M.AD_ORG_ID, M.ISACTIVE,
M.CREATED, M.CREATEDBY, M.UPDATED,
M.UPDATEDBY, M.M_INOUTLINE_ID, M.C_INVOICELINE_ID, M.M_PRODUCT_ID,
M.DATETRX, M.QTY, M.PROCESSING,
M.PROCESSED, M.POSTED, M.DATETRX AS DATEACCT, M.DATETRX AS DATEDOC,
I.C_BPARTNER_ID, IO.DATEACCT as orderAcctDate,
- IO.DOCSTATUS AS INOUTSTATUS, I.DOCSTATUS AS INVOICESTATUS,
IOL.MOVEMENTQTY, IL.QTYINVOICED
+ IO.DOCSTATUS AS INOUTSTATUS, I.DOCSTATUS AS INVOICESTATUS,
IOL.MOVEMENTQTY, IL.QTYINVOICED,
+ I.C_PROJECT_ID AS INVOICEPROJECT, IO.C_PROJECT_ID AS INOUTPROJECT
FROM M_MATCHINV M, C_INVOICELINE IL, C_INVOICE I, M_INOUTLINE IOL,
M_INOUT IO
WHERE IL.C_INVOICELINE_ID = M.C_INVOICELINE_ID
AND IL.C_INVOICE_ID = I.C_INVOICE_ID
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
