From 20223fe920c08702ed8b8d402acc7630cc091bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 29 Apr 2016 11:12:04 +0200 Subject: [PATCH] [MIGR] stock: reports and controllers --- addons/stock/controllers/main.py | 5 ++-- addons/stock/report/report_stock.py | 27 ++++++++++---------- addons/stock/report/report_stock_forecast.py | 13 +++++----- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/addons/stock/controllers/main.py b/addons/stock/controllers/main.py index 44531169254..1d85b8465fb 100644 --- a/addons/stock/controllers/main.py +++ b/addons/stock/controllers/main.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- import logging -from openerp import http -from openerp.http import request +from odoo import http +from odoo.http import request _logger = logging.getLogger(__name__) + class BarcodeController(http.Controller): @http.route(['/stock/barcode/'], type='http', auth='user') diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py index 4f86993c560..d04393f266e 100644 --- a/addons/stock/report/report_stock.py +++ b/addons/stock/report/report_stock.py @@ -1,25 +1,26 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.osv import fields, osv -from openerp.tools.sql import drop_view_if_exists +from odoo import api, fields, models +from odoo.tools.sql import drop_view_if_exists -class report_stock_lines_date(osv.osv): + +class ReportStockLinesDate(models.Model): _name = "report.stock.lines.date" _description = "Dates of Inventories and latest Moves" _auto = False _order = "date" - _columns = { - 'id': fields.integer('Product Id', readonly=True), - 'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True), - 'date': fields.datetime('Date of latest Inventory', readonly=True), - 'move_date': fields.datetime('Date of latest Stock Move', readonly=True), - "active": fields.boolean("Active", readonly=True), - } - def init(self, cr): - drop_view_if_exists(cr, 'report_stock_lines_date') - cr.execute(""" + id = fields.Integer('Product Id', readonly=True) + product_id = fields.Many2one('product.product', 'Product', readonly=True, select=True) + date = fields.Datetime('Date of latest Inventory', readonly=True) + move_date = fields.Datetime('Date of latest Stock Move', readonly=True) + active = fields.Boolean("Active", readonly=True) + + @api.model_cr + def init(self): + drop_view_if_exists(self._cr, 'report_stock_lines_date') + self._cr.execute(""" create or replace view report_stock_lines_date as ( select p.id as id, diff --git a/addons/stock/report/report_stock_forecast.py b/addons/stock/report/report_stock_forecast.py index 55affbd452c..a948d2acff4 100644 --- a/addons/stock/report/report_stock_forecast.py +++ b/addons/stock/report/report_stock_forecast.py @@ -1,11 +1,9 @@ # -*- coding: utf-8 -*- - -from openerp import fields, models -from openerp import tools +from odoo import api, fields, models, tools -class report_stock_forecast(models.Model): +class ReportStockForecat(models.Model): _name = 'report.stock.forecast' _auto = False @@ -15,9 +13,10 @@ class report_stock_forecast(models.Model): cumulative_quantity = fields.Float(string='Cumulative Quantity', readonly=True) quantity = fields.Float(readonly=True) - def init(self, cr): - tools.drop_view_if_exists(cr, 'report_stock_forecast') - cr.execute("""CREATE or REPLACE VIEW report_stock_forecast AS (SELECT + @api.model_cr + def init(self): + tools.drop_view_if_exists(self._cr, 'report_stock_forecast') + self._cr.execute("""CREATE or REPLACE VIEW report_stock_forecast AS (SELECT MIN(id) as id, product_id as product_id, date as date,