diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index f1cc0435ab9..54972defa5b 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -47,7 +47,7 @@ class crm_case_category2(osv.osv):
_description = "Category2 of case"
_rec_name = "name"
_columns = {
- 'name': fields.char('Case Category2 Name', size=64, required=True),
+ 'name': fields.char('Case Category2 Name', size=64, required=True, translate=True),
'section_id': fields.many2one('crm.case.section', 'Case Section'),
}
crm_case_category2()
@@ -57,7 +57,7 @@ class crm_case_stage(osv.osv):
_description = "Stage of case"
_rec_name = 'name'
_columns = {
- 'name': fields.char('Stage Name', size=64, required=True),
+ 'name': fields.char('Stage Name', size=64, required=True, translate=True),
'section_id': fields.many2one('crm.case.section', 'Case Section'),
}
crm_case_stage()
@@ -70,11 +70,26 @@ class crm_cases(osv.osv):
'category2_id': fields.many2one('crm.case.category2','Category Name', domain="[('section_id','=',section_id)]"),
'duration': fields.float('Duration'),
'note': fields.text('Note'),
+ 'case_id': fields.many2one('crm.case','Related Case'),
'partner_name': fields.char('Employee Name', size=64),
'partner_name2': fields.char('Employee Email', size=64),
'partner_phone': fields.char('Phone', size=16),
'partner_mobile': fields.char('Mobile', size=16),
}
+ def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}):
+ if not case_id: return {}
+ case = self.browse(cr, uid, case_id, context=context)
+ value = {}
+ if not name:
+ value['name'] = case.name
+ if (not partner_id) and case.partner_id:
+ value['partner_id'] = case.partner_id.id
+ if case.partner_address_id:
+ value['partner_address_id'] = case.partner_address_id.id
+ if case.email_from:
+ value['email_from'] = case.email_from
+ return {'value':value}
+
crm_cases()
class crm_menu_config_wizard(osv.osv_memory):
diff --git a/addons/crm_configuration/crm_meeting_data.xml b/addons/crm_configuration/crm_meeting_data.xml
index 97529d16602..441cb45a0fc 100644
--- a/addons/crm_configuration/crm_meeting_data.xml
+++ b/addons/crm_configuration/crm_meeting_data.xml
@@ -7,26 +7,26 @@
Mtngs
-
+
- Sales Meeting
+ Customer Meeting
Internal Meeting
-
+
- Training
+ Phone Call
-
-
+
+
-
+
Office
-
+
Home
@@ -35,29 +35,29 @@
Customer Office
-
+
-
+
Fixed
-
+
Not fixed
-
+
Invalid
-
+
Awaiting Response
-
+
Future
-
+
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index cc945080752..3730f481817 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -1,7 +1,40 @@
- ######################## MEETINGS (menu) ###########################
+
+
+
+
+
+
+
+
+
+ calendar
+
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
+
+
crm.case
calendar,tree,form
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index 12c554e209c..d4599e3ec76 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -18,16 +18,16 @@
-
+
+
+
-
-
@@ -45,6 +45,7 @@
+