pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-journal-items-kbh

Browse Source 
bzr revid: sgo@tinyerp.com-20120919052450-qyzu6gi2bz8fg130
This commit is contained in:
Sanjay Gohel (Open ERP)
2012-09-19 10:54:50 +05:30
parent 5902f20ef6 7ed74bec49
commit 3f79f07ca3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_move_line.py
+3 -1
View File
@@ -215,8 +215,10 @@ class account_move_line(osv.osv):
def _default_get(self, cr, uid, fields, context=None):
if context is None:
context = {}
if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
if not context.get('journal_id', False):
context['journal_id'] = context.get('search_default_journal_id')
if not context.get('period_id', False):
context['period_id'] = context.get('search_default_period_id')
account_obj = self.pool.get('account.account')
period_obj = self.pool.get('account.period')
journal_obj = self.pool.get('account.journal')
addons/account/wizard/account_move_journal.py
+1 -1
View File
@@ -92,7 +92,7 @@ class account_move_journal(osv.osv_memory):
journal = False
if journal_id:
journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).name
journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).get('name',False)
journal_string = _("Journal: %s") % tools.ustr(journal)
else:
journal_string = _("Journal: All")