[MERGE] Merge res.parnter.address cleaining

bzr revid: sbh@tinyerp.com-20120328084253-9w9cfhc22cqy7hk4

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 706fa46..a7dc94c 100644 (file)
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -96,7 +96,7 @@
                         <separator string="Supplier Debit" colspan="2"/>
                         <field name="debit"/>
                     </group>
-                    <field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1">
+                    <field colspan="4"  name="bank_ids" nolabel="1">
                         <form string="Bank account">
                             <field name="state"/>
                             <newline/>

diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 135ed19..5100e8d 100644 (file)
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -119,18 +119,20 @@
         <field name="phone">(+32)2 211 34 83</field>
         <field name="street">Rue des Palais 44, bte 33</field>
         <field name="type">default</field>
+        <field name="use_parent_address" eval="0"/>
         <field name="parent_id" ref="partner_record1"/>
     </record>
 
     <record id="res_partner_unknown_address_2" model="res.partner">
         <field name="city">Avignon CEDEX 091</field>
-        <field name="name">Laurent Jacot1</field>
+        <field name="name">Lara</field>
         <field name="zip">84911</field>
         <field name="country_id" model="res.country" search="[('name','=','France')]"/>
         <field name="email">contact@tecsas.fr</field>
         <field name="phone">(+33)4.32.74.10.57</field>
         <field name="street">85 rue du traite de Rome</field>
         <field name="type">default</field>
+        <field name="use_parent_address" eval="0"/>
         <field name="parent_id" ref="partner_record1"/>
     </record>
 
@@ -142,6 +144,7 @@
         <field name="email">info@mediapole.net</field>
         <field name="phone">(+32).10.45.17.73</field>
         <field name="street">Rue de l'Angelique, 1</field>
+        <field name="use_parent_address" eval="0"/>
         <field name="parent_id" ref="partner_record1"/>
     </record>
 

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 7afcc96..06d67ee 100644 (file)
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -78,15 +78,12 @@
                             domain="[('invoice_state', '=', '2binvoiced')]"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="partner_id"/>
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>                    
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-partner"
-                            domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State"
                             domain="[]" context="{'group_by':'state'}"/>

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1b9defb..ae3d23a 100644 (file)
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1073,6 +1073,7 @@ class stock_picking(osv.osv):
 
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
+        parnter_obj = self.pool.get('res.partner')
         invoices_group = {}
         res = {}
         inv_type = type
@@ -1080,6 +1081,8 @@ class stock_picking(osv.osv):
             if picking.invoice_state != '2binvoiced':
                 continue
             partner = self._get_partner_to_invoice(cr, uid, picking, context=context)
+            if isinstance(partner, int):
+                partner=parnter_obj.browse(cr,uid,[partner])[0]
             if not partner:
                 raise osv.except_osv(_('Error, no partner !'),
                     _('Please put a partner on the picking list if you want to generate invoice.'))

diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 141cb6c..5372ab6 100644 (file)
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -183,12 +183,14 @@
         <record id="res_partner_tinyshop0" model="res.partner">
             <field eval="0" name="customer"/>
             <field eval="0" name="supplier"/>
+            <field name="is_company">1</field>
             <field eval="1" name="active"/>
             <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="res_partner_address_fabien0" model="res.partner">
-            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Felix&quot;&quot;&quot;" name="name"/>
             <field name="parent_id" ref="res_partner_tinyshop0"/>
+            <field name="use_parent_address" eval="1"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_company_shop0" model="res.company">
@@ -201,11 +203,13 @@
             <field eval="1" name="customer"/>
             <field eval="0" name="supplier"/>
             <field eval="1" name="active"/>
+            <field name="is_company">1</field>
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="res_partner_address_eric0" model="res.partner">
-            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Edwin&quot;&quot;&quot;" name="name"/>
             <field name="parent_id" ref="res_partner_tinyshop1"/>
+            <field name="use_parent_address" eval="1"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_company_tinyshop0" model="res.company">