audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] account_payment_sale: Check if payment mode is set in the propagation

Browse Source
This commit is contained in:
Pedro M. Baeza
2014-09-23 09:24:14 +02:00
committed by Artem Kostyuk
parent b3302ceb2a
commit 011e4e89ca
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
account_payment_sale/models/sale_order.py
View File

@@ -44,7 +44,8 @@ class SaleOrder(models.Model):
def _prepare_invoice(self, order, lines): def _prepare_invoice(self, order, lines):
"""Copy bank partner from sale order to invoice""" """Copy bank partner from sale order to invoice"""
vals = super(SaleOrder, self)._prepare_invoice(order, lines) vals = super(SaleOrder, self)._prepare_invoice(order, lines)
vals['payment_mode_id'] = order.payment_mode_id.id, if order.payment_mode_id:
vals['partner_bank_id'] = (order.payment_mode_id and vals['payment_mode_id'] = order.payment_mode_id.id,
order.payment_mode_id.bank_id.id) vals['partner_bank_id'] = (order.payment_mode_id and
order.payment_mode_id.bank_id.id)
return vals return vals

2
account_payment_sale/models/stock_picking.py
View File

@@ -33,7 +33,7 @@ class StockPicking(models.Model):
sale_order_obj = self.env['sale.order'] sale_order_obj = self.env['sale.order']
sale_order = sale_order_obj.search( sale_order = sale_order_obj.search(
[('picking_ids', 'in', picking.id)], limit=1) [('picking_ids', 'in', picking.id)], limit=1)
if sale_order: if sale_order and sale_order.payment_mode_id:
vals['partner_bank_id'] = sale_order.payment_mode_id.bank_id.id vals['partner_bank_id'] = sale_order.payment_mode_id.bank_id.id
vals['payment_mode_id'] = sale_order.payment_mode_id.id vals['payment_mode_id'] = sale_order.payment_mode_id.id
return super(StockPicking, self)._create_invoice_from_picking(picking, return super(StockPicking, self)._create_invoice_from_picking(picking,