pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imprvoement

Browse Source 
bzr revid: fp@tinyerp.com-20081031153022-h2pxpydfqff7ms15
This commit is contained in:
Fabien Pinckaers
2008-10-31 16:30:22 +01:00
parent 72270c2394
commit 5679cb3f8a
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm.py
+7
View File
@@ -397,6 +397,13 @@ class crm_case(osv.osv):
}
_order = 'priority, date_deadline desc, date desc,id desc'
def unlink(self, cr, uid, ids, context={}):
for case in self.browse(cr, uid, ids, context):
if case.state <> 'draft':
raise osv.except_osv(_('Warning !'),
_('You can not delete this case. You should better cancel it.'))
return super(crm_case, self).unlink(cr, uid, ids, context)
def _action(self, cr, uid, cases, state_to, scrit=None, context={}):
if not scrit:
scrit = []
addons/crm_configuration/crm_jobs_menu.xml
+13 -13
View File
@@ -14,7 +14,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[]'"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support0)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
<field name="sequence" eval="1"/>
@@ -53,7 +53,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view1">
<field name="sequence" eval="1"/>
@@ -86,7 +86,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">form,tree</field>
<field name="view_id" ref="crm_case_form_view11"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
<field name="sequence" eval="2"/>
@@ -111,7 +111,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'in\',(\'pending\',\'open\',\'draft\'))]'"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'in\',(\'pending\',\'open\',\'draft\')),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
<field name="sequence" eval="1"/>
@@ -144,7 +144,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
<field name="sequence" eval="1"/>
@@ -181,7 +181,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\')]'"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
<field name="sequence" eval="1"/>
@@ -216,7 +216,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
<field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
<field name="sequence" eval="1"/>
@@ -251,7 +251,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">calendar,tree,form,graph</field>
<field name="view_id" ref="crm_case_calendar_view11"/>
<field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid)]'"/>
<field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myjobs">
<field name="sequence" eval="1"/>
@@ -290,7 +290,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'state\',\'&lt;&gt;\',\'done\')]'"/>
<field name="domain" eval="'[(\'state\',\'&lt;&gt;\',\'done\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
<field name="sequence" eval="1"/>
@@ -323,7 +323,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'state\',\'=\',\'draft\')]'"/>
<field name="domain" eval="'[(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
<field name="sequence" eval="1"/>
@@ -356,7 +356,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'state\',\'=\',\'pending\')]'"/>
<field name="domain" eval="'[(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
<field name="sequence" eval="1"/>
@@ -389,7 +389,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view11"/>
<field name="domain" eval="'[(\'state\',\'=\',\'open\')]'"/>
<field name="domain" eval="'[(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
<field name="sequence" eval="1"/>
@@ -422,7 +422,7 @@
<field name="res_model">crm.case</field>
<field name="view_mode">calendar,tree,form,graph</field>
<field name="view_id" ref="crm_case_calendar_view11"/>
<field name="domain" eval="'[(\'state\',\'=\',\'done\')]'"/>
<field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_alljobs">
<field name="sequence" eval="1"/>
addons/crm_configuration/crm_jobs_view.xml
+5 -4
View File
@@ -18,6 +18,7 @@
<field name="categ_id" string="Applied Job" select="1"/>
<field name="category2_id" string="Degree" select="1"/>
<field name="stage_id"/>
<field name="priority" string="Appreciation"/>
<field name="user_id"/>
<field name="state"/>
</tree>
@@ -34,7 +35,7 @@
<field name="name" string="Description" colspan="2"/>
<field name="section_id" colspan="1"/>
<field name="user_id" string="Responsible" select="2"/>
<button name="set_partner" string="Convert to Quote" icon="terp-sale"/>
<button name="set_partner" string="Convert to Partner" icon="terp-sale"/>
<newline/>
<field name="stage_id"/>
<field name="date" string="Next Interview"/>
@@ -60,14 +61,14 @@
<field name="categ_id" string="Applied Job" select="1" on_change="onchange_categ_id(categ_id)"/>
<field name="category2_id" string="Degree" select="1"/>
<separator colspan="4" string="Qualication"/>
<field name="priority" string="Priority"/>
<field name="priority" string="Appreciation" select="2"/>
<separator colspan="4" string="Status"/>
<group col="8" colspan="4">
<field name="state" select="1"/>
<button name="case_close" string="Done" states="open,draft,pending" type="object"/>
<button name="case_close" string="Candidate Hired" states="open,draft,pending" type="object"/>
<button name="case_open" string="Open" states="draft,pending" type="object"/>
<button name="case_cancel" string="Refuse Candidate" states="draft,open,pending" type="object"/>
<button name="case_cancel" string="Candidate Refused" states="draft,open,pending" type="object"/>
<button name="case_pending" string="Pending" states="draft,open" type="object"/>
<button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"/>
</group>