Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

16.0-MIG-hotel_restaurant #200

Open
wants to merge 84 commits into
base: 16.0
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
9efe769
[ADD] Added modules for hotel management
SerpentCS May 18, 2012
d3e5919
[IMP] Improve the module
May 22, 2012
9b4e7d2
[IMP] Improve the report and wizard code
May 23, 2012
859f9f2
[FIX/REF]Fixed the issues given and refactored the code
May 25, 2012
25dc3fc
mark modules as unported to v8
gurneyalex Oct 17, 2014
6eff40d
[MOV] move addons out of __unported__ (they remain not installable)
sbidoul Oct 13, 2015
028cf9a
[MIG] Make modules uninstallable
pedrobaeza Oct 14, 2015
f094e20
[MIG] Rename manifest files
pedrobaeza Oct 6, 2016
383bfe0
[ADD]Migrate hotel restaurant module as per v10 standard.
KrishnaPrajapati-SerpentCS Jun 7, 2017
9e54d9b
Update __manifest__.py
JayVora-SerpentCS Oct 2, 2017
e6320c8
Update README.rst
JayVora-SerpentCS Oct 2, 2017
c2cd5e4
Update README.rst
JayVora-SerpentCS Oct 2, 2017
2f0ffdd
Update README.rst
JayVora-SerpentCS Oct 2, 2017
e7e569e
Create README.rst
JayVora-SerpentCS Oct 2, 2017
b7555dc
[REF]
JayVora-SerpentCS Oct 3, 2017
321ac08
[FIX]Fix the travis error in hotel.
KrishnaPrajapati-SerpentCS Oct 31, 2017
3e9023f
[MIG] hotel_restaurant: Migration to 11.0
KrishnaPrajapati-SerpentCS Apr 23, 2018
239ef3d
[FIX] travis & other improvements
serpentcs-dev1 Jul 26, 2018
fb38cf8
[IMP] minor changes
serpentcs-dev1 Jul 26, 2018
579654d
[IMP] cosmetic changes and manifest
serpentcs-dev1 Jul 26, 2018
1d49ef9
[IMP] manifest and readme
serpentcs-dev1 Jul 27, 2018
486b70e
[IMP] code level suggested improvements
serpentcs-dev1 Jul 27, 2018
5271c29
[IMP] maintained iteration & more meaningful object names
serpentcs-dev1 Jul 31, 2018
3a48a1e
Update translation files
oca-transbot Dec 9, 2018
5646b93
[MIG]hotel_restaurant:Migrate from v11 to v12.
dhruvitaSerpentCS Apr 2, 2019
f44e86f
[UPD] Update hotel_restaurant.pot
oca-travis Jul 16, 2019
6b95eff
Update translation files
oca-transbot Jul 20, 2019
495d750
Added translation using Weblate (Chinese (Simplified))
liweijie0812 Oct 16, 2019
fdea73a
Added translation using Weblate (Portuguese (Brazil))
Nov 24, 2019
aabcdf7
Translated using Weblate (Portuguese (Brazil))
augustodinizl Dec 29, 2019
cb2ed44
Translated using Weblate (Portuguese (Brazil))
augustodinizl Dec 30, 2019
c6582b0
[FIX]hotel_reservation:Fix timezone issue from reservation email temp…
dhruvitaSerpentCS Jun 23, 2020
fd078c2
[UPD] Update hotel_restaurant.pot
oca-travis Jun 24, 2020
255be3d
Update translation files
oca-transbot Jun 24, 2020
4684457
[ADD] pre-commit config and fixes
mclaeysb Jun 16, 2020
9c0cefd
[UPD] Update hotel_restaurant.pot
oca-travis Jun 25, 2020
3d50dab
Update translation files
oca-transbot Jun 25, 2020
829351b
[MIG]hotel_restaurant:Migrated from v12 and v13.
dhruvitaSerpentCS Jul 7, 2020
e71ca6b
[IMP]hotel_restaurant:Fixed travis.
dhruvitaSerpentCS Sep 11, 2020
5b32746
[IMP]hotel_restaurant:Seperate files, improved field names.
dhruvitaSerpentCS Sep 18, 2020
9c03169
[IMP]hotel_restaurant:Improved code in restaurant.
dhruvitaSerpentCS Sep 23, 2020
04e0665
[IMP]hotel_restaurant:Improved variable name.
dhruvitaSerpentCS Sep 23, 2020
833eae8
[IMP]hotel_restaurant:Fixed Travis.
dhruvitaSerpentCS Sep 23, 2020
203338c
[IMP]hotel_restaurant:Oprtimised code and improved report.
dhruvitaSerpentCS Sep 23, 2020
039440d
[IMP]Improved reports.
dhruvitaSerpentCS Sep 24, 2020
83f4c8f
[IMP]hotel_restaurant:Improved README.rst.
dhruvitaSerpentCS Sep 24, 2020
c8d5080
[IMP]Improved README.rst
dhruvitaSerpentCS Sep 24, 2020
88e9dc5
[UPD] Update hotel_restaurant.pot
oca-travis Sep 25, 2020
995edce
Update translation files
oca-transbot Oct 24, 2020
f38ee3b
[IMP]Improved README.rst.
dhruvitaSerpentCS Oct 29, 2020
7d46619
[UPD] README.rst
OCA-git-bot Oct 29, 2020
7103548
[UPD] Update hotel_restaurant.pot
oca-travis Oct 29, 2020
67493ce
Update translation files
oca-transbot Oct 29, 2020
9a519db
[14.0][IMP] hotel_restaurant:run pre-commit.
maitripatel19 May 19, 2021
79dfb02
[14.0][ADD] hotel_restaurant: Migrated module.
maitripatel19 May 19, 2021
53785f9
[14.0][IMP] hotel_restaurant:Improve code.
maitripatel19 May 31, 2021
7ca86e8
[14.0][FIX] hotel_restaurant: Fixed comments.
maitripatel19 Jun 3, 2021
c579dac
[14.0][FIX] hotel_restaurant: Fixed comments.
maitripatel19 Jun 3, 2021
a359f68
[14.0][MIG] hotel_restaurant: Migrated to v14
Rajan-SerpentCS Aug 9, 2021
f14e9f3
[UPD] README.rst
OCA-git-bot Aug 12, 2021
8058c59
[IMP] update dotfiles [ci skip]
OCA-git-bot Mar 31, 2022
d2b2bd0
Added translation using Weblate (French)
abdawone Jun 4, 2022
99e8028
[UPD] Update hotel_restaurant.pot
oca-travis Jun 4, 2022
237f039
Update translation files
oca-transbot Jun 4, 2022
3879dc4
[15.0][MIG] hotel_restaurant
ShwetaSerpentCS Oct 3, 2022
0213a70
[UPD] README.rst
OCA-git-bot Apr 6, 2023
3f1b884
Added translation using Weblate (Italian)
mymage May 3, 2023
7c4eac1
Translated using Weblate (Italian)
mymage May 3, 2023
cb9c982
Translated using Weblate (Italian)
mymage May 3, 2023
9d8a69c
Translated using Weblate (Italian)
mymage May 9, 2023
c49afe9
Translated using Weblate (Italian)
mymage May 10, 2023
f199272
Translated using Weblate (Italian)
mymage May 11, 2023
16d217e
Translated using Weblate (Italian)
mymage May 12, 2023
1f742fe
Translated using Weblate (Italian)
francesco-ooops May 12, 2023
09a97f9
Translated using Weblate (Italian)
francesco-ooops May 12, 2023
20fb373
Translated using Weblate (Italian)
francesco-ooops May 16, 2023
1d163e1
Translated using Weblate (Italian)
francesco-ooops May 17, 2023
a9b319f
Translated using Weblate (Italian)
francesco-ooops Jul 10, 2023
1e0794a
Translated using Weblate (Italian)
francesco-ooops Jul 17, 2023
b1fa2df
[UPD] README.rst
OCA-git-bot Sep 3, 2023
8e5f93f
Translated using Weblate (Italian)
mymage Aug 22, 2023
1830b63
Update translation files
weblate Oct 9, 2023
f2ebb0f
[16.0][FIX] Travis
sachin-serpentcs Oct 11, 2023
ef3cae4
[16.0][MIG] hotel_restaurant
sachin-serpentcs Oct 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[MIG]hotel_restaurant:Migrate from v11 to v12.
dhruvitaSerpentCS authored and nikul-serpentcs committed Sep 30, 2024
commit 5646b93b991194a808ca319836a7434bc75b832e
2 changes: 1 addition & 1 deletion hotel_restaurant/LICENSE/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OpenERP, Open Source Management Solution
Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
Copyright (C) 2011-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
Copyright (C) 2019-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
2 changes: 1 addition & 1 deletion hotel_restaurant/__manifest__.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

{
'name': 'Hotel Restaurant Management',
'version': '11.0.1.0.0',
'version': '12.0.1.0.0',
'author': 'Odoo Community Association (OCA), Serpent Consulting\
Services Pvt. Ltd., Odoo S.A.',
'category': 'Generic Modules/Hotel Restaurant',
20 changes: 11 additions & 9 deletions hotel_restaurant/models/hotel_restaurant.py
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ class HotelMenucardType(models.Model):
name = fields.Char('Name', required=True)
menu_id = fields.Many2one('hotel.menucard.type', string='Food Item Type')
child_ids = fields.One2many('hotel.menucard.type', 'menu_id',
'Child Categories')
'Child Categories')

@api.multi
def name_get(self):
@@ -469,7 +469,7 @@ def generate_kot_update(self):
'room_no': order.room_no.name,
'w_name': order.waiter_name.name,
'tableno': [(6, 0, table_ids)],
}
}
kot_rec = order_tickets_obj.browse(self.kitchen_id)
kot_rec.write(line_data)
for order_line in order.order_list:
@@ -557,7 +557,7 @@ def reservation_generate_kot(self):
'kot_date': order.order_date,
'w_name': order.waitername.name,
'tableno': [(6, 0, table_ids)],
}
}
kot_data = order_tickets_obj.create(line_data)
self.kitchen_id = kot_data.id
for order_line in order.order_list:
@@ -591,11 +591,12 @@ def reservation_update_kot(self):
'kot_date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
'w_name': order.waitername.name,
'tableno': [(6, 0, table_ids)],
}
}
kot_rec = order_tickets_obj.browse(self.kitchen_id)
kot_rec.write(line_data)
for order_line in order.order_list:
if order_line.id not in order.rest_id.ids:

if order_line not in order.rest_id.ids:
kot_data1 = order_tickets_obj.create(line_data)
order.kitchen_id = kot_data1.id
o_line = {
@@ -622,6 +623,7 @@ def done_kot(self):
for order_obj in self:
hotelfolio = order_obj.folio_id.order_id.id
if order_obj.folio_id:

for order in order_obj.order_list:
values = {'order_id': hotelfolio,
'name': order.name.name,
@@ -649,9 +651,9 @@ def done_kot(self):
reservationno = fields.Many2one('hotel.restaurant.reservation',
'Reservation No')
order_date = fields.Datetime('Date', required=True,
default=(lambda *a:
time.strftime
(DEFAULT_SERVER_DATETIME_FORMAT)))
default=(lambda *a:
time.strftime
(DEFAULT_SERVER_DATETIME_FORMAT)))
waitername = fields.Many2one('res.partner', 'Waiter Name')
table_no = fields.Many2many('hotel.restaurant.tables', 'temp_table4',
'table_no', 'name', 'Table Number')
@@ -721,7 +723,7 @@ def on_change_item_name(self):
kot_order_list = fields.Many2one('hotel.restaurant.kitchen.order.tickets',
'Kitchen Order Tickets')
name = fields.Many2one('hotel.menucard', 'Item Name', required=True)
item_qty = fields.Integer('Qty', required=True)
item_qty = fields.Integer('Qty', required=True, default=1)
item_rate = fields.Float('Rate')
price_subtotal = fields.Float(compute='_compute_price_subtotal',
method=True, string='Subtotal')
95 changes: 49 additions & 46 deletions hotel_restaurant/report/hotel_restaurant_report.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
from dateutil import parser
from odoo import api, fields, models


@@ -17,16 +16,15 @@ def get_res_data(self, date_start, date_end):
('end_date', '<=', date_end)]
tids = rest_reservation_obj.search(act_domain)
for record in tids:
data.append({'reservation': record.reservation_id,
'name': record.cname.name,
'start_date': parser.parse(record.start_date).
strftime('%m/%d/%Y'),
'end_date': parser.parse(record.end_date).
strftime('%m/%d/%Y')})
data.append({
'reservation': record.reservation_id,
'name': record.cname.name,
'start_date': (record.start_date).strftime('%m/%d/%Y'),
'end_date': (record.end_date).strftime('%m/%d/%Y')})
return data

@api.model
def get_report_values(self, docids, data):
def _get_report_values(self, docids, data):
self.model = self.env.context.get('active_model')
if data is None:
data = {}
@@ -35,9 +33,11 @@ def get_report_values(self, docids, data):
folio_profile = self.env['hotel.restaurant.tables'].browse(docids)
date_start = data.get('date_start', fields.Date.today())
date_start = data.get('date_start', fields.Date.today())
date_end = data['form'].get('date_end', str(datetime.now() +
relativedelta(months=1,
day=1, days=1))[:10])
date_end = data['form'].get('date_end',
str(datetime.now() +
relativedelta(months=1,
day=1,
days=1))[:10])
rm_act = self.with_context(data['form'].get('used_context', {}))
reservation_res = rm_act.get_res_data(date_start, date_end)
return {
@@ -54,7 +54,7 @@ class ReportKot(models.AbstractModel):
_name = 'report.hotel_restaurant.report_hotel_order_kot'

@api.model
def get_report_values(self, docids, data):
def _get_report_values(self, docids, data):
self.model = self.env.context.get('active_model')
if data is None:
data = {}
@@ -86,15 +86,15 @@ def get_data(self, date_start, date_end):
total_amount = total_amount + order.amount_total
total_order += 1
total += total_amount
data.append({'folio_name': record.name,
'customer_name': record.partner_id.name,
'checkin_date': parser.parse(record.checkin_date).
strftime('%m/%d/%Y %H:%M:%S'),
'checkout_date': parser.parse(record.
checkout_date).
strftime('%m/%d/%Y %H:%M:%S'),
'total_amount': total_amount,
'total_order': total_order})
data.append({
'folio_name': record.name,
'customer_name': record.partner_id.name,
'checkin_date': (record.checkin_date)
.strftime('%m/%d/%Y %H:%M:%S'),
'checkout_date': (record.checkout_date)
.strftime('%m/%d/%Y %H:%M:%S'),
'total_amount': total_amount,
'total_order': total_order})
data.append({'total': total})
return data

@@ -107,30 +107,32 @@ def get_rest(self, date_start, date_end):
if record.hotel_reservation_order_ids:
order_data = []
for order in record.hotel_reservation_order_ids:
order_data.append({'order_no': order.order_number,
'order_date': parser.parse(order.order_date).
strftime('%m/%d/%Y %H:%M:%S'),
'state': order.state,
'table_no': len(order.table_no),
'order_len': len(order.order_list),
'amount_total': order.amount_total})
order_data.append({
'order_no': order.order_number,
'order_date': (order.order_date)
.strftime('%m/%d/%Y %H:%M:%S'),
'state': order.state,
'table_no': len(order.table_no),
'order_len': len(order.order_list),
'amount_total': order.amount_total})
data.append({'folio_name': record.name,
'customer_name': record.partner_id.name,
'order_data': order_data})
return data

@api.model
def get_report_values(self, docids, data):
def _get_report_values(self, docids, data):
self.model = self.env.context.get('active_model')
if data is None:
data = {}
if not docids:
docids = data['form'].get('docids')
folio_profile = self.env['hotel.reservation.order'].browse(docids)
date_start = data['form'].get('date_start', fields.Date.today())
date_end = data['form'].get('date_end', str(datetime.now() +
relativedelta(months=1,
day=1, days=1))[:10])
date_end = data['form'].get('date_end',
str(datetime.now() +
relativedelta(months=1,
day=1, days=1))[:10])
rm_act = self.with_context(data['form'].get('used_context', {}))
get_data_res = rm_act.get_data(date_start, date_end)
get_rest_res = rm_act.get_rest(date_start, date_end)
@@ -163,15 +165,15 @@ def get_data(self, date_start, date_end):
total_amount = total_amount + order.amount_total
total_order += 1
total += total_amount
data.append({'folio_name': record.name,
'customer_name': record.partner_id.name,
'checkin_date': parser.parse(record.checkin_date).
strftime('%m/%d/%Y %H:%M:%S'),
'checkout_date': parser.parse(record.
checkout_date).
strftime('%m/%d/%Y %H:%M:%S'),
'total_amount': total_amount,
'total_order': total_order})
data.append({
'folio_name': record.name,
'customer_name': record.partner_id.name,
'checkin_date': (record.checkin_date).
strftime('%m/%d/%Y %H:%M:%S'),
'checkout_date': (record.checkout_date).
strftime('%m/%d/%Y %H:%M:%S'),
'total_amount': total_amount,
'total_order': total_order})
data.append({'total': total})
return data

@@ -185,7 +187,7 @@ def get_reserv(self, date_start, date_end):
if record.hotel_restaurant_order_ids:
order_data = []
for order in record.hotel_restaurant_order_ids:
order_date = parser.parse(order.o_date)
order_date = order.o_date
order_date = order_date.strftime('%m/%d/%Y %H:%M:%S')
order_data.append({'order_no': order.order_no,
'order_date': order_date,
@@ -199,17 +201,18 @@ def get_reserv(self, date_start, date_end):
return data

@api.model
def get_report_values(self, docids, data):
def _get_report_values(self, docids, data):
self.model = self.env.context.get('active_model')
if data is None:
data = {}
if not docids:
docids = data['form'].get('docids')
folio_profile = self.env['hotel.restaurant.order'].browse(docids)
date_start = data.get('date_start', fields.Date.today())
date_end = data['form'].get('date_end', str(datetime.now() +
relativedelta(months=1,
day=1, days=1))[:10])
date_end = data['form'].get('date_end',
str(datetime.now() +
relativedelta(months=1,
day=1, days=1))[:10])
rm_act = self.with_context(data['form'].get('used_context', {}))
get_data_res = rm_act.get_data(date_start, date_end)
get_reserv_res = rm_act.get_reserv(date_start, date_end)
1 change: 1 addition & 0 deletions hotel_restaurant/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ access_product_product,product.product,product.model_product_product,hotel.group
access_hotel_menucard_type,hotel.menucard.type,model_hotel_menucard_type,hotel.group_hotel_user,1,1,0,0
access_hotel_menucard,hotel.menucard,model_hotel_menucard,hotel.group_hotel_user,1,1,0,0
access_hotel_restaurant_tables,hotel.restaurant.tables,model_hotel_restaurant_tables,hotel.group_hotel_user,1,1,0,0
access_hotel_restaurant_tables_manager,hotel.restaurant.tables.manager,model_hotel_restaurant_tables,hotel.group_hotel_manager,1,1,1,1
access_hotel_restaurant_reservation,hotel.restaurant.reservation,model_hotel_restaurant_reservation,hotel.group_hotel_user,1,1,1,1
access_hotel_restaurant_kitchen_order_tickets,hotel.restaurant.kitchen.order.tickets,model_hotel_restaurant_kitchen_order_tickets,hotel.group_hotel_user,1,1,1,1
access_hotel_restaurant_order,hotel.restaurant.order,model_hotel_restaurant_order,hotel.group_hotel_user,1,1,1,1
2 changes: 1 addition & 1 deletion hotel_restaurant/tests/test_hotel_restaurant.py
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ def setUp(self):
ref('hotel_restaurant.hotel_restaurant_tables_table1')
self.table0 = self.env.\
ref('hotel_restaurant.hotel_restaurant_tables_table0')
self.room1 = self.env.ref('point_of_sale.partner_product_3')
self.room1 = self.env.ref('point_of_sale.desk_organizer')
self.partner = self.env.ref('base.res_partner_4')
self.waiter = self.env.ref('base.res_partner_3')
cur_date = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
8 changes: 4 additions & 4 deletions hotel_restaurant/views/hotel_restaurant_data.xml
Original file line number Diff line number Diff line change
@@ -182,7 +182,7 @@
<record id="hotel_restaurant_reservation_0" model="hotel.restaurant.reservation">
<field name="tableno"
eval="[(6,0,[ref('hotel_restaurant.hotel_restaurant_tables_table1'),ref('hotel_restaurant.hotel_restaurant_tables_table0')])]" />
<field name="room_no" ref="point_of_sale.partner_product_3" />
<field name="room_no" ref="point_of_sale.wall_shelf" />
<field eval="&quot;2013-04-25 03:09:00&quot;" name="end_date" />
<field name="partner_address_id" ref="base.res_partner_4" />
<field eval="&quot;draft&quot;" name="state" />
@@ -193,7 +193,7 @@
<record id="hotel_restaurant_reservation_1" model="hotel.restaurant.reservation">
<field name="tableno"
eval="[(6,0,[ref('hotel_restaurant.hotel_restaurant_tables_table2'),ref('hotel_restaurant.hotel_restaurant_tables_table3')])]" />
<field name="room_no" ref="point_of_sale.partner_product_4" />
<field name="room_no" ref="point_of_sale.small_shelf" />
<field eval="&quot;2013-04-23 15:09:00&quot;" name="end_date" />
<field name="partner_address_id" ref="base.res_partner_3" />
<field eval="&quot;draft&quot;" name="state" />
@@ -237,7 +237,7 @@
<field eval="&quot;2013-04-25 15:09:00&quot;" name="o_date" />
<field name="cname" ref="base.res_partner_3" />
<field eval="&quot;OR/00001&quot;" name="order_no" />
<field name="room_no" ref="point_of_sale.partner_product_3" />
<field name="room_no" ref="point_of_sale.wall_shelf" />
</record>

<record id="hotel_restaurant_order_list_0" model="hotel.restaurant.order.list">
@@ -252,7 +252,7 @@
<field eval="&quot;2013-04-22 12:09:00&quot;" name="o_date" />
<field name="cname" ref="base.res_partner_4" />
<field eval="&quot;OR/00002&quot;" name="order_no" />
<field name="room_no" ref="point_of_sale.partner_product_4" />
<field name="room_no" ref="point_of_sale.small_shelf" />
</record>

<record id="hotel_restaurant_order_list_1" model="hotel.restaurant.order.list">
32 changes: 16 additions & 16 deletions hotel_restaurant/views/hotel_restaurant_view.xml
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@
<record id="view_hotelfolio1_form1_inherited" model="ir.ui.view">
<field name="name">hotel.folio1.form1.inherited</field>
<field name="model">hotel.folio</field>
<field name="inherit_id" ref="hotel.view_hotel_folio1_form" />
<field name="inherit_id" ref="hotel.view_hotel_folio_form" />
<field name="arch" type="xml">
<xpath expr="//form/sheet/notebook/page[3]"
position="after">
<page string="Hotel Restaurant">
<page name="hotel_restaurant" string="Hotel Restaurant">
<separator string="Restaurant Order Reservation Details"
colspan="4" />
<field name="hotel_reservation_order_ids" colspan="4"
@@ -127,7 +127,7 @@
</header>
<sheet>
<h1>
<label string="Table Booking" colspan="4" />
<label for="table_booking" string="Table Booking" colspan="4" />
<field name="reservation_id" colspan="4" />
</h1>
<group>
@@ -185,18 +185,18 @@
<search string="Restaurant Reservation">
<filter
domain="[('state','in',('confirm','done','order')),('start_date','&lt;=',datetime.datetime.now()),('end_date','&gt;',datetime.datetime.now())]"
string="Current Booking" />
string="Current Booking" name="current_booking" />
<separator />
<filter name="today"
domain="[('start_date','&gt;=',datetime.datetime.now().replace(hour=0, minute=0, second=0)),('end_date','&lt;=',datetime.datetime.now().replace(hour=23, minute=59, second=59))]"
string="Today's Booking" />
<separator />
<group string="States">
<filter icon="terp-check" domain="[('state','=','draft')]"
string="Draft" />
<filter domain="[('state','=','confirm')]" string="Confirm" />
<filter domain="[('state','=','cancel')]" string="Cancel" />
<filter domain="[('state','=','done')]" string="Done" />
string="Draft" name="draft" />
<filter domain="[('state','=','confirm')]" string="Confirm" name="confirm" />
<filter domain="[('state','=','cancel')]" string="Cancel" name="cancel"/>
<filter domain="[('state','=','done')]" string="Done" name="done" />
</group>
<field name="room_no" />
<field name="start_date" />
@@ -248,12 +248,12 @@
</header>
<sheet>
<h1>
<label string="Order" colspan="4" />
<label for="order" string="Order" colspan="4" />
<field name="order_number" colspan="4" />
</h1>
<group>
<group colspan="4" col="4">
<field name="is_folio" invisible="1" />
<field name="is_folio"/>
<newline />
<field name="reservationno" />
<field name="folio_id" attrs="{'invisible': [('is_folio','=',False)]}" />
@@ -376,7 +376,7 @@
</header>
<sheet>
<h1>
<label string="Table Order" colspan="4" />
<label for="table_order" string="Table Order" colspan="4" />
<field name="order_no" colspan="4" />
</h1>
<group>
@@ -643,7 +643,7 @@
</h1>
</div>
<notebook>
<page string="Information">
<page name="information" string="Information">
<group colspan="4" col="2">
<group colspan="4" col="4">
<field name="type" select="2" string="Food Type" />
@@ -662,7 +662,7 @@
<field name="taxes_id" colspan="4"
help='List of customer taxes applied on the perticular Food Item.' />
</page>
<page string="Procurement">
<page name="procurement" string="Procurement">
<group colspan="4" col="4">
<field name="cost_method" />
<field name="active" select="2" />
@@ -676,7 +676,7 @@
widget="one2many_list" />
</group>
</page>
<page string="Descriptions">
<page name="description" string="Descriptions">
<separator string="Description" />
<field name="description" colspan="4" nolabel="1" />
<separator string="Sale Description" />
@@ -714,7 +714,7 @@
<field name="list_price" />
<separator />
<group expand="0" string="Group By">
<filter string="Categoty" domain="[]" context="{'group_by':'categ_id'}" />
<filter name="category" string="Categoty" domain="[]" context="{'group_by':'categ_id'}" />
</group>
</search>
</field>
@@ -733,7 +733,7 @@
<t t-name="kanban-box">
<div class="oe_kanban_global_click">
<div class="o_kanban_image">
<img t-att-src="kanban_image('hotel.menucard', 'image_small', record.id.raw_value)"/>
<img alt="" t-att-src="kanban_image('hotel.menucard', 'image_small', record.id.raw_value)"/>
</div>
<div class="oe_kanban_details">
<h4>
6 changes: 3 additions & 3 deletions hotel_restaurant/wizard/hotel_restaurant_wizard.py
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ def print_report(self):
'form': self.read(['date_start', 'date_end'])[0]
}
return self.env.ref('hotel_restaurant.report_hotel_table_res').\
report_action(self, data=data)
report_action(self, data=data)


class FolioRestReservation(models.TransientModel):
@@ -37,7 +37,7 @@ def print_rest_report(self):
'form': self.read(['date_start', 'date_end', 'check'])[0]
}
return self.env.ref('hotel_restaurant.report_hotel_res_folio').\
report_action(self, data=data)
report_action(self, data=data)

@api.multi
def print_reserv_report(self):
@@ -47,4 +47,4 @@ def print_reserv_report(self):
'form': self.read(['date_start', 'date_end', 'check'])[0]
}
return self.env.ref('hotel_restaurant.report_hotel_res_folio1').\
report_action(self, data=data)
report_action(self, data=data)
6 changes: 3 additions & 3 deletions hotel_restaurant/wizard/hotel_restaurant_wizard.xml
Original file line number Diff line number Diff line change
@@ -43,9 +43,9 @@
<group col="4">
<field name="date_start" required="1" />
<field name="date_end" required="1" />
<group col="4">
<field name="check" />
</group>
</group>
<group>
<field name="check" />
</group>
<footer>
<button name="print_rest_report" string="Restaurant Reserved Order"