Merge branch 'main' of https://bitbucket.org/altafixco/fixco-addons

merge

3 files changed, 82 insertions, 0 deletions

diff --git a/fixco_custom/views/ir_sequence.xml b/fixco_custom/views/ir_sequence.xml
index 06e11cb..e4845f7 100644
--- a/fixco_custom/views/ir_sequence.xml
+++ b/fixco_custom/views/ir_sequence.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data noupdate="0">
+        <record id="sequence_upload_cancel_picking" model="ir.sequence">
+            <field name="name">Upload Cancel Picking</field>
+            <field name="code">upload.cancel.picking</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">UCP/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="company_id">4</field>
+        </record>
+        
         <record id="sequence_upload_payments" model="ir.sequence">
             <field name="name">Upload Payments</field>
             <field name="code">upload.payments</field>
diff --git a/fixco_custom/views/stock_picking.xml b/fixco_custom/views/stock_picking.xml
index 80add71..cc1fca1 100755
--- a/fixco_custom/views/stock_picking.xml
+++ b/fixco_custom/views/stock_picking.xml
@@ -121,6 +121,16 @@
             </field>
         </record>
 
+        <record id="action_cancel_selected_pickings" model="ir.actions.server">
+            <field name="name">Cancel Picking</field>
+            <field name="model_id" ref="stock.model_stock_picking"/>
+            <field name="binding_model_id" ref="stock.model_stock_picking"/>
+            <field name="state">code</field>
+            <field name="code">
+                action = records.action_cancel_selected_pickings()
+            </field>
+        </record>
+
         <record id="view_stock_picking_filter_inherit_name" model="ir.ui.view">
         <field name="name">stock.picking.filter.name.extend</field>
         <field name="model">stock.picking</field>
diff --git a/fixco_custom/views/upload_cancel_picking.xml b/fixco_custom/views/upload_cancel_picking.xml
new file mode 100644
index 0000000..5f14a75
--- /dev/null
+++ b/fixco_custom/views/upload_cancel_picking.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="upload_cancel_picking_tree" model="ir.ui.view">
+            <field name="name">upload.cancel.picking.tree</field>
+            <field name="model">upload.cancel.picking</field>
+            <field name="arch" type="xml">
+                <tree default_order="create_date desc">
+                    <field name="number"/>
+                    <field name="date_upload"/>
+                    <field name="user_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_upload_cancel_picking_form" model="ir.ui.view">
+            <field name="name">upload.cancel.picking.form</field>
+            <field name="model">upload.cancel.picking</field>
+            <field name="arch" type="xml">
+                <form string="Upload Cancel Picking">
+                    <header>
+                        <button name="action_import_excel" string="Import Excel" type="object" class="oe_highlight" attrs="{'invisible': [('number', '=', False)]}"/>
+                        <button name="action_cancel_picking" string="Cancel Picking" type="object" class="oe_highlight" attrs="{'invisible': [('number', '=', False)]}"/>
+                        <field name="number" widget="field_no_edit" options="{'no_open': True}"/>
+                        <field name="date_upload"/>
+                        <field name="user_id" widget="field_no_edit" options="{'no_open': True}"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="excel_file" filename="filename"/>
+                            <field name="filename" invisible="1"/>
+                        </group>
+                        <field name="picking_lines">
+                            <tree editable="bottom">
+                                <field name="invoice_marketplace"/>
+                                <field name="picking_id"/>
+                                <field name="status_picking"/>
+                                <field name="message_error"/>
+                            </tree>
+                        </field>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="upload_cancel_picking_action" model="ir.actions.act_window">
+            <field name="name">Upload Cancel Picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">upload.cancel.picking</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="menu_upload_cancel_picking"
+            name="Upload Cancel Picking"
+            parent="sale.menu_sale_report"
+            sequence="4"
+            action="upload_cancel_picking_action"
+        />
+    </data>
+</odoo>