@@ -437,7 +437,7 @@
-
+
|
Total (excl. taxes):
@@ -446,14 +446,14 @@
[[ formatLang(o.amount_untaxed) ]]
|
- [[ o.currency_id.code ]]
+ [[ o.currency_id.symbol ]]
|
-
+
|
Taxes:
@@ -462,14 +462,14 @@
[[ formatLang(o.amount_tax) ]]
|
- [[ o.currency_id.code ]]
+ [[ o.currency_id.symbol ]]
|
-
+
|
Total (inclu. taxes):
@@ -478,7 +478,7 @@
[[ formatLang(o.amount_total) ]]
|
- [[ o.currency_id.code ]]
+ [[ o.currency_id.symbol ]]
|
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 24efc179c03..5401c052dce 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -20,7 +20,6 @@
##############################################################################
from datetime import datetime, timedelta
-from mx import DateTime
import math
from faces import *
from new import classobj
@@ -113,7 +112,7 @@ class resource_calendar(osv.osv):
results = {}
for d, hours, id in date_and_hours_by_cal:
- dt_from = DateTime.strptime(d, '%Y-%m-%d %H:%M:%S')
+ dt_from = datetime.strptime(d, '%Y-%m-%d %H:%M:%S')
if not id:
td = int(hours)*3
results[(d, hours, id)] = [(dt_from, dt_from + timedelta(hours=td))]
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 801e363681f..b8f3d14df56 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,6 +11,8 @@
+
+
@@ -168,13 +170,19 @@
form
diff --git a/addons/sale/company.py b/addons/sale/company.py
index 52d513f6dc9..2b310925107 100644
--- a/addons/sale/company.py
+++ b/addons/sale/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from osv import osv, fields
class company(osv.osv):
_inherit = 'res.company'
diff --git a/addons/sale/product.py b/addons/sale/product.py
index 95d45c29575..cf86f49f583 100644
--- a/addons/sale/product.py
+++ b/addons/sale/product.py
@@ -30,10 +30,10 @@ class product_product(osv.osv):
if context is None:
context = {}
if name == 'pricelist_purchase':
- pricelist_ids = pricelist_obj.search(cr,uid,[('type','=','purchase')])
+ pricelist_ids = pricelist_obj.search(cr, uid, [('type', '=', 'purchase')])
else:
- pricelist_ids = pricelist_obj.search(cr,uid,[('type','=','sale')])
- pricelist_browse = pricelist_obj.browse(cr,uid,pricelist_ids)
+ pricelist_ids = pricelist_obj.search(cr, uid, [('type', '=', 'sale')])
+ pricelist_browse = pricelist_obj.browse(cr, uid, pricelist_ids)
for product in self.browse(cr, uid, ids, context):
result[product.id] = ""
for pricelist in pricelist_browse:
diff --git a/addons/sale/report/sale_order.py b/addons/sale/report/sale_order.py
index 88a2d32c490..430e1a03f76 100644
--- a/addons/sale/report/sale_order.py
+++ b/addons/sale/report/sale_order.py
@@ -30,7 +30,7 @@ class order(report_sxw.rml_parse):
'time': time,
})
-report_sxw.report_sxw('report.sale.order','sale.order','addons/sale/report/sale_order.rml',parser=order, header="external")
+report_sxw.report_sxw('report.sale.order', 'sale.order', 'addons/sale/report/sale_order.rml', parser=order, header="external")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 3590a87c4f5..25046063391 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -20,7 +20,7 @@
##############################################################################
import tools
-from osv import fields,osv
+from osv import fields, osv
class sale_report(osv.osv):
_name = "sale.report"
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 409be07a765..0d7b2a6a606 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -54,7 +54,7 @@ def _incoterm_get(self, cr, uid, context=None):
class sale_order(osv.osv):
_name = "sale.order"
_description = "Sale Order"
-
+
def copy(self, cr, uid, id, default=None, context=None):
if context is None:
context = {}
@@ -109,7 +109,7 @@ class sale_order(osv.osv):
for id in ids:
res[id] = [0.0, 0.0]
cr.execute('''SELECT
- p.sale_id,sum(m.product_qty), mp.state as mp_state
+ p.sale_id, sum(m.product_qty), mp.state as mp_state
FROM
stock_move m
LEFT JOIN
@@ -117,7 +117,7 @@ class sale_order(osv.osv):
LEFT JOIN
procurement_order mp on (mp.move_id=m.id)
WHERE
- p.sale_id IN %s GROUP BY mp.state, p.sale_id''',(tuple(ids),))
+ p.sale_id IN %s GROUP BY mp.state, p.sale_id''', (tuple(ids),))
for oid, nbr, mp_state in cr.fetchall():
if mp_state == 'cancel':
continue
@@ -321,7 +321,7 @@ class sale_order(osv.osv):
def action_cancel_draft(self, cr, uid, ids, *args):
if not len(ids):
return False
- cr.execute('select id from sale_order_line where order_id IN %s and state=%s',(tuple(ids),'cancel'))
+ cr.execute('select id from sale_order_line where order_id IN %s and state=%s', (tuple(ids), 'cancel'))
line_ids = map(lambda x: x[0], cr.fetchall())
self.write(cr, uid, ids, {'state': 'draft', 'invoice_ids': [], 'shipped': 0})
self.pool.get('sale.order.line').write(cr, uid, line_ids, {'invoiced': False, 'state': 'draft', 'invoice_lines': [(6, 0, [])]})
@@ -409,11 +409,11 @@ class sale_order(osv.osv):
def _make_invoice(self, cr, uid, order, lines, context=None):
journal_obj = self.pool.get('account.journal')
inv_obj = self.pool.get('account.invoice')
-
+ obj_invoice_line = self.pool.get('account.invoice.line')
if context is None:
context = {}
- journal_ids = journal_obj.search(cr, uid, [('type', '=','sale'),('company_id', '=', order.company_id.id)], limit=1)
+ journal_ids = journal_obj.search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)], limit=1)
if not journal_ids:
raise osv.except_osv(_('Error !'),
_('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
@@ -431,7 +431,7 @@ class sale_order(osv.osv):
for preinv in order.invoice_ids:
if preinv.state not in ('cancel',) and preinv.id not in from_line_invoice_ids:
for preline in preinv.invoice_line:
- inv_line_id = self.pool.get('account.invoice.line').copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
+ inv_line_id = obj_invoice_line.copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
lines.append(inv_line_id)
inv = {
'name': order.client_order_ref or order.name,
@@ -448,8 +448,8 @@ class sale_order(osv.osv):
'comment': order.note,
'payment_term': pay_term,
'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
- 'date_invoice' : context.get('date_invoice',False),
- 'company_id' : order.company_id.id,
+ 'date_invoice': context.get('date_invoice',False),
+ 'company_id': order.company_id.id,
'user_id':order.user_id and order.user_id.id or False
}
inv.update(self._inv_get(cr, uid, order))
@@ -474,11 +474,11 @@ class sale_order(osv.osv):
for record in self.pool.get('sale.order').browse(cr, uid, id).invoice_ids:
inv_ids1.add(record.id)
inv_ids = list(inv_ids1.difference(inv_ids))
-
+
result = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
res = mod_obj.read(cr, uid, result, ['res_id'])
result = {
- 'name': 'Invoices',
+ 'name': 'Customer Invoices',
'view_type': 'form',
'view_mode': 'form',
'view_id': [res['res_id']],
@@ -498,6 +498,7 @@ class sale_order(osv.osv):
invoice_ids = []
picking_obj = self.pool.get('stock.picking')
invoice = self.pool.get('account.invoice')
+ obj_sale_order_line = self.pool.get('sale.order.line')
if context is None:
context = {}
# If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
@@ -511,7 +512,7 @@ class sale_order(osv.osv):
continue
elif (line.state in states):
lines.append(line.id)
- created_lines = self.pool.get('sale.order.line').invoice_line_create(cr, uid, lines)
+ created_lines = obj_sale_order_line.invoice_line_create(cr, uid, lines)
if created_lines:
invoices.setdefault(o.partner_id.id, []).append((o, created_lines))
if not invoices:
@@ -521,7 +522,7 @@ class sale_order(osv.osv):
return i.id
for val in invoices.values():
if grouped:
- res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x,y: x + y, [l for o,l in val], []), context=context)
+ res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x, y: x + y, [l for o, l in val], []), context=context)
invoice_ref = ''
for o, l in val:
invoice_ref += o.name + '|'
@@ -589,11 +590,12 @@ class sale_order(osv.osv):
# Update the sale order state.
#
if order.state == 'invoice_except':
- self.write(cr, uid, [order.id], {'state' : 'progress'}, context=context)
+ self.write(cr, uid, [order.id], {'state': 'progress'}, context=context)
return True
def action_cancel(self, cr, uid, ids, context=None):
+ wf_service = netsvc.LocalService("workflow")
if context is None:
context = {}
sale_order_line_obj = self.pool.get('sale.order.line')
@@ -605,7 +607,6 @@ class sale_order(osv.osv):
_('You must first cancel all picking attached to this sale order.'))
for r in self.read(cr, uid, ids, ['picking_ids']):
for pick in r['picking_ids']:
- wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
for inv in sale.invoice_ids:
if inv.state not in ('draft', 'cancel'):
@@ -614,7 +615,6 @@ class sale_order(osv.osv):
_('You must first cancel all invoices attached to this sale order.'))
for r in self.read(cr, uid, ids, ['invoice_ids']):
for inv in r['invoice_ids']:
- wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
sale_order_line_obj.write(cr, uid, [l.id for l in sale.order_line],
{'state': 'cancel'})
@@ -681,6 +681,7 @@ class sale_order(osv.osv):
return canceled
def action_ship_create(self, cr, uid, ids, *args):
+ wf_service = netsvc.LocalService("workflow")
picking_id = False
company = self.pool.get('res.users').browse(cr, uid, uid).company_id
for order in self.browse(cr, uid, ids, context={}):
@@ -756,11 +757,9 @@ class sale_order(osv.osv):
val = {}
for proc_id in proc_ids:
- wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
if picking_id:
- wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
if order.state == 'shipping_except':
@@ -892,7 +891,7 @@ class sale_order_line(osv.osv):
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
}
- _order = 'sequence, id'
+ _order = 'sequence, id desc'
_defaults = {
'discount': 0.0,
'delay': 0.0,
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index ab4b165201a..ae29b70837b 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -27,10 +27,10 @@ class stock_move(osv.osv):
'sale_line_id': fields.many2one('sale.order.line', 'Sale Order Line', ondelete='set null', select=True, readonly=True),
}
- def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,move, context=None):
- res=super(stock_move, self)._create_chained_picking(cr, uid, pick_name,picking,ptype,move, context=context)
+ def _create_chained_picking(self, cr, uid, pick_name, picking, ptype, move, context=None):
+ res = super(stock_move, self)._create_chained_picking(cr, uid, pick_name, picking, ptype, move, context=context)
if picking.sale_id:
- self.pool.get('stock.picking').write(cr,uid,[res],{'sale_id':picking.sale_id.id})
+ self.pool.get('stock.picking').write(cr, uid, [res], {'sale_id': picking.sale_id.id})
return res
stock_move()
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml
index 0a8f2aafa81..5df007d1465 100644
--- a/addons/sale/test/prepaid_order_policy.yml
+++ b/addons/sale/test/prepaid_order_policy.yml
@@ -41,7 +41,7 @@
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
- assert picking_id,"There is a picking attached to this sale order"
+ assert not picking_id,"As the order policy is prepaid, the sale order shouldn't have already a picking."
-
I open the Invoice for the SO.
-
diff --git a/addons/sale/unit_test/__init__.py b/addons/sale/unit_test/__init__.py
deleted file mode 100644
index f96719c920e..00000000000
--- a/addons/sale/unit_test/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (). All Rights Reserved
-# $Id$
-#
-# 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 3 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, see .
-#
-##############################################################################
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/unit_test/test.py b/addons/sale/unit_test/test.py
deleted file mode 100644
index f1a90b4e2d9..00000000000
--- a/addons/sale/unit_test/test.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (). All Rights Reserved
-# $Id$
-#
-# 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 3 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, see .
-#
-##############################################################################
-import unittest
-import pooler
-import netsvc
-from cStringIO import StringIO
-from osv import osv
-
-cr = None
-uid = None
-order_id = None
-
-class sale_order_test_case(unittest.TestCase):
- def setUp(self):
- try:
- self.pool = pooler.get_pool(cr.dbname)
- self.sale_order = self.pool.get('sale.order')
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
-
- def tearDown(self):
- try:
- self.pool = None
- self.sale_order = None
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
-
- def test_1_Create(self):
-
- try:
- global order_id
- model_obj = self.pool.get('ir.model.data')
-
- ### SALE ORDER
- shop = model_obj._get_id(cr, uid, 'sale', 'shop')
- shop_id = model_obj.browse(cr, uid, shop).res_id
- partner = model_obj._get_id(cr,uid, 'base', 'res_partner_9')
- partner_id = model_obj.browse(cr, uid, partner,).res_id
- partner_invoice = model_obj._get_id(cr, uid, 'base', 'res_partner_address_9')
- partner_invoice_id = model_obj.browse(cr, uid, partner_invoice).res_id
- pricelist_id = self.pool.get('res.partner').browse(cr, uid,partner_id).property_product_pricelist.id
- order_id = self.sale_order.create(cr,uid,
- {'shop_id':shop_id,'pricelist_id':pricelist_id,'user_id':uid,
- 'partner_id':partner_id,'partner_invoice_id':partner_invoice_id,
- 'partner_shipping_id':partner_invoice_id,'partner_order_id':partner_invoice_id})
- ### SALE ORDER LINE
- product = model_obj._get_id(cr,uid, 'product', 'product_product_pc2')
- product_id = model_obj.browse(cr, uid, product).res_id
- product_uom = model_obj._get_id(cr, uid, 'product', 'product_uom_unit')
- product_uom_id = model_obj.browse(cr, uid, product_uom).res_id
- self.pool.get('sale.order.line').create(cr,uid,
- {'order_id':order_id,'name':'[PC2] Computer assembled on demand',
- 'product_id':product_id,'product_uom':product_uom_id,'price_unit':600,
- 'type':'make_to_order'})
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
- def test_2_ConfirmOrder(self):
- try:
- self.failUnless(order_id,"No Sale Order Created !")
- wf_service = netsvc.LocalService("workflow")
- res = wf_service.trg_validate(uid, 'sale.order',order_id, 'order_confirm', cr)
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
- def test_3_CreateInvoice(self):
-
- try:
- self.failUnless(order_id,"No Sale Order Created !")
- wf_service = netsvc.LocalService("workflow")
- res = wf_service.trg_validate(uid, 'sale.order',order_id, 'manual_invoice', cr)
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
- def test_4_CancelPicking(self):
- try:
- self.failUnless(order_id,"No Sale Order Created !")
- picking_obj = self.pool.get('stock.picking')
- pickings = picking_obj.search(cr,uid,[('sale_id','=',order_id)])
- picking_obj.action_cancel(cr, uid, pickings)
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
- def test_5_PrintOrder(self):
- try:
- self.failUnless(order_id,"No Sale Order Created !")
- report_service = netsvc.ExportService.getService('report')
- model_obj = self.pool.get('ir.model.data')
- passwd = self.pool.get('res.users').browse(cr,uid,uid).password
- report = model_obj._get_id(cr, uid, 'sale', 'report_sale_order')
- report_id = model_obj.browse(cr, uid, report).res_id
- report_service.exp_report(cr.dbname, uid, 'sale.order', [order_id])
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
- def test_6_CancelOrder(self):
- try:
- self.failUnless(order_id,"No Sale Order Created !")
- self.sale_order.action_cancel(cr, uid, [order_id])
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
- def test_7_Unlink(self):
- try:
- self.failUnless(order_id,"No Sale Order Created !")
- self.sale_order.unlink(cr, uid, [order_id])
- except osv.except_osv,e:
- self.fail(e.name + e.value)
- except Exception,e:
- self.fail(e)
-
-
-def runTest(cursor=None, user=None):
- global cr
- global uid
- cr = cursor
- uid = user
- out = StringIO()
- suite = unittest.TestLoader().loadTestsFromTestCase(sale_order_test_case)
- res = unittest.TextTestRunner(stream=out,verbosity=2).run(suite)
- if res.wasSuccessful():
- return (True,out.getvalue())
- return (res,out.getvalue())
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index b7ea27a3049..4281e180970 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from osv import osv
from tools.translate import _
import netsvc
@@ -80,7 +80,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
sales_order_line_obj = self.pool.get('sale.order.line')
sales_order_obj = self.pool.get('sale.order')
wf_service = netsvc.LocalService('workflow')
- for line in sales_order_line_obj.browse(cr,uid,context['active_ids']):
+ for line in sales_order_line_obj.browse(cr, uid, context['active_ids']):
if (not line.invoiced) and (line.state not in ('draft','cancel')):
if not line.order_id.id in invoices:
invoices[line.order_id.id] = []
@@ -90,24 +90,26 @@ class sale_order_line_make_invoice(osv.osv_memory):
invoices[line.order_id.id].append((line, lid))
sales_order_line_obj.write(cr, uid, [line.id],
{'invoiced': True})
+ for result in invoices.values():
+ order = result[0][0].order_id
+ il = map(lambda x: x[1], result)
+ res = make_invoice(order, il)
+ cr.execute('INSERT INTO sale_order_invoice_rel \
+ (order_id,invoice_id) values (%s,%s)', (order.id, res))
+
flag = True
- data_sale = sales_order_obj.browse(cr,uid,line.order_id.id)
+ data_sale = sales_order_obj.browse(cr, uid, line.order_id.id)
for line in data_sale.order_line:
if not line.invoiced:
flag = False
break
if flag:
wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
- sales_order_obj.write(cr,uid,[line.order_id.id],{'state' : 'progress'})
+ sales_order_obj.write(cr, uid, [line.order_id.id], {'state' : 'progress'})
if not invoices:
- raise osv.except_osv(_('Warning'),_('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
- for result in invoices.values():
- order = result[0][0].order_id
- il = map(lambda x: x[1], result)
- res = make_invoice(order, il)
- cr.execute('INSERT INTO sale_order_invoice_rel \
- (order_id,invoice_id) values (%s,%s)', (order.id, res))
+ raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
+
return {}
sale_order_line_make_invoice()
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index e1d26c7b987..8d0b191620b 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -45,17 +45,17 @@ class sale_make_invoice(osv.osv_memory):
def make_invoices(self, cr, uid, ids, context={}):
order_obj = self.pool.get('sale.order')
newinv = []
- data = self.read(cr,uid,ids)[0]
- order_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data['grouped'],date_inv = data['invoice_date'])
+ data = self.read(cr, uid, ids)[0]
+ order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_inv = data['invoice_date'])
wf_service = netsvc.LocalService("workflow")
- for id in context.get(('active_ids'),[]):
+ for id in context.get(('active_ids'), []):
wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
- for o in order_obj.browse(cr, uid, context.get(('active_ids'),[]), context):
+ for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context):
for i in o.invoice_ids:
newinv.append(i.id)
- mod_obj =self.pool.get('ir.model.data')
+ mod_obj = self.pool.get('ir.model.data')
result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
id = mod_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0037c10405d..ea7cdd56704 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -20,7 +20,6 @@
from osv import fields, osv
from tools.translate import _
-import ir
class sale_advance_payment_inv(osv.osv_memory):
_name = "sale.advance.payment.inv"
@@ -55,8 +54,6 @@ class sale_advance_payment_inv(osv.osv_memory):
for sale_adv_obj in self.browse(cr, uid, ids):
for sale in obj_sale.browse(cr, uid, context['active_ids']):
- address_contact = False
- address_invoice = False
create_ids = []
ids_inv = []
if sale.order_policy == 'postpaid':
@@ -107,7 +104,7 @@ class sale_advance_payment_inv(osv.osv_memory):
# If invoice on picking: add the cost on the SO
# If not, the advance will be deduced when generating the final invoice
#
- if sale.order_policy=='picking':
+ if sale.order_policy == 'picking':
self.pool.get('sale.order.line').create(cr, uid, {
'order_id': sale.id,
'name': val['value']['name'],
@@ -138,30 +135,20 @@ sale_advance_payment_inv()
class sale_open_invoice(osv.osv_memory):
_name = "sale.open.invoice"
_description = "Sale Open Invoice"
- _columns = {
- }
-
def open_invoice(self, cr, uid, ids, context):
"""
To open invoice.
-
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
@param ids: the ID or list of IDs if we want more than one
@param context: A standard dictionary
-
@return:
"""
- record_id = context and context.get('active_id', False) or False
mod_obj = self.pool.get('ir.model.data')
- obj_inv = self.pool.get('account.invoice')
- invoices = []
- invoice = obj_inv.browse(cr, uid, record_id, context=context)
-
for advance_pay in self.browse(cr, uid, ids):
result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
id = mod_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 1112ebd73b6..c5317950f1a 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -37,16 +37,16 @@ class crm_make_sale(osv.osv_memory):
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@param context: A standard dictionary for contextual values
- @return : default value of partner_id field.
+ @return: default value of partner_id field.
"""
if not context:
context = {}
-
+
lead_obj = self.pool.get('crm.lead')
active_id = context and context.get('active_id', False) or False
if not active_id:
return False
-
+
lead = lead_obj.read(cr, uid, active_id, ['partner_id'])
return lead['partner_id']
@@ -63,7 +63,7 @@ class crm_make_sale(osv.osv_memory):
@param uid: the current user’s ID for security checks,
@param ids: List of crm make sale' ids
@param context: A standard dictionary for contextual values
- @return : Dictionary value of created sale order.
+ @return: Dictionary value of created sale order.
"""
if not context:
context = {}
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 09902b21099..00c3a77126d 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -72,6 +72,7 @@ class sale(osv.osv):
}
def action_ship_create(self, cr, uid, ids, *args):
result = super(sale, self).action_ship_create(cr, uid, ids, *args)
+ obj_stock_pick = self.pool.get('stock.picking')
for order in self.browse(cr, uid, ids, context={}):
pids = [ x.id for x in order.picking_ids]
self.pool.get('stock.picking').write(cr, uid, pids, {
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
index 3e61a6cd3e9..847c2cb4834 100755
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -46,10 +46,10 @@ class sale_order_1(report_sxw.rml_parse):
info = []
order_lines = []
res = {}
-
- ids = self.pool.get('sale.order.line').search(self.cr, self.uid, [('order_id', '=', sale_order.id)])
+ obj_order_line = self.pool.get('sale.order.line')
+ ids = obj_order_line.search(self.cr, self.uid, [('order_id', '=', sale_order.id)])
for id in range(0, len(ids)):
- order = self.pool.get('sale.order.line').browse(self.cr, self.uid, ids[id], self.context.copy())
+ order = obj_order_line.browse(self.cr, self.uid, ids[id], self.context.copy())
order_lines.append(order)
i = 1
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index daa8011246e..03b16962a71 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -83,7 +83,7 @@ class stock_picking(osv.osv):
invoice_ids = []
margin_deduce = 0.0
picking_obj = self.pool.get('stock.picking')
- picking_obj.write(cr, uid, ids, {'invoice_state' : '2binvoiced'})
+ picking_obj.write(cr, uid, ids, {'invoice_state': '2binvoiced'})
res = picking_obj.action_invoice_create(cr, uid, ids, type='out_invoice', context={})
invoice_ids = res.values()
picking_obj.write(cr, uid, ids,{'invoice_ids': [[6,0,invoice_ids]]})
@@ -107,6 +107,6 @@ class account_invoice_line(osv.osv):
res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
vals['cost_price'] = res[0]['standard_price']
return super(account_invoice_line, self).create(cr, uid, vals, context)
-
+
account_invoice_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 9f23f325e35..6344fe2c044 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -29,7 +29,7 @@ class stock_report_prodlots(osv.osv):
_description = "Stock report by production lots"
_auto = False
_columns = {
- 'name': fields.float('Quantity', readonly=True),
+ 'qty': fields.float('Quantity', readonly=True),
'location_id': fields.many2one('stock.location', 'Location', readonly=True, select=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
'prodlot_id': fields.many2one('stock.production.lot', 'Production lot', readonly=True, select=True),
@@ -43,7 +43,7 @@ class stock_report_prodlots(osv.osv):
location_id,
product_id,
prodlot_id,
- sum(qty) as name
+ sum(qty) as qty
from (
select -max(sm.id) as id,
sm.location_id,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 831b1dafcb5..101a412329c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -842,7 +842,6 @@ class stock_picking(osv.osv):
""" Gets payment term from partner.
@return: Payment term
"""
- partner_obj = self.pool.get('res.partner')
partner = picking.address_id.partner_id
return partner.property_payment_term and partner.property_payment_term.id or False
@@ -1308,7 +1307,7 @@ class stock_production_lot(osv.osv):
if locations:
cr.execute('''select
prodlot_id,
- sum(name)
+ sum(qty)
from
stock_report_prodlots
where
@@ -1324,12 +1323,12 @@ class stock_production_lot(osv.osv):
locations = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'internal')])
cr.execute('''select
prodlot_id,
- sum(name)
+ sum(qty)
from
stock_report_prodlots
where
location_id IN %s group by prodlot_id
- having sum(name) '''+ str(args[0][1]) + str(args[0][2]),(tuple(locations),))
+ having sum(qty) '''+ str(args[0][1]) + str(args[0][2]),(tuple(locations),))
res = cr.fetchall()
ids = [('id', 'in', map(lambda x: x[0], res))]
return ids
@@ -1809,7 +1808,6 @@ class stock_move(osv.osv):
def setlast_tracking(self, cr, uid, ids, context=None):
tracking_obj = self.pool.get('stock.tracking')
- tracking = context.get('tracking', False)
picking = self.browse(cr, uid, ids)[0].picking_id
if picking:
last_track = [line.tracking_id.id for line in picking.move_lines if line.tracking_id]
@@ -2092,8 +2090,8 @@ class stock_move(osv.osv):
'state': move.state,
'scrapped' : True,
'location_dest_id': location_id,
- 'tracking_id':False,
- 'prodlot_id':False
+ 'tracking_id': move.tracking_id.id,
+ 'prodlot_id': move.prodlot_id.id,
}
new_move = self.copy(cr, uid, move.id, default_val)
@@ -2395,7 +2393,6 @@ class stock_inventory(osv.osv):
location_obj = self.pool.get('stock.location')
for inv in self.browse(cr, uid, ids):
move_ids = []
- move_line = []
for line in inv.inventory_line_id:
pid = line.product_id.id
product_context.update(uom=line.product_uom.id)
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 307f06c6f91..ef959a5fd67 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -22,7 +22,6 @@
# TODO:
# Error treatment: exception, request, ... -> send request to user_id
-from mx import DateTime
import time
from osv import fields,osv
from tools.translate import _
|