diff --git a/account_financial_report_webkit/i18n/account_financial_report_webkit.pot b/account_financial_report_webkit/i18n/account_financial_report_webkit.pot
index 861c314e..92a3eab1 100644
--- a/account_financial_report_webkit/i18n/account_financial_report_webkit.pot
+++ b/account_financial_report_webkit/i18n/account_financial_report_webkit.pot
@@ -1516,3 +1516,8 @@ msgstr ""
msgid "{'required': [('filter', '=', 'filter_opening')]}"
msgstr ""
+#. module: account_financial_report_webkit
+#: view:account.aged.trial.balance.webkit:account_financial_report_webkit.account_aged_trial_balance_webkit
+msgid "At the end of"
+msgstr ""
+
diff --git a/account_financial_report_webkit/i18n/de.po b/account_financial_report_webkit/i18n/de.po
index 8f5173d3..531d513e 100644
--- a/account_financial_report_webkit/i18n/de.po
+++ b/account_financial_report_webkit/i18n/de.po
@@ -1320,3 +1320,8 @@ msgstr ""
#: field:trial.balance.webkit,comp2_filter:0
msgid "Compare By"
msgstr ""
+
+#. module: account_financial_report_webkit
+#: view:account.aged.trial.balance.webkit:account_financial_report_webkit.account_aged_trial_balance_webkit
+msgid "At the end of"
+msgstr ""
diff --git a/account_financial_report_webkit/i18n/en_US.po b/account_financial_report_webkit/i18n/en_US.po
index 5db4722d..43886309 100644
--- a/account_financial_report_webkit/i18n/en_US.po
+++ b/account_financial_report_webkit/i18n/en_US.po
@@ -1320,3 +1320,8 @@ msgstr ""
#: field:trial.balance.webkit,comp2_filter:0
msgid "Compare By"
msgstr ""
+
+#. module: account_financial_report_webkit
+#: view:account.aged.trial.balance.webkit:account_financial_report_webkit.account_aged_trial_balance_webkit
+msgid "At the end of"
+msgstr ""
diff --git a/account_financial_report_webkit/i18n/es.po b/account_financial_report_webkit/i18n/es.po
index 9b5d7314..90497568 100644
--- a/account_financial_report_webkit/i18n/es.po
+++ b/account_financial_report_webkit/i18n/es.po
@@ -1367,3 +1367,8 @@ msgstr "¡Valor haber o debe erróneo en el asiento contable!"
#: field:trial.balance.webkit,comp2_filter:0
msgid "Compare By"
msgstr "Comparar por"
+
+#. module: account_financial_report_webkit
+#: view:account.aged.trial.balance.webkit:account_financial_report_webkit.account_aged_trial_balance_webkit
+msgid "At the end of"
+msgstr "Al final de"
diff --git a/account_financial_report_webkit/i18n/fr.po b/account_financial_report_webkit/i18n/fr.po
index 9956dd43..02cf5c0e 100644
--- a/account_financial_report_webkit/i18n/fr.po
+++ b/account_financial_report_webkit/i18n/fr.po
@@ -1580,3 +1580,8 @@ msgstr ""
#: view:trial.balance.webkit:account_financial_report_webkit.account_trial_balance_view_webkit
msgid "{'required': [('filter', '=', 'filter_opening')]}"
msgstr ""
+
+#. module: account_financial_report_webkit
+#: view:account.aged.trial.balance.webkit:account_financial_report_webkit.account_aged_trial_balance_webkit
+msgid "At the end of"
+msgstr "À fin de"
diff --git a/account_financial_report_webkit/i18n/it.po b/account_financial_report_webkit/i18n/it.po
index 09d7de92..57b33322 100644
--- a/account_financial_report_webkit/i18n/it.po
+++ b/account_financial_report_webkit/i18n/it.po
@@ -1366,3 +1366,8 @@ msgstr "Valore di credito o debito errato nella registrazione contabile!"
#: field:trial.balance.webkit,comp2_filter:0
msgid "Compare By"
msgstr "Confronta per"
+
+#. module: account_financial_report_webkit
+#: view:account.aged.trial.balance.webkit:account_financial_report_webkit.account_aged_trial_balance_webkit
+msgid "At the end of"
+msgstr ""
diff --git a/account_financial_report_webkit/i18n/nl.po b/account_financial_report_webkit/i18n/nl.po
index f458ed75..ff293ac8 100644
--- a/account_financial_report_webkit/i18n/nl.po
+++ b/account_financial_report_webkit/i18n/nl.po
@@ -1320,3 +1320,8 @@ msgstr ""
#: field:trial.balance.webkit,comp2_filter:0
msgid "Compare By"
msgstr ""
+
+#. module: account_financial_report_webkit
+#: view:account.aged.trial.balance.webkit:account_financial_report_webkit.account_aged_trial_balance_webkit
+msgid "At the end of"
+msgstr ""
diff --git a/account_financial_report_webkit/tests/aged_trial_balance.yml b/account_financial_report_webkit/tests/aged_trial_balance.yml
index d94cddab..4caf4e85 100644
--- a/account_financial_report_webkit/tests/aged_trial_balance.yml
+++ b/account_financial_report_webkit/tests/aged_trial_balance.yml
@@ -4,7 +4,9 @@
!python {model: account.account}: |
from datetime import datetime
ctx={}
- data_dict = {'chart_account_id':ref('account.chart0'), 'until_date': '%s-12-31' %(datetime.now().year)}
+ data_dict = {'chart_account_id':ref('account.chart0'), 'until_date': '%s-12-31' %(datetime.now().year),
+ 'fiscalyear_id': ref('account.data_fiscalyear'),
+ 'period_to': ref('account.period_12')}
from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
@@ -16,7 +18,8 @@
ctx={}
data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
- 'amount_currency': True, 'result_selection': 'customer_supplier'}
+ 'amount_currency': True, 'result_selection': 'customer_supplier',
+ 'period_to': ref('account.period_12')}
from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
@@ -29,7 +32,8 @@
data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
'amount_currency': True, 'result_selection': 'customer_supplier',
- 'partner_ids': [ref('base.res_partner_2'), ref('base.res_partner_1')]}
+ 'partner_ids': [ref('base.res_partner_2'), ref('base.res_partner_1')],
+ 'period_to': ref('account.period_12')}
from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
@@ -42,19 +46,6 @@
data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
'amount_currency': True, 'result_selection': 'customer_supplier',
- 'filter': 'filter_period', 'period_from': ref('account.period_1'), 'period_to': ref('account.period_12')}
- from openerp.tools import test_reports
- test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
-
--
- In order to test the PDF Aged Partner Balance Report webkit wizard I will print report with filters on dates
--
- !python {model: account.account}: |
- from datetime import datetime
- ctx={}
- data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
- 'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
- 'amount_currency': True, 'result_selection': 'customer_supplier',
- 'filter': 'filter_date', 'date_from': '%s-01-01' %(datetime.now().year), 'date_to': '%s-12-31' %(datetime.now().year)}
+ 'filter': 'filter_period', 'period_to': ref('account.period_12')}
from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
diff --git a/account_financial_report_webkit/wizard/aged_partner_balance_wizard.py b/account_financial_report_webkit/wizard/aged_partner_balance_wizard.py
index a3126489..19caf2d4 100644
--- a/account_financial_report_webkit/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report_webkit/wizard/aged_partner_balance_wizard.py
@@ -18,7 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
-from openerp.osv import orm
+from datetime import date
+from openerp.osv import orm, fields
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DATE_FORMAT
+from openerp.tools.translate import _
class AccountAgedTrialBalance(orm.TransientModel):
@@ -31,6 +34,55 @@ class AccountAgedTrialBalance(orm.TransientModel):
_name = "account.aged.trial.balance.webkit"
_description = "Aged partner balanced"
+ def _get_current_fiscalyear(self, cr, uid, context=None):
+ user_obj = self.pool['res.users']
+ company = user_obj.browse(cr, uid, uid, context=context).company_id
+ fyear_obj = self.pool['account.period']
+ today = date.today().strftime(DATE_FORMAT)
+ fyear_ids = fyear_obj.search(
+ cr, uid,
+ [('date_start', '>=', today),
+ ('date_stop', '<=', today),
+ ('company_id', '=', company.id)],
+ limit=1,
+ context=context)
+ if fyear_ids:
+ return fyear_ids[0]
+
+ _columns = {
+ 'filter': fields.selection(
+ [('filter_period', 'Periods')],
+ "Filter by",
+ required=True),
+ 'fiscalyear_id': fields.many2one(
+ 'account.fiscalyear',
+ 'Fiscal Year',
+ required=True),
+ 'period_to': fields.many2one('account.period', 'End Period',
+ required=True),
+ }
+
+ _defaults = {
+ 'filter': 'filter_period',
+ 'fiscalyear_id': _get_current_fiscalyear,
+ }
+
+ def onchange_fiscalyear(self, cr, uid, ids, fiscalyear=False,
+ period_id=False, date_to=False, until_date=False,
+ context=None):
+ res = super(AccountAgedTrialBalance, self).onchange_fiscalyear(
+ cr, uid, ids, fiscalyear=fiscalyear, period_id=period_id,
+ date_to=date_to, until_date=until_date, context=context
+ )
+ filters = self.onchange_filter(cr, uid, ids, filter='filter_period',
+ fiscalyear_id=fiscalyear,
+ context=context)
+ res['value'].update({
+ 'period_from': filters['value']['period_from'],
+ 'period_to': filters['value']['period_to'],
+ })
+ return res
+
def _print_report(self, cr, uid, ids, data, context=None):
# we update form with display account value
data = self.pre_print_report(cr, uid, ids, data, context=context)
diff --git a/account_financial_report_webkit/wizard/aged_partner_balance_wizard.xml b/account_financial_report_webkit/wizard/aged_partner_balance_wizard.xml
index 2d0d7273..7d19e28c 100644
--- a/account_financial_report_webkit/wizard/aged_partner_balance_wizard.xml
+++ b/account_financial_report_webkit/wizard/aged_partner_balance_wizard.xml
@@ -42,14 +42,17 @@
onchange_fiscalyear(fiscalyear_id, period_to, date_to, until_date)
-
- onchange_date_to(fiscalyear_id, period_to, date_to, until_date)
+
+ True
+
+
+ True
onchange_period_to(fiscalyear_id, period_to, date_to, until_date)
-
- [('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]
+
+ At the end of
[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]