diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index cb71e1c1091..0bd405feba2 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -74,7 +74,7 @@ ir.actions.act_window account.analytic.account form - tree,graph + tree,graph,form diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml old mode 100755 new mode 100644 index ebc0d822f2b..3162811e063 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -37,13 +37,13 @@ - + - + @@ -91,9 +91,9 @@ - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - Date + Date JNRL Partner Ref @@ -105,11 +105,13 @@ Balance Currency - [[ repeatIn(objects, 'a') ]] - [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] + + [[ repeatIn(objects, 'a') ]] + [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] + [[ o.code ]] [[ o.name ]] @@ -118,28 +120,35 @@ [[ sum_solde_account(o, data['form']) or '0.0' ]] [[ sum_currency_amount_account(o, data['form']) or '0.0' ]] + + [[ repeatIn(lines(o, data['form']), 'line') ]] + + + + [[ line['date'] ]] + [[ line['code'] ]] + [[ line['partner'] ]] + [[ line['ref'] ]] + [[ line['move'] ]] + [[ line['name'] ]] + [[ strip_name(line['line_corresp'],55) ]] + [[ line['debit'] and line['debit'] or '0.0' ]] + [[ line['credit'] and line['credit'] or '0.0' ]] + [[ line['progress'] and line['progress'] or '0.0' ]] + [[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]] + + + + - - - [[ repeatIn(lines(o, data['form']), 'line') ]] - [[ line['date'] ]] - [[ line['code'] ]] - [[ line['partner'] ]] - [[ line['ref'] ]] - [[ line['move'] ]] - [[ line['name'] ]] - [[ strip_name(line['line_corresp'],55) ]] - [[ line['debit'] and line['debit'] or '0.0' ]] - [[ line['credit'] and line['credit'] or '0.0' ]] - [[ line['progress'] and line['progress'] or '0.0' ]] - [[ line['amount_currency'] or '0.0' ]] [[ line['currency_code'] ]] + - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - Date + Date JNRL Partner Ref @@ -150,9 +159,10 @@ Credit Balance - [[ repeatIn(objects, 'a') ]] - [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] + + [[ repeatIn(objects, 'a') ]] + [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] @@ -162,22 +172,29 @@ [[sum_credit_account(o, data['form']) or '0.0']] [[sum_solde_account(o, data['form']) or '0.0' ]] + + [[ repeatIn(lines(o, data['form']), 'line') ]] + + + + [[ line['date'] ]] + [[ line['code'] ]] + [[ line['partner'] ]] + [[ line['ref'] ]] + [[ line['move'] ]] + [[ line['name'] ]] + [[ strip_name(line['line_corresp'],55) ]] + [[ line['debit'] and line['debit'] or '0.0' ]] + [[ line['credit'] and line['credit'] or '0.0' ]] + [[ line['progress'] and line['progress'] or '0.0' ]] + + + + - - [[ repeatIn(lines(o, data['form']), 'line') ]] - [[ line['date'] ]] - [[ line['code'] ]] - [[ line['partner'] ]] - [[ line['ref'] ]] - [[ line['move'] ]] - [[ line['name'] ]] - [[ strip_name(line['line_corresp'],55) ]] - [[ line['debit'] and line['debit'] or '0.0' ]] - [[ line['credit'] and line['credit'] or '0.0' ]] - [[ line['progress'] and line['progress'] or '0.0' ]] - + \ No newline at end of file diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py index 52181350073..22cb2479c87 100644 --- a/addons/account/report/partner_balance.py +++ b/addons/account/report/partner_balance.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -61,81 +61,81 @@ class partner_balance(report_sxw.rml_parse): for date in date_array: full_str_date.append(str(date)) return full_str_date - + # - - + + def transform_period_into_date_array(self,data): ## Get All Period Date # # If we have no period we will take all perdio in the FiscalYear. - - + + if not data['form']['periods'][0][2] : periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])]) else: periods_id = data['form']['periods'][0][2] - date_array = [] + date_array = [] for period_id in periods_id: period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id) date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop) self.date_lst = date_array self.date_lst.sort() - - + + def transform_date_into_date_array(self,data): return_array = self.date_range(data['form']['date1'],data['form']['date2']) self.date_lst = return_array self.date_lst.sort() - + def transform_both_into_date_array(self,data): if not data['form']['periods'][0][2] : periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])]) else: periods_id = data['form']['periods'][0][2] - date_array = [] + date_array = [] for period_id in periods_id: period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id) date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop) - + period_start_date = date_array[0] date_start_date = data['form']['date1'] period_stop_date = date_array[-1] date_stop_date = data['form']['date2'] - + if period_start_date sum(credit) " \ @@ -234,13 +234,13 @@ class partner_balance(report_sxw.rml_parse): "ORDER BY l.account_id,p.name", (self.date_lst[0],self.date_lst[0])) res = self.cr.dictfetchall() - + for r in res: full_account.append(r) # # # -# +# self.cr.execute( "SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, sum(debit) as debit, sum(credit) as credit, " \ "CASE WHEN sum(debit) > sum(credit) " \ @@ -264,10 +264,10 @@ class partner_balance(report_sxw.rml_parse): "GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \ "ORDER BY l.account_id,p.name") res = self.cr.dictfetchall() - + print "============ res",res for r in res: full_account.append(r) - + ## We will now compute Total return self._add_subtotal(full_account) @@ -303,7 +303,7 @@ class partner_balance(report_sxw.rml_parse): # r['type'] = 1 r['balance'] = float(r['sdebit']) - float(r['scredit']) - + completearray.append(r) # tot_debit = r['debit'] @@ -319,7 +319,7 @@ class partner_balance(report_sxw.rml_parse): # new_tot['ref'] = 'Total' # new_tot['name'] = cleanarray[i-1]['account_name'] # new_tot['code'] = cleanarray[i-1]['code'] -# +# # new_tot['debit'] = tot_debit # new_tot['credit'] = tot_credit # new_tot['scredit'] = tot_scredit @@ -329,9 +329,9 @@ class partner_balance(report_sxw.rml_parse): # new_tot['type'] = 3 # ## # completearray.append(new_tot) - - - + + + new_header['debit'] = tot_debit new_header['credit'] = tot_credit new_header['scredit'] = tot_scredit @@ -339,12 +339,14 @@ class partner_balance(report_sxw.rml_parse): new_header['enlitige'] = tot_enlitige new_header['balance'] = float(tot_sdebit) - float(tot_scredit) new_header['type'] = 3 - # we reset the counter + # we reset the counter tot_debit = r['debit'] tot_credit = r['credit'] tot_scredit = r['scredit'] tot_sdebit = r['sdebit'] tot_enlitige = (r['enlitige'] or 0.0) + + # ## new_header = {} @@ -360,36 +362,51 @@ class partner_balance(report_sxw.rml_parse): new_header['type'] = 3 ## ## - + completearray.append(new_header) - ## + ## # r['type'] = 1 # r['balance'] = float(r['sdebit']) - float(r['scredit']) - + # completearray.append(r) - + if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']: - # we reset the counter - + # we reset the counter + + new_header['debit'] = tot_debit + new_header['credit'] = tot_credit + new_header['scredit'] = tot_scredit + new_header['sdebit'] = tot_sdebit + new_header['enlitige'] = tot_enlitige + new_header['balance'] = float(tot_sdebit) - float(tot_scredit) + new_header['type'] = 3 + tot_debit = tot_debit + r['debit'] tot_credit = tot_credit + r['credit'] tot_scredit = tot_scredit + r['scredit'] tot_sdebit = tot_sdebit + r['sdebit'] tot_enlitige = tot_enlitige + (r['enlitige'] or 0.0) + + new_header['debit'] = tot_debit + new_header['credit'] = tot_credit + new_header['scredit'] = tot_scredit + new_header['sdebit'] = tot_sdebit + new_header['enlitige'] = tot_enlitige + new_header['balance'] = float(tot_sdebit) - float(tot_scredit) + # r['type'] = 2 # r['balance'] = float(r['sdebit']) - float(r['scredit']) # - completearray.append(r) - + i = i + 1 - + return completearray @@ -400,7 +417,7 @@ class partner_balance(report_sxw.rml_parse): result_tmp = 0.0 # # - + if data['form']['soldeinit'] : self.cr.execute( "SELECT sum(debit) " \ @@ -418,14 +435,14 @@ class partner_balance(report_sxw.rml_parse): "WHERE l.account_id IN (" + self.account_ids + ") " \ "AND l.date IN (" + self.date_lst_string + ") " ) result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0) - + return result_tmp def _sum_credit(self,data): if not self.ids: return 0.0 account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') - + result_tmp = 0.0 # # @@ -445,9 +462,9 @@ class partner_balance(report_sxw.rml_parse): "FROM account_move_line AS l " \ "WHERE l.account_id IN (" + self.account_ids + ") " \ "AND l.date IN (" + self.date_lst_string + ") " ) - + result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0) - + return result_tmp def _sum_litige(self,data): @@ -455,7 +472,7 @@ class partner_balance(report_sxw.rml_parse): return 0.0 account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') result_tmp = 0.0 - + # # if data['form']['soldeinit'] : @@ -477,7 +494,7 @@ class partner_balance(report_sxw.rml_parse): "AND l.date IN (" + self.date_lst_string + ") " \ "AND l.blocked=TRUE " ) result_tmp = result_tmp + float(self.cr.fetchone()[0] or 0.0) - + return result_tmp def _sum_sdebit(self,data): @@ -485,7 +502,7 @@ class partner_balance(report_sxw.rml_parse): return 0.0 account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') result_tmp = 0.0 - + # # if data['form']['soldeinit'] : @@ -500,7 +517,7 @@ class partner_balance(report_sxw.rml_parse): "AND l.reconcile_id IS NULL " \ "GROUP BY l.partner_id", (self.date_lst[0],)) - + if self.cr.fetchone() != None: result_tmp = float(self.cr.fetchone()[0]) else: @@ -517,20 +534,20 @@ class partner_balance(report_sxw.rml_parse): "AND l.date IN (" + self.date_lst_string + ") " \ "GROUP BY l.partner_id") a = self.cr.fetchone()[0] - + if self.cr.fetchone() != None: result_tmp = result_tmp + (a or 0.0) else: result_tmp = 0.0 - - return result_tmp + + return result_tmp def _sum_scredit(self,data): - + if not self.ids: return 0.0 account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') - + result_tmp = 0.0 # # @@ -546,7 +563,7 @@ class partner_balance(report_sxw.rml_parse): "AND l.reconcile_id IS NULL " \ "GROUP BY l.partner_id", (self.date_lst[0],)) - + if self.cr.fetchone() != None: result_tmp = float(self.cr.fetchone()[0]) or 0.0 else: @@ -565,16 +582,16 @@ class partner_balance(report_sxw.rml_parse): a = self.cr.fetchone()[0] or 0.0 if self.cr.fetchone() != None: result_tmp = result_tmp + (a or 0.0) - + else: result_tmp = 0.0 - + return result_tmp - + def _solde_balance_debit(self,data): debit, credit = self._sum_debit(data), self._sum_credit(data) return debit > credit and debit - credit - + def _solde_balance_credit(self,data): debit, credit = self._sum_debit(data), self._sum_credit(data) return credit > debit and credit - debit @@ -587,4 +604,4 @@ class partner_balance(report_sxw.rml_parse): report_sxw.report_sxw('report.account.partner.balance', 'res.partner', 'account/report/partner_balance.rml',parser=partner_balance, - header=False) + header=False) \ No newline at end of file diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py index 75319494235..0f5c92fa9f4 100644 --- a/addons/account/wizard/wizard_general_ledger_report.py +++ b/addons/account/wizard/wizard_general_ledger_report.py @@ -105,7 +105,7 @@ period_fields = { 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'help': 'Keep empty for all open fiscal year'}, 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'}, - 'sortbydate':{'string':"Sort by:",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Mouvement')]}, + 'sortbydate':{'string':"Sort by:",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Movement')]}, 'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]}, 'landscape':{'string':"Landscape Mode",'type':'boolean'}, 'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'}, diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py index f430e2a8ec9..9d5b3682f74 100644 --- a/addons/account_payment/payment.py +++ b/addons/account_payment/payment.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -400,7 +400,7 @@ class payment_line(osv.osv): method=True, type='date',help="Invoice Effective Date"), # 'reference': fields.function(select_by_name, string="Ref", method=True, # type='char'), - 'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='char', string='Maturity Date'), + 'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Maturity Date'), 'ml_inv_ref': fields.function(_get_ml_inv_ref, method=True, type='many2one', relation='account.invoice', string='Invoice Ref'), 'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text",help='Address of the Main Partner'), 'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text",help='Address of the Ordering Customer.'), diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index ba78a9a3a65..80c3a3382a9 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -17,47 +17,17 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + @@ -77,7 +47,6 @@ - [[ repeatIn(objects, 'o') ]] @@ -115,7 +84,7 @@ - + Partner @@ -134,7 +103,7 @@ - + [[repeatIn(o.line_ids, 'line') ]] @@ -144,13 +113,13 @@ [[ line.bank_id and line.bank_id.name ]] - [[ line.reference ]] + [[ line.name ]] - [[ formatLang(line.value_date, date=True) ]] + [[ line.date ]] - [[ formatLang(line.to_pay_currency) ]] [[ line.currency.name ]] + [[ formatLang(line.amount_currency) ]] [[ line.currency.name ]] diff --git a/addons/account_payment/wizard/wizard_payment_order.py b/addons/account_payment/wizard/wizard_payment_order.py index 758f2cbe30f..24c490fa818 100644 --- a/addons/account_payment/wizard/wizard_payment_order.py +++ b/addons/account_payment/wizard/wizard_payment_order.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -42,7 +42,7 @@ arch_duedate=''' def search_entries(self, cr, uid, data, context): search_due_date=data['form']['duedate'] - + pool = pooler.get_pool(cr.dbname) order_obj = pool.get('payment.order') line_obj = pool.get('account.move.line') @@ -54,14 +54,9 @@ def search_entries(self, cr, uid, data, context): ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id # Search for move line to pay: - line_ids = line_obj.search(cr, uid, [ - ('reconcile_id', '=', False), - ('account_id.type', '=', 'payable'), - ('amount_to_pay', '>', 0), - ('date_maturity','<=',search_due_date) - ], context=context) - - + domain = [('reconcile_id', '=', False),('account_id.type', '=', 'payable'),('amount_to_pay', '>', 0)] + domain = domain + ['|',('date_maturity','<',search_due_date),('date_maturity','=',False)] + line_ids = line_obj.search(cr, uid, domain, context=context) FORM.string = '''
. # ############################################################################## + import voucher import voucher_account -import report \ No newline at end of file +import report diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py index c2bd82ce157..9903f13ffa9 100755 --- a/addons/account_voucher/voucher.py +++ b/addons/account_voucher/voucher.py @@ -29,7 +29,6 @@ from mx.DateTime import RelativeDateTime from tools import config - class account_voucher(osv.osv): def _get_period(self, cr, uid, context): periods = self.pool.get('account.period').find(cr, uid) @@ -45,10 +44,8 @@ class account_voucher(osv.osv): def _get_reference_type(self, cursor, user, context=None): return [('none', 'Free Reference')] - - def _get_journal(self, cr, uid, context): - type_inv = context.get('type', 'rec_voucher') + type_inv = context #.get('type', 'rec_voucher') type2journal = {'rec_voucher': 'cash', 'bank_rec_voucher': 'cash','pay_voucher': 'cash','bank_pay_voucher': 'cash', 'cont_voucher': 'cash','journal_sale_voucher': 'sale','journal_pur_voucher': 'purchase' } journal_obj = self.pool.get('account.journal') res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'cash'))], limit=1) @@ -93,8 +90,7 @@ class account_voucher(osv.osv): ('cancel','Cancel') ], 'State', readonly=True), - 'amount':fields.float('Amount', readonly=True), -# , states={'draft':[('readonly',False)]} + 'amount':fields.float('Amount'), 'number':fields.char('Number', size=32, readonly=True), 'reference': fields.char('Voucher Reference', size=64), 'reference_type': fields.selection(_get_reference_type, 'Reference Type', @@ -168,11 +164,13 @@ class account_voucher(osv.osv): self.write(cr,uid,ids,{'amount':total}) self.write(cr, uid, ids, {'state':'proforma'}) return True + def proforma_voucher(self, cr, uid, ids, context={}): self.action_move_line_create(cr, uid, ids) self.action_number(cr, uid, ids) self.write(cr, uid, ids, {'state':'posted'}) return True + def cancel_voucher(self,cr,uid,ids,context={}): self.action_cancel(cr, uid, ids) self.write(cr, uid, ids, {'state':'cancel'}) @@ -213,12 +211,13 @@ class account_voucher(osv.osv): ref = inv.reference else: ref = self._convert_ref(cr, uid, inv.number) + il['analytic_lines'] = [(0,0, { 'name': il['name'], 'date': inv['date'], 'account_id': il['account_analytic_id'], 'amount': inv['amount'] * sign, - 'partner_id': il['partner_id'] or False, + #'partner_id': il['partner_id'] or False, 'general_account_id': il['account_id'] or False, 'journal_id': self._get_journal(cr, uid, inv.type), 'ref': ref, @@ -227,10 +226,14 @@ class account_voucher(osv.osv): return iml def action_move_line_create(self, cr, uid, ids, *args): + for inv in self.browse(cr, uid, ids): + if inv.move_id: continue + company_currency = inv.company_id.currency_id.id + # create the analytical lines line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids'] ils = self.pool.get('account.voucher.line').read(cr, uid, line_ids) @@ -277,13 +280,12 @@ class account_voucher(osv.osv): 'currency_id': diff_currency_p \ and inv.currency_id.id or False, 'ref': ref - }) + }) date = inv.date inv.amount=total - - line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x,date, context={})) ,iml) + line = map(lambda x:(0, 0, self.line_get_convert(cr, uid, x,date, context={})), iml) journal_id = inv.journal_id.id #self._get_journal(cr, uid, {'type': inv['type']}) journal = self.pool.get('account.journal').browse(cr, uid, journal_id) @@ -291,6 +293,7 @@ class account_voucher(osv.osv): name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id) move = {'name': name, 'line_id': line, 'journal_id': journal_id} + if inv.period_id: move['period_id'] = inv.period_id.id for i in line: @@ -301,12 +304,9 @@ class account_voucher(osv.osv): obj=self.pool.get('account.move').browse(cr,uid,move_id) for line in obj.line_id : cr.execute('insert into voucher_id (account_id,rel_account_move) values (%d, %d)',(int(ids[0]),int(line.id))) -# self.pool.get('account.move').post(cr, uid, [move_id]) -# self._log_event(cr, uid, ids) - return True - - + return True + def line_get_convert(self, cr, uid, x, date, context={}): return { 'date':date, diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 5b625f1c267..a1f6907c701 100755 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -30,13 +30,14 @@ - + + - - + + diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py index 9ad4a89dd7f..881b7595162 100644 --- a/addons/crm_configuration/__terp__.py +++ b/addons/crm_configuration/__terp__.py @@ -45,6 +45,8 @@ meetings, eso. "crm_meeting_view.xml", "crm_opportunity_view.xml", "crm_fund_view.xml", + "crm_claims_view.xml", + "crm_phonecall_view.xml", "crm_report_view.xml" ], "demo_xml" : [ @@ -54,6 +56,8 @@ meetings, eso. # "crm_meeting_demo.xml", # "crm_lead_demo.xml", # "crm_opportunity_demo.xml", +# "crm_claims_demo.xml", +# "crm_phonecall_demo.xml", ], "update_xml" : [ # "crm_bugs_data.xml", @@ -69,6 +73,10 @@ meetings, eso. # "crm_meeting_menu.xml", # "crm_opportunity_data.xml", # "crm_opportunity_menu.xml", +# "crm_claims_data.xml", +# "crm_claims_menu.xml", +# "crm_phonecall_data.xml", +# "crm_phonecall_menu.xml", "security/ir.model.access.csv", "process/crm_configuration_process.xml", ], diff --git a/addons/crm_configuration/crm_claims_data.xml b/addons/crm_configuration/crm_claims_data.xml new file mode 100644 index 00000000000..c4b41a30b9e --- /dev/null +++ b/addons/crm_configuration/crm_claims_data.xml @@ -0,0 +1,61 @@ + + + + + Claims + Claim + + + + + Factual Claims + + + + Value Claims + + + + Policy Claims + + + + + + Corrective + + + + Preventive + + + + + + Accepted as Claim + + + + Fixed + + + + Won't fix + + + + Invalid + + + + Awaiting Response + + + + \ No newline at end of file diff --git a/addons/crm_configuration/crm_claims_demo.xml b/addons/crm_configuration/crm_claims_demo.xml new file mode 100644 index 00000000000..e916399fee7 --- /dev/null +++ b/addons/crm_configuration/crm_claims_demo.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/crm_configuration/crm_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml new file mode 100644 index 00000000000..2918acbf1dc --- /dev/null +++ b/addons/crm_configuration/crm_claims_menu.xml @@ -0,0 +1,190 @@ + + + + + + ######################## CLAIMS (menu) ########################### + + All Claims + crm.case + form + tree,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + My Claims + crm.case + tree,form,calendar + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + Funds + crm.case + form + + + + + + form + + + + + + + My Unclosed Claims + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + My Cancelled Claims + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + + + + All Unclosed Claims + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + All Cancelled Claims + crm.case + tree,calendar,form + + + + + + tree + + + + + + calendar + + + + + + form + + + + + + + \ No newline at end of file diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml new file mode 100644 index 00000000000..254c9e30223 --- /dev/null +++ b/addons/crm_configuration/crm_claims_view.xml @@ -0,0 +1,144 @@ + + + + # ------------------------------------------------------ + # Claims + # ------------------------------------------------------ + + + CRM - Claims Tree + crm.case + tree + + + + + + + + + + + + + + + CRM - Claims Form + crm.case + form + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +