Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-first_10_clicks_crm_m2m_new-mdi into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first_10_clicks_crm_m2m_new-mdi/+merge/113725
Hello Sir,
Changed the field definition of 'categ_id' to many2many and its related changes.
Thanks,
Divyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first_10_clicks_crm_m2m_new-mdi/+merge/113725
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-first_10_clicks_crm_m2m_new-mdi.
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-07-02 13:08:24 +0000
+++ crm/crm_lead.py 2012-07-06 11:09:26 +0000
@@ -200,7 +200,7 @@
'email_cc': fields.text('Global CC', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
'description': fields.text('Notes'),
'write_date': fields.datetime('Update Date' , readonly=True),
- 'categ_id': fields.many2one('crm.case.categ', 'Category', \
+ 'categ_ids': fields.many2many('crm.case.categ', 'crm_lead_category_rel', 'lead_id', 'category_id', 'Categories', \
domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]"),
'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
domain="['|',('section_id','=',section_id),('section_id','=',False)]", help="From which campaign (seminar, marketing campaign, mass mailing, ...) did this contact come from?"),
=== modified file 'crm/crm_lead_demo.xml'
--- crm/crm_lead_demo.xml 2012-07-02 16:18:16 +0000
+++ crm/crm_lead_demo.xml 2012-07-06 11:09:26 +0000
@@ -39,7 +39,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="'(392) 895-7917'" name="mobile"/>
<field eval="1" name="active"/>
- <field name="categ_id" ref="crm.categ_oppor2"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor2')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Interest in Your New Product'" name="name"/>
<field eval="'(956) 293-2595'" name="phone"/>
@@ -56,7 +56,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="'(820) 167-3208'" name="mobile"/>
<field eval="1" name="active"/>
- <field name="categ_id" ref="crm.categ_oppor4"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor4')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Need Info about Web Design'" name="name"/>
<field eval="'(079) 681-2139'" name="phone"/>
@@ -91,7 +91,7 @@
<field name="section_id" ref="crm.section_sales_marketing_department"/>
<field eval="'(333) 715-1450'" name="mobile"/>
<field eval="1" name="active"/>
- <field name="categ_id" ref="crm.categ_oppor1"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Need a Quotation for PC1'" name="name"/>
<field eval="'(855) 924-4364'" name="phone"/>
@@ -111,7 +111,7 @@
<field name="country_id" ref="base.it"/>
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="'(468) 017-2684'" name="mobile"/>
- <field name="categ_id" ref="crm.categ_oppor8"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor8')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Need Info about your Services'" name="name"/>
<field eval="'(373) 907-1009'" name="phone"/>
@@ -130,7 +130,7 @@
<field name="country_id" ref="base.ua"/>
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="'(463) 014-1208'" name="mobile"/>
- <field name="categ_id" ref="crm.categ_oppor4"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor4')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Info about Your Company ?'" name="name"/>
<field eval="'(282) 603-7489'" name="phone"/>
@@ -143,7 +143,7 @@
<field name="user_id" ref="base.user_demo"/>
<field eval="'Survey'" name="name"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor6"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor6')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Survey Expert'" name="partner_name"/>
<field eval="'John Smith'" name="contact_name"/>
@@ -161,7 +161,7 @@
<field name="user_id" ref="base.user_root"/>
<field eval="'Partnership'" name="name"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor5"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor5')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Marketing Business'" name="partner_name"/>
<field eval="'Laure Smith'" name="contact_name"/>
@@ -189,7 +189,7 @@
<field name="user_id" ref="base.user_demo"/>
<field eval="'Need Info about Onsite Intervention'" name="name"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor3"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor3')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Agrolait'" name="partner_name"/>
<field eval="'Sylvie Lelitre'" name="contact_name"/>
@@ -202,7 +202,7 @@
<field name="user_id" ref="base.user_demo"/>
<field eval="'Need Quotation for 100 PC and 100 Keyboards'" name="name"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor1"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Centrale d\'achats 1'" name="partner_name"/>
</record>
@@ -234,7 +234,7 @@
<field name="user_id" ref="base.user_root"/>
<field eval="'150000'" name="planned_revenue"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor1"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
<field name="stage_id" ref="crm.stage_lead4"/>
<field eval="'Plan to buy 200 PC2'" name="name"/>
<field eval="'Conf call with purchase manager'" name="title_action"/>
@@ -249,7 +249,7 @@
<field eval="45000.0" name="planned_revenue"/>
<field eval="35" name="probability"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor3"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor3')])]"/>
<field name="stage_id" ref="crm.stage_lead3"/>
<field eval="'Pricing Information of Onsite Intervention'" name="name"/>
<field eval="'Send price list regarding our interventions'" name="title_action"/>
@@ -271,7 +271,7 @@
<field eval="30000.0" name="planned_revenue"/>
<field eval="30" name="probability"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor3"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor3')])]"/>
<field name="stage_id" ref="crm.stage_lead3"/>
<field eval="'Interest in your Kitchen Design Project'" name="name"/>
<field eval="'Send Catalogue by Email'" name="title_action"/>
@@ -345,7 +345,7 @@
<field eval="2500.0" name="planned_revenue"/>
<field eval="25" name="probability"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor6"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor6')])]"/>
<field name="stage_id" ref="crm.stage_lead3"/>
<field eval="'Plan train our students on your product'" name="name"/>
<field eval="'Call to define real needs about training'" name="title_action"/>
@@ -368,7 +368,7 @@
<field eval="462.0" name="planned_revenue"/>
<field eval="40" name="probability"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor2"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor2')])]"/>
<field name="stage_id" ref="crm.stage_lead3"/>
<field eval="'Plan to buy 66 keyboards and 66 mouses'" name="name"/>
<field eval="'Propose the kit keyboard+mouse'" name="title_action"/>
@@ -391,7 +391,7 @@
<field eval="55000.0" name="planned_revenue"/>
<field eval="90" name="probability"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor7"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor7')])]"/>
<field name="stage_id" ref="crm.stage_lead6"/>
<field eval="'Need 20 Days of Consultancy'" name="name"/>
<field eval="time.strftime('%Y-%m-%d')" name="date_deadline"/>
@@ -407,7 +407,7 @@
<field name="user_id" ref="base.user_demo"/>
<field eval="45000.0" name="planned_revenue"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor5"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor5')])]"/>
<field name="stage_id" ref="crm.stage_lead5"/>
<field eval="'Need a new design for my website'" name="name"/>
<field eval="time.strftime('%Y-05-01')" name="date_action"/>
@@ -429,7 +429,7 @@
<field name="user_id" ref="base.user_demo"/>
<field eval="42000.0" name="planned_revenue"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor2"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor2')])]"/>
<field name="stage_id" ref="crm.stage_lead8"/>
<field eval="'Want to subscribe to your online solution'" name="name"/>
</record>
@@ -442,7 +442,7 @@
<field name="user_id" ref="base.user_root"/>
<field eval="25000.0" name="planned_revenue"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor6"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor6')])]"/>
<field name="stage_id" ref="crm.stage_lead8"/>
<field eval="'Interest in your Partnership Contract'" name="name"/>
</record>
@@ -456,7 +456,7 @@
<field eval="5000" name="planned_revenue"/>
<field eval="30" name="probability"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor2"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor2')])]"/>
<field name="stage_id" ref="crm.stage_lead3"/>
<field eval="'Plan to attend a training'" name="name"/>
<field eval="time.strftime('%Y-04-10')" name="date_action"/>
@@ -478,7 +478,7 @@
<field name="user_id" ref="base.user_root"/>
<field eval="'150000'" name="planned_revenue"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor1"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
<field name="stage_id" ref="crm.stage_lead4"/>
<field eval="'Need to customize the solution'" name="name"/>
<field eval="'Conf call with technical service'" name="title_action"/>
@@ -499,7 +499,7 @@
<field name="user_id" ref="base.user_root"/>
<field eval="'1200'" name="planned_revenue"/>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="categ_id" ref="crm.categ_oppor1"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
<field name="stage_id" ref="crm.stage_lead4"/>
<field eval="'Interest in your customizable PC'" name="name"/>
<field eval="time.strftime('%Y-08-05')" name="date_action"/>
@@ -518,7 +518,7 @@
<field name="partner_id" ref="base.res_partner_fabiendupont0"/>
<field eval="'3'" name="priority"/>
<field name="user_id" ref="base.user_root"/>
- <field name="categ_id" ref="crm.categ_oppor4"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor4')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Need more info about the onsite intervention'" name="name"/>
</record>
@@ -529,7 +529,7 @@
<field name="partner_id" ref="base.res_partner_theshelvehouse0"/>
<field eval="'3'" name="priority"/>
<field name="user_id" ref="base.user_demo"/>
- <field name="categ_id" ref="crm.categ_oppor4"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor4')])]"/>
<field name="stage_id" ref="crm.stage_lead1"/>
<field eval="'Need more info about your pc2'" name="name"/>
</record>
=== modified file 'crm/crm_lead_menu.xml'
--- crm/crm_lead_menu.xml 2012-06-22 05:52:30 +0000
+++ crm/crm_lead_menu.xml 2012-07-06 11:09:26 +0000
@@ -43,7 +43,7 @@
<record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
<field name="name">Opportunities</field>
<field name="res_model">crm.lead</field>
- <field name="view_mode">kanban,tree,form,graph,calendar</field>
+ <field name="view_mode">kanban,tree,form,calendar</field>
<field name="domain">[('type','=','opportunity')]</field>
<field name="context">{'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
<field name="view_id" eval="False"/>
@@ -74,13 +74,6 @@
<field name="act_window_id" ref="crm_case_category_act_oppor11"/>
</record>
- <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
- <field name="sequence" eval="4"/>
- <field name="view_mode">graph</field>
- <field name="view_id" ref="crm_case_graph_view_opportunity"/>
- <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
- </record>
-
<menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
<menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" />
<menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" />
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2012-07-05 12:18:18 +0000
+++ crm/crm_lead_view.xml 2012-07-06 11:09:26 +0000
@@ -151,8 +151,8 @@
</group>
<group>
<field name="priority"/>
- <field name="categ_id"
- widget="selection"
+ <field name="categ_ids"
+ widget="many2many_tags"
domain="[('object_id.model','=','crm.lead')]"/>
</group>
<group>
@@ -234,7 +234,6 @@
<field name="email_from"/>
<field name="phone"/>
<field name="stage_id"/>
- <field name="categ_id" invisible="1"/>
<field name="section_id" invisible="context.get('invisible_section', True)" />
<field name="state" groups="base.group_no_one"/>
<field name="type_id" invisible="1"/>
@@ -392,7 +391,6 @@
<filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
<filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
<separator orientation="vertical"/>
- <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
<filter string="Campaign" icon="terp-gtk-jump-to-rtl"
domain="[]" context="{'group_by':'type_id'}" />
<filter string="Channel" icon="terp-call-start"
@@ -496,9 +494,9 @@
<field name="section_id" colspan="1" widget="selection"/>
</group>
<group>
- <field name="categ_id"
- string="Category" widget="selection"
- domain="[('object_id.model', '=', 'crm.lead')]" />
+ <field name="categ_ids"
+ string="Categories" widget="many2many_tags"
+ domain="[('object_id.model', '=', 'crm.lead')]"/>
</group>
</group>
@@ -594,7 +592,6 @@
<field name="section_id" invisible="context.get('invisible_section', True)" />
<field name="user_id"/>
<field name="priority" invisible="1"/>
- <field name="categ_id" invisible="1"/>
<field name="state" groups="base.group_no_one"/>
<field name="needaction_pending" invisible="1"/>
</tree>
@@ -646,7 +643,6 @@
<separator orientation="vertical" />
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
- <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
<filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -665,19 +661,5 @@
</field>
</record>
- <!-- crm.lead Opportunities Graph View -->
- <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
- <field name="name">CRM - Opportunity Graph</field>
- <field name="model">crm.lead</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
- <field name="categ_id"/>
- <field name="planned_revenue" operator="+"/>
- <field name="state" group="True"/>
- </graph>
- </field>
- </record>
-
</data>
</openerp>
=== modified file 'crm/report/crm_lead_report.py'
--- crm/report/crm_lead_report.py 2012-05-04 11:57:48 +0000
+++ crm/report/crm_lead_report.py 2012-07-06 11:09:26 +0000
@@ -85,8 +85,6 @@
'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
- 'categ_id': fields.many2one('crm.case.categ', 'Category',\
- domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('section_ids', '=', section_id)]"),
'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
'nbr': fields.integer('# of Cases', readonly=True),
@@ -134,7 +132,6 @@
c.section_id,
c.channel_id,
c.type_id,
- c.categ_id,
c.partner_id,
c.country_id,
c.planned_revenue,
=== modified file 'crm/report/crm_lead_report_view.xml'
--- crm/report/crm_lead_report_view.xml 2012-06-22 10:29:59 +0000
+++ crm/report/crm_lead_report_view.xml 2012-07-06 11:09:26 +0000
@@ -16,7 +16,6 @@
<field name="deadline_month" invisible="1"/>
<field name="state" invisible="1"/>
<field name="stage_id" invisible="1"/>
- <field name="categ_id" invisible="1"/>
<field name="type_id" invisible="1"/>
<field name="channel_id" invisible="1"/>
<field name="type" invisible="1"/>
@@ -114,7 +113,6 @@
<field name="partner_id"/>
<separator orientation="vertical"/>
<field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" />
- <field name="categ_id" widget="selection"/>
<field name="type_id" widget="selection"/>
<field name="channel_id" widget="selection"/>
<separator orientation="vertical"/>
@@ -140,8 +138,6 @@
<separator orientation="vertical" />
<filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
- <filter string="Category" name="Category" icon="terp-stock_symbol-selection"
- domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Campaign" icon="terp-gtk-jump-to-rtl"
domain="[]" context="{'group_by':'type_id'}" />
<filter string="Channel" icon="terp-call-start"
@@ -183,7 +179,6 @@
<field name="state" invisible="1"/>
<field name="stage_id" invisible="1"/>
<field name="priority" invisible="1"/>
- <field name="categ_id" invisible="1"/>
<field name="type_id" invisible="1"/>
<field name="channel_id" invisible="1"/>
<field name="type" invisible="1"/>
=== modified file 'crm/res_partner_view.xml'
--- crm/res_partner_view.xml 2012-07-03 08:36:41 +0000
+++ crm/res_partner_view.xml 2012-07-06 11:09:26 +0000
@@ -88,12 +88,6 @@
<field name="view_id" ref="crm_case_form_view_oppor"/>
<field name="act_window_id" ref="relate_partner_opportunities"/>
</record>
- <record model="ir.actions.act_window.view" id="relate_partner_opportunities_graph">
- <field name="sequence" eval="4"/>
- <field name="view_mode">graph</field>
- <field name="view_id" ref="crm_case_graph_view_opportunity"/>
- <field name="act_window_id" ref="relate_partner_opportunities"/>
- </record>
<!-- Partner kanban view inherte -->
<record model="ir.ui.view" id="crm_lead_partner_kanban_view">
=== modified file 'sale_crm/sale_crm.py'
--- sale_crm/sale_crm.py 2011-06-01 10:25:01 +0000
+++ sale_crm/sale_crm.py 2012-07-06 11:09:26 +0000
@@ -26,7 +26,7 @@
_columns = {
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
- 'categ_id': fields.many2one('crm.case.categ', 'Category', \
+ 'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \
domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
}
=== modified file 'sale_crm/sale_crm_view.xml'
--- sale_crm/sale_crm_view.xml 2012-06-27 10:04:34 +0000
+++ sale_crm/sale_crm_view.xml 2012-07-06 11:09:26 +0000
@@ -24,7 +24,7 @@
<field name="arch" type="xml">
<field name="user_id" position="after">
<field name="section_id" widget="selection"/>
- <field name="categ_id" widget="selection"/>
+ <field name="categ_ids" widget="many2many_tags"/>
</field>
</field>
</record>
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2012-06-19 12:10:16 +0000
+++ sale_crm/wizard/crm_make_sale.py 2012-07-06 11:09:26 +0000
@@ -86,11 +86,11 @@
pricelist = partner.property_product_pricelist.id
if False in partner_addr.values():
raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!'))
-
+
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,
+ 'categ_ids': [(6, 0, [categ_id.id for categ_id in case.categ_ids])],
'shop_id': make.shop_id.id,
'partner_id': partner.id,
'pricelist_id': pricelist,
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
