shipment group

3 files changed, 259 insertions, 1 deletions

diff --git a/fixco_custom/views/requisition.xml b/fixco_custom/views/requisition.xml
new file mode 100644
index 0000000..957113a
--- /dev/null
+++ b/fixco_custom/views/requisition.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="requisition_tree" model="ir.ui.view">
+        <field name="name">requisition.tree</field>
+        <field name="model">requisition</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="date_doc"/>
+                <field name="number"/>
+                <field name="description"/>
+                <field name="notification" readonly="1"/>
+                <field name="is_po" readonly="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="requisition_line_tree" model="ir.ui.view">
+        <field name="name">requisition.line.tree</field>
+        <field name="model">requisition.line</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="brand_id"/>
+                <field name="product_id"/>
+                <field name="partner_id"/>
+                <field name="qty_purchase"/>
+                <field name="price_unit"/>
+                <field name="tax_id"/>
+                <field name="subtotal"/>
+                <field name="source"/>
+                <field name="qty_available_store"/>
+                <field name="suggest"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="requisition_purchase_match_tree" model="ir.ui.view">
+        <field name="name">requisition.purchase.match.tree</field>
+        <field name="model">requisition.purchase.match</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="order_id" readonly="1"/>
+                <field name="vendor" readonly="1"/>
+                <field name="total" readonly="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="requisition_form" model="ir.ui.view">
+        <field name="name">requisition.form</field>
+        <field name="model">requisition</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="button_approve"
+                            string="Approve"
+                            type="object"
+                            class="mr-2 oe_highlight"
+                            />
+                </header>
+                <sheet string="Requisition">
+                        <div class="oe_button_box" name="button_box"/>
+                        <group>
+                            <group>
+                                <field name="number"/>
+                                <field name="date_doc"/>
+                                <field name="sale_order_id"/>
+                                <field name="description"/>
+                                <field name="notification" readonly="1"/>
+                            </group>
+                            <group>
+                                <div>
+                                    <button name="generate_requisition_from_so"
+                                        string="Create Line from SO"
+                                        type="object"
+                                        class="mr-2 oe_highlight"
+                                />
+                                </div>
+                                <div>
+                                    <button name="create_po_from_requisition"
+                                        string="Create PO"
+                                        type="object"
+                                        class="mr-2 oe_highlight"
+                                    />
+                                </div>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Lines">
+                                <field name="requisition_lines">
+                                    <tree editable="line">
+                                        <field name="product_id" required="1"/>
+                                        <field name="partner_id" required="1" />
+                                        <field name="qty_purchase" required="1" />
+                                        <field name="price_unit" required="1" />
+                                        <field name="taxes_id" readonly="1" />
+                                        <field name="subtotal" readonly="1" />
+                                        <field name="brand_id" />
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Matches">
+                                <field name="requisition_match"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="requisition_action" model="ir.actions.act_window">
+        <field name="name">Requisition</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">requisition</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_requisition"
+        name="Requisition"
+        action="requisition_action"
+        parent="purchase.menu_procurement_management"
+        sequence="300"/>
+</odoo>
\ No newline at end of file
diff --git a/fixco_custom/views/shipment_group.xml b/fixco_custom/views/shipment_group.xml
index 8a6c303..8ebcef9 100644
--- a/fixco_custom/views/shipment_group.xml
+++ b/fixco_custom/views/shipment_group.xml
@@ -15,7 +15,26 @@
         <field name="model">shipment.group</field>
         <field name="arch" type="xml">
             <form>
+                <header>
+                    <button name="get_status" 
+                            string="Get Status" 
+                            type="object" 
+                            class="oe_highlight" 
+                    />
+                    <button name="sync_product_to_picking_line" 
+                            string="Sync Picking Line" 
+                            type="object" 
+                            class="oe_highlight" 
+                    />
+                </header>
                 <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button type="object"  name="action_view_related_line"
+                            class="oe_stat_button"
+                            icon="fa-pencil-square-o">
+                            <field name="related_count" widget="statinfo" string="Related Line"/>
+                        </button>
+                    </div>
                     <group>
                         <group>
                             <field name="number" readonly="1"/>
@@ -25,9 +44,12 @@
                         <page string="Picking Line">
                             <field name="picking_lines">
                                 <tree editable="bottom">
-                                    <field name="scan_invoice_marketplace"/>
+                                    <field name="scan_receipt"/>
                                     <field name="picking_id"/>
                                     <field name="carrier"/>
+                                    <field name="invoice_marketplace"/>
+                                    <field name="order_reference" optional="hide"/>
+                                    <field name="status"/>
                                 </tree>
                             </field>  
                         </page>
@@ -37,6 +59,7 @@
                                     <field name="product_id"/>
                                     <field name="carrier"/>
                                     <field name="invoice_marketplace"/>
+                                    <field name="order_reference" optional="hide"/>
                                     <field name="picking_id"/>
                                 </tree>
                             </field>  
diff --git a/fixco_custom/views/shipment_line.xml b/fixco_custom/views/shipment_line.xml
new file mode 100644
index 0000000..dbeb1bb
--- /dev/null
+++ b/fixco_custom/views/shipment_line.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_picking_line_search" model="ir.ui.view">
+            <field name="name">picking.line.search</field>
+            <field name="model">picking.line</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="carrier"/>
+                    <filter string="Carrier" name="carrier_filter" domain="[('carrier','!=',False)]"/>
+                    <filter string="Group by Carrier" name="group_carrier" context="{'group_by':'carrier'}"/>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_product_shipment_line_search" model="ir.ui.view">
+            <field name="name">product.shipment.line.search</field>
+            <field name="model">product.shipment.line</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="carrier"/>
+                    <filter string="Carrier" name="carrier_filter" domain="[('carrier','!=',False)]"/>
+                    <filter string="Group by Carrier" name="group_carrier" context="{'group_by':'carrier'}"/>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_picking_line_tree" model="ir.ui.view">
+            <field name="name">picking.line.tree</field>
+            <field name="model">picking.line</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="shipment_id"/>
+                    <field name="picking_id" widget="many2one_clickable"/>
+                    <field name="scan_receipt"/>
+                    <field name="invoice_marketplace"/>
+                    <field name="carrier"/>
+                    <field name="order_reference"/>
+                    <field name="status"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_picking_line_form" model="ir.ui.view">
+            <field name="name">picking.line.form</field>
+            <field name="model">picking.line</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="shipment_id"/>
+                                <field name="picking_id" widget="many2one_clickable"/>
+                                <field name="scan_receipt"/>
+                            </group>
+                            <group>
+                                <field name="invoice_marketplace"/>
+                                <field name="carrier"/>
+                                <field name="order_reference"/>
+                                <field name="status"/>
+                            </group>
+                        </group>
+                        <field name="product_shipment_lines" mode="tree">
+                            <tree editable="bottom">
+                                <field name="product_id"/>
+                                <field name="carrier"/>
+                                <field name="invoice_marketplace"/>
+                                <field name="picking_id" widget="many2one_clickable"/>
+                                <field name="order_reference"/>
+                            </tree>
+                        </field>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_picking_line" model="ir.actions.act_window">
+            <field name="name">Shipment Lines</field>
+            <field name="res_model">picking.line</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+                <p class="o_view_nocontent_smiling_face">Create a new shipment line</p>
+            </field>
+        </record>
+
+        <menuitem
+            action="action_picking_line"
+            id="shipment_lines"
+            parent="stock.menu_stock_warehouse_mgmt"
+            name="Shipment Lines"
+            sequence="1"
+        />
+
+        <record id="view_product_shipment_line_tree" model="ir.ui.view">
+            <field name="name">product.shipment.line.tree</field>
+            <field name="model">product.shipment.line</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="picking_line_id"/>
+                    <field name="product_id"/>
+                    <field name="carrier"/>
+                    <field name="invoice_marketplace"/>
+                    <field name="picking_id" widget="many2one_clickable"/>
+                    <field name="order_reference"/>
+                </tree>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file