diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index fac55c593e7..cede85d1d38 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -91,85 +91,6 @@ class pos_return(osv.osv_memory):
'context': context,
'type': 'ir.actions.act_window',
}
- def create_returns2(self, cr, uid, ids, context=None):
-
- if context is None:
- context = {}
- active_id = context.get('active_id', False)
- order_obj =self.pool.get('pos.order')
- line_obj = self.pool.get('pos.order.line')
- picking_obj = self.pool.get('stock.picking')
- stock_move_obj = self.pool.get('stock.move')
- property_obj= self.pool.get("ir.property")
- uom_obj =self. pool.get('product.uom')
- statementl_obj = self.pool.get('account.bank.statement.line')
- #Todo :Need to clean the code
- if active_id:
- data = self.browse(cr, uid, ids, context=context)[0]
- date_cur = time.strftime('%Y-%m-%d %H:%M:%S')
-
- for order_id in order_obj.browse(cr, uid, [active_id], context=context):
- source_stock_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
- cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
- "WHERE w.lot_stock_id=s.id AND w.id=%s ",
- (order_id.warehouse_id.id,))
- res = cr.fetchone()
- location_id = res and res[0] or None
- new_picking = picking_obj.copy(cr, uid, order_id.picking_id.id, {'name':'%s (return)' % order_id.name,
- 'move_lines': [],
- 'state':'draft',
- 'type': 'in',
- 'partner_id': order_id.partner_id.id,
- 'date': date_cur })
- new_order = order_obj.copy(cr, uid, order_id.id, {'name': 'Refund %s'%order_id.name,
- 'lines':[],
- 'statement_ids':[],
- 'picking_id':[]})
- account_def = property_obj.get(cr, uid, 'property_account_payable', 'res.partner', context=context)
- amount = 0.0
- for line in order_id.lines:
- for record in data.pos_moves_ids:
- if line.id == record.line_id:
- qty = record.quantity
- amount += qty * line.price_unit
- stock_move_obj.create(cr, uid, {
- 'product_uom_qty': qty,
- 'product_uos_qty': uom_obj._compute_qty(cr, uid, qty ,line.product_id.uom_id.id),
- 'picking_id': new_picking,
- 'product_uom': line.product_id.uom_id.id,
- 'location_id': source_stock_id,
- 'product_id': line.product_id.id,
- 'location_dest_id': location_id,
- 'name': '%s (return)' %order_id.name,
- 'date': date_cur
- })
- if qty != 0.0:
- line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
- statementl_obj.create(cr, uid, {
- 'name': 'Refund %s'%order_id.name,
- 'statement_id': order_id.statement_ids[0].statement_id.id,
- 'pos_statement_id': new_order,
- 'date': fields.date.context_today(self, cr, uid, context=context),
- 'account_id': order_id.partner_id and order_id.partner_id.property_account_payable \
- and order_id.partner_id.property_account_payable.id or account_def.id,
- 'amount': -amount,
- })
- order_obj.write(cr,uid, [active_id,new_order], {'state': 'done'})
- picking_obj.signal_button_confirm(cr, uid, [new_picking])
- picking_obj.force_assign(cr, uid, [new_picking], context)
- act = {
- 'domain': "[('id', 'in', ["+str(new_order)+"])]",
- 'name': 'Refunded Orders',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'pos.order',
- 'auto_refresh':0,
- 'res_id':new_order,
- 'view_id': False,
- 'context':context,
- 'type': 'ir.actions.act_window'
- }
- return act
class add_product(osv.osv_memory):
diff --git a/addons/procurement_jit/test/procurement_jit.yml b/addons/procurement_jit/test/procurement_jit.yml
index 1a50fcbe0c2..82a0c5ea480 100644
--- a/addons/procurement_jit/test/procurement_jit.yml
+++ b/addons/procurement_jit/test/procurement_jit.yml
@@ -1,5 +1,5 @@
-
- In order to test mrp_jit module with OpenERP, I create procurement order for
+ In order to test procurement_jit module with OpenERP, I create procurement order for
Computer Case product and check whether it runs without scheduler or not.
-
!record {model: procurement.order, id: procurement_order_test1}:
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 1ea7ed60ae2..3730ec74113 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -49,7 +49,7 @@ completed.
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'],
- 'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
+ 'depends': ['project', 'procurement', 'sale', 'procurement_jit'],
'data': ['project_mrp_view.xml'], #'process/project_mrp_process.xml'
'demo': ['project_mrp_demo.xml'],
'test': ['test/project_task_procurement.yml'],
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index a1a901bf41e..a0d21807039 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1132,9 +1132,13 @@ class procurement_order(osv.osv):
def propagate_cancel(self, cr, uid, procurement, context=None):
if procurement.rule_id.action == 'buy' and procurement.purchase_line_id:
- self.pool.get('purchase.order.line').action_cancel(cr, uid, [procurement.purchase_line_id.id], context=context)
+ purchase_line_obj = self.pool.get('purchase.order.line')
+ if procurement.purchase_line_id.product_qty > procurement.product_qty and procurement.purchase_line_id.order_id.state == 'draft':
+ purchase_line_obj.write(cr, uid, [procurement.purchase_line_id.id], {'product_qty': procurement.purchase_line_id.product_qty - procurement.product_qty}, context=context)
+ else:
+ purchase_line_obj.action_cancel(cr, uid, [procurement.purchase_line_id.id], context=context)
return super(procurement_order, self).propagate_cancel(cr, uid, procurement, context=context)
-
+
def _run(self, cr, uid, procurement, context=None):
if procurement.rule_id and procurement.rule_id.action == 'buy':
#make a purchase order for the procurement
diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index 8abe8e544eb..d469cf946c5 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -403,6 +403,7 @@ class Report(osv.Model):
'report_name': report.report_name,
'report_type': report.report_type,
'report_file': report.report_file,
+ 'context': context,
}
if datas:
diff --git a/addons/report/static/src/js/qwebactionmanager.js b/addons/report/static/src/js/qwebactionmanager.js
index b75003942d2..dac8dcacf25 100644
--- a/addons/report/static/src/js/qwebactionmanager.js
+++ b/addons/report/static/src/js/qwebactionmanager.js
@@ -6,8 +6,6 @@ openerp.report = function(instance) {
var self = this;
instance.web.blockUI();
action = _.clone(action);
- var eval_contexts = ([instance.session.user_context] || []).concat([action.context]);
- action.context = instance.web.pyeval.eval('contexts',eval_contexts);
_t = instance.web._t;
// QWeb reports
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index e0e0b45d33f..c7afb693710 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -440,6 +440,21 @@ class stock_location_route(osv.osv):
class stock_picking(osv.osv):
_inherit = "stock.picking"
+ def _get_sale_id(self, cr, uid, ids, name, args, context=None):
+ sale_obj = self.pool.get("sale.order")
+ res = {}
+ for picking in self.browse(cr, uid, ids, context=context):
+ res[picking.id] = False
+ if picking.group_id:
+ sale_ids = sale_obj.search(cr, uid, [('procurement_group_id', '=', picking.group_id.id)], context=context)
+ if sale_ids:
+ res[picking.id] = sale_ids[0]
+ return res
+
+ _columns = {
+ 'sale_id': fields.function(_get_sale_id, type="many2one", relation="sale.order", string="Sale Order"),
+ }
+
def _create_invoice_from_picking(self, cr, uid, picking, vals, context=None):
sale_obj = self.pool.get('sale.order')
sale_line_obj = self.pool.get('sale.order.line')
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 5651913c9eb..3da1ccbcc8d 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -69,12 +69,11 @@ Dashboard / Reports for Warehouse Management will include:
],
'data': [
'security/stock_security.xml',
- 'security/ir.model.access.csv',
+ 'security/ir.model.access.csv',
'stock_data.xml',
'stock_data.yml',
'wizard/stock_move_view.xml',
'wizard/stock_change_product_qty_view.xml',
- 'wizard/stock_location_product_view.xml',
'wizard/stock_return_picking_view.xml',
'wizard/make_procurement_view.xml',
'wizard/mrp_procurement_view.xml',
@@ -89,6 +88,8 @@ Dashboard / Reports for Warehouse Management will include:
'board_warehouse_view.xml',
'res_config_view.xml',
'views/report_package_barcode.xml',
+ 'views/report_stockpicking.xml',
+ 'views/report_stockinventory.xml',
],
'test': [
'test/inventory.yml',
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index e5e6ad45d9f..7f3669174db 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -20,11 +20,7 @@
##############################################################################
import product_stock
-import picking
-import lot_overview_all
import report_stock
-import stock_inventory_move_report
-import lot_overview
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/lot_move_label.xml b/addons/stock/report/lot_move_label.xml
deleted file mode 100644
index 028e244b894..00000000000
--- a/addons/stock/report/lot_move_label.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
diff --git a/addons/stock/report/lot_move_label.xsl b/addons/stock/report/lot_move_label.xsl
deleted file mode 100644
index 73f99558932..00000000000
--- a/addons/stock/report/lot_move_label.xsl
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
- 24.5
- 1
- 3.8
- 7
- 3.5cm
- 6.5cm
- 3
- 21
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- cm
-
-
- cm
-
-
-
-
-
-
- ,
-
diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
deleted file mode 100644
index c8e80ac54b9..00000000000
--- a/addons/stock/report/lot_overview.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Location / Product
-
-
- Variants
-
-
- Quantity
-
-
- Unit Price
-
-
- Value
-
-
-
-
-
-
-
- Location Inventory Overview
-
-
-
-
-
-
- Location / Product
-
-
- Variants
-
-
- Quantity
-
-
- Unit Price
-
-
- Value
-
-
-
-
- [[ repeatIn(objects,'o') ]]
-
- [[ repeatIn(process(o.id),'ob') ]]
-
-
-
- [[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ repeatIn(ob['product'],'p') ]]
-
-
-
-
-
-
-
-
- [ [[ p['code'] ]] ] [[ p['prod_name'] ]]
-
-
- [[ p['variants'] ]]
-
-
- [[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]
-
-
- [[ formatLang(p['price'], dp='Account') ]]
-
-
- [[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]
-
-
-
-
-
-
-
- [[ (not ob['product']) and removeParentNode('blockTable') ]]
-
-
- Total:
-
-
- [[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]
-
-
-
-
-
-
-
-
- Grand Total:
-
-
-
-
-
-
-
- [[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]
-
-
-
-
-
-
-
-
-
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
deleted file mode 100644
index aba97fa6e1e..00000000000
--- a/addons/stock/report/lot_overview_all.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Location / Product
-
-
- Variants
-
-
- Quantity
-
-
- Unit Price
-
-
- Value
-
-
-
-
-
-
-
- Location Content
-
-
-
-
-
-
- Location / Product
-
-
- Variants
-
-
- Quantity
-
-
- Unit Price
-
-
- Value
-
-
-
-
- [[ repeatIn(objects,'o') ]]
-
- [[ repeatIn(process(o.id),'ob') ]]
-
-
-
- [[ (not ob['product']) and removeParentNode('blockTable') ]][[ ob['location_name'] ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ repeatIn(ob['product'],'p') ]]
-
-
-
-
-
-
-
-
- [ [[ p['code'] ]] ] [[ p['prod_name'] ]]
-
-
- [[ p['variants'] ]]
-
-
- [[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]
-
-
- [[ formatLang(p['price'], dp='Account') ]]
-
-
- [[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]
-
-
-
-
-
-
-
- [[ (not ob['product']) and removeParentNode('blockTable') ]]
-
-
- Total:
-
-
- [[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]
-
-
-
-
-
-
-
-
- Grand Total:
-
-
-
-
-
-
-
- [[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]
-
-
-
-
-
-
-
-
-
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
deleted file mode 100644
index a82e72766ac..00000000000
--- a/addons/stock/report/picking.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Description
-
-
- Lot
-
-
- Status
-
-
- Location
-
-
- Quantity
-
-
-
-
- [[repeatIn(objects,'picking')]]
- [[picking.picking_type_id.code == 'outgoing' and picking.partner_id and setLang(picking.partner_id.lang) or '']]
-
-
-
-
-
-
- Supplier Address : [[ (picking.picking_type_id.code == 'incoming' or removeParentNode('para')) and '' ]]
- Customer Address : [[ (picking.picking_type_id.code == 'outgoing' or removeParentNode('para')) and '' ]]
- Warehouse Address : [[ (picking.picking_type_id.code == 'internal' or removeParentNode('para')) and '' ]]
- [[ (picking.partner_id and picking.partner_id.id and picking.partner_id.title.name) or '' ]] [[ picking.partner_id and picking.partner_id.id and picking.partner_id.name ]]
- [[ picking.partner_id and display_address(picking.partner_id) ]]
- [[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]
-
-
- Contact Address :
- [[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]
- [[ picking.partner_id and display_address(picking.partner_id) ]]
- [[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]
-
-
-
-
-
-
-
-
-
-
-
-
- Delivery Order : [[ (picking.picking_type_id.code == 'outgoing' or removeParentNode('para')) and '' ]] [[ picking.name ]]
- Incoming Shipment : [[ (picking.picking_type_id.code == 'incoming' or removeParentNode('para')) and '' ]] [[ picking.name ]]
- Internal Shipment : [[ (picking.picking_type_id.code == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]
-
-
-
-
-
-
-
-
-
- Journal
-
-
- Order(Origin)
-
-
- Schedule Date
-
-
- Weight
-
-
-
-
-
-
- [[ picking.picking_type_id.name]]
-
-
- [[ picking.origin or '']]
-
-
- [[ formatLang(picking.min_date,date_time = True) ]]
-
-
- [[ 'weight' in picking._columns.keys() and picking.weight or '']]
-
-
-
-
-
-
-
-
-
- Description
-
-
- Serial Number
-
-
- Quantity
-
-
-
-
- [[ repeatIn([line for line in picking.move_lines if (line.state not in ['draft', 'cancel'] and not line.scrapped)],'move_lines') ]]
-
-
-
- [[ get_product_desc(move_lines) ]]
-
-
- [[ move_lines.quant_ids and ','.join(map(str, [q.lot_id.name for q in move_lines.quant_ids if q.lot_id])) or '' ]]
-
-
- [[ formatLang(move_lines.product_uom_qty) ]] [[ move_lines.product_uom.name ]]
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/stock/report/picking_internal.rml b/addons/stock/report/picking_internal.rml
deleted file mode 100644
index 83c412c8e68..00000000000
--- a/addons/stock/report/picking_internal.rml
+++ /dev/null
@@ -1,364 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Description
-
-
- Status
-
-
- Quantity
-
-
- Source Location
-
-
- Serial Number
-
-
- Barcode
-
-
-
-
- [[repeatIn(objects,'picking')]]
- [[picking.picking_type_id.code == 'outgoing' and picking.partner_id and setLang(picking.partner_id.lang) or '']]
-
-
-
-
-
-
-
-
-
-
-
-
- Delivery Order : [[ (picking.picking_type_id.code == 'outgoing' or removeParentNode('para')) and '' ]] [[ picking.name ]]
- Incoming Shipment : [[ (picking.picking_type_id.code == 'incoming' or removeParentNode('para')) and '' ]] [[ picking.name ]]
- Internal Shipment : [[ (picking.picking_type_id.code == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]
-
-
- [[ picking.name ]]
-
-
-
-
-
-
-
-
-
- Journal
-
-
- Order(Origin)
-
-
- Schedule Date
-
-
- Weight
-
-
-
-
-
-
- [[ picking.picking_type_id.name]]
-
-
- [[ picking.origin or '']]
-
-
- [[ formatLang(picking.min_date,date_time = True) ]]
-
-
- [[ 'weight' in picking._columns.keys() and picking.weight or '']]
-
-
-
-
-
-
-
-
-
- Description
-
-
- Status
-
-
- Quantity
-
-
- Source Location
-
-
- Serial Number
-
-
- Barcode
-
-
-
-
- [[ repeatIn(get_internal_picking_src_lines(picking), 'move_line') ]]
-
-
-
- [[ move_line['description'] ]]
-
-
- [[ move_line['state'] ]]
-
-
- [[ move_line['quantity'] ]] [[ move_line['uom'] ]]
-
-
- [[ move_line['location_id'] ]]
-
-
- [[ move_line['lot_id'] ]]
-
-
- [[ move_line['barcode'] or removeParentNode('barCode')]]
-
-
-
-
- [[ ([line for line in picking.move_lines if line.state == 'draft']) and 'Non Assigned Products:' or removeParentNode('para') ]]
-
- [[ repeatIn([line for line in picking.move_lines if line.state == 'draft'],'move_lines') ]]
-
-
-
- [[ get_product_desc(move_lines) ]]
-
-
- Unconfirmed
-
-
- [[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]]
-
-
- [[ move_lines.location_id.name ]]
-
-
-
-
- [[ move_lines.product_id.ean13 or removeParentNode('barCode')]]
-
-
-
-
-
-
-
-
-
-
-
-
-
- Description
-
-
- Quantity
-
-
- Suggested Destination
-
-
- Serial Number
-
-
- Barcode
-
-
-
-
-
-
-
-
-
-
- Suggested Destination Locations
-
-
-
-
-
-
- Description
-
-
- Quantity
-
-
- Suggested Destination
-
-
- Serial Number
-
-
- Barcode
-
-
-
-
- [[ repeatIn(get_internal_picking_dest_lines(picking), 'move_line') ]]
-
-
-
- [[ move_line['description'] ]]
-
-
- [[ move_line['quantity'] ]] [[ move_line['uom'] ]]
-
-
- [[ move_line['location_id'] ]]
-
-
- [[ move_line['lot_id'] ]]
-
-
- [[ move_line['barcode'] or removeParentNode('barCode')]]
-
-
-
-
-
-
-
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index db6ac9b5a02..b8994368b70 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -66,11 +66,13 @@ class report_stock(report_int):
for name in names:
names[name] = names[name].encode('utf8')
products = {}
- prods = registry['stock.location']._product_all_get(cr, uid, location_id, product_ids)
+ ctx = context.copy()
+ ctx['location_id'] = loc_ids
+ prods = registry['product.product']._product_available(cr, uid, product_ids, context=ctx)
+ for prod in prods.keys():
+ products[prod] = [(now, prods[prod]['qty_available'])]
+ prods[prod] = 0
- for p in prods:
- products[p] = [(now,prods[p])]
- prods[p] = 0
if not loc_ids or not product_ids:
return (False, 'pdf')
diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py
deleted file mode 100644
index 153b92f077c..00000000000
--- a/addons/stock/report/stock_by_location.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
- 09/09/2005
- 210.00mm,297.00mm
- 595.27
- 841.88
- 60.00mm,60.00mm,60.00mm
- Stock by location
- Generated by OpenERP
-
- """
- header = """
-
- Location
- Product name
- Product quantity
-
- """
-
- def process(location_id, level):
- registry = openerp.registry(cr.dbname)
- xml = ''
- location_name = registry['stock.location'].read(cr, uid, [location_id], ['name'])
- xml += "
'
-
- location_child = registry['stock.location'].read(cr, uid, [location_id], ['child_ids'])
- for child_id in location_child[0]['child_ids']:
- xml += process(child_id, level+1)
- return xml
-
- for location_id in ids:
- xml = '' + process(location_id, 0) + ' '
-
- xml = '' ''+ config + header + xml + ' '
-
- return self.post_process_xml_data(cr, uid, xml, context)
-
-report_custom('report.stock.lot.location', 'stock.location', '', 'addons/stock/report/stock_by_location.xsl')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/report/stock_by_location.xsl b/addons/stock/report/stock_by_location.xsl
deleted file mode 100644
index bb70b0b5643..00000000000
--- a/addons/stock/report/stock_by_location.xsl
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
- a4_normal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
deleted file mode 100644
index 2ecc7df2b2f..00000000000
--- a/addons/stock/report/stock_inventory_move.rml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ repeatIn(objects,'o') ]]
-
-
-
- Stock Inventory
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Inventory
-
-
- Date
-
-
-
-
-
-
- [[ o.name ]]
-
-
- [[ formatLang(o.date,date_time=True) ]]
-
-
-
-
-
-
-
-
-
- Location
-
-
- Production Lot
-
-
- Product
-
-
- Quantity
-
-
- Manual Quantity
-
-
-
-
- [[ repeatIn(o.line_ids, 'p') ]]
-
-
-
- [[ p.location_id.name ]]
-
-
- [[ p.prod_lot_id and p.prod_lot_id.name or '' ]]
-
-
- [ [[ p.product_id.code ]] ] [[ p.product_id.name ]]
-
-
- [[ formatLang(p.product_qty) ]] [[ p.product_uom.name ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Total:
-
-
- [[ formatLang(qty_total(o.line_ids)['quantity']) ]] [[ qty_total(o.line_ids)['uom'] ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
deleted file mode 100644
index ee1570b2193..00000000000
--- a/addons/stock/report/stock_inventory_move_report.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
+
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 60c7fde1bcd..2e11995f7c9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -586,11 +586,7 @@
-
- {'product_id': active_id}
- Stock by Location
- stock.location
-
+
{'search_default_done': 1,'search_default_product_id': active_id, 'default_product_id': active_id}
Moves
@@ -725,7 +721,6 @@
-
@@ -1360,29 +1355,6 @@
-
- tree_but_open
- stock.location
- Products
-
-
-
-
- tree_but_open
- stock.location
- Open Products
-
-
stock.picking.type.filter
@@ -2053,7 +2025,7 @@
-
+
@@ -2147,7 +2119,7 @@
stock.picking
form
tree,form
- [('group_id','=',active_id)]
+ [('group_id','=',active_id)]
procurement.group.form.herited
diff --git a/addons/stock/views/report_stockinventory.xml b/addons/stock/views/report_stockinventory.xml
new file mode 100644
index 00000000000..db4d1ac6a02
--- /dev/null
+++ b/addons/stock/views/report_stockinventory.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/stock/views/report_stockpicking.xml b/addons/stock/views/report_stockpicking.xml
new file mode 100644
index 00000000000..b91f5905a48
--- /dev/null
+++ b/addons/stock/views/report_stockpicking.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 4e2659f8218..f6fc43f68e6 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -20,7 +20,6 @@
##############################################################################
import stock_move
-import stock_location_product
import stock_return_picking
import stock_change_product_qty
import make_procurement_product
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
deleted file mode 100644
index ef7c9848160..00000000000
--- a/addons/stock/wizard/stock_location_product.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
-
-
- Products by Location
- stock.location.product
-
-
-
-
-
-
-
diff --git a/addons/stock_account/wizard/stock_valuation_history.py b/addons/stock_account/wizard/stock_valuation_history.py
index 5856d892bf8..b938c3da10b 100644
--- a/addons/stock_account/wizard/stock_valuation_history.py
+++ b/addons/stock_account/wizard/stock_valuation_history.py
@@ -43,13 +43,21 @@ class stock_history(osv.osv):
def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
res = super(stock_history, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby)
+ prod_dict= {}
if 'inventory_value' in fields:
for line in res:
if '__domain' in line:
lines = self.search(cr, uid, line['__domain'], context=context)
inv_value = 0.0
- for line2 in self.browse(cr, uid, lines, context=context):
- inv_value += line2.inventory_value
+ product_obj = self.pool.get("product.product")
+ lines_rec = self.browse(cr, uid, lines, context=context)
+ for line_rec in lines_rec:
+ if not line_rec.product_id.id in prod_dict:
+ if line_rec.product_id.cost_method == 'real':
+ prod_dict[line_rec.product_id.id] = line_rec.price_unit_on_quant
+ else:
+ prod_dict[line_rec.product_id.id] = product_obj.get_history_price(cr, uid, line_rec.product_id.id, line_rec.company_id.id, context=context)
+ inv_value += prod_dict[line_rec.product_id.id]
line['inventory_value'] = inv_value
return res
@@ -93,9 +101,7 @@ class stock_history(osv.osv):
ir_property.value_text AS cost_method,
quant.cost as price_unit_on_quant
FROM
- stock_move
- LEFT JOIN
- stock_quant quant ON quant.id IN (SELECT quant_id FROM stock_quant_move_rel WHERE move_id = stock_move.id)
+ stock_quant as quant, stock_quant_move_rel, stock_move
LEFT JOIN
stock_location location ON stock_move.location_dest_id = location.id
LEFT JOIN
@@ -104,7 +110,8 @@ class stock_history(osv.osv):
product_template ON product_template.id = product_product.product_tmpl_id
LEFT JOIN
ir_property ON (ir_property.name = 'cost_method' and ir_property.res_id = 'product.template,' || product_template.id::text)
- WHERE stock_move.state = 'done' AND location.usage = 'internal'
+ WHERE stock_move.state = 'done' AND location.usage = 'internal' AND stock_quant_move_rel.quant_id = quant.id
+ AND stock_quant_move_rel.move_id = stock_move.id
) UNION
(SELECT
'-' || stock_move.id::text || '-' || quant.id::text AS id,
@@ -117,9 +124,7 @@ class stock_history(osv.osv):
ir_property.value_text AS cost_method,
quant.cost as price_unit_on_quant
FROM
- stock_move
- LEFT JOIN
- stock_quant quant ON quant.id IN (SELECT quant_id FROM stock_quant_move_rel WHERE move_id = stock_move.id)
+ stock_quant as quant, stock_quant_move_rel, stock_move
LEFT JOIN
stock_location location ON stock_move.location_id = location.id
LEFT JOIN
@@ -128,6 +133,7 @@ class stock_history(osv.osv):
product_template ON product_template.id = product_product.product_tmpl_id
LEFT JOIN
ir_property ON (ir_property.name = 'cost_method' and ir_property.res_id = 'product.template,' || product_template.id::text)
- WHERE stock_move.state = 'done' AND location.usage = 'internal'
+ WHERE stock_move.state = 'done' AND location.usage = 'internal' AND stock_quant_move_rel.quant_id = quant.id
+ AND stock_quant_move_rel.move_id = stock_move.id
)
)""")
diff --git a/addons/stock_account/wizard/stock_valuation_history_view.xml b/addons/stock_account/wizard/stock_valuation_history_view.xml
index ea8b983f13e..83d58133de2 100644
--- a/addons/stock_account/wizard/stock_valuation_history_view.xml
+++ b/addons/stock_account/wizard/stock_valuation_history_view.xml
@@ -8,7 +8,7 @@
diff --git a/addons/stock_picking_wave/__init__.py b/addons/stock_picking_wave/__init__.py
index 59d0d9f72d0..4a3f27b2ebd 100644
--- a/addons/stock_picking_wave/__init__.py
+++ b/addons/stock_picking_wave/__init__.py
@@ -21,5 +21,6 @@
import stock_picking_wave
import wizard
+import controllers
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_picking_wave/controllers/__init__.py b/addons/stock_picking_wave/controllers/__init__.py
new file mode 100644
index 00000000000..039d9715fab
--- /dev/null
+++ b/addons/stock_picking_wave/controllers/__init__.py
@@ -0,0 +1 @@
+import main
\ No newline at end of file
diff --git a/addons/stock_picking_wave/controllers/main.py b/addons/stock_picking_wave/controllers/main.py
new file mode 100644
index 00000000000..9de14934828
--- /dev/null
+++ b/addons/stock_picking_wave/controllers/main.py
@@ -0,0 +1,16 @@
+from openerp.addons.web import http
+from openerp.addons.web.http import request
+
+
+class picking_wave_report(http.Controller):
+ @http.route('/report/stock_picking_wave.report_pickingwave/', type='http', auth='user',
+ website=True, multilang=True)
+ def report_picking_wave(self, ids):
+ self.cr, self.uid, self.pool = request.cr, request.uid, request.registry
+ ids = [int(i) for i in ids.split(',')]
+ picking_wave_obj = self.pool["stock.picking.wave"]
+ wave = picking_wave_obj.browse(self.cr, self.uid, ids[0])
+ docargs = {
+ 'docs': wave.picking_ids,
+ }
+ return request.registry['report'].render(self.cr, self.uid, [], 'stock.report_picking', docargs)
diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
index c5e3377b023..3fd7d9cdbc0 100644
--- a/addons/stock_picking_wave/stock_picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -31,22 +31,16 @@ class stock_picking_wave(osv.osv):
'''
This function print the report for all picking_ids associated to the picking wave
'''
+ if context is None:
+ context = {}
picking_ids = []
for wave in self.browse(cr, uid, ids, context=context):
picking_ids += [picking.id for picking in wave.picking_ids]
if not picking_ids:
raise osv.except_osv(_('Error!'), _('Nothing to print.'))
- datas = {
- 'ids': picking_ids,
- 'model': 'stock.picking',
- 'form': self.read(cr, uid, picking_ids, context=context)
- }
- return {
- 'type': 'ir.actions.report.xml',
- 'report_name': context.get('report', 'stock.picking.list'),
- 'datas': datas,
- 'nodestroy': True
- }
+ context['active_ids'] = picking_ids
+ context['active_model'] = 'stock.picking'
+ return self.pool.get("report").get_action(cr, uid, [], 'stock.report_picking', context=context)
def create(self, cr, uid, vals, context=None):
if vals.get('name', '/') == '/':
diff --git a/addons/stock_picking_wave/stock_picking_wave_view.xml b/addons/stock_picking_wave/stock_picking_wave_view.xml
index 450232603e1..2dec7ad4388 100644
--- a/addons/stock_picking_wave/stock_picking_wave_view.xml
+++ b/addons/stock_picking_wave/stock_picking_wave_view.xml
@@ -13,7 +13,7 @@
-
+
+
+
+
+
+
+
+
+
+
+ + Stock Inventory +
+| Inventory | +Date | +
|---|---|
| + + | ++ + | +
| Location | +Product | +Production Lot | +Package | +Quantity | +
|---|---|---|---|---|
| + | + | + | + | + |
| + |
+
+
+
+
+
+ | Total Quantity | ++ + | +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ Supplier Address:
+
+
+ Warehouse Address:
+
+
+ Customer Address:
+
+
+
+
+
+ VAT:
++ : + +
+| Order (Origin) | +State | +Commitment Date | +Scheduled Date | +
|---|---|---|---|
| + + | ++ + | ++ + | ++ + | +
+
+
| Product | +Quantity | +Source | Barcode | +Destination |
|---|---|---|---|---|
| + | + |
+
+ |
+
| Product | +Quantity | +Source | Barcode | +Destination |
|---|---|---|---|---|
|
+ |
+ + | + : + + : + + | +
+
+ |
+ + : + + |