diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml index 926b2adadd3..52878d08612 100644 --- a/addons/account/project/report/analytic_balance.rml +++ b/addons/account/project/report/analytic_balance.rml @@ -3,37 +3,6 @@ @@ -41,156 +10,216 @@ - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - + + - + - - + + + + - - - - - - Code - - - Account Name - - - Debit - - - Credit - - - Balance - - - Quantity - - - - - - Total - - - - [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] - - - [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] - - - [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] - - - [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]] - - - -
- [[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]] - - + + - [[ o['code'] ]] - - - [[ o['complete_name'] ]] - - - [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'debit')) ]] - - - [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'credit')) ]] - - - [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] - - - [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'], 'quantity')) ]] - - - - - [[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]] - [[ move_g['code'] ]] - - - [[ move_g['name'] ]] - - - [[ formatLang(move_g['debit'])]] - - - [[ formatLang(move_g['credit']) ]] - - - [[ formatLang(move_g['balance'])]] - - - [[ formatLang(move_g['quantity']) ]] - - + Analytic Balance - [[ company.currency_id.name ]] + + + + + + + + + + Code + + + Account Name + + + Debit([[ company.currency_id.name]]) + + + Credit([[ company.currency_id.name]]) + + + Balance([[ company.currency_id.name]]) + + + Quantity + + + + + + + + + + Total + + + + + + + + [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] [[ company.currency_id.symbol ]] + + + [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] [[ company.currency_id.symbol]] + + + [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]] + + + [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]] + + + + + + +
+ [[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]] + + + + [[ o['code'] ]] + + + [[ o['complete_name'] ]] + + + [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]] [[ company.currency_id.symbol]] + + + [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] [[ company.currency_id.symbol]] + + + [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]] + + + [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]] + + -
- + +
+ [[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]] + + + + [[ move_g['code'] ]] + + + [[ move_g['name'] ]] + + + [[ formatLang(move_g['debit'])]] [[ company.currency_id.symbol ]] + + + [[ formatLang(move_g['credit']) ]] [[ company.currency_id.symbol ]] + + + [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]] + + + [[ formatLang(move_g['quantity']) ]] + + + + + + +
+ + + +
+ + + + + + + + + + + +
\ No newline at end of file