audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '11.0' into hotel_node_master

Browse Source
This commit is contained in:
Pablo
2018-10-23 13:58:09 +02:00
parent 07e7ac78d7 dca70847f0
commit b11d346b8b
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hotel/models/hotel_folio.py
View File

@@ -321,16 +321,17 @@ class HotelFolio(models.Model):
).next_by_code('sale.order') or _('New') ).next_by_code('sale.order') or _('New')
else: else:
vals['name'] = self.env['ir.sequence'].next_by_code('hotel.folio') or _('New') vals['name'] = self.env['ir.sequence'].next_by_code('hotel.folio') or _('New')
# Makes sure partner_invoice_id' and 'pricelist_id' are defined # Makes sure partner_invoice_id' and 'pricelist_id' are defined
lfields = ('partner_invoice_id', 'partner_shipping_id', 'pricelist_id') lfields = ('partner_invoice_id', 'partner_shipping_id', 'pricelist_id')
#~ if any(f not in vals for f in lfields): if any(f not in vals for f in lfields):
#~ partner = self.env['res.partner'].browse(vals.get('partner_id')) partner = self.env['res.partner'].browse(vals.get('partner_id'))
#~ addr = partner.address_get(['delivery', 'invoice']) addr = partner.address_get(['delivery', 'invoice'])
#~ vals['partner_invoice_id'] = vals.setdefault('partner_invoice_id', addr['invoice']) #~ vals['partner_invoice_id'] = vals.setdefault('partner_invoice_id', addr['invoice'])
#~ vals['pricelist_id'] = vals.setdefault( vals['pricelist_id'] = vals.setdefault(
#~ 'pricelist_id', 'pricelist_id',
#~ partner.property_product_pricelist and partner.property_product_pricelist.id) partner.property_product_pricelist and partner.property_product_pricelist.id)
result = super(HotelFolio, self).create(vals) result = super(HotelFolio, self).create(vals)
return result return result
@@ -353,7 +354,10 @@ class HotelFolio(models.Model):
addr = self.partner_id.address_get(['invoice']) addr = self.partner_id.address_get(['invoice'])
#TEMP: #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 = { #~ values = {
#~ 'pricelist_id': self.partner_id.property_product_pricelist and \ #~ 'pricelist_id': self.partner_id.property_product_pricelist and \
#~ self.partner_id.property_product_pricelist.id or False, #~ self.partner_id.property_product_pricelist.id or False,