Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port base_usability, sale_usability, sale_stock_usability to v10

Browse Source
This commit is contained in:
Alexis de Lattre
2016-10-27 09:33:15 +02:00
parent 74c399009a
commit ef5779cedb
11 changed files with 91 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sale_stock_usability/__manifest__.py
View File

@@ -1,24 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## # © 2015-2016 Akretion (http://www.akretion.com)
# # @author Alexis de Lattre <alexis.delattre@akretion.com>
# Sale Stock Usability module for Odoo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# 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/>.
#
##############################################################################
{ {
@@ -42,5 +25,5 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
'website': 'http://www.akretion.com', 'website': 'http://www.akretion.com',
'depends': ['sale_stock'], 'depends': ['sale_stock'],
'data': ['sale_stock_view.xml'], 'data': ['sale_stock_view.xml'],
'installable': False, 'installable': True,
} }

47
sale_stock_usability/sale_stock.py
View File

@@ -1,24 +1,7 @@
# -*- encoding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## # © 2015-2016 Akretion (http://www.akretion.com)
# # @author Alexis de Lattre <alexis.delattre@akretion.com>
# Sale Usability Extension module for Odoo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# 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 from openerp import models, fields
@@ -28,25 +11,3 @@ class SaleOrder(models.Model):
warehouse_id = fields.Many2one(track_visibility='onchange') warehouse_id = fields.Many2one(track_visibility='onchange')
incoterm = fields.Many2one(track_visibility='onchange') incoterm = fields.Many2one(track_visibility='onchange')
class SaleOrderLine(models.Model):
_inherit = 'sale.order.line'
# The sale_stock module defines the field product_tmpl_id as related
# field without readonly=True, which causes some access right issues
# when you change the product on a sale.order.line and you don't have
# write access on product.product
product_tmpl_id = fields.Many2one(
'product.template', related='product_id.product_tmpl_id',
string='Product Template', readonly=True)
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)

43
sale_stock_usability/sale_stock_view.xml
View File

@@ -1,26 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright (C) 2015 Akretion (http://www.akretion.com/) © 2015-2016 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <alexis.delattre@akretion.com> @author Alexis de Lattre <alexis.delattre@akretion.com>
The licence is in the file __openerp__.py License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--> -->
<openerp> <odoo>
<data>
<record id="view_picking_internal_search_inherit" model="ir.ui.view">
<field name="name">sale_stock_usability.picking.search</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="sale_stock.view_picking_internal_search_inherit" />
<field name="arch" type="xml">
<filter name="to_invoice" position="attributes">
<attribute name="domain">[('invoice_state', '=', '2binvoiced'), ('state', '=', 'done')]</attribute>
</filter>
</field>
</record>
<!-- the truck icon is probably enough
<record id="view_order_form_inherit" model="ir.ui.view"> <record id="view_order_form_inherit" model="ir.ui.view">
<field name="name">sale_stock_usability.sale_order_form</field> <field name="name">sale_stock_usability.sale_order_form</field>
<field name="model">sale.order</field> <field name="model">sale.order</field>
@@ -33,23 +21,6 @@
</notebook> </notebook>
</field> </field>
</record> </record>
-->
</odoo>
<record id="procurement_group_form_view" model="ir.ui.view">
<field name="name">sale_stock_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">
<xpath expr="//field[@name='move_type']/.." position="after">
<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>
</data>
</openerp>

1
sale_usability/__init__.py
View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from . import sale from . import sale
from . import account_invoice

26
sale_usability/__manifest__.py
View File

@@ -1,25 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## # © 2014-2016 Akretion (http://www.akretion.com)
# # @author Alexis de Lattre <alexis.delattre@akretion.com>
# Sale Usability module for Odoo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# Copyright (C) 2014-2016 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/>.
#
##############################################################################
{ {
'name': 'Sale Usability', 'name': 'Sale Usability',
@@ -44,5 +26,5 @@ Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for
'data': [ 'data': [
'sale_view.xml', 'sale_view.xml',
], ],
'installable': False, 'installable': True,
} }

32
sale_usability/account_invoice.py
View File

@@ -1,32 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Sale Usability Extension 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
class AccountInvoiceLine(models.Model):
_inherit = 'account.invoice.line'
# reverse of the native M2M invoice_lines field on sale.order.line
sale_line_ids = fields.Many2many(
'sale.order.line', 'sale_order_line_invoice_rel', 'invoice_id',
'order_line_id', 'Sale Order Lines', readonly=True)

37
sale_usability/sale.py
View File

@@ -1,32 +1,13 @@
# -*- encoding: utf-8 -*- # -*- coding: utf-8 -*-
##############################################################################
#
# Sale Usability Extension module for Odoo
# Copyright (C) 2015 Akretion (http://www.akretion.com) # Copyright (C) 2015 Akretion (http://www.akretion.com)
# @author Alexis de Lattre <alexis.delattre@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 from odoo import models, fields
class SaleOrder(models.Model): class SaleOrder(models.Model):
_inherit = 'sale.order' _inherit = 'sale.order'
state = fields.Selection(track_visibility='onchange')
date_order = fields.Datetime(track_visibility='onchange') date_order = fields.Datetime(track_visibility='onchange')
date_confirm = fields.Date(track_visibility='onchange') date_confirm = fields.Date(track_visibility='onchange')
client_order_ref = fields.Char(track_visibility='onchange') client_order_ref = fields.Char(track_visibility='onchange')
@@ -34,7 +15,13 @@ class SaleOrder(models.Model):
partner_shipping_id = fields.Many2one(track_visibility='onchange') partner_shipping_id = fields.Many2one(track_visibility='onchange')
partner_invoice_id = fields.Many2one(track_visibility='onchange') partner_invoice_id = fields.Many2one(track_visibility='onchange')
pricelist_id = fields.Many2one(track_visibility='onchange') pricelist_id = fields.Many2one(track_visibility='onchange')
order_policy = fields.Selection(track_visibility='onchange') payment_term_id = fields.Many2one(track_visibility='onchange')
payment_term = fields.Many2one(track_visibility='onchange') fiscal_position_id = fields.Many2one(track_visibility='onchange')
fiscal_position = fields.Many2one(track_visibility='onchange')
user_id = fields.Many2one(track_visibility='onchange')
class ProcurementGroup(models.Model):
_inherit = 'procurement.group'
sale_ids = fields.One2many(
'sale.order', 'procurement_group_id', string='Sale Orders',
readonly=True)

52
sale_usability/sale_view.xml
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright (C) 2015 Akretion (http://www.akretion.com/) © 2015-2016 Akretion (http://www.akretion.com/)
@author: Alexis de Lattre <alexis.delattre@akretion.com> @author: Alexis de Lattre <alexis.delattre@akretion.com>
The licence is in the file __openerp__.py License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--> -->
<openerp> <odoo>
<data>
<record id="view_order_form" model="ir.ui.view"> <record id="view_order_form" model="ir.ui.view">
<field name="name">usability.sale.order.form</field> <field name="name">usability.sale.order.form</field>
@@ -18,11 +17,7 @@
<field name="invoice_ids" nolabel="1" context="{'form_view_ref': 'account.invoice_form'}"/> <field name="invoice_ids" nolabel="1" context="{'form_view_ref': 'account.invoice_form'}"/>
</page> </page>
</notebook> </notebook>
<field name="date_order" position="after"> <field name="fiscal_position_id" position="attributes">
<field name="date_confirm"
attrs="{'invisible': [('state', 'in', ('draft', 'sent'))]}"/>
</field>
<field name="fiscal_position" position="attributes">
<attribute name="widget">selection</attribute> <attribute name="widget">selection</attribute>
</field> </field>
</field> </field>
@@ -34,10 +29,7 @@
<field name="inherit_id" ref="sale.view_quotation_tree"/> <field name="inherit_id" ref="sale.view_quotation_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="amount_total" position="before"> <field name="amount_total" position="before">
<field name="amount_untaxed" sum="Total Untaxed"/> <field name="amount_untaxed" sum="Total Untaxed" widget="monetary"/>
</field>
<field name="amount_total" position="after">
<field name="currency_id" groups="base.group_multi_currency"/>
</field> </field>
</field> </field>
</record> </record>
@@ -48,10 +40,7 @@
<field name="inherit_id" ref="sale.view_order_tree"/> <field name="inherit_id" ref="sale.view_order_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="amount_total" position="before"> <field name="amount_total" position="before">
<field name="amount_untaxed" sum="Total Untaxed"/> <field name="amount_untaxed" sum="Total Untaxed" widget="monetary"/>
</field>
<field name="amount_total" position="after">
<field name="currency_id" groups="base.group_multi_currency"/>
</field> </field>
<field name="date_order" position="attributes"> <field name="date_order" position="attributes">
<attribute name="invisible">1</attribute> <attribute name="invisible">1</attribute>
@@ -62,7 +51,16 @@
</field> </field>
</record> </record>
<!-- TODO : handle date_confirm in search/graph views --> <record id="view_sales_order_filter" model="ir.ui.view">
<field name="name">usability.sale.order.search</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_sales_order_filter"/>
<field name="arch" type="xml">
<filter context="{'group_by':'date_order'}" position="after">
<filter string="Order Confirmation Month" name="confirmation_date_groupby" context="{'group_by': 'confirmation_date'}"/>
</filter>
</field>
</record>
<record id="procurement_form_view" model="ir.ui.view"> <record id="procurement_form_view" model="ir.ui.view">
<field name="name">procurement_usability.procurement.order.form</field> <field name="name">procurement_usability.procurement.order.form</field>
@@ -75,5 +73,17 @@
</field> </field>
</record> </record>
</data> <record id="procurement_group_form_view" model="ir.ui.view">
</openerp> <field name="name">sale_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">
<xpath expr="//field[@name='move_type']/.." position="after">
<group name="sale" string="Sale Orders">
<field name="sale_ids" nolabel="1"/>
</group>
</xpath>
</field>
</record>
</odoo>

25
stock_usability/__manifest__.py
View File

@@ -1,24 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## # © 2014-2016 Akretion (http://www.akretion.com)
# # @author Alexis de Lattre <alexis.delattre@akretion.com>
# Stock Usability module for Odoo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# Copyright (C) 2014-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/>.
#
##############################################################################
{ {
@@ -48,5 +31,5 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
'procurement_view.xml', 'procurement_view.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',
], ],
'installable': False, 'installable': True,
} }

34
stock_usability/stock.py
View File

@@ -1,27 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## # © 2014-2016 Akretion (http://www.akretion.com)
# # @author Alexis de Lattre <alexis.delattre@akretion.com>
# Stock Usability module for Odoo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# Copyright (C) 2014-2016 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, api from odoo import models, fields, api
import openerp.addons.decimal_precision as dp import odoo.addons.decimal_precision as dp
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -121,3 +104,10 @@ class StockIncoterms(models.Model):
for inco in self: for inco in self:
res.append((inco.id, u'[%s] %s' % (inco.code, inco.name))) res.append((inco.id, u'[%s] %s' % (inco.code, inco.name)))
return res return res
class ProcurementGroup(models.Model):
_inherit = 'procurement.group'
picking_ids = fields.One2many(
'stock.picking', 'group_id', string='Pickings', readonly=True)

13
stock_usability/stock_view.xml
View File

@@ -284,5 +284,18 @@ in the quantities for his reception -->
<field name="view_id" ref="stock.view_move_tree"/> <field name="view_id" ref="stock.view_move_tree"/>
</record> </record>
<record id="procurement_group_form_view" model="ir.ui.view">
<field name="name">stock_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">
<xpath expr="//field[@name='move_type']/.." position="after">
<group name="picking" string="Pickings">
<field name="picking_ids" nolabel="1"/>
</group>
</xpath>
</field>
</record>
</data> </data>
</openerp> </openerp>