odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: account: l10n fullness and inheritancy : Improved code of journals_already_created in vals_journal argument 

bzr revid: ron@tinyerp.com-20110905095814-n9o6a9w7h4dqdobf
This commit is contained in:
ron@tinyerp.com 2011-09-05 15:28:14 +05:30
parent 93c2c6cc88
commit 88bc353ca7
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/account/account.py
View File

@ -2864,12 +2864,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
res['fields'][field]['selection'] = template_select res['fields'][field]['selection'] = template_select
return res return res
def journals_already_created(self, cr, uid, name, vals_journal, company_id, context=None): def journals_already_created(self, cr, uid, vals_journal, company_id, context=None):
""" """
This method used for checking journals already created or not. If not then create new journal. This method used for checking journals already created or not. If not then create new journal.
""" """
obj_journal = self.pool.get('account.journal') obj_journal = self.pool.get('account.journal')
rec_list = obj_journal.search(cr, uid, [('name','=', name),('company_id', '=', company_id)], context=context) rec_list = obj_journal.search(cr, uid, [('name','=', vals_journal['name']),('company_id', '=', company_id)], context=context)
if not rec_list: if not rec_list:
obj_journal.create(cr, uid, vals_journal, context=context) obj_journal.create(cr, uid, vals_journal, context=context)
return True return True
@ -2916,7 +2916,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'default_credit_account_id': income_acc_id, 'default_credit_account_id': income_acc_id,
'default_debit_account_id': income_acc_id 'default_debit_account_id': income_acc_id
}) })
self.journals_already_created(cr, uid, vals_journal['name'], vals_journal, company_id, context=context) self.journals_already_created(cr, uid, vals_journal, company_id, context=context)
# Purchase Journal # Purchase Journal
analytical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')], context=context) analytical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')], context=context)
@ -2936,7 +2936,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'default_credit_account_id': expense_acc_id, 'default_credit_account_id': expense_acc_id,
'default_debit_account_id': expense_acc_id 'default_debit_account_id': expense_acc_id
}) })
self.journals_already_created(cr, uid, vals_journal['name'], vals_journal, company_id, context=context) self.journals_already_created(cr, uid, vals_journal, company_id, context=context)
# Creating Journals Sales Refund and Purchase Refund # Creating Journals Sales Refund and Purchase Refund
data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view') data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view')
@ -2956,7 +2956,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'default_credit_account_id': income_acc_id, 'default_credit_account_id': income_acc_id,
'default_debit_account_id': income_acc_id 'default_debit_account_id': income_acc_id
}) })
self.journals_already_created(cr, uid, vals_journal['name'], vals_journal, company_id, context=context) self.journals_already_created(cr, uid, vals_journal, company_id, context=context)
# Purchase Refund Journal # Purchase Refund Journal
vals_journal = { vals_journal = {
@ -2972,7 +2972,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'default_credit_account_id': expense_acc_id, 'default_credit_account_id': expense_acc_id,
'default_debit_account_id': expense_acc_id 'default_debit_account_id': expense_acc_id
}) })
self.journals_already_created(cr, uid, vals_journal['name'], vals_journal, company_id, context=context) self.journals_already_created(cr, uid, vals_journal, company_id, context=context)
# Miscellaneous Journal # Miscellaneous Journal
data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_view') data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_view')
@ -2988,7 +2988,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'analytic_journal_id': analytical_miscellaneous_ids and analytical_miscellaneous_ids[0] or False, 'analytic_journal_id': analytical_miscellaneous_ids and analytical_miscellaneous_ids[0] or False,
'company_id': company_id 'company_id': company_id
} }
self.journals_already_created(cr, uid, vals_journal['name'], vals_journal, company_id, context=context) self.journals_already_created(cr, uid, vals_journal, company_id, context=context)
# Opening Entries Journal # Opening Entries Journal
if template.property_account_income_opening and template.property_account_expense_opening: if template.property_account_income_opening and template.property_account_expense_opening:
@ -3002,7 +3002,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'default_credit_account_id': credit_acc_id, 'default_credit_account_id': credit_acc_id,
'default_debit_account_id': debit_acc_id 'default_debit_account_id': debit_acc_id
} }
self.journals_already_created(cr, uid, vals_journal['name'], vals_journal, company_id, context=context) self.journals_already_created(cr, uid, vals_journal, company_id, context=context)
data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view_multi') data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view_multi')
view_id_cur = data and data[1] or False view_id_cur = data and data[1] or False

3
addons/l10n_multilang/__openerp__.py
View File

@ -36,9 +36,10 @@
"depends" : ['account_accountant'], "depends" : ['account_accountant'],
'update_xml': [ 'update_xml': [
'l10n_multilang.xml', 'l10n_multilang.xml',
'l10n_multilang_demo.xml'
], ],
'demo_xml': [ 'demo_xml': [
'l10n_multilang_demo.xml'
], ],
'installable': True, 'installable': True,
'active': False, 'active': False,