Merge branch '10.0' of github.com:akretion/odoo-usability into 10.0
This commit is contained in:
@@ -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>
|
||||||
# MRP 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/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -35,7 +18,11 @@ Small usability improvements on MRP:
|
|||||||
|
|
||||||
* order by id desc
|
* order by id desc
|
||||||
|
|
||||||
* show date start and date finished on production order form view
|
* show field date_start and date_finished on mrp.production form view
|
||||||
|
|
||||||
|
* show more fields on stock move form
|
||||||
|
|
||||||
|
* show bom type in tree view + add group by
|
||||||
|
|
||||||
This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
|
This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
|
||||||
""",
|
""",
|
||||||
@@ -43,5 +30,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': ['mrp'],
|
'depends': ['mrp'],
|
||||||
'data': ['mrp_view.xml'],
|
'data': ['mrp_view.xml'],
|
||||||
'installable': False,
|
'installable': True,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,26 +1,10 @@
|
|||||||
# -*- encoding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
##############################################################################
|
# © 2015-2016 Akretion (http://www.akretion.com)
|
||||||
#
|
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||||
# MRP 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/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
from openerp import models
|
|
||||||
|
from odoo import models
|
||||||
|
|
||||||
|
|
||||||
class MrpProduction(models.Model):
|
class MrpProduction(models.Model):
|
||||||
|
|||||||
@@ -1,30 +1,27 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!--
|
<!--
|
||||||
Copyright (C) 2016 Akretion (http://www.akretion.com/)
|
© 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="mrp_production_form_view" model="ir.ui.view">
|
<record id="mrp_production_form_view" model="ir.ui.view">
|
||||||
<field name="name">usability.mrp.production.form</field>
|
<field name="name">usability.mrp.production.form</field>
|
||||||
<field name="model">mrp.production</field>
|
<field name="model">mrp.production</field>
|
||||||
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
|
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="date_start" position="attributes">
|
<field name="availability" position="after">
|
||||||
<attribute name="invisible">0</attribute>
|
<field name="date_start"/>
|
||||||
</field>
|
<field name="date_finished"/>
|
||||||
<field name="date_finished" position="attributes">
|
|
||||||
<attribute name="invisible">0</attribute>
|
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
<record id="view_move_form" model="ir.ui.view">
|
<record id="view_move_form" model="ir.ui.view">
|
||||||
<field name="name">stock.usability.stock.move.form</field>
|
<field name="name">mrp.usability.stock.move.form</field>
|
||||||
<field name="model">stock.move</field>
|
<field name="model">stock.move</field>
|
||||||
<field name="inherit_id" ref="stock.view_move_form" />
|
<field name="inherit_id" ref="stock.view_move_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
@@ -35,5 +32,27 @@
|
|||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
<record id="mrp_bom_tree_view" model="ir.ui.view">
|
||||||
</openerp>
|
<field name="name">mrp_usability.bom.tree</field>
|
||||||
|
<field name="model">mrp.bom</field>
|
||||||
|
<field name="inherit_id" ref="mrp.mrp_bom_tree_view"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="routing_id" position="after">
|
||||||
|
<field name="type"/>
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record id="view_mrp_bom_filter" model="ir.ui.view">
|
||||||
|
<field name="name">mrp_usability.bom.search</field>
|
||||||
|
<field name="model">mrp.bom</field>
|
||||||
|
<field name="inherit_id" ref="mrp.view_mrp_bom_filter"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<group expand="0" position="inside">
|
||||||
|
<filter string="Type" context="{'group_by': 'type'}" name="type_groupby"/>
|
||||||
|
</group>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
|
||||||
|
</odoo>
|
||||||
|
|||||||
@@ -1,25 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
##############################################################################
|
# © 2014-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
|
||||||
#
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||||
# POS Usability module for Odoo
|
|
||||||
# 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/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
'name': 'Point of Sale Usability',
|
'name': 'Point of Sale Usability',
|
||||||
@@ -31,9 +12,7 @@
|
|||||||
Point of Sale Usability
|
Point of Sale Usability
|
||||||
=======================
|
=======================
|
||||||
|
|
||||||
Small usability enhancements in POS:
|
Minor usability enhancements in POS:
|
||||||
|
|
||||||
* Add a filter *Available in POS* in Product search view
|
|
||||||
|
|
||||||
This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
|
This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
|
||||||
""",
|
""",
|
||||||
@@ -41,5 +20,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': ['point_of_sale'],
|
'depends': ['point_of_sale'],
|
||||||
'data': ['pos_view.xml'],
|
'data': ['pos_view.xml'],
|
||||||
'installable': False,
|
'installable': True,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,27 +1,53 @@
|
|||||||
<?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 (Alexis de Lattre <alexis.delattre@akretion.com>)
|
||||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||||
The licence is in the file __openerp__.py
|
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<openerp>
|
<odoo>
|
||||||
<data>
|
|
||||||
|
|
||||||
|
|
||||||
<record id="product_template_search_view" model="ir.ui.view">
|
<record id="view_pos_config_tree" model="ir.ui.view">
|
||||||
<field name="name">pos_usability.product.template.search</field>
|
<field name="name">usability.pos.config.tree</field>
|
||||||
<field name="model">product.template</field>
|
<field name="model">pos.config</field>
|
||||||
<field name="inherit_id" ref="product.product_template_search_view"/>
|
<field name="inherit_id" ref="point_of_sale.view_pos_config_tree"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<filter name="filter_to_sell" position="after">
|
<field name="name" position="after">
|
||||||
<filter name="available_in_pos" string="Available in the Point of Sale"
|
<field name="company_id" groups="base.group_multi_company"/>
|
||||||
domain="[('available_in_pos', '=', 1)]"/>
|
</field>
|
||||||
</filter>
|
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
||||||
</data>
|
<record id="view_pos_session_form" model="ir.ui.view">
|
||||||
</openerp>
|
<field name="name">usability.pos.session.form</field>
|
||||||
|
<field name="model">pos.session</field>
|
||||||
|
<field name="inherit_id" ref="point_of_sale.view_pos_session_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//field[@name='statement_ids']/tree/field[@name='total_entry_encoding']" position="attributes">
|
||||||
|
<attribute name="sum">Total Transactions</attribute>
|
||||||
|
</xpath>
|
||||||
|
<xpath expr="//field[@name='statement_ids']/tree/field[@name='balance_end_real']" position="attributes">
|
||||||
|
<attribute name="sum">Total Balance Finale</attribute>
|
||||||
|
</xpath>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<!-- put option "available in POS" at the top of product form view -->
|
||||||
|
<record id="product_template_form_view" model="ir.ui.view">
|
||||||
|
<field name="name">usability.pos.product.template</field>
|
||||||
|
<field name="model">product.template</field>
|
||||||
|
<field name="inherit_id" ref="point_of_sale.product_template_form_view"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//group[@name='pos']/field[@name='available_in_pos']" position="replace"/>
|
||||||
|
<xpath expr="//div[@name='options']" position="inside">
|
||||||
|
<div name="available_in_pos">
|
||||||
|
<field name="available_in_pos"/>
|
||||||
|
<label for="available_in_pos"/>
|
||||||
|
</div>
|
||||||
|
</xpath>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
</odoo>
|
||||||
|
|||||||
Reference in New Issue
Block a user