From 284e62def9f4cb6e7c1c636e64248f1701fdcc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Maes?= Date: Mon, 30 May 2016 11:49:04 +0200 Subject: [PATCH] [MOV] pos_restaurant : slip file per models --- addons/pos_restaurant/__openerp__.py | 2 ++ addons/pos_restaurant/models/__init__.py | 2 ++ addons/pos_restaurant/models/pos_config.py | 19 +++++++++++ addons/pos_restaurant/models/pos_order.py | 18 +++++++++++ .../pos_restaurant/models/pos_restaurant.py | 29 +---------------- .../pos_restaurant/views/pos_config_views.xml | 21 ++++++++++++ .../pos_restaurant/views/pos_order_views.xml | 16 ++++++++++ .../views/pos_restaurant_views.xml | 32 ------------------- 8 files changed, 79 insertions(+), 60 deletions(-) create mode 100644 addons/pos_restaurant/models/pos_config.py create mode 100644 addons/pos_restaurant/models/pos_order.py create mode 100644 addons/pos_restaurant/views/pos_config_views.xml create mode 100644 addons/pos_restaurant/views/pos_order_views.xml diff --git a/addons/pos_restaurant/__openerp__.py b/addons/pos_restaurant/__openerp__.py index cfcc7616f32..6deaa86450b 100644 --- a/addons/pos_restaurant/__openerp__.py +++ b/addons/pos_restaurant/__openerp__.py @@ -22,6 +22,8 @@ This module adds several restaurant features to the Point of Sale: 'website': 'https://www.odoo.com/page/point-of-sale', 'data': [ 'security/ir.model.access.csv', + 'views/pos_config_views.xml', + 'views/pos_order_views.xml', 'views/pos_restaurant_views.xml', 'views/pos_restauraunt_templates.xml', ], diff --git a/addons/pos_restaurant/models/__init__.py b/addons/pos_restaurant/models/__init__.py index c137f1765e1..d6315a09502 100644 --- a/addons/pos_restaurant/models/__init__.py +++ b/addons/pos_restaurant/models/__init__.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +import pos_config +import pos_order import pos_restaurant diff --git a/addons/pos_restaurant/models/pos_config.py b/addons/pos_restaurant/models/pos_config.py new file mode 100644 index 00000000000..3d6ed5edded --- /dev/null +++ b/addons/pos_restaurant/models/pos_config.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from openerp.osv import fields, osv + + +class pos_config(osv.osv): + _inherit = 'pos.config' + _columns = { + 'iface_splitbill': fields.boolean('Bill Splitting', help='Enables Bill Splitting in the Point of Sale'), + 'iface_printbill': fields.boolean('Bill Printing', help='Allows to print the Bill before payment'), + 'iface_orderline_notes': fields.boolean('Orderline Notes', help='Allow custom notes on Orderlines'), + 'floor_ids': fields.one2many('restaurant.floor','pos_config_id','Restaurant Floors', help='The restaurant floors served by this point of sale'), + 'printer_ids': fields.many2many('restaurant.printer','pos_config_printer_rel', 'config_id','printer_id',string='Order Printers'), + } + _defaults = { + 'iface_splitbill': False, + 'iface_printbill': False, + } diff --git a/addons/pos_restaurant/models/pos_order.py b/addons/pos_restaurant/models/pos_order.py new file mode 100644 index 00000000000..bcbf3117347 --- /dev/null +++ b/addons/pos_restaurant/models/pos_order.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from openerp.osv import fields, osv + + +class pos_order(osv.osv): + _inherit = 'pos.order' + _columns = { + 'table_id': fields.many2one('restaurant.table','Table', help='The table where this order was served'), + 'customer_count' : fields.integer('Guests', help='The amount of customers that have been served by this order.'), + } + + def _order_fields(self, cr, uid, ui_order, context=None): + fields = super(pos_order,self)._order_fields(cr,uid,ui_order,context) + fields['table_id'] = ui_order.get('table_id',0) + fields['customer_count'] = ui_order.get('customer_count',0) + return fields diff --git a/addons/pos_restaurant/models/pos_restaurant.py b/addons/pos_restaurant/models/pos_restaurant.py index 65725cc13d9..d06d1c26ef1 100644 --- a/addons/pos_restaurant/models/pos_restaurant.py +++ b/addons/pos_restaurant/models/pos_restaurant.py @@ -56,7 +56,7 @@ class restaurant_table(osv.osv): def create_from_ui(self, cr, uid, table, context=None): """ create or modify a table from the point of sale UI. table contains the table's fields. If it contains an - id, it will modify the existing table. It then + id, it will modify the existing table. It then returns the id of the table. """ if table.get('floor_id',False): @@ -84,30 +84,3 @@ class restaurant_printer(osv.osv): _defaults = { 'name' : 'Printer', } - -class pos_config(osv.osv): - _inherit = 'pos.config' - _columns = { - 'iface_splitbill': fields.boolean('Bill Splitting', help='Enables Bill Splitting in the Point of Sale'), - 'iface_printbill': fields.boolean('Bill Printing', help='Allows to print the Bill before payment'), - 'iface_orderline_notes': fields.boolean('Orderline Notes', help='Allow custom notes on Orderlines'), - 'floor_ids': fields.one2many('restaurant.floor','pos_config_id','Restaurant Floors', help='The restaurant floors served by this point of sale'), - 'printer_ids': fields.many2many('restaurant.printer','pos_config_printer_rel', 'config_id','printer_id',string='Order Printers'), - } - _defaults = { - 'iface_splitbill': False, - 'iface_printbill': False, - } - -class pos_order(osv.osv): - _inherit = 'pos.order' - _columns = { - 'table_id': fields.many2one('restaurant.table','Table', help='The table where this order was served'), - 'customer_count' : fields.integer('Guests', help='The amount of customers that have been served by this order.'), - } - - def _order_fields(self, cr, uid, ui_order, context=None): - fields = super(pos_order,self)._order_fields(cr,uid,ui_order,context) - fields['table_id'] = ui_order.get('table_id',0) - fields['customer_count'] = ui_order.get('customer_count',0) - return fields diff --git a/addons/pos_restaurant/views/pos_config_views.xml b/addons/pos_restaurant/views/pos_config_views.xml new file mode 100644 index 00000000000..5837e89364d --- /dev/null +++ b/addons/pos_restaurant/views/pos_config_views.xml @@ -0,0 +1,21 @@ + + + + + pos.config.form.view.inherit + pos.config + + + + + + + + + + + + + + + diff --git a/addons/pos_restaurant/views/pos_order_views.xml b/addons/pos_restaurant/views/pos_order_views.xml new file mode 100644 index 00000000000..182eb8d4047 --- /dev/null +++ b/addons/pos_restaurant/views/pos_order_views.xml @@ -0,0 +1,16 @@ + + + + + pos.order.form.view.inherit + pos.order + + + + + + + + + + diff --git a/addons/pos_restaurant/views/pos_restaurant_views.xml b/addons/pos_restaurant/views/pos_restaurant_views.xml index 4e5ece5fcd5..1b3ef4bfba4 100644 --- a/addons/pos_restaurant/views/pos_restaurant_views.xml +++ b/addons/pos_restaurant/views/pos_restaurant_views.xml @@ -2,21 +2,6 @@ - - - - - pos.order.form.view.inherit - pos.order - - - - - - - - - @@ -154,23 +139,6 @@ id="menu_restaurant_printer_all" sequence="30" groups="point_of_sale.group_pos_manager"/> - - - pos.config.form.view.inherit - pos.config - - - - - - - - - - - - -