Add scheduler.procurement.log

Re-organize the code, so that each module xxx_usability only depend on xxx
This commit is contained in:
Alexis de Lattre
2016-04-03 10:53:35 +02:00
parent ad786e892f
commit c7908c38ed
13 changed files with 209 additions and 128 deletions

View File

@@ -1,23 +1 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# Procurement Usability module for Odoo
# Copyright (C) 2015 Akretion (http://www.akretion.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
from . import procurement
# -*- coding: utf-8 -*-

View File

@@ -37,7 +37,9 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
""",
'author': 'Akretion',
'website': 'http://www.akretion.com',
'depends': ['sale_stock'],
'data': ['procurement_view.xml'],
'depends': ['procurement'],
'data': [
'procurement_view.xml',
],
'installable': True,
}

View File

@@ -1,55 +0,0 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# Procurement Usability module for Odoo
# Copyright (C) 2015 Akretion (http://www.akretion.com)
# @author Alexis de Lattre <alexis.delattre@akretion.com>
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp import models, fields
import logging
logger = logging.getLogger(__name__)
class ProcurementOrder(models.Model):
_inherit = 'procurement.order'
def run_scheduler(
self, cr, uid, use_new_cursor=False, company_id=False,
context=None):
'''Inherit to add info logs'''
logger.info(
'START procurement scheduler (company ID=%d, uid=%d)',
company_id, uid)
res = super(ProcurementOrder, self).run_scheduler(
cr, uid, use_new_cursor=use_new_cursor, company_id=company_id,
context=context)
logger.info(
'END procurement scheduler (company ID=%d, uid=%d)',
company_id, uid)
return res
class ProcurementGroup(models.Model):
_inherit = 'procurement.group'
sale_ids = fields.One2many(
'sale.order', 'procurement_group_id', string='Sale Orders',
readonly=True)
picking_ids = fields.One2many(
'stock.picking', 'group_id', string='Pickings', readonly=True)

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 Akretion (http://www.akretion.com/)
Copyright (C) 2015-2016 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <alexis.delattre@akretion.com>
The licence is in the file __openerp__.py
-->
@@ -9,43 +9,15 @@
<openerp>
<data>
<record id="view_procurement_form_stock_inherit" model="ir.ui.view">
<field name="name">procurement_usability.procurement.order.form</field>
<field name="model">procurement.order</field>
<field name="inherit_id" ref="stock.view_procurement_form_stock_inherit"/>
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="sale_line_id" readonly="True"/> <!-- field defined in the sale module -->
</field>
<xpath expr="//field[@name='company_id']/.." position="after">
<group name="move_ids" string="Stock Moves" colspan="4">
<field name="move_ids" nolabel="1" readonly="True"/>
</group>
</xpath>
<field name="partner_dest_id" position="before">
<field name="orderpoint_id" readonly="True"/>
</field>
</field>
</record>
<record id="procurement_group_form_view" model="ir.ui.view">
<field name="name">procurement_usability.procurement.group.form</field>
<field name="model">procurement.group</field>
<field name="inherit_id" ref="procurement.procurement_group_form_view"/>
<field name="arch" type="xml">
<field name="move_type" position="after">
<field name="partner_id" readonly="True"/>
</field>
<xpath expr="//field[@name='move_type']/.." position="after">
<group name="procurements" string="Procurements">
<field name="procurement_ids" nolabel="1"/>
</group>
<group name="sale" string="Sale Orders">
<field name="sale_ids" nolabel="1"/>
</group>
<group name="picking" string="Pickings">
<field name="picking_ids" nolabel="1"/>
</group>
</xpath>
</field>
</record>