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-18 13:53:29 +02:00
parent 89fcc852a5 9401fbe918
commit 9fb96931f0
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
hotel/models/hotel_folio.py
View File

@@ -324,13 +324,13 @@ class HotelFolio(models.Model):
# 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
@@ -344,20 +344,22 @@ class HotelFolio(models.Model):
- user_id - user_id
""" """
if not self.partner_id: if not self.partner_id:
self.update({ #~ self.update({
'partner_invoice_id': False, #~ 'partner_invoice_id': False,
'payment_term_id': False, #~ 'payment_term_id': False,
'fiscal_position_id': False, #~ 'fiscal_position_id': False,
}) #~ })
return return
addr = self.partner_id.address_get(['invoice']) addr = self.partner_id.address_get(['invoice'])
values = { #TEMP:
'pricelist_id': self.partner_id.property_product_pricelist and \ values = { 'user_id': self.partner_id.user_id.id or self.env.uid }
self.partner_id.property_product_pricelist.id or False, #~ values = {
'partner_invoice_id': addr['invoice'], #~ 'pricelist_id': self.partner_id.property_product_pricelist and \
'user_id': self.partner_id.user_id.id or self.env.uid #~ self.partner_id.property_product_pricelist.id or False,
} #~ 'partner_invoice_id': addr['invoice'],
#~ 'user_id': self.partner_id.user_id.id or self.env.uid
#~ }
if self.env['ir.config_parameter'].sudo().get_param('sale.use_sale_note') and \ if self.env['ir.config_parameter'].sudo().get_param('sale.use_sale_note') and \
self.env.user.company_id.sale_note: self.env.user.company_id.sale_note:
values['note'] = self.with_context( values['note'] = self.with_context(