diff --git a/addons/account/account.py b/addons/account/account.py
index 549f257b124..ad44b3e9ac5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1708,6 +1708,7 @@ account_subscription_line()
class account_config_wizard(osv.osv_memory):
_name = 'account.config.wizard'
+ _inherit = 'res.config'
def _get_charts(self, cr, uid, context):
module_obj=self.pool.get('ir.module.module')
@@ -1732,15 +1733,6 @@ class account_config_wizard(osv.osv_memory):
'date2': lambda *a: time.strftime('%Y-12-31'),
'period':lambda *a:'month',
}
- def action_cancel(self,cr,uid,ids,conect=None):
- return {
- 'view_type': 'form',
- "view_mode": 'form',
- 'res_model': 'ir.actions.configuration.wizard',
- 'type': 'ir.actions.act_window',
- 'target':'new',
- }
-
def install_account_chart(self, cr, uid, ids, context=None):
for res in self.read(cr,uid,ids):
chart_id = res['charts']
@@ -1750,7 +1742,7 @@ class account_config_wizard(osv.osv_memory):
cr.commit()
db, pool = pooler.restart_pool(cr.dbname, update_module=True)
- def action_create(self, cr, uid,ids, context=None):
+ 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')
@@ -1769,16 +1761,6 @@ class account_config_wizard(osv.osv_memory):
elif res['period']=='3months':
res_obj.create_period3(cr,uid,[new_id])
self.install_account_chart(cr,uid,ids)
- return {
- 'view_type': 'form',
- "view_mode": 'form',
- 'res_model': 'ir.actions.configuration.wizard',
- 'type': 'ir.actions.act_window',
- 'target':'new',
- }
-
-
-
account_config_wizard()
@@ -2117,6 +2099,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
* generates all accounting properties and assigns them correctly
"""
_name='wizard.multi.charts.accounts'
+ _inherit = 'res.config'
_columns = {
'company_id':fields.many2one('res.company','Company',required=True),
@@ -2137,7 +2120,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'code_digits': lambda *a:6,
}
- def action_create(self, cr, uid, ids, context=None):
+ def execute(self, cr, uid, ids, context=None):
obj_multi = self.browse(cr,uid,ids[0])
obj_acc = self.pool.get('account.account')
obj_acc_tax = self.pool.get('account.tax')
@@ -2400,24 +2383,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'position_id' : new_fp,
}
obj_ac_fp.create(cr, uid, vals_acc)
-
- return {
- 'view_type': 'form',
- "view_mode": 'form',
- 'res_model': 'ir.actions.configuration.wizard',
- 'type': 'ir.actions.act_window',
- 'target':'new',
- }
- def action_cancel(self,cr,uid,ids,conect=None):
- return {
- 'view_type': 'form',
- "view_mode": 'form',
- 'res_model': 'ir.actions.configuration.wizard',
- 'type': 'ir.actions.act_window',
- 'target':'new',
- }
-
-
wizard_multi_charts_accounts()
class account_bank_accounts_wizard(osv.osv_memory):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ce03dd1b044..044ad910c91 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1447,8 +1447,13 @@
Account Configure wizard
account.config.wizard
form
+
-
+
+
@@ -1471,6 +1471,7 @@
Account Configure Wizard
ir.actions.act_window
account.config.wizard
+
form
form
new
@@ -1478,8 +1479,6 @@
- Account Configure Wizard
- Define Fiscal Years and Select Charts of Account
@@ -1728,31 +1727,37 @@
Generate Chart of Accounts from a Chart Template
wizard.multi.charts.accounts
form
+
-
+
+
+ Generate Chart of Accounts from a Chart Template
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1760,6 +1765,7 @@
Generate Chart of Accounts from a Chart Template
ir.actions.act_window
wizard.multi.charts.accounts
+
form
form
new
diff --git a/addons/account/company.py b/addons/account/company.py
index 7858339727e..04a2611fe7d 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -42,6 +42,7 @@ class company_setup(osv.osv_memory):
* Insert a suitable message for Overdue Payment Report.
"""
_name='wizard.company.setup'
+ _inherit = 'res.config'
_columns = {
'company_id':fields.many2one('res.company','Company',required=True),
@@ -72,27 +73,9 @@ class company_setup(osv.osv_memory):
return {'value': res }
- def action_create(self, cr, uid, ids, context=None):
+ def execute(self, cr, uid, ids, context=None):
content_wiz = self.pool.get('wizard.company.setup').read(cr,uid,ids,['company_id','overdue_msg'])
if content_wiz:
wiz_data = content_wiz[0]
self.pool.get('res.company').write(cr, uid, [wiz_data['company_id']], {'overdue_msg':wiz_data['overdue_msg']})
-
- return {
- 'view_type': 'form',
- "view_mode": 'form',
- 'res_model': 'ir.actions.configuration.wizard',
- 'type': 'ir.actions.act_window',
- 'target':'new',
- }
-
- def action_cancel(self,cr,uid,ids,conect=None):
- return {
- 'view_type': 'form',
- "view_mode": 'form',
- 'res_model': 'ir.actions.configuration.wizard',
- 'type': 'ir.actions.act_window',
- 'target':'new',
- }
-
company_setup()
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 1d4571e0d4f..ec4cec0c54a 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -22,17 +22,21 @@
wizard.company.setup.form
wizard.company.setup
form
+
-
-
+
+
+ Overdue Payment Report Message
+
+
+
-
-
-
-
-
+
+
@@ -40,6 +44,7 @@
Overdue Payment Report Message
ir.actions.act_window
wizard.company.setup
+
form
form
new
@@ -48,8 +53,6 @@
- Overdue Payment Report Message
- Specify The Message for the Overdue Payment Report.