From e235786c547dda46f5ed93aba15e1c120dcfc7f0 Mon Sep 17 00:00:00 2001 From: "nch@tinyerp.com" <> Date: Fri, 30 Apr 2010 11:43:14 +0530 Subject: [PATCH] [IMP]:account configuration wizard bzr revid: nch@tinyerp.com-20100430061314-xpcxye6afshqxg9h --- addons/account/account.py | 46 ----------------- addons/account/account_installer.xml | 29 +++++++++-- addons/account/account_view.xml | 43 ---------------- addons/account/i18n/account.pot | 4 -- addons/account/i18n/ar.po | 4 -- addons/account/i18n/bg.po | 5 -- addons/account/i18n/bs.po | 5 -- addons/account/i18n/ca.po | 5 -- addons/account/i18n/cs.po | 5 -- addons/account/i18n/da.po | 5 -- addons/account/i18n/de.po | 5 -- addons/account/i18n/el.po | 5 -- addons/account/i18n/es.po | 5 -- addons/account/i18n/es_AR.po | 5 -- addons/account/i18n/es_EC.po | 5 -- addons/account/i18n/et.po | 5 -- addons/account/i18n/fa.po | 5 -- addons/account/i18n/fi.po | 5 -- addons/account/i18n/fr.po | 5 -- addons/account/i18n/gl.po | 4 -- addons/account/i18n/gu.po | 5 -- addons/account/i18n/hr.po | 5 -- addons/account/i18n/hu.po | 5 -- addons/account/i18n/id.po | 5 -- addons/account/i18n/it.po | 5 -- addons/account/i18n/kab.po | 5 +- addons/account/i18n/ko.po | 5 -- addons/account/i18n/lt.po | 5 -- addons/account/i18n/lv.po | 5 -- addons/account/i18n/mn.po | 5 -- addons/account/i18n/nb.po | 5 -- addons/account/i18n/nl.po | 5 -- addons/account/i18n/nl_BE.po | 5 -- addons/account/i18n/oc.po | 4 -- addons/account/i18n/pl.po | 5 -- addons/account/i18n/pt.po | 5 -- addons/account/i18n/pt_BR.po | 5 -- addons/account/i18n/ro.po | 5 -- addons/account/i18n/ru.po | 5 -- addons/account/i18n/si.po | 5 -- addons/account/i18n/sk.po | 5 -- addons/account/i18n/sl.po | 5 -- addons/account/i18n/sq.po | 5 -- addons/account/i18n/sr.po | 5 -- addons/account/i18n/sv.po | 5 -- addons/account/i18n/te.po | 5 -- addons/account/i18n/th.po | 5 -- addons/account/i18n/tlh.po | 5 -- addons/account/i18n/tr.po | 5 -- addons/account/i18n/uk.po | 5 -- addons/account/i18n/vi.po | 5 -- addons/account/i18n/zh_CN.po | 5 -- addons/account/i18n/zh_HK.po | 5 -- addons/account/i18n/zh_TW.po | 5 -- addons/account/installer.py | 57 ++++++++++++++++++--- addons/account/security/ir.model.access.csv | 2 - addons/base_setup/base_setup_todo.xml | 2 +- addons/base_setup/todo.py | 6 +-- 58 files changed, 77 insertions(+), 359 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 74531102073..6a96fba8e16 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1763,52 +1763,6 @@ class account_subscription_line(osv.osv): _rec_name = 'date' account_subscription_line() - -class account_config_wizard(osv.osv_memory): - _name = 'account.config.wizard' - _inherit = 'res.config' - - _columns = { - 'name':fields.char( - 'Name', required=True, size=64, - help="Name of the fiscal year as displayed on screens."), - 'code':fields.char( - 'Code', required=True, size=64, - help="Name of the fiscal year as displayed in reports."), - 'date1': fields.date('Start Date', required=True), - 'date2': fields.date('End Date', required=True), - 'period':fields.selection([('month','Month'), ('3months','3 Months')], - 'Periods', required=True), - } - _defaults = { - 'code': lambda *a: time.strftime('%Y'), - 'name': lambda *a: time.strftime('%Y'), - 'date1': lambda *a: time.strftime('%Y-01-01'), - 'date2': lambda *a: time.strftime('%Y-12-31'), - 'period':lambda *a:'month', - } - - def execute(self, cr, uid, ids, context=None): - for res in self.read(cr,uid,ids): - if 'date1' in res and 'date2' in res: - res_obj = self.pool.get('account.fiscalyear') - start_date=res['date1'] - end_date=res['date2'] - name=res['name']#DateTime.strptime(start_date, '%Y-%m-%d').strftime('%m.%Y') + '-' + DateTime.strptime(end_date, '%Y-%m-%d').strftime('%m.%Y') - vals={ - 'name':name, - 'code':name, - 'date_start':start_date, - 'date_stop':end_date, - } - new_id=res_obj.create(cr, uid, vals, context=context) - if res['period']=='month': - res_obj.create_period(cr,uid,[new_id]) - elif res['period']=='3months': - res_obj.create_period3(cr,uid,[new_id]) -account_config_wizard() - - # --------------------------------------------------------------- # Account Templates : Account, Tax, Tax Code and chart. + Wizard # --------------------------------------------------------------- diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 4c9742fd127..3cd0495904e 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -18,16 +18,35 @@ You can enhance OpenERP's basic accounting support with a few additional OpenERP applications + 150 - - - - - + + Configure + + + 20 + + + + + + + + + + + + + + + + + + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 9ace27294fa..b72c01f9cf7 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1445,49 +1445,6 @@ - - - - - - Account Configure wizard - account.config.wizard - form - - - -
- Account Configure -
- - - - - - - - - - - - - - - Account Configure Wizard - ir.actions.act_window - account.config.wizard - - form - form - new - - - - - - onskip - - Account Add wizard account.addtmpl.wizard diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index a777acb9c5c..ef00056ee8e 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -785,10 +785,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index f69b3246eff..e838f3bce27 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -805,10 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po index 91dfbca2279..56befb5c212 100644 --- a/addons/account/i18n/bg.po +++ b/addons/account/i18n/bg.po @@ -819,11 +819,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po index d1da22ef906..36cd444b21d 100644 --- a/addons/account/i18n/bs.po +++ b/addons/account/i18n/bs.po @@ -816,11 +816,6 @@ msgstr "(Ostaviti prazno za sve otvorene fiskalne godine)" msgid "Move Lines" msgstr "Retci prijenosa" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po index 9f2c82ec366..6a5f47dfb24 100644 --- a/addons/account/i18n/ca.po +++ b/addons/account/i18n/ca.po @@ -829,11 +829,6 @@ msgstr "(deixar-lo buit per a tots els exercicis fiscals oberts)" msgid "Move Lines" msgstr "Línies moviment" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.assistent" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 8d393298e01..be9a9612f42 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -809,11 +809,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 55cb096e90e..e27b080077d 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -811,11 +811,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index e978a71d610..4f9893960bf 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -827,11 +827,6 @@ msgstr "(frei lassen für alle Wirtschaftsjahre)" msgid "Move Lines" msgstr "Buchungszeilen" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po index f2e5ed77ea6..af0ca7265c3 100644 --- a/addons/account/i18n/el.po +++ b/addons/account/i18n/el.po @@ -829,11 +829,6 @@ msgstr "(Διατηρήστε κενό για όλα τα ανοιχτά λογ msgid "Move Lines" msgstr "Μετακίνηση Γραμμών" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 0a2b2c626d6..21becbd9c99 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -828,11 +828,6 @@ msgstr "(dejarlo vacío para todos los ejercicios fiscales abiertos)" msgid "Move Lines" msgstr "Líneas movimiento" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.asistente" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po index f578cbc7493..cbdf13eb4b0 100644 --- a/addons/account/i18n/es_AR.po +++ b/addons/account/i18n/es_AR.po @@ -827,11 +827,6 @@ msgstr "(dejar vacío para todos los ejercicios fiscales abiertos)" msgid "Move Lines" msgstr "Líneas del movimiento" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "asistente.configuracion.contable" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index 0f0f933abdb..bed04b5b069 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -826,11 +826,6 @@ msgstr "(dejarlo vacío para todos los ejercicios fiscales abiertos)" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po index fbe197f9df7..6ecd769ea63 100644 --- a/addons/account/i18n/et.po +++ b/addons/account/i18n/et.po @@ -807,11 +807,6 @@ msgstr "(Jäta tühjaks kõigi avatud majandusaastate jaoks)" msgid "Move Lines" msgstr "Liiguta read" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po index 95af7a94323..3dace56df79 100644 --- a/addons/account/i18n/fa.po +++ b/addons/account/i18n/fa.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po index b5274399fea..1f1de60a69e 100644 --- a/addons/account/i18n/fi.po +++ b/addons/account/i18n/fi.po @@ -826,11 +826,6 @@ msgstr "(Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia)" msgid "Move Lines" msgstr "Siirron rivit" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index ffb5f882d9b..1785d79bf38 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -1240,11 +1240,6 @@ msgstr "Livre de coûts" msgid "Move Lines" msgstr "Lignes de mouvements" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po index 65856053bdd..6bcd627b0bf 100644 --- a/addons/account/i18n/gl.po +++ b/addons/account/i18n/gl.po @@ -806,10 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po index 3a997d3000f..ecd36932d38 100644 --- a/addons/account/i18n/gu.po +++ b/addons/account/i18n/gu.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index e6b360683ea..e01b198f2d5 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.po @@ -805,11 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index c8349d8f0c5..8f70c2fd083 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -805,11 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po index 1d999f12888..c7c2f143c8b 100644 --- a/addons/account/i18n/id.po +++ b/addons/account/i18n/id.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 79335be4e75..6007a539d21 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -826,11 +826,6 @@ msgstr "(Lasciare vuoto per tutti gli esercizi fiscali aperti)" msgid "Move Lines" msgstr "Righe Movimentate" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po index 67801be10cf..383cf564a8b 100644 --- a/addons/account/i18n/kab.po +++ b/addons/account/i18n/kab.po @@ -806,10 +806,7 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" + #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index e97724467c6..4391aa7bb08 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po index 0adf15c8787..4558f305972 100644 --- a/addons/account/i18n/lt.po +++ b/addons/account/i18n/lt.po @@ -809,11 +809,6 @@ msgstr "(palikite tuščią, jei norite visų atvirų fiskalinių metų)" msgid "Move Lines" msgstr "Didžiosios knygos įrašai" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po index e17722af03f..67a585f4a57 100644 --- a/addons/account/i18n/lv.po +++ b/addons/account/i18n/lv.po @@ -818,11 +818,6 @@ msgstr "(Atstāt tukšu visiem nenoslēgtajiem fiskālajiem gadiem)" msgid "Move Lines" msgstr "Grāmatojumu Rindas" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 11bab9eed81..52512785a61 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po index e27d8cc9677..1041a90be21 100644 --- a/addons/account/i18n/nb.po +++ b/addons/account/i18n/nb.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index ea10f588dc6..ac1f183a5fa 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -827,11 +827,6 @@ msgstr "(laat leeg om alle boekjaren mee te nemen)" msgid "Move Lines" msgstr "Verplaats boekingsregels" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po index c9fda154dab..f298c31854d 100644 --- a/addons/account/i18n/nl_BE.po +++ b/addons/account/i18n/nl_BE.po @@ -805,11 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po index a322bf511b0..53532fba0ac 100644 --- a/addons/account/i18n/oc.po +++ b/addons/account/i18n/oc.po @@ -808,10 +808,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 12e8c9efdf8..354d3ebaa83 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -825,11 +825,6 @@ msgstr "(Pozostaw puste dla wszystkich otwartych lat podatkowych)" msgid "Move Lines" msgstr "Pozycje zapisów" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po index 2f23e7ccc7e..1f006f5ba61 100644 --- a/addons/account/i18n/pt.po +++ b/addons/account/i18n/pt.po @@ -823,11 +823,6 @@ msgstr "(Manter vazio para todos os anos fiscais aberto)" msgid "Move Lines" msgstr "Linhas de movimentos" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index deb3ee9afb8..95117f2d96e 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -826,11 +826,6 @@ msgstr "(Manter vazio para todos os anos fiscais abertos)" msgid "Move Lines" msgstr "Mover Linhas" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index 30c07e9f381..d70c8ee4c69 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -827,11 +827,6 @@ msgstr "(Lasaţi necompletat pentru toţi anii fiscali deschişi)" msgid "Move Lines" msgstr "Linii mişcări" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 9e34bba0b59..7c0acebc4bc 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -820,11 +820,6 @@ msgstr "Оставить пустым для всех открытых фина msgid "Move Lines" msgstr "Строки финансового документа" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "Мастер конфигурации" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po index b717c4bfcec..e7d7718f9e6 100644 --- a/addons/account/i18n/si.po +++ b/addons/account/i18n/si.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po index 7d8c17aee9a..cbe99fcfee3 100644 --- a/addons/account/i18n/sk.po +++ b/addons/account/i18n/sk.po @@ -809,11 +809,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po index ae98b095426..6eb777a8261 100644 --- a/addons/account/i18n/sl.po +++ b/addons/account/i18n/sl.po @@ -818,11 +818,6 @@ msgstr "(Prazno za vsa odprta davčna leta)" msgid "Move Lines" msgstr "Postavke knjižb" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po index de0b5913aa6..e82be2f3bc9 100644 --- a/addons/account/i18n/sq.po +++ b/addons/account/i18n/sq.po @@ -828,11 +828,6 @@ msgstr "(Mbaje zbrazët për të gjitha vitet fiskale)" msgid "Move Lines" msgstr "Lëviz Linjat" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po index 99cda7934ad..c2a3d8276ae 100644 --- a/addons/account/i18n/sr.po +++ b/addons/account/i18n/sr.po @@ -809,11 +809,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 5959bd7abbe..085cc58caba 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -815,11 +815,6 @@ msgstr "(tomt för alla öppna verksamhetsår)" msgid "Move Lines" msgstr "Flytta rader" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po index 53daa3531e5..eaa42f35d86 100644 --- a/addons/account/i18n/te.po +++ b/addons/account/i18n/te.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po index 3c3e7026dea..320fdc82290 100644 --- a/addons/account/i18n/th.po +++ b/addons/account/i18n/th.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po index dbda43952e8..41390d44aac 100644 --- a/addons/account/i18n/tlh.po +++ b/addons/account/i18n/tlh.po @@ -805,11 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 6f445a81528..a203f350368 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -805,11 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "Hareket Kalemleri" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po index fb52db34f13..02020dd4cb8 100644 --- a/addons/account/i18n/uk.po +++ b/addons/account/i18n/uk.po @@ -805,11 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index b83ea120c76..6e5a40ad057 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.po @@ -817,11 +817,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index f904e3f8d45..5dfad6b78e0 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -808,11 +808,6 @@ msgstr "(留空为所有开启的会计年度)" msgid "Move Lines" msgstr "凭证明细" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "科目.设置.向导" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po index fa207ddcf49..7ca8d6548e9 100644 --- a/addons/account/i18n/zh_HK.po +++ b/addons/account/i18n/zh_HK.po @@ -806,11 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index 0b8bfac659b..c73c4d65323 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -805,11 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print diff --git a/addons/account/installer.py b/addons/account/installer.py index 35a09406891..31618122af8 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -18,8 +18,11 @@ # along with this program. If not, see . # ############################################################################## -from operator import itemgetter +import time +import datetime +from dateutil.relativedelta import relativedelta +from operator import itemgetter from osv import fields, osv import netsvc @@ -30,10 +33,12 @@ class account_installer(osv.osv_memory): def _get_charts(self, cr, uid, context=None): modules = self.pool.get('ir.module.module') ids = modules.search(cr, uid, [('category_id','=','Account Charts')]) - return list( + charts = list( sorted(((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids)), key=itemgetter(1))) + charts.insert(0,('','')) + return charts _columns = { # Accounting @@ -42,9 +47,6 @@ class account_installer(osv.osv_memory): help="Installs localized accounting charts to match as closely as " "possible the accounting needs of your company based on your " "country."), - 'account_analytic_default':fields.boolean('Analytic Accounting', - help="Automatically selects analytic accounts based on various " - "criteria."), 'account_analytic_plans':fields.boolean('Multiple Analytic Plans', help="Allows invoice lines to impact multiple analytic accounts " "simultaneously."), @@ -57,16 +59,55 @@ class account_installer(osv.osv_memory): "per-partner policies."), 'account_asset':fields.boolean('Assets Management', help="Enables asset management in the accounting application, " - "including asset categories and usage periods.") + "including asset categories and usage periods."), + 'name':fields.char('Name', required=True, size=64, + help="Name of the fiscal year as displayed on screens."), + 'code':fields.char('Code', required=True, size=64, + help="Name of the fiscal year as displayed in reports."), + 'date_start': fields.date('Start Date', required=True), + 'date_stop': fields.date('End Date', required=True), + 'period':fields.selection([('month','Month'), ('3months','3 Months')], + 'Periods', required=True), + 'account_name':fields.char('Name', size=128), + 'account_type':fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32), + 'account_currency':fields.many2one('res.currency', 'Currency') } _defaults = { - 'account_analytic_default':True, + 'code': lambda *a: time.strftime('%Y'), + 'name': lambda *a: time.strftime('%Y'), + 'date_start': lambda *a: time.strftime('%Y-01-01'), + 'date_stop': lambda *a: time.strftime('%Y-12-31'), + 'period':lambda *a:'month', + 'account_currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, } + def on_change_start_date(self, cr, uid, id, start_date): + if start_date: + start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d") + end_date = (start_date + relativedelta(months=12)) - relativedelta(days=1) + return {'value':{'date_stop':end_date.strftime('%Y-%m-%d')}} + return {} + + def execute(self, cr, uid, ids, context=None): + super(account_installer, self).execute(cr, uid, ids, context=context) + for res in self.read(cr,uid,ids): + if 'date1' in res and 'date2' in res: + res_obj = self.pool.get('account.fiscalyear') + name = res['name'] + vals = {'name':res['name'], + 'code':res['code'], + 'date_start':res['date_start'], + 'date_stop':res['date_stop'], + } + period_id = res_obj.create(cr, uid, vals, context=context) + if res['period'] == 'month': + res_obj.create_period(cr, uid, [period_id]) + elif res['period'] == '3months': + res_obj.create_period3(cr, uid, [period_id]) + def modules_to_install(self, cr, uid, ids, context=None): modules = super(account_installer, self).modules_to_install( cr, uid, ids, context=context) - chart = self.read(cr, uid, ids, ['charts'], context=context)[0]['charts'] self.logger.notifyChannel( diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 656e05e2a9b..e1aa3b6510a 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -65,8 +65,6 @@ "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0 "access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1 -"access_account_config_wizard_account_manager","account.config.wizard account manager","model_account_config_wizard","group_account_manager",1,1,1,1 -"access_account_config_wizard_system_manager","account.config.wizard system manager","model_account_config_wizard","base.group_system",1,1,1,1 "access_account_add_tmpl_wizard_account_manager","account.addtmpl.wizard account manager","model_account_addtmpl_wizard","group_account_manager",1,1,1,1 "access_account_add_tmpl_wizard_system_manager","account.addtmpl.wizard system manager","model_account_addtmpl_wizard","base.group_system",1,1,1,1 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0 diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 2a7699bf1ea..3ccba59fca0 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -34,7 +34,7 @@ - + diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py index d23ac71d60b..811d6f21bf5 100644 --- a/addons/base_setup/todo.py +++ b/addons/base_setup/todo.py @@ -48,8 +48,6 @@ class base_setup_company(osv.osv_memory): cr, uid, 'res.country.state', context=context) def _get_all_countries(self, cr, uid, context=None): return self._get_all(cr, uid, 'res.country', context=context) - def _get_all_currencies(self, cr, uid, context=None): - return self._get_all(cr, uid, 'res.currency', context=context) def default_get(self, cr, uid, fields_list=None, context=None): """ get default company if any, and the various other fields @@ -90,7 +88,7 @@ class base_setup_company(osv.osv_memory): 'country_id':fields.selection(_get_all_countries, 'Countries'), 'email':fields.char('E-mail', size=64), 'phone':fields.char('Phone', size=64), - 'currency':fields.selection(_get_all_currencies, 'Currency', required=True), + 'currency':fields.many2one('res.currency', 'Currency', required=True), 'rml_header1':fields.char('Report Header', size=200, help='''This sentence will appear at the top right corner of your reports. We suggest you to put a slogan here: @@ -112,7 +110,6 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), if not getattr(payload, 'company_id', None): raise ValueError('Case where no default main company is setup ' 'not handled yet') - company = payload.company_id company.write({ 'name':payload.name, @@ -120,6 +117,7 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), 'rml_footer1':payload.rml_footer1, 'rml_footer2':payload.rml_footer2, 'logo':payload.logo, + 'currency_id':payload.currency.id, }) company.partner_id.write({