diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-21 11:04:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-21 11:04:48 +0100 |
| commit | b51f2d38c247dce9afc04c29774a77d773e3f393 (patch) | |
| tree | 1133e0dd4c082543d1f361fb7ec160ac0b2cccc6 /addons/purchase | |
| parent | c7dff653d56910fd46e4dcf745c2c6088ce9fc58 (diff) | |
| parent | 500e3f497057c5d00ae5cc34da7012c6f31f81d4 (diff) | |
[MERGE] forward port branch saas-11.2 up to 500e3f49705
Diffstat (limited to 'addons/purchase')
| -rw-r--r-- | addons/purchase/data/mail_template_data.xml | 4 | ||||
| -rw-r--r-- | addons/purchase/models/stock.py | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml index dc51e377149..d3c075c3ff0 100644 --- a/addons/purchase/data/mail_template_data.xml +++ b/addons/purchase/data/mail_template_data.xml @@ -15,7 +15,7 @@ <field name="lang">${object.partner_id.lang}</field> <field name="body_html"><![CDATA[ <p>Dear -% if object.partner_id.is_company and object.child_ids: +% if object.partner_id.is_company and object.partner_id.child_ids: ${object.partner_id.child_ids[0].name} % else : ${object.partner_id.name} @@ -55,7 +55,7 @@ from ${object.company_id.name}. <field name="report_name">PO_${(object.name or '').replace('/','_')}</field> <field name="lang">${object.partner_id.lang}</field> <field name="body_html"><![CDATA[ -<p>Dear ${object.partner_id.name} +<p>Dear ${object.partner_id.name} % if object.partner_id.parent_id: (<i>${object.partner_id.parent_id.name}</i>) % endif diff --git a/addons/purchase/models/stock.py b/addons/purchase/models/stock.py index fa38fa44bae..295632baffb 100644 --- a/addons/purchase/models/stock.py +++ b/addons/purchase/models/stock.py @@ -11,17 +11,6 @@ class StockPicking(models.Model): purchase_id = fields.Many2one('purchase.order', related='move_lines.purchase_line_id.order_id', string="Purchase Orders", readonly=True) - @api.model - def _create_backorder(self, backorder_moves=[]): - res = super(StockPicking, self)._create_backorder(backorder_moves) - for picking in self: - if picking.picking_type_id.code == 'incoming': - for backorder in self.search([('backorder_id', '=', picking.id)]): - backorder.message_post_with_view('mail.message_origin_link', - values={'self': backorder, 'origin': backorder.purchase_id}, - subtype_id=self.env.ref('mail.mt_note').id) - return res - class StockMove(models.Model): _inherit = 'stock.move' |