[[ line.currency_id and formatLang(line.amount_currency) or '' ]] [[ line.currency_id.symbol or '']]
-
diff --git a/addons/account/report/account_voucher_print.rml b/addons/account/report/account_voucher_print.rml
index 3e3d8990758..1d8f237c132 100644
--- a/addons/account/report/account_voucher_print.rml
+++ b/addons/account/report/account_voucher_print.rml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index c69e11abd6b..109b098d6a7 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -8,14 +8,14 @@
date_stop: !eval "'%s-12-31' %(datetime.now().year+1)"
name: !eval "'Fiscal Year %s' %(datetime.now().year+1)"
-
- I create a period for the month of january for the new fiscalyear
+ I create a period for the opening entries for the new fiscalyear
-
!record {model: account.period, id: account_period_jan11}:
company_id: base.main_company
date_start: !eval "'%s-01-01'% (datetime.now().year+1)"
- date_stop: !eval "'%s-12-31'% (datetime.now().year+1)"
+ date_stop: !eval "'%s-01-01'% (datetime.now().year+1)"
fiscalyear_id: account_fiscalyear_fiscalyear0
- name: !eval "'Jan%s' %(datetime.now().year+1)"
+ name: !eval "'OP %s' %(datetime.now().year+1)"
special: 1
-
@@ -91,4 +91,4 @@
# self.action_open_window(cr, uid, [ref("account_move_journal_2")], {"lang": 'en_US',
# "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
# "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
-# })
\ No newline at end of file
+# })
diff --git a/addons/account/test/price_accuracy00.yml b/addons/account/test/price_accuracy00.yml
index 81023395141..135dcf1ec60 100644
--- a/addons/account/test/price_accuracy00.yml
+++ b/addons/account/test/price_accuracy00.yml
@@ -14,8 +14,6 @@
!record {model: account.tax, id: tax196}:
name: Tax 19.6%
amount: &tax 0.196
- account_collected_id: account.a_recv
- account_paid_id: account.a_recv
-
And we define an invoice with one invoice line with a tax of *tax
-
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 4ab6201b507..42383341828 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -33,14 +33,12 @@ class account_fiscalyear_close(osv.osv_memory):
'Fiscal Year to close', required=True, help="Select a Fiscal year to close"),
'fy2_id': fields.many2one('account.fiscalyear', \
'New Fiscal Year', required=True),
- 'journal_id': fields.many2one('account.journal', \
- 'Opening Entries Journal', required=True, help='The best practice here is to use a journal dedicated to contain the opening entries of all fiscal years. Note that you should define it with default debit/credit accounts and with a centralized counterpart.'),
- 'period_id': fields.many2one('account.period', \
- 'Opening Entries Period', required=True),
+ 'journal_id': fields.many2one('account.journal', 'Opening Entries Journal', domain="[('type','=','situation')]", required=True, help='The best practice here is to use a journal dedicated to contain the opening entries of all fiscal years. Note that you should define it with default debit/credit accounts, of type \'situation\' and with a centralized counterpart.'),
+ 'period_id': fields.many2one('account.period', 'Opening Entries Period', required=True),
'report_name': fields.char('Name of new entries',size=64, required=True, help="Give name of the new entries"),
}
_defaults = {
- 'report_name':'End of Fiscal Year Entry',
+ 'report_name': _('End of Fiscal Year Entry'),
}
def data_save(self, cr, uid, ids, context=None):
@@ -221,4 +219,4 @@ class account_fiscalyear_close(osv.osv_memory):
account_fiscalyear_close()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index eb31f4e20f0..9438a6f9216 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -9,10 +9,16 @@
form
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index 7166923bf78..97b73784f43 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -8,12 +8,18 @@
form
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index ca7103c685e..b139f0f2c43 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -26,7 +26,7 @@