From 32540eafab6c5a6e2c5b0c2faf47e8a09803279b Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 13 Jan 2010 16:38:21 +0530 Subject: [PATCH] [IMP]: create a new object for job_stage and changed the name of category2_id field bzr revid: sbh@tinyerp.com-20100113110821-frhggihs3pp5jczv --- addons/crm_job/crm_job.py | 29 +++++++++++++++++-- addons/crm_job/crm_jobs_data.xml | 49 +++++++++++++++----------------- addons/crm_job/crm_jobs_demo.xml | 28 +++++++++--------- addons/crm_job/crm_jobs_view.xml | 37 ++++++++++++++++++++++-- 4 files changed, 99 insertions(+), 44 deletions(-) diff --git a/addons/crm_job/crm_job.py b/addons/crm_job/crm_job.py index 15a4d56066d..a104fc5ab61 100644 --- a/addons/crm_job/crm_job.py +++ b/addons/crm_job/crm_job.py @@ -59,6 +59,31 @@ class crm_job_categ(osv.osv): } crm_job_categ() +class crm_job_type(osv.osv): + _name = "crm.job.type" + _description = "Job Type" + _rec_name = "name" + _columns = { + 'name': fields.char('Claim Type Name', size=64, required=True, translate=True), + 'section_id': fields.many2one('crm.case.section', 'Case Section'), + } +crm_job_type() + +class crm_job_stage(osv.osv): + _name = "crm.job.stage" + _description = "Stage of job case" + _rec_name = 'name' + _order = "sequence" + _columns = { + 'name': fields.char('Stage Name', size=64, required=True, translate=True), + 'section_id': fields.many2one('crm.case.section', 'Case Section'), + 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."), + } + _defaults = { + 'sequence': lambda *args: 1 + } +crm_job_stage() + class crm_job(osv.osv): _name = "crm.job" _description = "Job Cases" @@ -75,8 +100,8 @@ class crm_job(osv.osv): 'partner_name2': fields.char('Employee Email', size=64), 'partner_phone': fields.char('Phone', size=32), 'partner_mobile': fields.char('Mobile', size=32), - 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"), - 'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"), + 'stage_id': fields.many2one ('crm.job.stage', 'Stage', domain="[('section_id','=',section_id)]"), + 'type_id': fields.many2one('crm.job.type', 'Type Name', domain="[('section_id','=',section_id)]"), 'duration': fields.float('Duration'), 'case_id': fields.many2one('crm.case', 'Related Case'), 'ref' : fields.reference('Reference', selection=_links_get, size=128), diff --git a/addons/crm_job/crm_jobs_data.xml b/addons/crm_job/crm_jobs_data.xml index 716cb4c2554..2486981eded 100644 --- a/addons/crm_job/crm_jobs_data.xml +++ b/addons/crm_job/crm_jobs_data.xml @@ -1,67 +1,64 @@ - - Jobs - jobs - + Salesman - + Junior Developer - + - + Graduate - + - + Licenced - + - + > Bac +5 - + - + Initial Jobs Demand - + - + First Interview - + - + Second Interview - + - + Contract Proposed - + - + Contract Signed - + - + Refused by Employee - + - + Refused by Company - + diff --git a/addons/crm_job/crm_jobs_demo.xml b/addons/crm_job/crm_jobs_demo.xml index 8878eca9e47..3ab57a9f26c 100644 --- a/addons/crm_job/crm_jobs_demo.xml +++ b/addons/crm_job/crm_jobs_demo.xml @@ -9,13 +9,13 @@ - + - + @@ -30,14 +30,14 @@ - + - + @@ -52,14 +52,14 @@ - + - + @@ -71,7 +71,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -87,14 +87,14 @@ - + - + @@ -106,13 +106,13 @@ - + - + @@ -127,14 +127,14 @@ - + - + diff --git a/addons/crm_job/crm_jobs_view.xml b/addons/crm_job/crm_jobs_view.xml index a695343c30b..4a53b29ee0f 100644 --- a/addons/crm_job/crm_jobs_view.xml +++ b/addons/crm_job/crm_jobs_view.xml @@ -37,7 +37,40 @@ form - + # ------------------------------------------------------ + # Stage + # ------------------------------------------------------ + + crm.job.stage.tree + crm.job.stage + tree + + + + + + + + + + crm.job.stage.form + crm.job.stage + form + +
+ + + + + +
+ + Job Stages + crm.claim.stage + form + + + # ------------------------------------------------------ # Jobs # ------------------------------------------------------ @@ -113,7 +146,7 @@ - +