pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to fb25735

Browse Source
This commit is contained in:
Damien Bouvy
2017-05-04 09:25:50 +02:00
parent 73527d0fc6 fb257353fa
commit e460616428
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_invoice.py
+4 -4
View File
@@ -1165,11 +1165,11 @@ class AccountInvoiceLine(models.Model):
string='Analytic Account') string='Analytic Account')
analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Analytic Tags') analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Analytic Tags')
company_id = fields.Many2one('res.company', string='Company', company_id = fields.Many2one('res.company', string='Company',
related='invoice_id.company_id', store=True, readonly=True) related='invoice_id.company_id', store=True, readonly=True, related_sudo=False)
partner_id = fields.Many2one('res.partner', string='Partner', partner_id = fields.Many2one('res.partner', string='Partner',
related='invoice_id.partner_id', store=True, readonly=True) related='invoice_id.partner_id', store=True, readonly=True, related_sudo=False)
currency_id = fields.Many2one('res.currency', related='invoice_id.currency_id', store=True) currency_id = fields.Many2one('res.currency', related='invoice_id.currency_id', store=True, related_sudo=False)
company_currency_id = fields.Many2one('res.currency', related='invoice_id.company_currency_id', readonly=True) company_currency_id = fields.Many2one('res.currency', related='invoice_id.company_currency_id', readonly=True, related_sudo=False)
@api.model @api.model
def fields_view_get(self, view_id=None, view_type='form', toolbar=False, submenu=False): def fields_view_get(self, view_id=None, view_type='form', toolbar=False, submenu=False):
addons/purchase/invoice.py
+2 -5
View File
@@ -68,10 +68,7 @@ class AccountInvoice(models.Model):
self.partner_id = self.purchase_id.partner_id.id self.partner_id = self.purchase_id.partner_id.id
new_lines = self.env['account.invoice.line'] new_lines = self.env['account.invoice.line']
for line in self.purchase_id.order_line: for line in self.purchase_id.order_line - self.invoice_line_ids.mapped('purchase_line_id'):
# Load a PO line only once
if line in self.invoice_line_ids.mapped('purchase_line_id'):
continue
data = self._prepare_invoice_line_from_po_line(line) data = self._prepare_invoice_line_from_po_line(line)
new_line = new_lines.new(data) new_line = new_lines.new(data)
new_line._set_additional_fields(self) new_line._set_additional_fields(self)
@@ -195,5 +192,5 @@ class AccountInvoiceLine(models.Model):
_inherit = 'account.invoice.line' _inherit = 'account.invoice.line'
purchase_line_id = fields.Many2one('purchase.order.line', 'Purchase Order Line', ondelete='set null', index=True, readonly=True) purchase_line_id = fields.Many2one('purchase.order.line', 'Purchase Order Line', ondelete='set null', index=True, readonly=True)
purchase_id = fields.Many2one('purchase.order', related='purchase_line_id.order_id', string='Purchase Order', store=False, readonly=True, purchase_id = fields.Many2one('purchase.order', related='purchase_line_id.order_id', string='Purchase Order', store=False, readonly=True, related_sudo=False,
help='Associated Purchase Order. Filled in automatically when a PO is chosen on the vendor bill.') help='Associated Purchase Order. Filled in automatically when a PO is chosen on the vendor bill.')