midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

https://sourceforge.net/tracker/?func=detail&aid=2722871&group_id=176962&atid=879332

This commit is contained in:
Heng Sin Low 2009-03-31 04:50:13 +00:00
parent 1027cd66cd
commit f3a81a267d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
base/src/org/compiere/model/MInvoice.java
View File

@ -316,7 +316,6 @@ public class MInvoice extends X_C_Invoice implements DocAction
setDateAcct(getDateInvoiced()); setDateAcct(getDateInvoiced());
// //
setSalesRep_ID(ship.getSalesRep_ID()); setSalesRep_ID(ship.getSalesRep_ID());
setAD_User_ID(ship.getAD_User_ID());
} // MInvoice } // MInvoice
/** /**
@ -485,6 +484,8 @@ public class MInvoice extends X_C_Invoice implements DocAction
MBPartner bp = new MBPartner (getCtx(), ship.getC_BPartner_ID(), null); MBPartner bp = new MBPartner (getCtx(), ship.getC_BPartner_ID(), null);
setBPartner (bp); setBPartner (bp);
// //
setAD_User_ID(ship.getAD_User_ID());
//
setSendEMail(ship.isSendEMail()); setSendEMail(ship.isSendEMail());
// //
setPOReference(ship.getPOReference()); setPOReference(ship.getPOReference());
@ -513,8 +514,13 @@ public class MInvoice extends X_C_Invoice implements DocAction
MDocType dt = MDocType.get(getCtx(), order.getC_DocType_ID()); MDocType dt = MDocType.get(getCtx(), order.getC_DocType_ID());
if (dt.getC_DocTypeInvoice_ID() != 0) if (dt.getC_DocTypeInvoice_ID() != 0)
setC_DocTypeTarget_ID(dt.getC_DocTypeInvoice_ID()); setC_DocTypeTarget_ID(dt.getC_DocTypeInvoice_ID());
// Overwrite Invoice Address // Overwrite Invoice BPartner
setC_BPartner_ID(order.getBill_BPartner_ID());
// Overwrite Invoice Address
setC_BPartner_Location_ID(order.getBill_Location_ID()); setC_BPartner_Location_ID(order.getBill_Location_ID());
// Overwrite Contact
setAD_User_ID(order.getBill_User_ID());
//
} }
// Check if Shipment/Receipt is based on RMA // Check if Shipment/Receipt is based on RMA
if (ship.getM_RMA_ID() != 0) if (ship.getM_RMA_ID() != 0)