[MOV] pos_restaurant : slip file per models

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',
     ],

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

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,
+    }

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

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

addons/pos_restaurant/views/pos_config_views.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record id="view_pos_config_form" model="ir.ui.view">
+        <field name="name">pos.config.form.view.inherit</field>
+        <field name="model">pos.config</field>
+        <field name="inherit_id" ref="point_of_sale.view_pos_config_form"></field>
+        <field name="arch" type="xml">
+            <sheet position='inside'>
+                <group string="Bar &amp; Restaurant" >
+                    <field name="iface_splitbill" />
+                    <field name="iface_printbill" />
+                    <field name="iface_orderline_notes" />
+                    <field name="floor_ids" />
+                    <field name="printer_ids" />
+                </group>
+            </sheet>
+        </field>
+    </record>
+
+</odoo>

addons/pos_restaurant/views/pos_order_views.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<odoo>
+
+    <record id="view_pos_pos_form" model="ir.ui.view">
+        <field name="name">pos.order.form.view.inherit</field>
+        <field name="model">pos.order</field>
+        <field name="inherit_id" ref="point_of_sale.view_pos_pos_form"></field>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='order_fields']" position="inside">
+                <field name="table_id"/>
+                <field name="customer_count"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

addons/pos_restaurant/views/pos_restaurant_views.xml

@@ -2,21 +2,6 @@
 <openerp>
     <data>
 
-
-        <!--     POS ORDERS     -->
-
-        <record model="ir.ui.view" id="view_pos_pos_form">
-            <field name="name">pos.order.form.view.inherit</field>
-            <field name="model">pos.order</field>
-            <field name="inherit_id" ref="point_of_sale.view_pos_pos_form"></field>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='order_fields']" position="inside">
-                    <field name="table_id"/>
-                    <field name="customer_count"/>
-                </xpath>
-            </field>
-        </record>
-
         <!--     RESTAURANTS FLOORS  -->
 
         <record model="ir.ui.view" id="view_restaurant_floor_form">
@@ -154,23 +139,6 @@
             id="menu_restaurant_printer_all"
             sequence="30"
             groups="point_of_sale.group_pos_manager"/>
-        
-        <record model="ir.ui.view" id="view_pos_config_form">
-            <field name="name">pos.config.form.view.inherit</field>
-            <field name="model">pos.config</field>
-            <field name="inherit_id" ref="point_of_sale.view_pos_config_form"></field>
-            <field name="arch" type="xml">
-                <sheet position='inside'>
-                    <group string="Bar &amp; Restaurant" >
-                        <field name="iface_splitbill" />
-                        <field name="iface_printbill" />
-                        <field name="iface_orderline_notes" />
-                        <field name="floor_ids" />
-                        <field name="printer_ids" />
-                    </group>
-                </sheet>
-            </field>
-        </record>
 
     </data>
 </openerp>