|
[[ move_g['code'] ]]
@@ -188,7 +208,7 @@
[[ formatLang(move_g['debit'])]]
|
- [[ formatLang(move_g['credit']) ]]
+ [[ formatLang(move_g['credit']) ]]
|
[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]
@@ -202,21 +222,13 @@
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index a59e95724d0..90ff16be217 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -1,8 +1,8 @@
-
-
+
+
-
+
@@ -120,7 +120,29 @@
-
+
+
+
+
+ |
+ Date/Code
+ |
+
+ J.C. /Move name
+ |
+
+ Debit
+ |
+
+ Credit
+ |
+
+ Balance
+ |
+
+
+
+
|
@@ -137,7 +159,7 @@
|
-
+
|
Period from
@@ -150,7 +172,7 @@
|
-
+
[[ formatLang(data['form']['date1'],date = True) ]]
@@ -166,7 +188,7 @@
-
+
|
Date/Code
@@ -181,11 +203,11 @@
Credit
|
- Balance
+ Balance
|
-
+
Total:
@@ -208,7 +230,7 @@
[[ repeatIn(objects,'o') ]]
-
+
[[ o.code ]]
@@ -229,7 +251,7 @@
[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]
-
+
[[ move_g['code'] ]]
@@ -250,7 +272,7 @@
[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]
-
+
[[ formatLang(move_a['date'],date = True) ]]
@@ -278,5 +300,6 @@
+
\ No newline at end of file
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index 6de2e28d46e..25a79aa63f9 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -87,6 +87,31 @@
+
+
+
+
+ |
+ Code
+ |
+
+ Name
+ |
+
+ Debit
+ |
+
+ Credit
+ |
+
+ Balance
+ |
+
+ Quantity
+ |
+
+
+
@@ -199,5 +224,6 @@
+
\ No newline at end of file
diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml
index 68e391223b4..8d83b9512ab 100644
--- a/addons/account/project/report/quantity_cost_ledger.rml
+++ b/addons/account/project/report/quantity_cost_ledger.rml
@@ -1,8 +1,8 @@
-
-
+
+
-
+
@@ -117,7 +117,26 @@
-
+
+
+
+
+ |
+ Code/Date
+ |
+
+ J.C./Move name
+ |
+
+ Quantity
+ |
+
+ Total
+ |
+
+
+
+
|
@@ -134,7 +153,7 @@
|
-
+
|
Period from
@@ -147,7 +166,7 @@
|
-
+
[[ formatLang(data['form']['date1'],date = True) ]]
@@ -166,7 +185,7 @@
-
+
|
Code/Date
@@ -175,14 +194,14 @@
J.C./Move name
|
- Quantity
+ Quantity
|
Total
|
-
+
|
Total:
@@ -203,8 +222,8 @@
|
- [[ repeatIn(objects,'o') ]]
-
+ [[ repeatIn(objects,'o') ]]
+
|
[[ o.code ]]
@@ -221,8 +240,8 @@
|
- [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]
-
+ [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]
+
|
[[ move_g['code'] ]]
@@ -235,7 +254,7 @@
|
-
+
[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]
@@ -257,5 +276,6 @@
+
\ No newline at end of file
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 879560a5b4a..b99070330f7 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -20,12 +20,10 @@
##############################################################################
import time
-
-import rml_parse
from report import report_sxw
from common_report_header import common_report_header
-class aged_trial_report(rml_parse.rml_parse, common_report_header):
+class aged_trial_report(report_sxw.rml_parse, common_report_header):
def __init__(self, cr, uid, name, context):
super(aged_trial_report, self).__init__(cr, uid, name, context=context)
diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index 8b8336d1c06..cbc4688c368 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -107,7 +107,7 @@
|
|
- Aged Trial balance |
+ Aged Trial Balance |
|
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index b1ac882dae7..d99cad9535e 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -95,10 +95,10 @@
tree,graph
{'search_default_month':1, 'group_by_no_leaf':1, 'search_default_Account':1, 'search_default_Month':1, 'group_by':[]}
- A tool search lets you know statistics on your analytics records that match your needs.
+ From this view, have an analysis of your different analytic entries following the analytic account you defined matching your business need. Use the tool search to analyse information about analytic entries generated in the system.
-
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 5a6c7700b9d..f9697710f8f 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -20,7 +20,6 @@
##############################################################################
import time
-
from report import report_sxw
from common_report_header import common_report_header
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 277d568330c..7c9aa13da2e 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -18,7 +18,7 @@
-
+
@@ -148,11 +148,11 @@
-
+
-
+
@@ -189,7 +189,7 @@
-
+
@@ -283,7 +283,7 @@
-
+
| Code |
Account |
diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py
index 6ec7ec7c10e..8576850ff5e 100644
--- a/addons/account/report/account_balance_landscape.py
+++ b/addons/account/report/account_balance_landscape.py
@@ -22,7 +22,6 @@
import time
import locale
from report import report_sxw
-import rml_parse
parents = {
'tr':1,
@@ -31,7 +30,7 @@ parents = {
'section': 0
}
-class account_balance_landscape(rml_parse.rml_parse):
+class account_balance_landscape(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_balance_landscape, self).__init__(cr, uid, name, context=context)
self.flag=1
diff --git a/addons/account/report/account_balance_landscape.rml b/addons/account/report/account_balance_landscape.rml
index 1f695eb36a8..d8e4881bbbe 100644
--- a/addons/account/report/account_balance_landscape.rml
+++ b/addons/account/report/account_balance_landscape.rml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/addons/account/report/account_balance_landscape_old_backup.rml b/addons/account/report/account_balance_landscape_old_backup.rml
index cd7e9edc860..6790082f8dd 100755
--- a/addons/account/report/account_balance_landscape_old_backup.rml
+++ b/addons/account/report/account_balance_landscape_old_backup.rml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -80,7 +80,7 @@
- Account balance
+ Account Balance
|
diff --git a/addons/account/report/account_balance_old_backup.rml b/addons/account/report/account_balance_old_backup.rml
index 1d40e58cbfb..cf67cb6bc3d 100755
--- a/addons/account/report/account_balance_old_backup.rml
+++ b/addons/account/report/account_balance_old_backup.rml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 4d3e06dee05..b6f39fbbebd 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -22,13 +22,12 @@
import time
import pooler
-import rml_parse
from report import report_sxw
from account.report import account_profit_loss
from common_report_header import common_report_header
from tools.translate import _
-class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
+class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header):
def __init__(self, cr, uid, name, context=None):
super(report_balancesheet_horizontal, self).__init__(cr, uid, name, context=context)
self.obj_pl = account_profit_loss.report_pl_account_horizontal(cr, uid, name, context=context)
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 076de7bdcd4..74b3bf81190 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -35,19 +35,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -230,7 +218,7 @@
|
-
+
Balance:
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index bde0d2786d0..7bfaeb9f33e 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index 6ab5b38d03d..d3113b63133 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -20,7 +20,6 @@
##############################################################################
import time
-
from report import report_sxw
from common_report_header import common_report_header
#
diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 28cb68fcce3..320a38370a2 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -274,7 +274,7 @@
- [[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
| A/C No. |
Account Name |
@@ -283,7 +283,7 @@
Balance |
- [[ display_currency(data) or removeParentNode('blockTable') ]]
+ [[ display_currency(data) or removeParentNode('blockTable') ]]
| A/C No. |
Account Name |
@@ -293,7 +293,7 @@
Currency |
- [[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
| Total: |
|
@@ -302,7 +302,7 @@
[[ 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 ]] |
- [[ display_currency(data) or removeParentNode('blockTable') ]]
+ [[ display_currency(data) or removeParentNode('blockTable') ]]
| Total: |
|
@@ -314,7 +314,7 @@
[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]
- [[ display_currency(data) == False or removeParentNode('blockTable') ]]
+ [[ display_currency(data) == False or removeParentNode('blockTable') ]]
| [[ line['code'] ]] |
[[ line['name'] ]] |
@@ -323,7 +323,7 @@
[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]] |
- [[ display_currency(data) or removeParentNode('blockTable') ]]
+ [[ display_currency(data) or removeParentNode('blockTable') ]]
| [[ line['code'] ]] |
[[ line['name'] ]] |
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 0b4042b8681..8eefe75838f 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -130,7 +130,7 @@
{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}
- A tool search lets you know statistics on your different financial accounts that match your needs.
+ From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool.
| | | | | | | | | |