From dca70847f0b40d0821c2d645887f1d0822e9ec5b Mon Sep 17 00:00:00 2001 From: Dario Lodeiros Date: Tue, 23 Oct 2018 13:48:23 +0200 Subject: [PATCH] [TMP][FIX] run create direct folio --- hotel/models/hotel_folio.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hotel/models/hotel_folio.py b/hotel/models/hotel_folio.py index 9ef68c97f..85de9f48d 100644 --- a/hotel/models/hotel_folio.py +++ b/hotel/models/hotel_folio.py @@ -321,16 +321,17 @@ class HotelFolio(models.Model): ).next_by_code('sale.order') or _('New') else: vals['name'] = self.env['ir.sequence'].next_by_code('hotel.folio') or _('New') + # Makes sure partner_invoice_id' and 'pricelist_id' are defined lfields = ('partner_invoice_id', 'partner_shipping_id', 'pricelist_id') - #~ if any(f not in vals for f in lfields): - #~ partner = self.env['res.partner'].browse(vals.get('partner_id')) - #~ addr = partner.address_get(['delivery', 'invoice']) + if any(f not in vals for f in lfields): + partner = self.env['res.partner'].browse(vals.get('partner_id')) + addr = partner.address_get(['delivery', 'invoice']) #~ vals['partner_invoice_id'] = vals.setdefault('partner_invoice_id', addr['invoice']) - #~ vals['pricelist_id'] = vals.setdefault( - #~ 'pricelist_id', - #~ partner.property_product_pricelist and partner.property_product_pricelist.id) + vals['pricelist_id'] = vals.setdefault( + 'pricelist_id', + partner.property_product_pricelist and partner.property_product_pricelist.id) result = super(HotelFolio, self).create(vals) return result @@ -353,7 +354,10 @@ class HotelFolio(models.Model): addr = self.partner_id.address_get(['invoice']) #TEMP: - values = { 'user_id': self.partner_id.user_id.id or self.env.uid } + values = { 'user_id': self.partner_id.user_id.id or self.env.uid, + 'pricelist_id':self.partner_id.property_product_pricelist and \ + self.partner_id.property_product_pricelist.id or \ + self.env['ir.default'].sudo().get('res.config.settings', 'parity_pricelist_id')} #~ values = { #~ 'pricelist_id': self.partner_id.property_product_pricelist and \ #~ self.partner_id.property_product_pricelist.id or False,