audrius/stock-logistics-warehouse
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-warehouse.git synced 2025-01-21 14:27:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

pre-commit update

Browse Source
This commit is contained in:
OCA-git-bot
2020-03-14 12:28:39 +01:00
committed by Mateu Griful
parent adac6490e3
commit 214f74ba49
6 changed files with 94 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
stock_inventory_discrepancy/security/stock_inventory_discrepancy_security.xml
View File

@@ -1,29 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2017-2020 ForgeFlow S.L. <!-- Copyright 2017-2020 ForgeFlow S.L.
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo noupdate="1"> <odoo noupdate="1">
<record id="group_stock_inventory_validation" model="res.groups"> <record id="group_stock_inventory_validation" model="res.groups">
<field name="name">Validate Inventory Adjustments Under Threshold</field> <field name="name">Validate Inventory Adjustments Under Threshold</field>
<field name="category_id" ref="base.module_category_usability"/> <field name="category_id" ref="base.module_category_usability" />
</record> </record>
<record id="group_stock_inventory_validation_always" model="res.groups"> <record id="group_stock_inventory_validation_always" model="res.groups">
<field name="name">Validate All inventory Adjustments</field> <field name="name">Validate All inventory Adjustments</field>
<field name="category_id" ref="base.module_category_usability"/> <field name="category_id" ref="base.module_category_usability" />
<field name="implied_ids" <field
eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation'))]"/> name="implied_ids"
<field name="users" eval="[(4, ref('base.user_root'))]"/> eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation'))]"
/>
<field name="users" eval="[(4, ref('base.user_root'))]" />
</record> </record>
<record model="res.groups" id="stock.group_stock_user"> <record model="res.groups" id="stock.group_stock_user">
<field name="implied_ids" <field
eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation'))]"/> name="implied_ids"
eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation'))]"
/>
</record> </record>
<record model="res.groups" id="stock.group_stock_manager"> <record model="res.groups" id="stock.group_stock_manager">
<field name="implied_ids" <field
eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation_always'))]"/> name="implied_ids"
eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation_always'))]"
/>
</record> </record>
</odoo> </odoo>

45
stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js
View File

@@ -1,38 +1,41 @@
odoo.define('stock_inventory_discrepancy.InventoryValidationController', function (require) { odoo.define("stock_inventory_discrepancy.InventoryValidationController", function(
require
) {
"use strict"; "use strict";
var core = require('web.core'); var core = require("web.core");
var InventoryValidationController = require('stock.InventoryValidationController'); var InventoryValidationController = require("stock.InventoryValidationController");
var _t = core._t; var _t = core._t;
InventoryValidationController.include({ InventoryValidationController.include({
/** /**
* @override * @override
* @see displayNotification * @see displayNotification
*/ */
do_notify: function (title, message, sticky, className) { do_notify: function(title, message, sticky, className) {
var self = this; var self = this;
if (this.modelName === "stock.inventory.line") { if (this.modelName === "stock.inventory.line") {
this._rpc({ this._rpc({
model: 'stock.inventory', model: "stock.inventory",
method: 'read', method: "read",
args: [this.inventory_id, ['state']], args: [this.inventory_id, ["state"]],
}).then(function (res) { })
if (res[0].state === "pending") { .then(function(res) {
title = _t("Pending to Approve"); if (res[0].state === "pending") {
message = _t("The inventory needs to be approved"); title = _t("Pending to Approve");
} message = _t("The inventory needs to be approved");
}).finally(function () { }
return self.displayNotification({ })
type: 'warning', .finally(function() {
title: title, return self.displayNotification({
message: message, type: "warning",
sticky: sticky, title: title,
className: className, message: message,
sticky: sticky,
className: className,
});
}); });
});
} }
}, },
}); });

17
stock_inventory_discrepancy/views/assets_backend.xml
View File

@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<template
<template id="stock_assets_backend" name="stock_inventory assets" inherit_id="web.assets_backend"> id="stock_assets_backend"
name="stock_inventory assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js"></script> <script
type="text/javascript"
src="/stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js"
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>

57
stock_inventory_discrepancy/views/stock_inventory_view.xml
View File

@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2017-2020 ForgeFlow S.L. <!-- Copyright 2017-2020 ForgeFlow S.L.
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<record id="view_inventory_form" model="ir.ui.view"> <record id="view_inventory_form" model="ir.ui.view">
<field name="name">Inventory form view - discrepancy extension </field> <field name="name">Inventory form view - discrepancy extension </field>
<field name="model">stock.inventory</field> <field name="model">stock.inventory</field>
<field name="inherit_id" ref="stock.view_inventory_form"/> <field name="inherit_id" ref="stock.view_inventory_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="state" position="attributes"> <field name="state" position="attributes">
<attribute name="statusbar_visible"> <attribute name="statusbar_visible">
@@ -17,42 +15,55 @@
{"pending":"red"} {"pending":"red"}
</attribute> </attribute>
</field> </field>
<xpath expr="//button[@name='action_validate']" <xpath expr="//button[@name='action_validate']" position="attributes">
position="attributes"> <attribute
<attribute name="groups">stock_inventory_discrepancy.group_stock_inventory_validation</attribute> name="groups"
>stock_inventory_discrepancy.group_stock_inventory_validation</attribute>
</xpath> </xpath>
<xpath expr="//button[@name='action_validate']" <xpath expr="//button[@name='action_validate']" position="after">
position="after"> <button
<button name="action_force_done" name="action_force_done"
string="Force Validation" type="object" string="Force Validation"
class="oe_highlight" type="object"
groups="stock_inventory_discrepancy.group_stock_inventory_validation_always" class="oe_highlight"
attrs="{'invisible': ['|',('state', '!=', 'pending'),('over_discrepancy_line_count', '=', 0)]}"/> groups="stock_inventory_discrepancy.group_stock_inventory_validation_always"
attrs="{'invisible': ['|',('state', '!=', 'pending'),('over_discrepancy_line_count', '=', 0)]}"
/>
</xpath> </xpath>
<xpath expr="//button[@name='action_open_inventory_lines']" position="attributes"> <xpath
expr="//button[@name='action_open_inventory_lines']"
position="attributes"
>
<attribute name="states">pending,confirm</attribute> <attribute name="states">pending,confirm</attribute>
</xpath> </xpath>
<xpath expr="//button[@name='action_cancel_draft'][2]" position="attributes"> <xpath
expr="//button[@name='action_cancel_draft'][2]"
position="attributes"
>
<attribute name="states">pending,confirm</attribute> <attribute name="states">pending,confirm</attribute>
</xpath> </xpath>
<field name="company_id" position="before"> <field name="company_id" position="before">
<field name="over_discrepancy_line_count" attrs="{'invisible': [('state', '!=', 'pending')]}"/> <field
name="over_discrepancy_line_count"
attrs="{'invisible': [('state', '!=', 'pending')]}"
/>
</field> </field>
</field> </field>
</record> </record>
<record id="stock_inventory_line_tree2" model="ir.ui.view"> <record id="stock_inventory_line_tree2" model="ir.ui.view">
<field name="name">stock.inventory.line.tree2</field> <field name="name">stock.inventory.line.tree2</field>
<field name="model">stock.inventory.line</field> <field name="model">stock.inventory.line</field>
<field name="inherit_id" ref="stock.stock_inventory_line_tree2"/> <field name="inherit_id" ref="stock.stock_inventory_line_tree2" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="product_qty" position="after"> <field name="product_qty" position="after">
<field name="discrepancy_qty"/> <field name="discrepancy_qty" />
<field name="discrepancy_percent"/> <field name="discrepancy_percent" />
<field name="discrepancy_threshold"/> <field name="discrepancy_threshold" />
</field> </field>
<xpath expr="//tree" position="attributes"> <xpath expr="//tree" position="attributes">
<attribute name="decoration-danger">theoretical_qty &lt; 0 or discrepancy_percent &gt; discrepancy_threshold or "product_qty != theoretical_qty"</attribute> <attribute
name="decoration-danger"
>theoretical_qty &lt; 0 or discrepancy_percent &gt; discrepancy_threshold or "product_qty != theoretical_qty"</attribute>
</xpath> </xpath>
</field> </field>
</record> </record>

13
stock_inventory_discrepancy/views/stock_location_view.xml
View File

@@ -1,22 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2017-2020 ForgeFlow S.L. <!-- Copyright 2017-2020 ForgeFlow S.L.
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<record id="view_location_form" model="ir.ui.view"> <record id="view_location_form" model="ir.ui.view">
<field name="name">Location form - cycle count extension</field> <field name="name">Location form - cycle count extension</field>
<field name="model">stock.location</field> <field name="model">stock.location</field>
<field name="inherit_id" ref="stock.view_location_form"/> <field name="inherit_id" ref="stock.view_location_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="return_location" position="after"> <field name="return_location" position="after">
<label for="discrepancy_threshold"/> <label for="discrepancy_threshold" />
<div> <div>
<field name="discrepancy_threshold" class="oe_inline"/> % <field name="discrepancy_threshold" class="oe_inline" /> %
</div> </div>
<field name="propagate_discrepancy_threshold"/> <field name="propagate_discrepancy_threshold" />
</field> </field>
</field> </field>
</record> </record>
</odoo> </odoo>

11
stock_inventory_discrepancy/views/stock_warehouse_view.xml
View File

@@ -1,22 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2017-2020 ForgeFlow S.L. <!-- Copyright 2017-2020 ForgeFlow S.L.
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<record id="view_warehouse" model="ir.ui.view"> <record id="view_warehouse" model="ir.ui.view">
<field name="name">Warehouse form - Inventory Discrepancy <field name="name">Warehouse form - Inventory Discrepancy
extension</field> extension</field>
<field name="model">stock.warehouse</field> <field name="model">stock.warehouse</field>
<field name="inherit_id" ref="stock.view_warehouse"/> <field name="inherit_id" ref="stock.view_warehouse" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="partner_id" position="after"> <field name="partner_id" position="after">
<label for="discrepancy_threshold"/> <label for="discrepancy_threshold" />
<div> <div>
<field name="discrepancy_threshold" class="oe_inline"/> % <field name="discrepancy_threshold" class="oe_inline" /> %
</div> </div>
</field> </field>
</field> </field>
</record> </record>
</odoo> </odoo>