[IMP] point_of_sale : typos correction + settings reorganization

addons/point_of_sale/account_bank_statement.py

@@ -8,7 +8,7 @@ from openerp.osv import fields, osv
 class account_journal(osv.osv):
     _inherit = 'account.journal'
     _columns = {
-        'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in point of sales."),
+        'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in a point of sale."),
 
         'amount_authorized_diff' : fields.float('Amount Authorized Difference', help="This field depicts the maximum difference allowed between the ending balance and the theorical cash when closing a session, for non-POS managers. If this maximum is reached, the user will have an error message at the closing of his session saying that he needs to contact his manager."),
     }

addons/point_of_sale/point_of_sale_view.xml

@@ -761,7 +761,7 @@
             domain="[('config_id', '=', active_id)]" />
 
         <record model="ir.actions.act_window" id="action_pos_config_pos">
-            <field name="name">Point of Sales</field>
+            <field name="name">Point of Sale</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.config</field>
             <field name="view_type">form</field>
@@ -915,7 +915,7 @@
                     <field name="user_id" />
                     <group expand="0" string="Group By">
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-                        <filter string="Point of Sales" domain="[]" context="{'group_by': 'user_id'}" />
+                        <filter string="Point of Sale" domain="[]" context="{'group_by': 'user_id'}" />
                     </group>
                 </search>
             </field>

addons/point_of_sale/res_config.py

@@ -1,13 +1,14 @@
 from openerp.osv import fields, osv
 
-class sale_configuration(osv.TransientModel):
-    _inherit = 'sale.config.settings'
+class pos_configuration(osv.TransientModel):
+    _inherit = 'base.config.settings'
+    _name = 'pos.config.settings'
 
     _columns = {
         'module_pos_restaurant': fields.boolean("Use restaurant extensions",
             help='This module adds several restaurant features to the Point of Sale: \n\n- Bill Printing: Allows you to print a receipt before the order is paid \n\n- Bill Splitting: Allows you to split an order into different orders \n\n- Kitchen Order Printing: allows you to print orders updates to kitchen or bar printers'),
         'module_pos_loyalty': fields.boolean("Use loyalty programs",
             help='Allows you to define a loyalty program in the point of sale, where the customers earn loyalty points and get rewards'),
-        'module_pos_discount': fields.boolean("Allow global discounts on point of sales orders",
+        'module_pos_discount': fields.boolean("Allow global discounts on point of sale orders",
             help='Allows the cashier to quickly give a percentage sale discount for all the sales order to a customer'),
     }

addons/point_of_sale/res_config_view.xml

@@ -2,11 +2,15 @@
 <openerp>
     <data>
         <record id="view_sale_config_settings_form_pos" model="ir.ui.view">
-            <field name="name">sale.config.settings.form.pos</field>
-            <field name="model">sale.config.settings</field>
-            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
+            <field name="name">pos.config.settings.form</field>
+            <field name="model">pos.config.settings</field>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='config_pos']" position="inside">
+                <form string="Configure Point of Sale" class="oe_form_configuration">
+                    <header>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+                    </header>
                     <separator string="Point of Sale"/>
                     <group>
                     	<label for="id" string="Extensions"/>
@@ -25,8 +29,17 @@
                         	</div>
                         </div>
                     </group>
-                </xpath>
+                </form>
 			</field>
 		</record>            	
+        <record id="action_pos_configuration" model="ir.actions.act_window">
+            <field name="name">Configure Point of Sale</field>
+            <field name="res_model">pos.config.settings</field>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+
+        <menuitem id="menu_pos_global_settings" name="Settings" 
+            parent="menu_point_config_product" sequence="7" action="action_pos_configuration"/>
 	</data>
-</openerp>
+</openerp>