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

[FIX] Account_analytic_default : Analytic Account value set from picking,sale

Browse Source 
lp bug: https://launchpad.net/bugs/493444 fixed

bzr revid: jvo@tinyerp.com-20091209093302-q6i4ymvpurkmk8wv
This commit is contained in:
GPA,JVO
2009-12-09 15:03:02 +05:30
committed by Jay (Open ERP)
parent 48a4938d24
commit ee88e0641f
2 changed files with 30 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_default/__terp__.py
+1 -1
View File
@@ -35,7 +35,7 @@ Allows to automatically select analytic accounts based on criterions:
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['account', 'stock'],
'depends': ['account', 'sale'],
'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'account_analytic_default_view.xml'],
'demo_xml': [],
addons/account_analytic_default/account_analytic_default.py
+29 -42
View File
@@ -20,33 +20,6 @@
#
##############################################################################
##############################################################################
#
# Copyright (c) 2007 TINY SPRL. (http://tiny.be) All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
from osv import fields,osv
from osv import orm
import time
@@ -112,23 +85,37 @@ account_invoice_line()
class stock_picking(osv.osv):
_inherit = "stock.picking"
_description = "Packing List"
def action_invoice_create(self, cr, uid, ids, journal_id=False,
group=False, type='out_invoice', context=None):
invoice_obj = self.pool.get('account.invoice')
invoice_line_obj = self.pool.get('account.invoice.line')
res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context)
if type == 'out_invoice':
for inv in invoice_obj.browse(cr, uid, res.values(), context=context):
for ol in inv.invoice_line:
rec = self.pool.get('account.analytic.default').account_get(cr, uid, ol.product_id.id, inv.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
if ol.product_id:
if rec:
invoice_line_obj.write(cr, uid, ol.id, {'account_analytic_id': rec.analytic_id.id})
return res
def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
partner_id = picking.address_id and picking.address_id.partner_id or False
rec = self.pool.get('account.analytic.default').account_get(cursor, user, move_line.product_id.id, partner_id and partner_id.id, user, time.strftime('%Y-%m-%d'), context={})
if rec:
return rec.analytic_id.id
return super(stock_picking, self)._get_account_analytic_invoice(cursor,
user, picking, move_line)
stock_picking()
class sale_order_line(osv.osv):
_inherit = 'sale.order.line'
# Method overridden to set the analytic account by default on criterion match
def invoice_line_create(self, cr, uid, ids, context={}):
create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
sale_line_obj = self.browse(cr, uid, ids[0], context)
pool_inv_line = self.pool.get('account.invoice.line')
for line in pool_inv_line.browse(cr, uid, create_ids, context):
rec = self.pool.get('account.analytic.default').account_get(cr, uid, line.product_id.id, sale_line_obj.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
if rec:
pool_inv_line.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)
return create_ids
sale_order_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: