diff --git a/addons/account/account.py b/addons/account/account.py index 485b085fbbe..f557861700e 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -585,7 +585,7 @@ class account_journal(osv.osv): _description = "Journal" _columns = { 'name': fields.char('Journal Name', size=64, required=True, translate=True), - 'code': fields.char('Code', size=16, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."), + 'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."), 'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True, help="Select 'Sale' for Sale journal to be used at the time of making invoice."\ " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\ diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index 10f2df28605..871ef514836 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -342,7 +342,7 @@ Sales Journal - (test) - SAJ - (test) + TSAJ sale @@ -353,7 +353,7 @@ Sales Credit Note Journal - (test) - SCNJ - (test) + TSCNJ sale_refund @@ -366,7 +366,7 @@ Expenses Journal - (test) - EXJ - (test) + TEXJ purchase @@ -377,7 +377,7 @@ Expenses Credit Notes Journal - (test) - ECNJ - (test) + TECNJ purchase_refund @@ -390,7 +390,7 @@ Bank Journal - (test) - BNK - (test) + TBNK bank @@ -401,7 +401,7 @@ Checks Journal - (test) - CHK - (test) + TCHK bank @@ -412,7 +412,7 @@ Cash Journal - (test) - CSH - (test) + TCSH cash diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index 4656987cbeb..b904aba298f 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -86,18 +86,9 @@ class general_ledger(report_sxw.rml_parse, common_report_header): 'get_start_date':self._get_start_date, 'get_end_date':self._get_end_date, 'get_target_move': self._get_target_move, - 'strip_name': self._strip_name, }) self.context = context - def _ellipsis(self, char, size=100, truncation_str='...'): - if len(char) <= size: - return char - return char[:size-len(truncation_str)] + truncation_str - - def _strip_name(self, name, maxlen=50): - return self._ellipsis(name, maxlen) - def _sum_currency_amount_account(self, account): self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \ FROM account_move_line l \ @@ -164,12 +155,12 @@ class general_ledger(report_sxw.rml_parse, common_report_header): # Then select all account_move_line of this account if self.sortby == 'sort_journal_partner': - sql_sort='j.code, p.name' + sql_sort='j.code, p.name, l.move_id' else: - sql_sort='l.date' + sql_sort='l.date, l.move_id' sql = """ SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id, - m.name AS move_name, m.id AS mmove_id, + m.name AS move_name, m.id AS mmove_id,per.code as period_code, c.symbol AS currency_code, i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number, p.name AS partner_name @@ -178,6 +169,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header): LEFT JOIN res_currency c on (l.currency_id=c.id) LEFT JOIN res_partner p on (l.partner_id=p.id) LEFT JOIN account_invoice i on (m.id =i.move_id) + LEFT JOIN account_period per on (per.id=l.period_id) JOIN account_journal j on (l.journal_id=j.id) WHERE %s AND m.state IN %s AND l.account_id = %%s ORDER by %s """ %(self.query, tuple(move_state), sql_sort) @@ -188,7 +180,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header): #FIXME: replace the label of lname with a string translatable sql = """ SELECT 0 AS lid, '' AS ldate, '' AS lcode, COALESCE(SUM(l.amount_currency),0.0) AS amount_currency, '' AS lref, 'Initial Balance' AS lname, COALESCE(SUM(l.debit),0.0) AS debit, COALESCE(SUM(l.credit),0.0) AS credit, '' AS lperiod_id, '' AS lpartner_id, - '' AS move_name, '' AS mmove_id, + '' AS move_name, '' AS mmove_id, '' AS period_code, '' AS currency_code, NULL AS currency_id, '' AS invoice_id, '' AS invoice_type, '' AS invoice_number, @@ -205,15 +197,12 @@ class general_ledger(report_sxw.rml_parse, common_report_header): res_init = self.cr.dictfetchall() res = res_init + res_lines account_sum = 0.0 - inv_types = { 'out_invoice': 'CI', 'in_invoice': 'SI', 'out_refund': 'OR', 'in_refund': 'SR', } for l in res: - l['move'] = l['move_name'] - if l['invoice_id']: - l['lref'] = '%s: %s'%(inv_types[l['invoice_type']], l['invoice_number']) + l['move'] = l['move_name'] != '/' and l['move_name'] or ('*'+str(l['mmove_id'])) l['partner'] = l['partner_name'] or '' account_sum += l['debit'] - l['credit'] l['progress'] = account_sum - l['line_corresp'] = l['mmove_id'] == '' and ' ' or counterpart_accounts[l['mmove_id']] + l['line_corresp'] = l['mmove_id'] == '' and ' ' or counterpart_accounts[l['mmove_id']].replace(', ',',') # Modification of amount Currency if l['credit'] > 0: if l['amount_currency'] != None: diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index 78a5fd35a46..ae47873a294 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -2,363 +2,624 @@ - - - - - - + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] - - Date - Partner - Ref - Move - Entry Label - Debit - Credit - Balance - - - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - - Date - Partner - Ref - Move - Entry Label - Debit - Credit - Balance - Currency - - - - + + + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Partner + + + Ref + + + Move + + + Entry Label + + + Counterpart + + + Debit + + + Credit + + + Balance + + + + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + + + Date + + + JNRL + + + Partner + + + Ref + + + Move + + + Entry Label + + + Counterpart + + + Debit + + + Credit + + + Balance + + + Currency + + + + + [[ repeatIn(objects, 'a') ]] + General Ledger + + + + - General Ledger + Chart of Account + + + Fiscal Year + + + Journal + + + Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + + + Partner's + + + Target Moves - - - - [[ repeatIn(objects, 'a') ]] - + - Chart of Account - Fiscal Year - Journals - Display Account - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - Entries Sorted By - Target Moves - - - [[ get_account(data) or removeParentNode('para') ]] - [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - - Start Date - End Date - + + [[ get_account(data) or '' ]] + + + [[ get_fiscalyear(data) or '' ]] + + + [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] + + + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - [[ formatLang(get_start_date(data),date=True) ]] - [[ formatLang(get_end_date(data),date=True) ]] + + Start Date + + + End Date + - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] - - Start Period - End Period - + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - [[ get_start_period(data) or removeParentNode('para') ]] - [[ get_end_period(data) or removeParentNode('para') ]] + + [[ formatLang(get_start_date(data),date=True) ]] + + + [[ formatLang(get_end_date(data),date=True) ]] + - - - [[ get_sortby(data) ]] - [[ get_target_move(data) ]] - - - - - - - - - - - [[data['form']['amount_currency'] == False or removeParentNode('blockTable')]] - - Date - Partner - Ref - Move - Entry Label - Debit - Credit - Balance - - -
- [[ repeatIn(get_children_accounts(a), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - - - - - [[ '..'*(o.level-1) ]][[ o.code or '']] [[ o.name or '']] - - [[formatLang(sum_debit_account(o)) ]] - [[formatLang(sum_credit_account(o)) ]] - [[ formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]] + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + + Start Period + + + End Period + + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + + [[ get_start_period(data) or removeParentNode('para') ]] + + + [[ get_end_period(data) or removeParentNode('para') ]] + + + + + + + + + [[ get_partners() ]] + + + [[ get_target_move(data) ]] + - - - - - - - - - - - - [[ repeatIn(lines(o), 'line') ]] [[ formatLang(line['ldate'],date=True) ]] - [[ line['partner'] or '']] - [[ line['lref'] or '']] - [[ line['move'] or '']] - [[ line['lname'] or '' ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] - -
- - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - - Date - Partner - Ref - Move - Entry Label - Debit - Credit - Balance - Currency - - -
- [[ repeatIn(get_children_accounts(a), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] - - - - - [[ '..'*(o.level-1) ]][[ o.code or '' ]] [[ o.name or '' ]] - - [[formatLang(sum_debit_account(o)) ]] - [[formatLang(sum_credit_account(o)) ]] - [[formatLang(sum_balance_account(o)) ]] [[ company.currency_id.symbol ]] - [[ o.currency_id and sum_currency_amount_account(o) +o.currency_id.symbol or '' ]] - - - - - - - - - - - + + + + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + + + Date + + + JNRL + + + Partner + + + Ref + + + Move + + + Entry Label + + + Counterpart + + + Debit + + + Credit + + + Balance + + + Currency + - - [[ repeatIn(lines(o), 'line') ]] [[ formatLang(line['ldate'],date=True) ]] - [[ line['partner'] or '' ]] - [[ line['lref'] or '']] - [[ line['move'] or '' ]] - [[ line['lname'] or '' ]] - [[ formatLang(line['debit']) ]] - [[ formatLang(line['credit']) ]] - [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] - [[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']] - - -
- + +
+ [[ repeatIn(get_children_accounts(a), 'o') ]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + + + [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] + + + [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] + + + [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] + + + [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]] + + + +
+ [[ repeatIn(lines(o), 'line') ]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + + + [[ formatLang(line['ldate'],date=True) ]] + + + [[ line['lcode'] ]] + + + [[ strip_name(line['partner_name'],10) ]] + + + [[ strip_name(line['lref'],9) ]] + + + [[ strip_name(line['move'],9) ]] + + + [[ strip_name(line['lname'],10) ]] + + + [[ strip_name(line['line_corresp'].replace(', ',','),10) ]] + + + [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + [[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']] + + + +
+
+ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Partner + + + Ref + + + Move + + + Entry Label + + + Counterpart + + + Debit + + + Credit + + + Balance + + + +
+ [[ repeatIn(get_children_accounts(a), 'o') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] + + + [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] + + + [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] + + + [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + +
+ [[ repeatIn(lines(o), 'line') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + + [[ formatLang(line['ldate'],date=True) ]] + + + [[ line['lcode'] ]] + + + [[ strip_name(line['partner_name'],20) ]] + + + [[ strip_name(line['lref'],9) ]] + + + [[ strip_name(line['move'],9) ]] + + + [[ strip_name(line['lname'],18) ]] + + + [[ strip_name(line['line_corresp'].replace(', ',','),20) ]] + + + [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + +
+
+ - + \ No newline at end of file diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 82b5b57d986..56624256300 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -2,7 +2,7 @@ @@ -176,6 +176,7 @@ + @@ -196,6 +197,7 @@ + @@ -210,6 +212,7 @@ + @@ -229,6 +232,7 @@ + @@ -246,53 +250,55 @@ - - - + + + - - - - + + + + - + - - - - + + + + - + - - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] Date - JNRL + Period + + + JRNL Partner - Ref + Ref - Move + Move Entry Label - Counterpart + Counterpart Debit @@ -307,29 +313,32 @@ Currency - - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date - JNRL + Period + + + JRNL Partner - Ref + Ref - Move + Move Entry Label - Counterpart + Counterpart Debit @@ -343,8 +352,11 @@ - [[ repeatIn(objects, 'a') ]] + [[ repeatIn(objects, 'a') ]] General Ledger + + + @@ -374,19 +386,19 @@ - [[ get_account(data) or removeParentNode('para') ]] + [[ get_account(data) or removeParentNode('para') ]] - [[ get_fiscalyear(data) or '' ]] + [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] + [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] @@ -400,10 +412,10 @@ [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - [[ formatLang(get_start_date(data),date=True) ]] + [[ formatLang(get_start_date(data),date=True) ]] - [[ formatLang(get_end_date(data),date=True) ]] + [[ formatLang(get_end_date(data),date=True) ]] @@ -420,47 +432,50 @@ [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] - [[ get_start_period(data) or removeParentNode('para') ]] + [[ get_start_period(data) or removeParentNode('para') ]] - [[ get_end_period(data) or removeParentNode('para') ]] + [[ get_end_period(data) or removeParentNode('para') ]] - [[ get_sortby(data) ]] + [[ get_sortby(data) ]] - [[ get_target_move(data) ]] + [[ get_target_move(data) ]] - + - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] Date - JNRL + Period + + + JRNL Partner - Ref + Ref - Move + Move Entry Label - Counterpart + Counterpart Debit @@ -477,89 +492,95 @@
- [[ repeatIn(get_children_accounts(a), 'o') ]] - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[ repeatIn(get_children_accounts(a), 'o') ]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] - [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] + [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] - [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] + [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] + [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] - [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]] + [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]
- [[ repeatIn(lines(o), 'line') ]] - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[ repeatIn(lines(o), 'line') ]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] - [[ formatLang(line['ldate'],date=True) ]] + [[ formatLang(line['ldate'],date=True) ]] - [[ line['lcode'] ]] + [[ line['period_code'] ]] - [[ line['partner_name'] ]] + [[ line['lcode'] ]] - [[ line['lref'] ]] + [[ strip_name(line['partner_name'],21) ]] - [[ line['move'] ]] + [[ strip_name(line['lref'],17) ]] - [[ line['lname'] ]] + [[ line['move'] ]] - [[ strip_name(line['line_corresp'].replace(', ',','),20) ]] + [[ strip_name(line['lname'],26) ]] - [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] + [[ strip_name(line['line_corresp'],18) ]] - [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] + [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] - [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] - [[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']] + [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + + + [[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date - JNRL + Period + + + JRNL Partner - Ref + Ref - Move + Move Entry Label - Counterpart + Counterpart Debit @@ -574,55 +595,58 @@
[[ repeatIn(get_children_accounts(a), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] + [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] - [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] + [[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] + [[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]] - [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]
[[ repeatIn(lines(o), 'line') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] - [[ formatLang(line['ldate'],date=True) ]] + [[ formatLang(line['ldate'],date=True) ]] - [[ line['lcode'] ]] + [[ line['period_code'] ]] - [[ line['partner_name'] ]] + [[ line['lcode'] ]] - [[ line['lref'] ]] + [[ strip_name(line['partner_name'],25) ]] - [[ line['move'] ]] + [[ strip_name(line['lref'],21) ]] - [[ line['lname'] ]] + [[ line['move'] ]] - [[ strip_name(line['line_corresp'].replace(', ',','),20) ]] + [[ strip_name(line['lname'],35) ]] - [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] + [[ strip_name(line['line_corresp'],23) ]] - [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] + [[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] - [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]] + + + [[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]] @@ -630,4 +654,4 @@
- \ No newline at end of file + diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index 82af01cdb0b..d43adeef2be 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -118,7 +118,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): if self.target_move == 'posted': move_state = ['posted'] - self.cr.execute('SELECT l.id FROM account_move_line l, account_move am WHERE l.move_id=am.id AND am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ORDER BY l.'+ self.sort_selection + '',(tuple(move_state), period_id, tuple(journal_id) )) + self.cr.execute('SELECT l.id FROM account_move_line l, account_move am WHERE l.move_id=am.id AND am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ORDER BY l.'+ self.sort_selection + ', l.move_id',(tuple(move_state), period_id, tuple(journal_id) )) ids = map(lambda x: x[0], self.cr.fetchall()) return obj_mline.browse(self.cr, self.uid, ids) diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index c2807a2e8a2..a81c634ddc8 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -128,22 +128,14 @@ - - - - - - - - - - - - - - - - + + + + + + + + @@ -151,23 +143,21 @@ - + - - - - - - - + + + + + - - + + - + @@ -175,10 +165,9 @@ - - - - + + + @@ -196,117 +185,119 @@ - [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] Fiscal Year - Journal + Journal Filters By Entries Sorted By Target Moves - - [[ get_account(data) or '' ]] + + [[ get_account(data) or '' ]] [[ get_fiscalyear(data) or '' ]] - [[o.journal_id.name ]] + [[o.journal_id.name ]] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - - Start Date - End Date - - - [[ formatLang(get_start_date(data),date=True) ]] - [[ formatLang(get_end_date(data),date=True) ]] - - - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] - - Start Period - End Period - - - [[ get_start_period(data) or removeParentNode('para') ]] - [[ get_end_period(data) or removeParentNode('para') ]] - - - + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + + Start Date + End Date + + + [[ formatLang(get_start_date(data),date=True) ]] + [[ formatLang(get_end_date(data),date=True) ]] + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + Start Period + End Period + + + [[ get_start_period(data) or removeParentNode('para') ]] + [[ get_end_period(data) or removeParentNode('para') ]] + + + [[ get_sortby(data) ]] - [[ get_target_move(data) ]] - - + [[ get_target_move(data) ]] + + - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] Date - Entry No - A/c No. + Ref + Move + Account Partner - Move/Entry Label + Label Debit Credit - Balance [[o.period_id.name ]] - [[ o.journal_id.code ]] + [[ o.journal_id.code ]] - [[ 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_debit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] + [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] [[ company.currency_id.symbol ]] [[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]] [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]][[ formatLang(line.date,date=True) ]] - [[ line.ref ]] - [[ line.account_id.code ]] - [[ line.partner_id and line.partner_id.name ]] - [[ line.move_id.name ]] - [[ line.name ]] - [[ formatLang(line.debit) ]] - [[ formatLang(line.credit) ]] - [[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]] + [[ strip_name(line.ref,20) ]] + [[ line.move_id.name <> '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]] + [[ line.account_id.code ]] + [[ line.partner_id and strip_name(line.partner_id.name,16) ]] + [[ strip_name(line.name,35) ]] + [[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]] - [[ display_currency(data) or removeParentNode('blockTable') ]] + [[ display_currency(data) or removeParentNode('blockTable') ]] Date - Entry No - A/c No. + Ref + Move + Account Partner - Move/Entry Label + Label Debit Credit - Balance - Currency + Currency [[o.period_id.name ]] - [[ o.journal_id.code ]] + [[ o.journal_id.code ]] - [[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]] - [[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]] - [[ formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ company.currency_id.symbol ]] + + [[ formatLang(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)) ]] [[ company.currency_id.symbol ]] + + [[lines(o.period_id.id, o.journal_id.id) or removeParentNode('story') ]] [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]][[ formatLang(line.date,date=True) ]] - [[ line.ref ]] - [[ line.account_id.code ]] - [[ line.partner_id and line.partner_id.name ]] - [[ line.move_id.name ]] - [[ line.name ]] - [[ formatLang(line.debit) ]] - [[ formatLang(line.credit) ]] - [[ formatLang(line.credit - line.debit) ]] [[ company.currency_id.symbol ]] - [[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']] + [[ strip_name(line.ref,20) ]] + [[ line.move_id.name <> '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]] + [[ line.account_id.code ]] + [[ line.partner_id and strip_name(line.partner_id.name,16) ]] + [[ strip_name(line.name,17) ]] + [[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]] + [[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']] diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 96c0612d234..1a32bc13bde 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -2,7 +2,7 @@ @@ -10,11 +10,153 @@ - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26,71 +168,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + - + + + + + + + + + + + + + @@ -103,464 +206,453 @@ - + - + - + - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + - - + + + + + + + + - - + + - - + + - + - + - - - - - + + + - + + + - - - - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + + [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + + + [[ display_currency(data) == True or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + + + [[ repeatIn(objects, 'p') ]] + [[ setLang(p.lang) ]] + + + + Partner Ledger + + + + - Date + Chart of Account - JNRL + Fiscal Year - Ref. + Journal - Account + Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - Entry Label + Partner's - Debit - - - Credit - - - Balance + Target Moves - [[ display_currency(data) == True or removeParentNode('blockTable') ]] + - Date + [[ get_account(data) or '' ]] - JNRL + [[ get_fiscalyear(data) or '' ]] - Ref. + [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - Currency - - - - - - - - - - - Partner Ledger - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] - - - Chart of Account - Fiscal Year - Journal - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - Partner's - Target Moves - - - [[ get_account(data) or '' ]] - [[ get_fiscalyear(data) or '' ]] - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - - Start Date - End Date - + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - [[ formatLang(get_start_date(data),date=True) ]] - [[ formatLang(get_end_date(data),date=True) ]] + + Start Date + + + End Date + - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] - - Start Period - End Period - + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - [[ get_start_period(data) or removeParentNode('para') ]] - [[ get_end_period(data) or removeParentNode('para') ]] + + [[ formatLang(get_start_date(data),date=True) ]] + + + [[ formatLang(get_end_date(data),date=True) ]] + - - - [[ get_partners() ]] - [[ get_target_move(data) ]] - - - - - - - - - - - - - - - - - - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - Date - - - JNRL - - - Ref. - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - - - - - - - - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - - [[ p.ref ]] - [[ p.name ]] - - - [[ formatLang((sum_debit_partner(p))) ]] - - - [[ formatLang((sum_credit_partner(p))) ]] - - - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - - - - [[ data['form']['initial_balance'] or removeParentNode('tr') ]] - Initial Balance - - - [[ formatLang(get_intial_balance(p)[0][0])]] - - - [[ formatLang(get_intial_balance(p)[0][1]) ]] - - - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] - - - - - - -
- [[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - [[ formatLang(line['date'],date=True) ]] - - - [[ line['code'] ]] - - - [[ line['move_name'] ]] - - - [[ line['a_code'] ]] - - - [[ line['ref'] ]] - [[ line['name'] ]] - - - [[ formatLang((line['debit'])) ]] - - - [[ formatLang((line['credit'])) ]] - - - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] - - - - - - -
- [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - Date - - - JNRL - - - Ref. - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - Currency - - - - - - - - - - [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - - [[ p.ref ]] - [[ p.name ]] - - - [[ formatLang((sum_debit_partner(p))) ]] - - - [[ formatLang((sum_credit_partner(p))) ]] - - - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - - - + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + + Start Period + + + End Period + + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + + [[ get_start_period(data) or removeParentNode('para') ]] + + + [[ get_end_period(data) or removeParentNode('para') ]] + + + + + + [[ get_partners() ]] + + + [[ get_target_move(data) ]] + - - [[display_initial_balance(data) or removeParentNode('tr') ]] - Initial Balance - - - [[ formatLang(get_intial_balance(p)[0][0]) ]] - - - [[ formatLang(get_intial_balance(p)[0][1]) ]] - - - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] - - - - - - +
- [[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == True or removeParentNode('blockTable') ]] + + [[ display_currency(data) == False or removeParentNode('section') ]] + + - [[ formatLang(line['date'],date=True) ]] + Date - [[ line['code'] ]] + JNRL - [[ line['move_name'] ]] + Ref - [[ line['a_code'] ]] + Account - [[ (line['ref'] or '') + ' ' + line['name'] ]] + Entry Label - [[ formatLang((line['debit'])) ]] + Debit - [[ formatLang((line['credit'])) ]] + Credit - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] - - - [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] + Balance - - - + + + + [[ p.ref ]] - [[ p.name ]] + + + [[ formatLang((sum_debit_partner(p))) ]] + + + [[ formatLang((sum_credit_partner(p))) ]] + + + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] + + + +
+ + [[data['form']['initial_balance']==True or removeParentNode('section') ]] + + + + + Initial Balance + + + [[ formatLang(get_intial_balance(p)[0][0])]] + + + [[ formatLang(get_intial_balance(p)[0][1]) ]] + + + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + + + +
+
+ [[ repeatIn(lines(p), 'line') ]] + + + + [[ formatLang(line['date'],date=True) ]] + + + [[ line['code'] ]] + + + [[ line['move_name'] ]] + + + [[ line['a_code'] ]] + + + [[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + + + +
+
+
+ + [[ display_currency(data) == True or removeParentNode('section') ]] + + + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + + + + + [[ p.ref ]] - [[ p.name ]] + + + [[ formatLang((sum_debit_partner(p))) ]] + + + [[ formatLang((sum_credit_partner(p))) ]] + + + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] + + + + + + + + +
+ [[ data['form']['initial_balance']==True or removeParentNode('section') ]] + + + + Initial Balance + + + [[ formatLang(get_intial_balance(p)[0][0])]] + + + [[ formatLang(get_intial_balance(p)[0][1]) ]] + + + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + + + + + + + + +
+
+ [[ repeatIn(lines(p), 'line') ]] + + + + [[ formatLang(line['date'],date=True) ]] + + + [[ line['code'] ]] + + + [[ line['move_name'] ]] + + + [[ line['a_code'] ]] + + + [[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + + + + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] + + + + +
- - - - - + \ No newline at end of file diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 24ac80dfc38..b3dec993cdb 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -2,7 +2,7 @@ @@ -10,196 +10,153 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + + + + + + + - + + + + + + + + - + @@ -211,32 +168,32 @@ - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + @@ -249,454 +206,460 @@ - + - - - - - + - + - + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + - - - - - + + + + - - + + - + - - + + - + - + - - - - - + + + - - - - + + - - - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + + [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + + + [[ display_currency(data) == True or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + + + + + + + Partner Ledger + + + + - Date + Chart of Account - JNRL + Fiscal Year - Ref. + Journal - Account + Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - Entry Label + Partner's - Debit - - - Credit - - - Balance + Target Moves -[[ display_currency(data) == True or removeParentNode('blockTable') ]] + - Date + [[ get_account(data) or '' ]] - JNRL + [[ get_fiscalyear(data) or '' ]] - Ref. + [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - Currency - - - - - - - - Partner Ledger - - - - - - - - - - - - - - - - - + [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - Chart of Account + Start Date - Fiscal Year - - - Journal - - - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - - - Partner's - - - Target Moves - - - - - [[ get_account(data) or '' ]] - - - [[ get_fiscalyear(data) or '' ]] - - [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] - - - Start Date - - - End Date - - - - - [[ formatLang(get_start_date(data),date=True) ]] - - - [[ formatLang(get_end_date(data),date=True) ]] - - - - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] - - - Start Period - - - End Period - - - - - [[ get_start_period(data) or removeParentNode('para') ]] - - - [[ get_end_period(data) or removeParentNode('para') ]] - - - - - - [[ get_partners() ]] - - - [[ get_target_move(data) ]] + End Date - + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + + + [[ formatLang(get_start_date(data),date=True) ]] + + + [[ formatLang(get_end_date(data),date=True) ]] + + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + + Start Period + + + End Period + + + + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + + + [[ get_start_period(data) or removeParentNode('para') ]] + + + [[ get_end_period(data) or removeParentNode('para') ]] + + + + - - - - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - Date - JNRL + [[ get_partners() ]] - Ref. - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance + [[ get_target_move(data) ]] -
- [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] - - - - [[ p.ref ]] - [[ p.name ]] - - - [[ formatLang((sum_debit_partner(p))) ]] - - - [[ formatLang((sum_credit_partner(p))) ]] - - - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - - - - [[ display_initial_balance(data) or removeParentNode('tr') ]] - Initial Balance - - - [[ formatLang(get_intial_balance(p)[0][0])]] - - - [[ formatLang(get_intial_balance(p)[0][1]) ]] - - - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] - - - -
- [[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + + + + + [[ display_currency(data) == False or removeParentNode('blockTable') ]] - [[ formatLang(line['date'],date=True) ]] + Date - [[ line['code'] ]] + JNRL - [[ line['move_name'] ]] + Ref - [[ line['a_code'] ]] + Account - [[ (line['ref'] or '') + ' ' + line['name'] ]] + Entry Label - [[ formatLang((line['debit'])) ]] + Debit - [[ formatLang((line['credit'])) ]] + Credit - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + Balance -
-
- [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - Date - - - JNRL - - - Ref. - - - Account - - - Entry Label - - - Debit - - - Credit - - - Balance - - - Currency - - - -
- [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] - [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - [[ p.ref ]] - [[ p.name ]] - - - [[ formatLang((sum_debit_partner(p))) ]] - - - [[ formatLang((sum_credit_partner(p))) ]] - - - [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] - - - - - - - - - [[ data['form']['initial_balance'] or removeParentNode('tr') ]] - Initial Balance - - - [[ formatLang(get_intial_balance(p)[0][0]) ]] - - - [[ formatLang(get_intial_balance(p)[0][1]) ]] - - - [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] - - - - - - -
- [[ repeatIn(lines(p), 'line') ]] - [[ display_currency(data) == True or removeParentNode('blockTable') ]] - - - [[ formatLang(line['date'],date=True) ]] - - - [[ line['code'] ]] - - - [[ line['move_name'] ]] - - - [[ line['a_code'] ]] - - - [[ (line['ref'] or '') + ' ' + line['name'] ]] - - - [[ formatLang((line['debit'])) ]] - - - [[ formatLang((line['credit'])) ]] - - - [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] - - - [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] - - - -
+ [[ repeatIn(objects, 'p') ]] + [[ setLang(p.lang) ]] - + [[ display_currency(data) == False or removeParentNode('section') ]] + + + + + [[ p.ref ]] - [[ p.name ]] + + + [[ formatLang((sum_debit_partner(p))) ]] + + + [[ formatLang((sum_credit_partner(p))) ]] + + + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] + + + +
+ + [[data['form']['initial_balance']==True or removeParentNode('section') ]] + + + + + Initial Balance + + + [[ formatLang(get_intial_balance(p)[0][0])]] + + + [[ formatLang(get_intial_balance(p)[0][1]) ]] + + + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + + + +
+
+ [[ repeatIn(lines(p), 'line') ]] + + + + [[ formatLang(line['date'],date=True) ]] + + + [[ line['code'] ]] + + + [[ line['move_name'] ]] + + + [[ line['a_code'] ]] + + + [[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + + + +
+
+ + [[ display_currency(data) == True or removeParentNode('blockTable') ]] + + + Date + + + JNRL + + + Ref + + + Account + + + Entry Label + + + Debit + + + Credit + + + Balance + + + Currency + + + +
+ [[ repeatIn(objects, 'p') ]] + [[ setLang(p.lang) ]] + + [[ display_currency(data) == True or removeParentNode('section') ]] + + + + + + [[ p.ref ]] - [[ p.name ]] + + + [[ formatLang((sum_debit_partner(p))) ]] + + + [[ formatLang((sum_credit_partner(p))) ]] + + + [[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]] + + + + + + + + +
+ [[ data['form']['initial_balance']==True or removeParentNode('section') ]] + + + + Initial Balance + + + [[ formatLang(get_intial_balance(p)[0][0])]] + + + [[ formatLang(get_intial_balance(p)[0][1]) ]] + + + [[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]] + + + + + + + + +
+
+ [[ repeatIn(lines(p), 'line') ]] + + + + [[ formatLang(line['date'],date=True) ]] + + + [[ line['code'] ]] + + + [[ line['move_name'] ]] + + + [[ line['a_code'] ]] + + + [[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]] + + + [[ formatLang((line['debit'])) ]] + + + [[ formatLang((line['credit'])) ]] + + + [[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]] + + + + [[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]] + + + + +
- + \ No newline at end of file diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml index a74ca7ee6f8..67a49abc4c6 100644 --- a/addons/hr_payroll/report/report_employees_detail.rml +++ b/addons/hr_payroll/report/report_employees_detail.rml @@ -1,8 +1,8 @@ -