- [[ 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((solde_debit()-solde_credit())) ]] [[ company.currency_id.symbol ]] [[ formatLang((sum_debit()-sum_credit())) ]] [[ company.currency_id.symbol ]] [[ formatLang(sum_litige()) ]] [[ company.currency_id.symbol ]]
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index bf10838b9c8..b8e18659327 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -44,14 +44,6 @@ class account_chart(osv.osv_memory):
fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now)], limit=1 )
return fiscalyears and fiscalyears[0] or False
- def _build_periods(self, cr, uid, period_from, period_to):
- period_obj = self.pool.get('account.period')
- period_date_start = period_obj.read(cr, uid, period_from, ['date_start'])['date_start']
- period_date_stop = period_obj.read(cr, uid, period_to, ['date_stop'])['date_stop']
- if period_date_start > period_date_stop:
- raise osv.except_osv(_('Error'),_('Start period should be smaller then End period'))
- return period_obj.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop)])
-
def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
res = {}
res['value'] = {}
@@ -95,9 +87,9 @@ class account_chart(osv.osv_memory):
result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
result = act_obj.read(cr, uid, [id], context=context)[0]
- result['periods'] = []
+ result['periods'] = []
if data['period_from'] and data['period_to']:
- result['periods'] = self._build_periods(cr, uid, data['period_from'], data['period_to'])
+ result['periods'] = self.pool.get('account.period').build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \
'state': data['target_move']})
if data['fiscalyear']:
@@ -111,4 +103,4 @@ class account_chart(osv.osv_memory):
account_chart()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index e5ed39427b4..a9a343a0d6a 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -103,14 +103,6 @@ class account_common_report(osv.osv_memory):
'chart_account_id': _get_account,
}
- def _build_periods(self, cr, uid, period_from, period_to):
- period_obj = self.pool.get('account.period')
- period_date_start = period_obj.read(cr, uid, period_from, ['date_start'])['date_start']
- period_date_stop = period_obj.read(cr, uid, period_to, ['date_stop'])['date_stop']
- if period_date_start > period_date_stop:
- raise osv.except_osv(_('Error'),_('Start period should be smaller then End period'))
- return period_obj.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop)])
-
def _build_contexts(self, cr, uid, ids, data, context=None):
if context is None:
context = {}
@@ -129,9 +121,10 @@ class account_common_report(osv.osv_memory):
elif data['form']['filter'] == 'filter_period':
if not data['form']['period_from'] or not data['form']['period_to']:
raise osv.except_osv(_('Error'),_('Select a starting and an ending period'))
- result['periods'] = self._build_periods(cr, uid, data['form']['period_from'], data['form']['period_to'])
- first_period = self.pool.get('account.period').search(cr, uid, [], order='date_start', limit=1)[0]
- result_initial_bal['periods'] = self._build_periods(cr, uid, first_period, data['form']['period_from'])
+ company_id = period_obj.browse(cr, uid, data['form']['period_from'], context=context).company_id.id
+ result['periods'] = period_obj.build_ctx_periods(cr, uid, data['form']['period_from'], data['form']['period_to'])
+ first_period = self.pool.get('account.period').search(cr, uid, [('company_id', '=', company_id)], order='date_start', limit=1)[0]
+ result_initial_bal['periods'] = period_obj.build_ctx_periods(cr, uid, first_period, data['form']['period_from'])
else:
if data['form']['fiscalyear_id']:
fiscal_date_start = fiscal_obj.browse(cr, uid, [data['form']['fiscalyear_id']], context=context)[0].date_start
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index e0e1be5e2a2..6c7eb6639ec 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -18,6 +18,7 @@
# along with this program. If not, see
- account.analytic.account.form.inherot.cci
+
+ account.analytic.account.form.inherot.budget
form
account.analytic.account
).
#
@@ -15,12 +15,13 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see 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/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 648015b3d2b..171984e9851 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -20,8 +20,9 @@
##############################################################################
import time
-from report import report_sxw
import datetime
+
+from report import report_sxw
import operator
class budget_report(report_sxw.rml_parse):
@@ -64,8 +65,8 @@ class budget_report(report_sxw.rml_parse):
achievements = float(self.cr.fetchone()[0])
res.append({'name': a.name, 'code': a.code, 'achievements': achievements})
return res
+
report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml',parser=budget_report, header="internal")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_budget/wizard/account_budget_analytic.py b/addons/account_budget/wizard/account_budget_analytic.py
index 62553520cbd..70ce1a5156b 100644
--- a/addons/account_budget/wizard/account_budget_analytic.py
+++ b/addons/account_budget/wizard/account_budget_analytic.py
@@ -53,5 +53,4 @@ class account_budget_analytic(osv.osv_memory):
account_budget_analytic()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index 2862cd1db48..2427044e681 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -18,6 +18,7 @@
# along with this program. If not, see form
@@ -31,12 +35,46 @@
-
+
+ account_followup.stat.search
+ account_followup.stat
+ search
+
+
+
+
+
+
+
+
+
Follow-ups Sent
account_followup.stat
form
tree,graph
+ {'search_default_followup_level':1,'search_default_fiscalyear':1}
+
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index c37fe6a3d04..be0ca2a127b 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -33,7 +33,7 @@
* a basic mechanism to easily plug various automated payment.
""",
'author': 'OpenERP SA',
- 'depends': ['account'],
+ 'depends': ['account_voucher'],
'init_xml': [],
'update_xml': [
'security/account_payment_security.xml',
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 38d742119ad..0e7ea32e8d3 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -19,6 +19,7 @@
#
##############################################################################
+import time
from lxml import etree
from osv import osv, fields
@@ -53,7 +54,9 @@ class account_payment_populate_statement(osv.osv_memory):
statement_obj = self.pool.get('account.bank.statement')
statement_line_obj = self.pool.get('account.bank.statement.line')
currency_obj = self.pool.get('res.currency')
- statement_reconcile_obj = self.pool.get('account.bank.statement.reconcile')
+ voucher_obj = self.pool.get('account.voucher')
+ voucher_line_obj = self.pool.get('account.voucher.line')
+
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
@@ -68,11 +71,37 @@ class account_payment_populate_statement(osv.osv_memory):
ctx['date'] = line.ml_maturity_date # was value_date earlier,but this field exists no more now
amount = currency_obj.compute(cr, uid, line.currency.id,
statement.currency.id, line.amount_currency, context=ctx)
+ if line.partner_id:
+# line['partner_id'] = mv.partner_id.id
+ if amount < 0 :
+ account = line.partner_id.property_account_payable.id
+ else :
+ account = line.partner_id.property_account_receivable.id
if line.move_line_id:
- reconcile_id = statement_reconcile_obj.create(cr, uid, {
- 'line_ids': [(6, 0, [line.move_line_id.id])]
- }, context=context)
+ voucher_res = { 'type': 'payment' ,
+ 'name': line.name,
+ 'partner_id': line.partner_id.id,
+ 'journal_id': statement.journal_id.id,
+ 'account_id': account,
+ 'company_id': statement.company_id.id,
+ 'currency_id': statement.currency.id,
+ 'date': line.date or time.strftime('%Y-%m-%d'),
+ 'amount': abs(amount),
+ 'period_id': statement.period_id.id
+ }
+ voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
+ result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment')
+ voucher_line_dict = False
+ if result['value']['line_ids']:
+ for line_dict in result['value']['line_ids']:
+ move_line = self.pool.get('account.move.line').browse(cr, uid, line_dict['move_line_id'], context)
+ if line.move_line_id.move_id.id == move_line.move_id.id:
+ voucher_line_dict = line_dict
+ if voucher_line_dict:
+ voucher_line_dict.update({'voucher_id':voucher_id})
+ voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
+
st_line_id = statement_line_obj.create(cr, uid, {
'name': line.order_id.reference or '?',
'amount': - amount,
@@ -81,8 +110,9 @@ class account_payment_populate_statement(osv.osv_memory):
'account_id': line.move_line_id.account_id.id,
'statement_id': statement.id,
'ref': line.communication,
- 'reconcile_id': reconcile_id,
+ 'voucher_id': voucher_id,
}, context=context)
+
line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c6f7759859c..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)
@@ -580,10 +580,8 @@ crm_case_section()
class crm_case_categ(osv.osv):
""" Category of Case """
-
_name = "crm.case.categ"
- _description = "Category of case"
-
+ _description = "Category of Case"
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True),
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0a552a4165a..ee778401e4a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -120,7 +120,7 @@ class crm_lead(crm_case, osv.osv):
# Lead fields
'categ_id': fields.many2one('crm.case.categ', 'Category', \
- domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
+ domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.project.bug')]"),
'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
'channel_id': fields.many2one('res.partner.canal', 'Channel'),
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 @@
- Existing Customer
+ Interrest in Computer
- Self Generated
+ Interrest in Accessories
- Employee
+ Need Services
- Partner
+ Need Information
- Campaign
+ Need a Website Design
- Website
+ Potential Reseller
- Word of mouth
+ Need Consulting
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 0bfb5f35efc..d2d2a299edb 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -28,7 +28,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 c2713b91f89..34f5e542ab0 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -15,7 +15,7 @@
@@ -118,7 +118,7 @@
@@ -337,7 +337,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 de77c842aa6..d6c6603b829 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -54,9 +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', 'Claim Type', \
- domain="[('section_id','=',section_id),\
- ('object_id.model', '=', 'crm.claim')]"),
+ '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
-