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

pull

4 files changed, 21 insertions, 14 deletions

diff --git a/fixco_custom/views/account_move.xml b/fixco_custom/views/account_move.xml
index 3eab56a..ee3cd20 100644
--- a/fixco_custom/views/account_move.xml
+++ b/fixco_custom/views/account_move.xml
@@ -153,6 +153,7 @@
                         filter_domain="[
                             ('invoice_marketplace', 'ilike', self)
                         ]"/>
+
                     <field name="soo_number"
                         string="SOO Number"
                         filter_domain="[
@@ -174,6 +175,7 @@
                     <field name="reklas_used" optional="hide"/>
                     <field name="reklas_used_by" optional="hide"/>
                     <field name="soo_number" optional="hide"/>
+                    <field name="invoice_marketplace" optional="hide"/>
                 </field>
             </field>
         </record>
diff --git a/fixco_custom/views/account_move_line.xml b/fixco_custom/views/account_move_line.xml
index 245bdfe..5b55729 100644
--- a/fixco_custom/views/account_move_line.xml
+++ b/fixco_custom/views/account_move_line.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
-<record id="view_move_line_tree_gl_invoice_mp" model="ir.ui.view">
-    <field name="name">account.move.line.tree.gl.invoice.marketplace</field>
-    <field name="model">account.move.line</field>
-    <field name="inherit_id" ref="account.view_move_line_tree_grouped_general"/>
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='name']" position="after">
-            <field name="invoice_marketplace" optional="hide"/>
-        </xpath>
-    </field>
-</record>
+    <record id="view_move_line_tree_gl_invoice_mp" model="ir.ui.view">
+        <field name="name">account.move.line.tree.gl.invoice.marketplace</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_tree_grouped_general"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="invoice_marketplace" optional="hide"/>
+                <field name="faktur_pajak" optional="hide"/>
+            </xpath>
+        </field>
+    </record>
 </data>
     <data>
 <record id="action_gl_reconcile_server" model="ir.actions.server">
diff --git a/fixco_custom/views/account_payment.xml b/fixco_custom/views/account_payment.xml
index c291281..a0af30b 100644
--- a/fixco_custom/views/account_payment.xml
+++ b/fixco_custom/views/account_payment.xml
@@ -11,5 +11,13 @@
                 </button>
             </field>
         </record>
+
+        <record id="action_reset_to_draft" model="ir.actions.server">
+            <field name="name">Reset to Draft</field>
+            <field name="model_id" ref="account.model_account_payment" />
+            <field name="binding_model_id" ref="account.model_account_payment" />
+            <field name="state">code</field>
+            <field name="code">action = records.action_multi_reset_to_draft()</field>
+        </record>
     </data>
 </odoo>
diff --git a/fixco_custom/views/stock_inventory.xml b/fixco_custom/views/stock_inventory.xml
index 89c058e..a343db3 100644
--- a/fixco_custom/views/stock_inventory.xml
+++ b/fixco_custom/views/stock_inventory.xml
@@ -6,10 +6,6 @@
         <field name="model">stock.inventory</field>
         <field name="inherit_id" ref="stock.view_inventory_form"/>
         <field name="arch" type="xml">
-            <header>
-                <button name="action_approve" string="Approve" type="object"
-                    class="btn-primary" attrs="{'invisible': [('adjusment_type', 'not in', ['out'])]}"/>
-            </header>
             <xpath expr="//field[@name='location_ids']" position="after">
                 <field name="number" readonly="1"/>
                 <field name="adjusment_type" />