Merge with addons-trunk revno 7150

[odoo/odoo.git] / addons / purchase / stock.py

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index b5b7081..084d105 100644 (file)
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -60,6 +60,9 @@ class stock_picking(osv.osv):
         invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
         if picking.purchase_id:
             invoice_vals['fiscal_position'] = picking.purchase_id.fiscal_position.id
+            invoice_vals['payment_term'] = picking.purchase_id.payment_term.id
+            if picking.purchase_id.payment_term and context.get('date_inv'):
+                invoice_vals['date_due'] = self.pool.get('account.invoice').onchange_payment_term_date_invoice(cr, uid, [], picking.purchase_id.payment_term.id, context.get('invoice_date'))['value'].get('date_due')
         return invoice_vals
 
     def get_currency_id(self, cursor, user, picking):