Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-suppliers-kbh
into lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-suppliers-kbh/+merge/124904
Hello,
Acccount:
I have fixed the issue of creating journal items from suppliers and
customers.
Thanks,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-suppliers-kbh/+merge/124904
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa.
=== modified file 'account/account.py'
--- account/account.py 2012-09-17 10:03:06 +0000
+++ account/account.py 2012-09-18 12:33:21 +0000
@@ -842,6 +842,11 @@
if isinstance(ids, (int, long)):
ids = [ids]
result = self.browse(cr, user, ids, context=context)
+ ress = self.read(cr, user, ids, ['journal_id'], context=context)
+ print "ressssss........................s",ress
+ print "iDDDDDDDDDDDD",ids
+ print "concontext::::::::::::::::::::::",context
+ print "result::::::::",result
res = []
for rs in result:
if rs.currency:
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2012-09-17 10:03:06 +0000
+++ account/account_move_line.py 2012-09-18 12:33:21 +0000
@@ -215,8 +215,10 @@
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')
@@ -261,6 +263,7 @@
move_id = False
partner_id = False
if context.get('journal_id', False) and context.get('period_id', False):
+ print "cCCCCCCCCCC::::::::::::",context
if 'move_id' in fields:
cr.execute('SELECT move_id \
FROM \
@@ -526,6 +529,10 @@
context or {}
period_obj = self.pool.get('account.period')
dt = time.strftime('%Y-%m-%d')
+ if context.get('search_default_journal_id', False) or context.get('search_default_period_id', False):
+ context['journal_id'] = context['search_default_journal_id']
+ context['period_id'] = context['search_default_period_id']
+ print "?????????????????????????????",context['journal_id'],context['period_id']
if ('journal_id' in context) and ('period_id' in context):
cr.execute('SELECT date FROM account_move_line ' \
'WHERE journal_id = %s AND period_id = %s ' \
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-09-18 06:26:06 +0000
+++ account/account_view.xml 2012-09-18 12:33:21 +0000
@@ -1078,7 +1078,7 @@
<group>
<field name="name"/>
<field name="ref"/>
- <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+ <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
</group>
<group>
<field name="journal_id"/>
@@ -1152,7 +1152,7 @@
<field name="journal_id" readonly="False"/>
<field name="period_id" readonly="False"/>
<field name="account_id" domain="[('type','<>','view'),('type','<>','consolidation'),('company_id', '=', company_id)]"/>
- <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+ <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
<newline/>
<field name="debit"/>
<field name="credit"/>
=== modified file 'account/wizard/account_move_journal.py'
--- account/wizard/account_move_journal.py 2012-09-17 09:41:12 +0000
+++ account/wizard/account_move_journal.py 2012-09-18 12:33:21 +0000
@@ -92,7 +92,7 @@
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")
_______________________________________________
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
