From 4db07670163eee3c596815f4a948e0507033370f Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 8 Feb 2011 10:27:50 +0530 Subject: [PATCH 1/5] [FIX] HR : Correction on List view definition for model hr.employee (Ref : SaaS Maintenance Case 3990) bzr revid: mra@mra-laptop-20110208045750-9okcwgulbh1ijaw3 --- addons/hr/hr_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index c2b738351aa..cf7fe75e986 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -82,7 +82,6 @@ hr.employee.tree hr.employee tree - child_ids From b18aa2ecefc1ae2fa97a19d08309ca74c91770a6 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 8 Feb 2011 10:49:51 +0530 Subject: [PATCH 2/5] [FIX] hr: try to create an employee as employee -> bug lp bug: https://launchpad.net/bugs/713177 fixed bzr revid: mra@mra-laptop-20110208051951-usjzx6dih5ap9o45 --- addons/hr/hr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index e2b9a7089f3..90605e1a745 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -191,7 +191,7 @@ class hr_employee(osv.osv): _defaults = { 'active': 1, 'photo': _get_photo, - 'address_id': lambda self,cr,uid,c: self.pool.get('res.partner.address').browse(cr, uid, uid, c).partner_id.id + 'address_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).address_id.id } def _check_recursion(self, cr, uid, ids, context=None): From 2762d10d8e8ee80e40fe653659248ad19156dfe2 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 8 Feb 2011 12:28:24 +0530 Subject: [PATCH 3/5] [REF] account_anglo_saxon/stock.py => remove unused import of fields bzr revid: mra@mra-laptop-20110208065824-6vl7noekz1grku36 --- addons/account_anglo_saxon/stock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py index a544b9a6e2a..9ddfab86a94 100644 --- a/addons/account_anglo_saxon/stock.py +++ b/addons/account_anglo_saxon/stock.py @@ -15,11 +15,11 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## -from osv import fields,osv +from osv import osv #---------------------------------------------------------- # Stock Picking From ff225574c77ab682a98a26f2a484218bac692d7a Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 8 Feb 2011 12:47:02 +0530 Subject: [PATCH 4/5] [REF] Account: typo bzr revid: mra@mra-laptop-20110208071702-1a2e37v6bsmwgiya --- addons/account/account.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index adddf4bd3f2..78c8bb31031 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2690,6 +2690,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): analytic_journal_obj = self.pool.get('account.analytic.journal') obj_tax_code = self.pool.get('account.tax.code') obj_tax_code_template = self.pool.get('account.tax.code.template') + ir_values = self.pool.get('ir.values') # Creating Account obj_acc_root = obj_multi.chart_template_id.account_root_id tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id @@ -2789,7 +2790,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): new_account = obj_acc.create(cr, uid, vals, context=ctx) acc_template_ref[account_template.id] = new_account #reactivate the parent_store functionnality on account_account - self.pool.get('account.account')._parent_store_compute(cr) + obj_acc._parent_store_compute(cr) for key,value in todo_dict.items(): if value['account_collected_id'] or value['account_paid_id']: @@ -3026,7 +3027,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'name': record[0], 'company_id': company_id, 'fields_id': field[0], - 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False, + 'value': account and 'account.account,' + str(acc_template_ref[account.id]) or False, } if r: @@ -3039,7 +3040,6 @@ class wizard_multi_charts_accounts(osv.osv_memory): fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)]) if fp_ids: - obj_tax_fp = self.pool.get('account.fiscal.position.tax') obj_ac_fp = self.pool.get('account.fiscal.position.account') @@ -3067,7 +3067,6 @@ class wizard_multi_charts_accounts(osv.osv_memory): } obj_ac_fp.create(cr, uid, vals_acc) - ir_values = self.pool.get('ir.values') if obj_multi.sale_tax: ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id, models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]]) From c162de5ab1c203a1def6b00a61681ee2aeed97e7 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 8 Feb 2011 12:55:57 +0530 Subject: [PATCH 5/5] [REF] Account: typo bzr revid: mra@mra-laptop-20110208072557-uzi20kapg0c6w4nf --- addons/account/account.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 78c8bb31031..968af43396e 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2238,6 +2238,7 @@ class account_subscription(osv.osv): ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(years=sub.period_nbr)).strftime('%Y-%m-%d') self.write(cr, uid, ids, {'state':'running'}) return True + account_subscription() class account_subscription_line(osv.osv): @@ -2266,6 +2267,7 @@ class account_subscription_line(osv.osv): return all_moves _rec_name = 'date' + account_subscription_line() # --------------------------------------------------------------- @@ -2534,7 +2536,6 @@ class account_tax_template(osv.osv): } _order = 'sequence' - account_tax_template() # Fiscal Position Templates @@ -2643,10 +2644,9 @@ class wizard_multi_charts_accounts(osv.osv_memory): return False def _get_default_accounts(self, cr, uid, context=None): - accounts = [{'acc_name':'Current','account_type':'bank'}, + return [{'acc_name':'Current','account_type':'bank'}, {'acc_name':'Deposit','account_type':'bank'}, {'acc_name':'Cash','account_type':'cash'}] - return accounts _defaults = { 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id, @@ -3086,7 +3086,7 @@ class account_bank_accounts_wizard(osv.osv_memory): 'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32), } _defaults = { - 'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, + 'currency_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, } account_bank_accounts_wizard()