Merge lp:~openerp-dev/openobject-addons/trunk-muilti_address-rmu into lp:openobject-addons

[Randhir Mayatra (OpenERP)]

Hello,
 As per the task specification, "change multiple addresses per company". made all the changes.

Thank you...

-- Randhir (RMA)

[lp:~openerp-dev/openobject-addons/trunk-muilti_address-rmu]

8607. By Randhir Mayatra (OpenERP) on 2013-03-28

[MERGE] merge with trunk

8608. By Randhir Mayatra (OpenERP) on 2013-03-28

[IMP] resolve conflicts

8609. By Randhir Mayatra (OpenERP) on 2013-04-05

[MERGE] merge with trunk

Unmerged revisions

8609. By Randhir Mayatra (OpenERP) on 2013-04-05

[MERGE] merge with trunk

8608. By Randhir Mayatra (OpenERP) on 2013-03-28

[IMP] resolve conflicts

8607. By Randhir Mayatra (OpenERP) on 2013-03-28

[MERGE] merge with trunk

8606. By Randhir Mayatra (OpenERP) on 2013-03-25

[IMP] change the address string

8605. By Randhir Mayatra (OpenERP) on 2013-03-22

[IMP] improve code

8604. By Ravish(OpenERP) on 2013-03-13

[IMP] done all require changes

8603. By Ravish(OpenERP) on 2013-03-12

[IMP]improved all require changes

8602. By Ravish(OpenERP) on 2013-03-12

improved all require changes

8601. By Ravish(OpenERP) on 2013-03-12

[Merge] with trunk

8600. By Ravish(OpenERP) on 2013-03-11

improved changes

=== modified file 'account/account.py'
--- account/account.py	2013-04-04 09:52:57 +0000
+++ account/account.py	2013-04-05 11:48:33 +0000
@@ -3562,4 +3562,5 @@
 
 account_bank_accounts_wizard()
 
+  
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-03-29 10:55:46 +0000
+++ account/account_invoice.py	2013-04-05 11:48:33 +0000
@@ -1773,5 +1773,17 @@
             self.pool.get('account.invoice').write(cr, uid, [context['default_res_id']], {'sent': True}, context=context)
             self.pool.get('account.invoice').message_post(cr, uid, [context['default_res_id']], body=_("Invoice sent"), context=context)
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
+        
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    
+    def _address_type_get(self, cr, uid, context=None):
+        res = super(res_partner, self)._address_type_get(cr, uid, context=context);
+        res.append(('invoice', 'Invoice'))
+        return res
+    _columns = {
+        'type': fields.selection(_address_type_get, 'Address Type',
+            help="Used to select automatically the right address according to the context in sales and purchases documents."),
+    }        
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'base_setup/res_config_view.xml'
--- base_setup/res_config_view.xml	2012-12-17 08:30:17 +0000
+++ base_setup/res_config_view.xml	2013-04-05 11:48:33 +0000
@@ -28,6 +28,10 @@
                             </div>
                         </div>
                     </group>
+                    <group name="multi_address" invisible="1">
+                        <label for="id" string="Contact's Addresses"/>
+                        <div/>
+                    </group>
                     <group>
                         <label for="id" string="Email"/>
                         <div name="email">
 
=== modified file 'sale/res_config.py'
--- sale/res_config.py	2013-04-04 09:52:57 +0000
+++ sale/res_config.py	2013-04-05 11:48:33 +0000
@@ -146,5 +146,13 @@
         if not module_sale_analytic_plans:
             return {}
         return {'value': {'group_analytic_account_for_sales': module_sale_analytic_plans}}
+        
+class base_config_settings(osv.osv_memory):
+    _inherit = 'base.config.settings'
+    _columns = {
+        'group_delivery_invoice_address': fields.boolean("Allow supporting several addresses per company ",
+            implied_group='sale.group_delivery_invoice_address',
+            help="Allows you to use different types (invoice, contact, delivery, etc) of addresses for contacts of a company"),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'sale/res_config_view.xml'
--- sale/res_config_view.xml	2013-03-01 08:29:28 +0000
+++ sale/res_config_view.xml	2013-04-05 11:48:33 +0000
@@ -133,5 +133,22 @@
                 </xpath>
             </field>
         </record>
+        
+        <record id="view_general_configuration" model="ir.ui.view">
+            <field name="name">base.config.settings.signup</field>
+            <field name="model">base.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='multi_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//group[@name='multi_address']/div" position="inside">
+                    <div>
+                        <field name="group_delivery_invoice_address" class="oe_inline"/>
+                        <label for="group_delivery_invoice_address"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
 
=== modified file 'sale/res_partner_view.xml'
--- sale/res_partner_view.xml	2012-12-20 11:43:56 +0000
+++ sale/res_partner_view.xml	2013-04-05 11:48:33 +0000
@@ -55,27 +55,6 @@
                 </xpath>
             </field>
         </record>
-
-        <record id="res_partner_address_type" model="ir.ui.view">
-            <field name="name">res.partner.view.address_type</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="arch" type="xml">
-                <xpath expr="//label[@for='type']" position="attributes">
-                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-                <xpath expr="//label[@for='type']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//div[@name='div_type']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//div[@name='div_type']" position="attributes">
-                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-            </field>
-        </record>
-
     </data>
 </openerp>
 
 
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2013-03-14 11:27:40 +0000
+++ sale/sale_view.xml	2013-04-05 11:48:33 +0000
@@ -155,8 +155,8 @@
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'invoice'}"/>
-                            <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'default_pricelist_id':pricelist_id, 'default_name':name, 'default_type': 'contract'}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
+                            <field name="partner_shipping_id"  groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}" invisible="1"/>
+                            <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name, 'default_type': 'contract'}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
                             <field name="date_order"/>
 
=== modified file 'sale/security/sale_security.xml'
--- sale/security/sale_security.xml	2012-12-21 16:48:08 +0000
+++ sale/security/sale_security.xml	2013-04-05 11:48:33 +0000
@@ -30,7 +30,7 @@
     </record>
 
     <record id="group_delivery_invoice_address" model="res.groups">
-        <field name="name">Addresses in Sales Orders</field>
+        <field name="name">Multiple addresses per company</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
 
=== modified file 'sale_stock/res_config.py'
--- sale_stock/res_config.py	2013-03-27 13:00:26 +0000
+++ sale_stock/res_config.py	2013-04-05 11:48:33 +0000
@@ -26,9 +26,6 @@
     _inherit = 'sale.config.settings'
 
     _columns = {
-        'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
-            implied_group='sale.group_delivery_invoice_address',
-            help="Allows you to specify different delivery and invoice addresses on a sales order."),
         'group_invoice_deli_orders': fields.boolean('Generate invoices after and based on delivery orders',
             implied_group='sale_stock.group_invoice_deli_orders',
             help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
 
=== modified file 'sale_stock/res_config_view.xml'
--- sale_stock/res_config_view.xml	2012-10-12 05:51:52 +0000
+++ sale_stock/res_config_view.xml	2013-04-05 11:48:33 +0000
@@ -8,12 +8,6 @@
              <field name="inherit_id" ref="sale.view_sales_config"/>
              <field name="arch" type="xml">
                  <data>
-                     <xpath expr="//div[@name='Customer Features']" position="inside">
-                         <div>
-                              <field name="group_sale_delivery_address" class="oe_inline"/>
-                              <label for="group_sale_delivery_address"/>
-                         </div>
-                     </xpath>
                      <xpath expr="//div[@name='group_invoice_so_lines']" position="replace">
                          <div>
                              <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
 
=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py	2013-02-04 11:29:49 +0000
+++ sale_stock/sale_stock.py	2013-04-05 11:48:33 +0000
@@ -630,3 +630,15 @@
             }
             sale_line_obj.create(cr, uid, vals, context=context)
         return result
+        
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    
+    def _address_type_get(self, cr, uid, context=None):
+        res = super(res_partner, self)._address_type_get(cr, uid, context=context);
+        res.append(('delivery', 'Delivery'))
+        return res
+    _columns = {
+        'type': fields.selection(_address_type_get, 'Address Type',
+            help="Used to select automatically the right address according to the context in sales and purchases documents."),
+    }        
 
=== modified file 'sale_stock/sale_stock_view.xml'
--- sale_stock/sale_stock_view.xml	2013-03-14 11:27:40 +0000
+++ sale_stock/sale_stock_view.xml	2013-04-05 11:48:33 +0000
@@ -62,7 +62,10 @@
                              name="product_uom_qty" class="oe_inline"
                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
                    </field>
-
+                   <xpath expr="//field[@name='partner_shipping_id']" position="replace">
+                        <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
+                   </xpath>
+                  
                    <field name='invoiced' position="after">
                        <field name="shipped"/>
                        <field name="invoice_exists" invisible="1"/>