diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index 4656987cbeb..891d9ec92b3 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 \ 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..fcf635e3a5c 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -2,7 +2,7 @@ @@ -246,32 +246,32 @@ - - - + + + - - - - + + + + - + - - - - + + + + - + - - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + Date @@ -308,7 +308,7 @@ - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date @@ -345,6 +345,9 @@ [[ repeatIn(objects, 'a') ]] General Ledger + + + @@ -439,7 +442,7 @@ - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] Date @@ -478,7 +481,7 @@
[[ repeatIn(get_children_accounts(a), 'o') ]] - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] [[ '..'*(o.level-1) ]][[ o.code ]] [[ o.name ]] @@ -499,7 +502,7 @@
[[ repeatIn(lines(o), 'line') ]] - [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] + [[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] [[ formatLang(line['ldate'],date=True) ]] @@ -532,13 +535,13 @@ [[ 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 '']] + [[ (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 @@ -574,7 +577,7 @@
[[ 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 ]] @@ -592,7 +595,7 @@
[[ 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) ]] 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 @@ -