Ashvin Rathod (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-984855-ara into
lp:openobject-addons.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
Bug #984855 in OpenERP Addons: "Separated journal sequences is not working"
https://bugs.launchpad.net/openobject-addons/+bug/984855
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-984855-ara/+merge/105937
Hello,
Fix: lp:984855 Separated journal sequences is not working
Thank you,
ara
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-984855-ara/+merge/105937
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-bug-984855-ara into
lp:openobject-addons.
=== modified file 'account/account.py'
--- account/account.py 2012-05-02 06:51:45 +0000
+++ account/account.py 2012-05-16 07:30:25 +0000
@@ -3060,7 +3060,7 @@
obj_journal.create(cr, uid, vals_journal, context=context)
return True
- def generate_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None):
+ def generate_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, seq_journal=False, context=None):
"""
This method is used for creating journals.
@@ -3069,12 +3069,12 @@
:param company_id: company_id selected from wizard.multi.charts.accounts.
:returns: True
"""
- journal_data = self._prepare_all_journals(cr, uid, chart_template_id, acc_template_ref, company_id, context=context)
+ journal_data = self._prepare_all_journals(cr, uid, chart_template_id, acc_template_ref, company_id, seq_journal, context=context)
for vals_journal in journal_data:
self.check_created_journals(cr, uid, vals_journal, company_id, context=context)
return True
- def _prepare_all_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None):
+ def _prepare_all_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, seq_journal=False, context=None):
def _get_analytic_journal(journal_type):
# Get the analytic journal
data = False
@@ -3130,6 +3130,7 @@
obj_data = self.pool.get('ir.model.data')
analytic_journal_obj = self.pool.get('account.analytic.journal')
template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
+ obj_sequence = self.pool.get('ir.sequence')
journal_data = []
for journal_type in ['sale', 'purchase', 'sale_refund', 'purchase_refund', 'general', 'situation']:
@@ -3144,6 +3145,9 @@
'default_credit_account_id': _get_default_account(journal_type, 'credit'),
'default_debit_account_id': _get_default_account(journal_type, 'debit'),
}
+ if not seq_journal:
+ seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
+ vals.update({'sequence_id':seq_id})
journal_data.append(vals)
return journal_data
@@ -3264,7 +3268,8 @@
})
# Create Journals
- self.generate_journals(cr, uid, template_id, account_ref, company_id, context=context)
+ seq_journal = obj_wizard.seq_journal
+ self.generate_journals(cr, uid, template_id, account_ref, company_id, seq_journal, context=context)
# generate properties function
self.generate_properties(cr, uid, template_id, account_ref, company_id, context=context)
=== modified file 'account/data/account_data.xml'
--- account/data/account_data.xml 2011-10-16 01:28:00 +0000
+++ account/data/account_data.xml 2012-05-16 07:30:25 +0000
@@ -468,6 +468,15 @@
<!--
Account Journal Sequences
-->
+ <record id="sequence_journal_type" model="ir.sequence.type">
+ <field name="name">Account Journal</field>
+ <field name="code">account.journal</field>
+ </record>
+ <record id="sequence_journal" model="ir.sequence">
+ <field name="name">Account Journal</field>
+ <field name="code">account.journal</field>
+ <field name="prefix"/>
+ </record>
<record id="sequence_sale_journal" model="ir.sequence">
<field name="name">Account Default Sales Journal</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
