Ajay Chauhan(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-stage_fold-cha into
lp:openobject-addons.
Requested reviews:
Purnendu Singh (OpenERP) (psi-tinyerp)
Ajay Chauhan(OpenERP) (cha-tinyerp)
Divyesh Makwana(OpenERP) (mdi-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-stage_fold-cha/+merge/122483
Hello,
i have made stages that are shown on view accurate according to state. Like in
'opportunity' form there was 'lost' stage at new creation which should not be
there.
Thanks,
Ajay Chauhan
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-stage_fold-cha/+merge/122483
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-stage_fold-cha.
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-08-23 14:35:21 +0000
+++ crm/crm_lead.py 2012-09-05 09:33:23 +0000
@@ -213,7 +213,7 @@
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
'date_closed': fields.datetime('Closed', readonly=True),
'stage_id': fields.many2one('crm.case.stage', 'Stage',
- domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
+ domain="['&', ('fold', '=', False), '&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
'user_id': fields.many2one('res.users', 'Salesperson'),
'referred': fields.char('Referred By', size=64),
'date_open': fields.datetime('Opened', readonly=True),
=== modified file 'crm/crm_lead_data.xml'
--- crm/crm_lead_data.xml 2012-08-14 08:20:29 +0000
+++ crm/crm_lead_data.xml 2012-09-05 09:33:23 +0000
@@ -55,7 +55,7 @@
<record model="crm.case.stage" id="stage_lead7">
<field name="name">Dead</field>
<field eval="1" name="case_default"/>
- <field eval="True" name="fold"/>
+ <field eval="False" name="fold"/>
<field name="state">cancel</field>
<field eval="'0'" name="probability"/>
<field eval="'16'" name="sequence"/>
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2012-09-05 08:04:02 +0000
+++ crm/crm_lead_view.xml 2012-09-05 09:33:23 +0000
@@ -211,7 +211,7 @@
<field name="type_id" widget="selection"/>
<field name="channel_id" widget="selection"/>
<field name="referred"/>
- <field name="state" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
</group>
<group string="Mailings">
<field name="opt_out" />
@@ -257,7 +257,7 @@
<field name="stage_id"/>
<field name="user_id" invisible="1"/>
<field name="section_id" invisible="context.get('invisible_section', True)" />
- <field name="state" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
<field name="type_id" invisible="1"/>
<field name="referred" invisible="1"/>
<field name="channel_id" invisible="1"/>
@@ -386,7 +386,6 @@
<filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
<separator orientation="vertical"/>
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
- <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
</group>
<group string="Display">
@@ -515,7 +514,7 @@
<field name="day_open" groups="base.group_no_one"/>
<field name="day_close" groups="base.group_no_one"/>
<field name="referred"/>
- <field name="state" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
<field name="type" invisible="1"/>
</group>
<group string="References">
@@ -562,7 +561,7 @@
<field name="section_id" invisible="context.get('invisible_section', True)" />
<field name="user_id"/>
<field name="priority" invisible="1"/>
- <field name="state" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
<field name="needaction_pending" invisible="1"/>
</tree>
</field>
@@ -600,7 +599,6 @@
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<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'}"/>
<filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
<filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
</group>
=== modified file 'crm/report/crm_lead_report_view.xml'
--- crm/report/crm_lead_report_view.xml 2012-08-08 12:19:50 +0000
+++ crm/report/crm_lead_report_view.xml 2012-09-05 09:33:23 +0000
@@ -105,21 +105,11 @@
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<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="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'}" />
- <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'creation_year'}"/>
- <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'creation_month'}"/>
- <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'creation_day'}"/>
- <filter string="Exp. Closing" icon="terp-go-month" domain="[]" context="{'group_by':'deadline_month'}"/>
<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'}" />
<separator orientation="vertical" />
- <filter string="Status" icon="terp-stock_effects-object-colorize"
- domain="[]" context="{'group_by':'state'}" />
- <separator orientation="vertical" />
<filter string="Year" icon="terp-go-year"
domain="[]" context="{'group_by':'creation_year'}"/>
<filter string="Month" icon="terp-go-month"
=== modified file 'hr_recruitment/board_hr_recruitment_statistical_view.xml'
--- hr_recruitment/board_hr_recruitment_statistical_view.xml 2012-08-08 12:48:39 +0000
+++ hr_recruitment/board_hr_recruitment_statistical_view.xml 2012-09-05 09:33:23 +0000
@@ -11,7 +11,7 @@
<field name="job_id"/>
<field name="partner_name"/>
<field name="stage_id"/>
- <field name="state" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
</tree>
</field>
</record>
=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py 2012-08-23 15:32:03 +0000
+++ hr_recruitment/hr_recruitment.py 2012-09-05 09:33:23 +0000
@@ -185,7 +185,7 @@
'create_date': fields.datetime('Creation Date', readonly=True, select=True),
'write_date': fields.datetime('Update Date', readonly=True),
'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
- domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
+ domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
'state': fields.related('stage_id', 'state', type="selection", store=True,
selection=AVAILABLE_STATES, string="State", readonly=True,
help='The state is set to \'Draft\', when a case is created.\
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml 2012-09-05 08:04:02 +0000
+++ hr_recruitment/hr_recruitment_view.xml 2012-09-05 09:33:23 +0000
@@ -95,7 +95,7 @@
<field name="availability" invisible="1"/>
<field name="department_id" invisible="context.get('invisible_department', True)"/>
<field name="user_id"/>
- <field name="state" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
</tree>
</field>
</record>
@@ -107,7 +107,7 @@
<form string="Jobs - Recruitment Form" version="7.0">
<header>
<button name="case_close_with_emp" string="Hire" type="object"
- states="open,pending" class="oe_highlight"/>
+ states="draft,open,pending" class="oe_highlight"/>
<button name="case_cancel" string="Refuse" type="object"
states="draft,open,pending" class="oe_highlight"/>
<field name="stage_id" widget="statusbar" clickable="True"/>
@@ -228,7 +228,6 @@
<filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
<filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
- <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
<filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
</group>
@@ -376,10 +375,15 @@
<field name="arch" type="xml">
<form string="Stage" version="7.0">
<group string="Stage Definition">
- <field name="name"/>
- <field name="department_id"/>
- <field name="sequence"/>
- <field name="state"/>
+ <group>
+ <field name="name"/>
+ <field name="department_id"/>
+ </group>
+ <group>
+ <field name="state"/>
+ <field name="sequence"/>
+ <field name="fold"/>
+ </group>
</group>
<separator string="Requirements"/>
<field name="requirements"/>
=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml 2012-08-08 12:48:39 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml 2012-09-05 09:33:23 +0000
@@ -71,7 +71,6 @@
<filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
- <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
=== modified file 'project/board_project_view.xml'
--- project/board_project_view.xml 2012-08-09 06:05:16 +0000
+++ project/board_project_view.xml 2012-09-05 09:33:23 +0000
@@ -16,7 +16,7 @@
<field name="effective_hours" widget="float_time"/>
<field name="progress" widget="progressbar"/>
<field name="stage_id" invisible="context.get('set_visible',False)"/>
- <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
</tree>
</field>
</record>
=== modified file 'project/project.py'
--- project/project.py 2012-09-03 22:37:41 +0000
+++ project/project.py 2012-09-05 09:33:23 +0000
@@ -739,7 +739,7 @@
'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
'stage_id': fields.many2one('project.task.type', 'Stage',
- domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+ domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
'state': fields.related('stage_id', 'state', type="selection", store=True,
selection=_TASK_STATE, string="State", readonly=True,
help='The state is set to \'Draft\', when a case is created.\
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-09-05 08:13:14 +0000
+++ project/project_view.xml 2012-09-05 09:33:23 +0000
@@ -424,7 +424,7 @@
<button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
states="cancelled,done" context="{'button_reactivate':True}"/>
<button name="action_close" string="Done" type="object"
- states="draft,open,pending" class="oe_highlight"/>
+ states="draft,open,pending"/>
<button name="%(action_project_task_delegate)d" string="Delegate" type="action"
states="pending,open,draft" groups="project.group_delegate_task"/>
<button name="do_cancel" string="Cancel" type="object"
@@ -482,7 +482,7 @@
<field name="name"/>
<field name="user_id"/>
<field name="stage_id"/>
- <field name="state" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
<field name="effective_hours" widget="float_time"/>
<field name="progress" widget="progressbar"/>
<field name="remaining_hours" widget="float_time"/>
@@ -498,7 +498,7 @@
<field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
groups="project.group_time_work_estimation_tasks"
on_change="onchange_planned(planned_hours, effective_hours)"/>
- <field name="state" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
</group>
</page>
</notebook>
@@ -607,7 +607,7 @@
<field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
<field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
<field name="stage_id" invisible="context.get('set_visible',False)"/>
- <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
+ <field name="state" invisible="1"/>
<field name="date_start" invisible="1" groups="base.group_no_one"/>
<field name="date_end" invisible="1" groups="base.group_no_one"/>
<field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -674,7 +674,6 @@
<filter string="Users" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
<filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
- <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
<filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
<filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
=== modified file 'project/report/project_report_view.xml'
--- project/report/project_report_view.xml 2012-08-13 16:06:57 +0000
+++ project/report/project_report_view.xml 2012-09-05 09:33:23 +0000
@@ -79,7 +79,6 @@
<filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
<filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
<filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
- <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
=== modified file 'project_issue/board_project_issue_view.xml'
--- project_issue/board_project_issue_view.xml 2012-08-09 06:05:16 +0000
+++ project_issue/board_project_issue_view.xml 2012-09-05 09:33:23 +0000
@@ -16,7 +16,7 @@
<field name="version_id" widget="selection"/>
<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="state" invisible="1"/>
<field name="categ_ids" invisible="1"/>
<field name="task_id" invisible="1"/>
</tree>
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2012-08-30 07:49:03 +0000
+++ project_issue/project_issue.py 2012-09-05 09:33:23 +0000
@@ -240,7 +240,7 @@
'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',
- domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+ domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
'project_id':fields.many2one('project.project', 'Project'),
'duration': fields.float('Duration'),
'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-09-05 08:04:02 +0000
+++ project_issue/project_issue_view.xml 2012-09-05 09:33:23 +0000
@@ -151,7 +151,7 @@
<field name="id"/>
<field name="active"/>
</group>
- <group colspan="4" col="4">
+ <group colspan="4" col="4" invisible="1">
<separator string="Status" colspan="4"/>
<field name="state" groups="base.group_no_one" string="Status"/>
</group>
@@ -182,7 +182,7 @@
<field name="user_id"/>
<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="state" invisible="1"/>
<field name="categ_ids" invisible="1"/>
<field name="task_id" invisible="1"/>
</tree>
@@ -212,7 +212,6 @@
<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="[]" context="{'group_by':'stage_id'}"/>
- <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
</group>
</search>
=== modified file 'project_issue/report/project_issue_report_view.xml'
--- project_issue/report/project_issue_report_view.xml 2012-08-13 16:06:57 +0000
+++ project_issue/report/project_issue_report_view.xml 2012-09-05 09:33:23 +0000
@@ -67,7 +67,6 @@
<filter string="Version" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
- <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
_______________________________________________
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
