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' of github.com:hootel/hootel into 11.0

Browse Source
This commit is contained in:
QS5ELkMu
2018-11-07 14:22:19 +01:00
parent a8bcfddd79 8dd3b411bc
commit 2589f9610d
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hotel/models/hotel_folio.py
View File

@@ -190,7 +190,7 @@ class HotelFolio(models.Model):
self.ensure_one()
partner = self.partner_id.id
amount = self.pending_amount
view_id = self.env.ref('hotel.view_account_payment_folio_form').id
view_id = self.env.ref('hotel.account_payment_view_form_folio').id
return{
'name': _('Register Payment'),
'view_type': 'form',

2
hotel/models/hotel_reservation.py
View File

@@ -811,7 +811,7 @@ class HotelReservation(models.Model):
partner = self.partner_id.id
amount = min(self.amount_reservation, self.folio_pending_amount)
note = self.folio_id.name + ' (' + self.name + ')'
view_id = self.env.ref('hotel.view_account_payment_folio_form').id
view_id = self.env.ref('hotel.account_payment_view_form_folio').id
return{
'name': _('Register Payment'),
'view_type': 'form',

4
hotel/views/inherited_account_payment_views.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<odoo>
<record id="account_payment_form" model="ir.ui.view">
<record id="account_payment_view_form" model="ir.ui.view">
<field name="model">account.payment</field>
<field name="inherit_id" ref="account.view_account_payment_form" />
<field name="arch" type="xml">
@@ -11,7 +11,7 @@
</field>
</record>
<record id="view_account_payment_folio_form" model="ir.ui.view">
<record id="account_payment_view_form_folio" model="ir.ui.view">
<field name="name">account.payment.folio.form</field>
<field name="model">account.payment</field>
<field name="arch" type="xml">

2
hotel/views/inherited_product_template_views.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="view_product_template_form_inherited" model="ir.ui.view">
<record id="product_template_view_form" model="ir.ui.view">
<field name="name">view.product.template.form.inherited</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_form_view" />

4
hotel/views/inherited_res_partner_views.xml
View File

@@ -13,8 +13,8 @@
<field name="domain">[('partner_id', '=',active_id)]</field>
</record>
<record id="view_partner_form" model="ir.ui.view">
<field name="name"> hotel.view.partner.form </field>
<record id="res_partner_view_form" model="ir.ui.view">
<field name="name">res.partner.view.form </field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form" />
<field name="arch" type="xml">