[IMP] point_of_sale: forgot views and decls for partner's ean13. Demo data where at the wrong place also

bzr revid: fva@openerp.com-20121121165823-awkqy7wp0mq4zkhm

5 files changed, 84 insertions, 33 deletions

diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index 2e9cf84ff39..2164ddc1cb1 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -1,29 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
-        <!-- Partners with EAN13s -->
-        <record id='base.res_partner_1'  model='res.partner'> <field name='ean13'>0420100000005</field> </record>
-        <record id='base.res_partner_2'  model='res.partner'> <field name='ean13'>0420200000004</field> </record>
-        <record id='base.res_partner_3'  model='res.partner'> <field name='ean13'>0420300000003</field> </record>
-        <record id='base.res_partner_4'  model='res.partner'> <field name='ean13'>0420400000002</field> </record>
-        <record id='base.res_partner_5'  model='res.partner'> <field name='ean13'>0420500000001</field> </record>
-        <record id='base.res_partner_6'  model='res.partner'> <field name='ean13'>0420600000000</field> </record>
-        <record id='base.res_partner_7'  model='res.partner'> <field name='ean13'>0420700000009</field> </record>
-        <record id='base.res_partner_8'  model='res.partner'> <field name='ean13'>0420800000008</field> </record>
-        <record id='base.res_partner_9'  model='res.partner'> <field name='ean13'>0420900000007</field> </record>
-        <record id='base.res_partner_10' model='res.partner'> <field name='ean13'>0421000000003</field> </record>
-        <record id='base.res_partner_11' model='res.partner'> <field name='ean13'>0421100000002</field> </record>
-        <record id='base.res_partner_12' model='res.partner'> <field name='ean13'>0421200000001</field> </record>
-        <record id='base.res_partner_13' model='res.partner'> <field name='ean13'>0421300000000</field> </record>
-        <record id='base.res_partner_14' model='res.partner'> <field name='ean13'>0421400000009</field> </record>
-        <record id='base.res_partner_15' model='res.partner'> <field name='ean13'>0421500000008</field> </record>
-        <record id='base.res_partner_16' model='res.partner'> <field name='ean13'>0421600000007</field> </record>
-        <record id='base.res_partner_17' model='res.partner'> <field name='ean13'>0421700000006</field> </record>
-        <record id='base.res_partner_18' model='res.partner'> <field name='ean13'>0421800000005</field> </record>
-        <record id='base.res_partner_19' model='res.partner'> <field name='ean13'>0421900000004</field> </record>
-        <record id='base.res_partner_20' model='res.partner'> <field name='ean13'>0422000000000</field> </record>
-        <record id='base.res_partner_21' model='res.partner'> <field name='ean13'>0422100000009</field> </record>
 
         <!-- After installation of the module, open the related menu -->
         <record id="action_client_pos_menu" model="ir.actions.client">
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index faa3927a9c4..d49805656f3 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -1,13 +1,32 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <!-- Partners with EAN13s -->
+        <record id='base.res_partner_1'  model='res.partner'> <field name='ean13'>0420100000005</field> </record>
+        <record id='base.res_partner_2'  model='res.partner'> <field name='ean13'>0420200000004</field> </record>
+        <record id='base.res_partner_3'  model='res.partner'> <field name='ean13'>0420300000003</field> </record>
+        <record id='base.res_partner_4'  model='res.partner'> <field name='ean13'>0420400000002</field> </record>
+        <record id='base.res_partner_5'  model='res.partner'> <field name='ean13'>0420500000001</field> </record>
+        <record id='base.res_partner_6'  model='res.partner'> <field name='ean13'>0420600000000</field> </record>
+        <record id='base.res_partner_7'  model='res.partner'> <field name='ean13'>0420700000009</field> </record>
+        <record id='base.res_partner_8'  model='res.partner'> <field name='ean13'>0420800000008</field> </record>
+        <record id='base.res_partner_9'  model='res.partner'> <field name='ean13'>0420900000007</field> </record>
+        <record id='base.res_partner_10' model='res.partner'> <field name='ean13'>0421000000003</field> </record>
+        <record id='base.res_partner_11' model='res.partner'> <field name='ean13'>0421100000002</field> </record>
+        <record id='base.res_partner_12' model='res.partner'> <field name='ean13'>0421200000001</field> </record>
+        <record id='base.res_partner_13' model='res.partner'> <field name='ean13'>0421300000000</field> </record>
+        <record id='base.res_partner_14' model='res.partner'> <field name='ean13'>0421400000009</field> </record>
+        <record id='base.res_partner_15' model='res.partner'> <field name='ean13'>0421500000008</field> </record>
+        <record id='base.res_partner_16' model='res.partner'> <field name='ean13'>0421600000007</field> </record>
+        <record id='base.res_partner_17' model='res.partner'> <field name='ean13'>0421700000006</field> </record>
+        <record id='base.res_partner_18' model='res.partner'> <field name='ean13'>0421800000005</field> </record>
+        <record id='base.res_partner_19' model='res.partner'> <field name='ean13'>0421900000004</field> </record>
+        <record id='base.res_partner_20' model='res.partner'> <field name='ean13'>0422000000000</field> </record>
+        <record id='base.res_partner_21' model='res.partner'> <field name='ean13'>0422100000009</field> </record>
+
         <record id="base.user_root" model="res.users">
             <field name="ean13">0410100000006</field>
         </record>
-        <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
-            <field name="ean13">0420100000005</field>
-        </record>
         <record id="account.cash_journal" model="account.journal">
             <field eval="True" name="journal_user"/>
         </record>
@@ -15,10 +34,6 @@
             <field name="ean13">0410100000006</field>
             <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
         </record>
-        <record id="base.user_demo" model="res.users">
-            <field name="ean13">0420100000005</field>
-            <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
-        </record>
 
         <record model="pos.config" id="pos_config_main">
             <field name="journal_ids" eval="[(6, 0, [ref('account.cash_journal'), ref('account.bank_journal')])]" />
diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py
new file mode 100644
index 00000000000..61462b8e0de
--- /dev/null
+++ b/addons/point_of_sale/res_partner.py
@@ -0,0 +1,35 @@
+
+#!/usr/bin/env python
+from osv import osv, fields
+import math
+import openerp.addons.product.product
+
+
+class res_users(osv.osv):
+    _inherit = 'res.partner'
+    _columns = {
+        'ean13' : fields.char('EAN13', size=13, help="BarCode"),
+    }
+
+    def _check_ean(self, cr, uid, ids, context=None):
+        return all(
+            openerp.addons.product.product.check_ean(user.ean13) == True
+            for user in self.browse(cr, uid, ids, context=context)
+        )
+
+    def edit_ean(self, cr, uid, ids, context):
+        return {
+            'name': "Edit Ean",
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'pos.ean_wizard',
+            'target' : 'new',
+            'view_id': False,
+            'context':context,
+        }
+
+    _constraints = [
+        (_check_ean, "Error: Invalid ean code", ['ean13'],),
+    ]
+
diff --git a/addons/point_of_sale/res_partner_view.xml b/addons/point_of_sale/res_partner_view.xml
new file mode 100644
index 00000000000..4bd433adf28
--- /dev/null
+++ b/addons/point_of_sale/res_partner_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.product.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Point of Sale"> 
+                        <group>
+                            <field name="ean13" />
+                            <button name="edit_ean" type="object" string="Edit" />
+                        </group>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index a8cb56dd7f8..1b98c25f1c6 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -7,7 +7,7 @@
     padding: 0;
     margin: 0;
     background-color: #f0eeee;
-    font-family: "Lucida Grande", Helvetica, Verdana, Arial;
+    font-family: "Lato","Lucida Grande", Helvetica, Verdana, Arial;
     color: #555555;
     font-size: 12px;
     position: absolute;
@@ -15,6 +15,7 @@
     top: 0;
     width: 100%;
     height: 100%;
+    text-shadow: none;
     -webkit-user-select: none;
        -moz-user-select: none;
             user-select: none;
@@ -955,7 +956,7 @@
 }
 
 .point-of-sale .order{
-    background: #F00;
+    background: white;
     background: -webkit-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
     background:    -moz-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
     background:     -ms-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));