- [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]][[ line['code'] ]]
[[ line['name'] ]]
@@ -365,10 +365,10 @@
+ [[ repeatIn(lines(o.id),'line')]]
[[ display_currency(data) or removeParentNode('blockTable') ]]
- [[lines(o.id) and removeParentNode('para') or removeParentNode('section') ]]
- [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]][[ line['code'] ]] [[ line['name'] ]] [[ formatLang(line['debit'] )]] [[ formatLang(line['credit']) ]] Move Entry Label Debit Crebit Credit Balance
@@ -254,7 +254,7 @@
[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
-
+
[[ '..'*(o.level-1) ]] [[ o.code or '']] [[ o.name or '']][[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
-
+
[[ '..'*(o.level-1) ]] [[ o.code or '' ]] [[ o.name or '' ]][[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
-
+
[[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]][[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
-
+
[[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]Entry No A/c No. Partner Move - Entry label Move/Entry label Debit Credit Balance [[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ formatLang((sum_credit(o.period_id.id, o.journal_id.id) - sum_debit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ formatLang((sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]]
[[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]]
@@ -287,7 +287,7 @@
Entry No A/c No. Partner Move - Entry label Move/Entry label Debit Credit Balance Debit Credit Balance In dispute In dispute
Total: [[ formatLang(sum_debit()) ]] [[ formatLang(sum_debit()) ]] [[ formatLang(sum_credit()) ]] [[ formatLang((sum_debit()-sum_credit())) ]] [[ company.currency_id.symbol ]] [[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]] Currency: [[ company.currency_id.name ]]
- Printed at: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]Printed at: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]
@@ -186,4 +186,4 @@
-
\ No newline at end of file
+
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4f21eb6f162..edfe79540e6 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -179,7 +179,7 @@ class crm_case(object):
if not stage_record.section_id:
section_id = False # only select stages without section
- domain = [('object_id.model', '=', self._name), ('section_id', '=', section_id)]
+ domain = [('object_id.model', '=', self._name), '|', ('section_id', '=', section_id),('section_id','=',False)]
if 'force_domain' in context and context['force_domain']:
domain += context['force_domain']
sid = stage_obj.search(cr, uid, domain, context=context)
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 0bb854fea17..65daf5d79d5 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -10,7 +10,7 @@
{"search_default_user_id":uid,'search_default_current':1}
{'search_default_current':1, 'default_type': 'lead'}
+ {'search_default_current':1, 'default_type': 'lead', 'search_default_section_id':section_id}
A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities.
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2df1369bbb1..40317a4b188 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -32,20 +32,6 @@
id="menu_crm_lead_categ" name="Categories"
parent="base.menu_crm_config_lead" sequence="1"/>
-
-
- Lead Sources
- crm.case.resource.type
- form
- [('object_id.model', '=', 'crm.lead')]
- {'object_id':'crm.lead'}
-
-
-
@@ -70,7 +56,7 @@
crm.lead
tree,form,graph,calendar
[('type','=','opportunity')]
- {'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}
+ {'search_default_user_id':uid,'search_default_current':1, 'search_default_section_id':section_id,'default_type': 'opportunity'}
Opportunities allows you to track your best deals pipeline: history of
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index a6a410fabb8..34f5e542ab0 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -15,7 +15,7 @@
form
tree,calendar
{"search_default_user_id":uid}
+ {"search_default_user_id":uid, 'search_default_section_id':section_id}
@@ -106,7 +106,7 @@
tree,calendar
The Outbound menu open a search view in editable mode, so you can easily modify or plan a new call. Actions buttons allows you to to make you call status evolved for a better follow up of your planned calls. During calls, convert your lead into an opportunity, plan a meeting or canceled it.
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 71d19b3d6f1..69f08faac79 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -100,9 +100,9 @@ class crm_lead_report(osv.osv):
'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
'categ_id': fields.many2one('crm.case.categ', 'Category',\
- domain="[('section_id','=',section_id)]" , readonly=True),
+ domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
- domain="[('section_id','=',section_id),\
+ domain="['|',('section_id','=',False),('section_id','=',section_id),\
('object_id.model', '=', 'crm.lead')]", readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
'opening_date': fields.date('Opening Date', readonly=True),
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index fdf5cfc1f37..bd2aaca0607 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -34,7 +34,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
'date': fields.datetime('Date' , required=True),
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
'categ_id': fields.many2one('crm.case.categ', 'Category', required=True, \
- domain="[('section_id','=',section_id),\
+ domain="['|',('section_id','=',False),('section_id','=',section_id),\
('object_id.model', '=', 'crm.phonecall')]"),
}
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index f288fd2d5b7..aaba8e082c5 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -103,7 +103,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
'name' : fields.char('Call summary', size=64, required=True, select=1),
'user_id' : fields.many2one('res.users',"Assign To"),
'categ_id': fields.many2one('crm.case.categ', 'Category', required=True, \
- domain="[('section_id','=',section_id),\
+ domain="['|',('section_id','=',False),('section_id','=',section_id),\
('object_id.model', '=', 'crm.phonecall')]"),
'date': fields.datetime('Date', required=True),
'section_id':fields.many2one('crm.case.section','Sales Team'),
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 62c15759bbc..d6c6603b829 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -54,8 +54,7 @@ class crm_claim(crm.crm_case, osv.osv):
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.claim')]"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
- 'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
- domain="[('section_id','=',section_id)]"),
+ 'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
'user_id': fields.many2one('res.users', 'Responsible'),
'section_id': fields.many2one('crm.case.section', 'Sales Team', \
select=True, help="Sales team to which Case belongs to."\
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index a176b3aa8e0..cd8db8499a5 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -1,78 +1,76 @@
-
+
-
-
-
- Factual Claims
-
-
-
- Value Claims
-
-
-
- Policy Claims
-
-
-
-
-
- Corrective
-
-
-
- Preventive
-
-
-
-
-
- Accepted as Claim
-
-
-
- Fixed
-
-
-
- Won't fix
-
-
-
- Invalid
-
-
-
- Awaiting Response
-
-
-
+
+
+
+ Factual Claims
+
+
+
+ Value Claims
+
+
+
+ Policy Claims
+
+
+
+
+
+ Corrective
+
+
+
+ Preventive
+
+
+
+
+
+ Accepted as Claim
+
+
+
+ Fixed
+
+
+
+ Won't fix
+
+
+
+ Invalid
+
+
+
+ Awaiting Response
+
+
+
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index db21223656e..0a603cb8f5a 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -1,129 +1,122 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index a341915bc39..64c917ffe4b 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -117,8 +117,7 @@
tree
-
@@ -36,11 +36,11 @@
crm.claim.report
form
-