[MERGE] seb branch

diff --git a/remembership.py b/remembership.py
index b6a6857..7115b86 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -29,9 +29,13 @@ class Partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
-        'member_ident': fields.char('Member identifier', size=64, readonly=True),
+        'member_ident': fields.char('Member identifier', size=64),
     }
 
+    _sql_constraints = [
+        ('member_ident_uniq', 'unique(member_ident, company_id)', 'The member identifier must be unique !'),
+    ]
+
 Partner()
 
 

diff --git a/view/partner.xml b/view/partner.xml
index 5f4560e..a9d909e 100644 (file)
--- a/view/partner.xml
+++ b/view/partner.xml
@@ -4,11 +4,10 @@
         <record id="view_remembership_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form - Remembership</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="membership.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='free_member']" position="before">
-                    <field name="member_ident"/>
+                    <field name="member_ident" readonly="1"/>
                     <newline/>
                 </xpath>
             </field>
@@ -16,7 +15,6 @@
         <record id="view_remembership_members_tree" model="ir.ui.view">
             <field name="name">Members</field>
             <field name="model">res.partner</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="membership.membership_members_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='name']" position="after">
@@ -27,7 +25,6 @@
         <record id="view_remembership_res_partner_member_filter" model="ir.ui.view">
             <field name="name">res.partner.select</field>
             <field name="model">res.partner</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="membership.view_res_partner_member_filter"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='membership_stop']" position="before">

diff --git a/view/point_of_sale.xml b/view/point_of_sale.xml
index 5f7dea2..2bf3349 100644 (file)
--- a/view/point_of_sale.xml
+++ b/view/point_of_sale.xml
@@ -3,7 +3,6 @@
         <record id="view_pos_pos_form" model="ir.ui.view">
             <field name="name">pos.order.form - Remembership</field>
             <field name="model">pos.order</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="point_of_sale.view_pos_pos_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='partner_id']" position="replace">