From f8d2111b2a0b5dde776a44c0f8c6c1402455ec5c Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 12 May 2010 19:37:19 +0530
Subject: [PATCH] [IMP]:account & installer wizards
bzr revid: nch@tinyerp.com-20100512140719-tl5gdbqa4egvbpwm
---
addons/account/configurable_account_chart.xml | 2 +-
addons/account/installer.py | 6 ++++
addons/base_setup/base_setup_data.xml | 36 ++++++++++---------
addons/base_setup/base_setup_installer.xml | 2 +-
addons/base_setup/base_setup_todo.xml | 2 +-
addons/base_setup/gtk_contact_form.py | 6 ++--
addons/base_setup/gtk_contact_form.xml | 6 ++--
addons/base_setup/installer.py | 6 ++--
addons/hr/hr_installer.xml | 2 +-
9 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index a6b271bedcb..73cb4499e20 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -154,7 +154,7 @@
1104
Bank Current Account
- other
+ view
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 81993908be9..1cbed3cd2a7 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -32,6 +32,11 @@ class account_installer(osv.osv_memory):
_name = 'account.installer'
_inherit = 'res.config.installer'
+ def _get_default_accounts(self, cr, uid, context=None):
+ accounts = [{'acc_name':'Current','account_type':'cash'},
+ {'acc_name':'Deposit','account_type':'cash'}]
+ return accounts
+
def _get_charts(self, cr, uid, context=None):
modules = self.pool.get('ir.module.module')
ids = modules.search(cr, uid, [('category_id','=','Account Charts')])
@@ -77,6 +82,7 @@ class account_installer(osv.osv_memory):
'sale_tax':lambda *a:0.0,
'purchase_tax':lambda *a:0.0,
'charts':'configurable',
+ 'bank_accounts_id':_get_default_accounts
}
def on_change_start_date(self, cr, uid, id, start_date):
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 90d48de5eba..024accc77ce 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -7,23 +7,25 @@
form
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 2b4a870236a..7a543f5466f 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -8,7 +8,7 @@
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index eb108aef229..b348b0c8a60 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,7 +11,7 @@
Main Company Setup
- Information of your company will be used to custiomize your documents like Invoices, Sale Orders,...
+ Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...
Configure Your Company
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index b1d01cecb66..354080df451 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -46,10 +46,10 @@ class base_gtkcontactform(osv.osv_memory):
return defaults
_columns = {
- 'name':fields.char('Your Name', size=64, required=True),
+ 'name':fields.char('Your Name', size=64),
'job':fields.char('Job Title', size=64,),
- 'email':fields.char('E-mail', size=64, required=True),
- 'phone':fields.char('Phone', size=64, required=True),
+ 'email':fields.char('E-mail', size=64),
+ 'phone':fields.char('Phone', size=64),
'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32),
'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'),
('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'),
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index c4fe08207dd..f833f7051d6 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -31,10 +31,10 @@
-
+
-
-
+
+
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 13b37c67e1f..a92d5ab4b97 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -93,9 +93,9 @@ class base_setup_installer(osv.osv_memory):
def onchange_moduleselection(self, cr, uid, ids, *args):
- progress = self._progress(cr, uid) - (2.5 * len(filter(lambda x: x==1, args)))
- if progress <= 5.0:
- progress = 5.0
+ progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args))
+ if progress <= 10.0:
+ progress = 10.0
return {'value':{'progress':progress}}
def modules_to_install(self, cr, uid, ids, context=None):
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index b01f538b193..3ce73f07b12 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -19,7 +19,7 @@
- The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.
+ The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.