Merge lp:~openerp-dev/openobject-addons/trunk-bugfix-791151 into lp:openobject-addons

[Jacques-Etienne Baudoux]

Add category in the sale order like section and copy it from the opportunity when creating quote from opportunity

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== modified file 'sale_crm/sale_crm.py'
--- sale_crm/sale_crm.py	2011-01-14 00:11:01 +0000
+++ sale_crm/sale_crm.py	2011-06-01 10:31:21 +0000
@@ -26,6 +26,8 @@
 
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
     }
 
 sale_order()

=== modified file 'sale_crm/sale_crm_view.xml'
--- sale_crm/sale_crm_view.xml	2011-01-14 00:11:01 +0000
+++ sale_crm/sale_crm_view.xml	2011-06-01 10:31:21 +0000
@@ -22,6 +22,7 @@
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
                 <field name="section_id" widget="selection" groups="base.group_extended"/>
+                <field name="categ_id" widget="selection" groups="base.group_extended"/>
                 </field>
             </field>
         </record>

=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py	2011-03-17 17:33:16 +0000
+++ sale_crm/wizard/crm_make_sale.py	2011-06-01 10:31:21 +0000
@@ -91,6 +91,7 @@
                 vals = {
                     'origin': _('Opportunity: %s') % str(case.id),
                     'section_id': case.section_id and case.section_id.id or False,
+                    'categ_id': case.categ_id and case.categ_id.id or False,
                     'shop_id': make.shop_id.id,
                     'partner_id': partner.id,
                     'pricelist_id': pricelist,