Merge branch 'dev/wms' into odoo-production

# Conflicts:
#	indoteknik_custom/models/__init__.py

3 files changed, 106 insertions, 4 deletions

diff --git a/indoteknik_custom/views/barcoding_product.xml b/indoteknik_custom/views/barcoding_product.xml
new file mode 100644
index 00000000..566655ff
--- /dev/null
+++ b/indoteknik_custom/views/barcoding_product.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="barcoding_product_tree" model="ir.ui.view">
+            <field name="name">barcoding.product.tree</field>
+            <field name="model">barcoding.product</field>
+            <field name="arch" type="xml">
+                <tree default_order="create_date desc">
+                    <field name="product_id"/>
+                    <field name="quantity"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="barcoding_product_line_tree" model="ir.ui.view">
+            <field name="name">barcoding.product.line.tree</field>
+            <field name="model">barcoding.product.line</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="product_id"/>
+                    <field name="qr_code_variant" widget="image"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="barcoding_product_form" model="ir.ui.view">
+            <field name="name">barcoding.product.form</field>
+            <field name="model">barcoding.product</field>
+            <field name="arch" type="xml">
+                <form >
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="product_id" required="1"/>
+                                <field name="quantity" required="1"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Line">
+                                <field name="barcoding_product_line"/>    
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="barcoding_product_view_search" model="ir.ui.view">
+            <field name="name">barcoding.product.search.view</field>
+            <field name="model">barcoding.product</field>
+            <field name="arch" type="xml">
+                <search string="Search Barcoding Product">
+                    <field name="product_id"/>
+                </search>
+            </field>
+        </record>    
+
+        <record id="barcoding_product_action" model="ir.actions.act_window">
+            <field name="name">Barcoding Product</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">barcoding.product</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="menu_barcoding_product"
+            name="Barcoding Product"
+            parent="stock.menu_stock_warehouse_mgmt"
+            sequence="4"
+            action="barcoding_product_action"
+        />
+    </data>
+</odoo>
diff --git a/indoteknik_custom/views/stock_backorder_confirmation_views.xml b/indoteknik_custom/views/stock_backorder_confirmation_views.xml
new file mode 100644
index 00000000..a622899e
--- /dev/null
+++ b/indoteknik_custom/views/stock_backorder_confirmation_views.xml
@@ -0,0 +1,14 @@
+<odoo>
+    <record id="view_backorder_confirmation_inherit" model="ir.ui.view">
+        <field name="name">stock_backorder_confirmation_inherit</field>
+        <field name="model">stock.backorder.confirmation</field>
+        <field name="inherit_id" ref="stock.view_backorder_confirmation"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group/p[1]" position="replace">
+                <p>
+                    Ada product yang quantity done nya kurang dari quantity demand.
+                </p>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 38ce1af5..50ea40bf 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -132,6 +132,7 @@
                     <field name="sale_id" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="print_barcode" optional="hide"/>
                     <field name="qr_code_variant" widget="image" optional="hide"/>
+                    <field name="barcode" optional="hide"/>
                 </field>
                 <page name="note" position="after">
                     <page string="E-Faktur" name="efaktur" attrs="{'invisible': [['is_internal_use', '=', False]]}">
@@ -191,15 +192,18 @@
                             </group>
                         </group>
                     </page>
-                    <!-- <page string="Check Product" name="check_product">
+                    <page string="Check Product" name="check_product">
                         <field name="check_product_lines"/>
-                    </page> -->
+                    </page>
+                    <page string="Barcode Product" name="barcode_product" attrs="{'invisible': [('picking_type_code', '!=', 'incoming')]}">
+                        <field name="barcode_product_lines"/>
+                    </page>
                 </page>
                 
             </field>
         </record>
 
-        <!-- <record id="check_product_tree" model="ir.ui.view">
+        <record id="check_product_tree" model="ir.ui.view">
             <field name="name">check.product.tree</field>
             <field name="model">check.product</field>
             <field name="arch" type="xml">
@@ -209,7 +213,18 @@
                     <field name="status"/>
                 </tree>
             </field>
-        </record> -->
+        </record>
+
+        <record id="barcode_product_tree" model="ir.ui.view">
+            <field name="name">barcode.product.tree</field>
+            <field name="model">barcode.product</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">
+                    <field name="product_id"/>
+                    <field name="barcode"/>
+                </tree>
+            </field>
+        </record>
 
         <record id="view_stock_move_line_detailed_operation_tree_inherit" model="ir.ui.view">
             <field name="name">stock.move.line.operations.tree.inherit</field>