[Adempiere-cvslog] SF.net SVN: adempiere: [2157] trunk/base/src/org/compiere/model/ MInvoiceLine.java

[<vp...@us...>]

Revision: 2157
          http://svn.sourceforge.net/adempiere/?rev=2157&view=rev
Author:   vpj-cd
Date:     2007-04-18 15:57:18 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
Fixed : [ 1703318 ] Error generate invoice line ad charge and should use product
https://sourceforge.net/tracker/index.php?func=detail&aid=1703318&group_id=176962&atid=879332

Modified Paths:
--------------
    trunk/base/src/org/compiere/model/MInvoiceLine.java

Modified: trunk/base/src/org/compiere/model/MInvoiceLine.java
===================================================================
--- trunk/base/src/org/compiere/model/MInvoiceLine.java	2007-04-18 22:35:01 UTC (rev 2156)
+++ trunk/base/src/org/compiere/model/MInvoiceLine.java	2007-04-18 22:57:18 UTC (rev 2157)
@@ -189,6 +189,7 @@
 		setIsDescription(oLine.isDescription());
 		setDescription(oLine.getDescription());
 		//
+		if(oLine.getM_Product_ID() == 0)
 		setC_Charge_ID(oLine.getC_Charge_ID());
 		//
 		setM_Product_ID(oLine.getM_Product_ID());
@@ -236,6 +237,7 @@
 		setC_UOM_ID(sLine.getC_UOM_ID());
 		setM_AttributeSetInstance_ID(sLine.getM_AttributeSetInstance_ID());
 	//	setS_ResourceAssignment_ID(sLine.getS_ResourceAssignment_ID());
+		if(getM_Product_ID() == 0)
 		setC_Charge_ID(sLine.getC_Charge_ID());
 		//
 		int C_OrderLine_ID = sLine.getC_OrderLine_ID();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.