Rajesh Prajapati (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-project_issue_m2m-rpr into
lp:~openerp-dev/openobject-addons/trunk-project_issue_m2m-psi.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-project_issue_m2m-rpr/+merge/113580
Hello
I have changed category to m2m tag from m2o.
Thanks
Rajesh Peajapati
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-project_issue_m2m-rpr/+merge/113580
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-commiter/openobject-addons/trunk-project_issue_m2m-rpr into
lp:~openerp-dev/openobject-addons/trunk-project_issue_m2m-psi.
=== modified file 'project_issue/board_project_issue_view.xml'
--- project_issue/board_project_issue_view.xml 2012-06-12 05:06:28 +0000
+++ project_issue/board_project_issue_view.xml 2012-07-05 13:31:25 +0000
@@ -18,7 +18,6 @@
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
<field name="stage_id" widget="selection" readonly="1"/>
<field name="state" groups="base.group_no_one"/>
- <field name="categ_id" invisible="1"/>
<field name="task_id" invisible="1"/>
</tree>
</field>
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2012-07-02 13:08:24 +0000
+++ project_issue/project_issue.py 2012-07-05 13:31:25 +0000
@@ -238,7 +238,7 @@
'date_closed': fields.datetime('Closed', readonly=True,select=True),
'date': fields.datetime('Date'),
'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
- 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
+ 'categ_ids': fields.many2many('crm.case.categ', 'project_category_rel', 'project_id', 'category_id', 'Categories', domain="[('object_id.model', '=', 'crm.project.bug')]"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
'version_id': fields.many2one('project.issue.version', 'Version'),
'stage_id': fields.many2one ('project.task.type', 'Stage',
@@ -281,7 +281,7 @@
'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
'priority': crm.AVAILABLE_PRIORITIES[2][0],
- 'categ_id' : lambda *a: False,
+ 'categ_ids' : lambda *a: False,
}
_group_by_full = {
@@ -361,7 +361,7 @@
if id2:
categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
if categ_id:
- self.write(cr, uid, ids, {'categ_id': categ_id})
+ self.write(cr, uid, ids, {'categ_ids': categ_id})
return True
def convert_to_feature(self, cr, uid, ids, context=None):
=== modified file 'project_issue/project_issue_demo.xml'
--- project_issue/project_issue_demo.xml 2012-07-02 16:13:23 +0000
+++ project_issue/project_issue_demo.xml 2012-07-05 13:31:25 +0000
@@ -9,7 +9,7 @@
<field name="partner_id" ref="base.res_partner_agrolait"/>
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
- <field name="categ_id" ref="bug_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('bug_categ')])]"/>
<field name="project_id" ref="project.project_project_22"/>
<field eval="15.0" name="duration"/>
<field eval=""Bug in Accounts module"" name="name"/>
@@ -25,7 +25,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="3.5" name="duration"/>
- <field name="categ_id" ref="bug_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('bug_categ')])]"/>
<field eval=""Program not giving proper output"" name="name"/>
<field name="project_id" ref="project.project_project_22"/>
<field name="stage_id" ref="project.project_tt_specification"/>
@@ -38,7 +38,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="2.3" name="duration"/>
- <field name="categ_id" ref="bug_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('bug_categ')])]"/>
<field name="project_id" ref="project.project_project_23"/>
<field eval=""Output incorrect"" name="name"/>
<field name="stage_id" ref="project.project_tt_development"/>
@@ -52,7 +52,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="4.0" name="duration"/>
- <field name="categ_id" ref="bug_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('bug_categ')])]"/>
<field name="project_id" ref="project.project_project_22"/>
<field eval=""Problem loading page"" name="name"/>
<field name="stage_id" ref="project.project_tt_testing"/>
@@ -66,7 +66,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="1.0" name="duration"/>
- <field name="categ_id" ref="bug_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('bug_categ')])]"/>
<field name="project_id" ref="project.project_project_22"/>
<field eval=""Page not Found"" name="name"/>
<field name="stage_id" ref="project.project_tt_development"/>
@@ -80,7 +80,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="4.0" name="duration"/>
- <field name="categ_id" ref="bug_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('bug_categ')])]"/>
<field name="project_id" ref="project.project_project_22"/>
<field eval=""Programming Error"" name="name"/>
<field name="stage_id" ref="project.project_tt_testing"/>
@@ -94,7 +94,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="2.0" name="duration"/>
- <field name="categ_id" ref="bug_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('bug_categ')])]"/>
<field name="project_id" ref="project.project_project_9"/>
<field eval=""Logical Error in Program"" name="name"/>
<field name="stage_id" ref="project.project_tt_testing"/>
@@ -108,7 +108,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="7.3" name="duration"/>
- <field name="categ_id" ref="bug_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('bug_categ')])]"/>
<field name="project_id" ref="project.project_project_9"/>
<field eval=""Constraint Error"" name="name"/>
<field name="stage_id" ref="project.project_tt_testing"/>
@@ -121,7 +121,7 @@
<field name="partner_id" ref="base.res_partner_5"/>
<field eval="1" name="active"/>
<field eval="1.3" name="duration"/>
- <field name="categ_id" ref="feature_request_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('feature_request_categ')])]"/>
<field name="project_id" ref="project.project_project_22"/>
<field eval=""Error in Program"" name="name"/>
<field name="stage_id" ref="project.project_tt_testing"/>
@@ -135,7 +135,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="13.0" name="duration"/>
- <field name="categ_id" ref="feature_request_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('feature_request_categ')])]"/>
<field name="project_id" ref="project.project_project_9"/>
<field eval=""Patches Error in Program"" name="name"/>
<field name="stage_id" ref="project.project_tt_testing"/>
@@ -149,7 +149,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="3.2" name="duration"/>
- <field name="categ_id" ref="feature_request_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('feature_request_categ')])]"/>
<field name="project_id" ref="project.project_project_21"/>
<field eval=""New Features To Be Added"" name="name"/>
<field name="stage_id" ref="project.project_tt_merge"/>
@@ -163,7 +163,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="3.0" name="duration"/>
- <field name="categ_id" ref="feature_request_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('feature_request_categ')])]"/>
<field name="project_id" ref="project.project_project_21"/>
<field eval=""Add menus to the module"" name="name"/>
<field eval=""[email protected]"" name="email_from"/>
@@ -178,7 +178,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="2.0" name="duration"/>
- <field name="categ_id" ref="feature_request_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('feature_request_categ')])]"/>
<field name="project_id" ref="project.project_project_9"/>
<field eval=""Include Attendance sheet in Project"" name="name"/>
<field eval=""[email protected]"" name="email_from"/>
@@ -193,7 +193,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="2.45" name="duration"/>
- <field name="categ_id" ref="feature_request_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('feature_request_categ')])]"/>
<field name="project_id" ref="project.project_project_22"/>
<field eval=""Create new object"" name="name"/>
<field name="stage_id" ref="project.project_tt_specification"/>
@@ -207,7 +207,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="15.0" name="duration"/>
- <field name="categ_id" ref="feature_request_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('feature_request_categ')])]"/>
<field name="project_id" ref="project.project_project_22"/>
<field eval=""Improve Reports in HRMS"" name="name"/>
<field name="stage_id" ref="project.project_tt_development"/>
@@ -221,7 +221,7 @@
<field name="section_id" ref="crm.section_sales_department"/>
<field eval="1" name="active"/>
<field eval="06.15" name="duration"/>
- <field name="categ_id" ref="feature_request_categ"/>
+ <field name="categ_ids" eval="[(6, 0, [ref('feature_request_categ')])]"/>
<field name="project_id" ref="project.project_project_22"/>
<field eval=""Improve Reports in PMS"" name="name"/>
<field name="stage_id" ref="project.project_tt_specification"/>
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-07-03 12:41:11 +0000
+++ project_issue/project_issue_view.xml 2012-07-05 13:31:25 +0000
@@ -128,7 +128,7 @@
<field name="email_from"/>
</group><group>
<field name="task_id" on_change="onchange_task_id(task_id)"/>
- <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+ <field name="categ_ids" widget="many2many_tags" domain="[('object_id.model', '=', 'project.issue')]"/>
<field name="version_id" widget="selection"/>
<field name="priority"/>
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
@@ -181,7 +181,6 @@
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
<field name="stage_id" widget="selection" readonly="1"/>
<field name="state" groups="base.group_no_one"/>
- <field name="categ_id" invisible="1"/>
<field name="task_id" invisible="1"/>
</tree>
</field>
@@ -222,8 +221,6 @@
<filter string="Version" icon="terp-gtk-jump-to-rtl"
domain="[]" context="{'group_by':'version_id'}"/>
<separator orientation="vertical"/>
- <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
- context="{'group_by':'categ_id'}"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]"
context="{'group_by':'priority'}"/>
<filter string="Stage" icon="terp-stage" domain="[]"
@@ -269,7 +266,7 @@
<t t-name="kanban-tooltip">
<ul class="oe_kanban_tooltip">
<li><b>Project:</b> <field name="project_id"/></li>
- <li><b>Category:</b> <field name="categ_id"/></li>
+ <li><b>Category:</b> <field name="categ_ids"/></li>
</ul>
</t>
<t t-name="kanban-box">
=== modified file 'project_issue/report/project_issue_report.py'
--- project_issue/report/project_issue_report.py 2012-05-23 12:55:23 +0000
+++ project_issue/report/project_issue_report.py 2012-07-05 13:31:25 +0000
@@ -50,7 +50,6 @@
'opening_date': fields.date('Date of Opening', readonly=True),
'creation_date': fields.date('Creation Date', readonly=True),
'date_closed': fields.date('Date of Closing', readonly=True),
- 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
'stage_id': fields.many2one('project.task.type', 'Stage'),
'nbr': fields.integer('# of Issues', readonly=True),
'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True),
@@ -86,7 +85,6 @@
c.working_hours_open,
c.working_hours_close,
c.section_id,
- c.categ_id,
c.stage_id,
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
c.company_id as company_id,
@@ -104,7 +102,7 @@
FROM
project_issue c
- WHERE c.active= 'true' and c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
+ WHERE c.active= 'true'
)""")
project_issue_report()
=== modified file 'project_issue/report/project_issue_report_view.xml'
--- project_issue/report/project_issue_report_view.xml 2012-06-22 13:42:18 +0000
+++ project_issue/report/project_issue_report_view.xml 2012-07-05 13:31:25 +0000
@@ -17,7 +17,6 @@
<field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="section_id" invisible="1"/>
<field name="user_id" invisible="1"/>
- <field name="categ_id" invisible="1"/>
<field name="channel_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="task_id" invisible="1"/>
@@ -33,19 +32,6 @@
</tree>
</field>
</record>
- <record id="view_project_issue_report_graph" model="ir.ui.view">
- <field name="name">project.issue.report.graph</field>
- <field name="model">project.issue.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph orientation="horizontal" string="Project Issue" type="bar">
- <field name="state"/>
- <field name="nbr" operator="+"/>
- <field group="True" name="user_id"/>
- </graph>
- </field>
- </record>
-
<record id="view_project_issue_report_filter" model="ir.ui.view">
<field name="name">project.issue.report.select</field>
<field name="model">project.issue.report</field>
@@ -86,8 +72,6 @@
<filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
<filter string="Task" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
<separator orientation="vertical" />
- <filter string="Category" icon="terp-stock_symbol-selection"
- domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Version" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
<separator orientation="vertical" />
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
@@ -116,7 +100,7 @@
<field name="name">Issues Analysis</field>
<field name="res_model">project.issue.report</field>
<field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
+ <field name="view_mode">tree</field>
<field name="context">{'search_default_year':1,'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_project_issue_report_tree"/>
<field name="search_view_id" ref="view_project_issue_report_filter"/>
@@ -130,12 +114,7 @@
<field name="view_id" ref="view_project_issue_report_tree"/>
<field name="act_window_id" ref="action_project_issue_report"/>
</record>
- <record model="ir.actions.act_window.view" id="action_project_issue_report_graph">
- <field name="sequence" eval="2"/>
- <field name="view_mode">graph</field>
- <field name="view_id" ref="view_project_issue_report_graph"/>
- <field name="act_window_id" ref="action_project_issue_report"/>
- </record>
+
<menuitem action="action_project_issue_report" id="menu_project_issue_report_tree"
parent="base.menu_project_report"/>
_______________________________________________
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
