@@ -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 fcab2312c42..d43adeef2be 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -117,22 +117,10 @@ class journal_print(report_sxw.rml_parse, common_report_header):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
- self.cr.execute("SELECT l.id, l.date, l.ref, l.name, l.debit, l.credit, m.name as move_name, acc.code as account_code, rp.name as partner_name "\
- "FROM account_move_line l "\
- "LEFT JOIN account_move m ON (m.id=l.move_id) "\
- "LEFT JOIN account_account acc ON (l.account_id = acc.id) "\
- "LEFT JOIN res_partner rp ON (l.partner_id=rp.id) "\
- "WHERE m.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) ))
- res = self.cr.dictfetchall()
- account_sum = 0.0
- for l in res:
- account_sum += l['credit']-l['debit']
- l['progress'] = account_sum
- return res
+
+ 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)
def _set_get_account_currency_code(self, account_id):
self.cr.execute("SELECT c.symbol AS code "\
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 487fabb0b71..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 |
Filters By |
- Entries Sorted By |
+ Entries Sorted By |
Target Moves |
-
+
[[ get_account(data) or '' ]] |
[[ get_fiscalyear(data) or '' ]] |
- [[o.journal_id.name ]] |
- [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]
- [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+ [[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 |
+ 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') ]]
+
+ [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
- Start Period |
- End Period |
+ Start Period |
+ End Period |
- [[ get_start_period(data) or removeParentNode('para') ]] |
- [[ get_end_period(data) or removeParentNode('para') ]] |
+ [[ get_start_period(data) or removeParentNode('para') ]] |
+ [[ get_end_period(data) or removeParentNode('para') ]] |
-
- |
- [[ get_sortby(data) ]] |
- [[ get_target_move(data) ]] |
- |
-
+
+ |
+ [[ get_sortby(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'] or '' ]] |
- [[ line['account_code'] or '' ]] |
- [[ line['partner_name'] or '' ]] |
- [[ line['move_name'] or '' ]] - [[ line['name'] or '' ]] |
- [[ formatLang(line['debit']) ]] |
- [[ formatLang(line['credit']) ]] |
- [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] |
+ [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]][[ formatLang(line.date,date=True) ]] |
+ [[ 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'] or '' ]] |
- [[ line['account_code'] or '' ]] |
- [[ line['partner_name'] or '' ]] |
- [[ line['move_name'] or '' ]] - [[ line['name'] or '' ]] |
- [[ formatLang(line['debit']) ]] |
- [[ formatLang(line['credit']) ]] |
- [[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]] |
- [[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']] |
+ [[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]][[ formatLang(line.date,date=True) ]] |
+ [[ 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 @@
-
-
-
-
- [[ 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 @@
-
-
-
- [[ 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
- |
-
-
-
-
-
- |
-
- |
-