fix conflict

7 files changed, 80 insertions, 4 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index af4eaa05..4c99692d 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -34,8 +34,6 @@
                 <field name="payment_state" position="after">
                     <field name="invoice_payment_term_id"/>
                     <field name="date_kirim_tukar_faktur"/>
-                    <field name="shipper_faktur_id"/>
-                    <field name="resi_tukar_faktur"/>
                     <field name="date_terima_tukar_faktur"/>
                 </field>
             </field>
diff --git a/indoteknik_custom/views/crm_lead.xml b/indoteknik_custom/views/crm_lead.xml
index 5d9969a0..58c3987a 100755
--- a/indoteknik_custom/views/crm_lead.xml
+++ b/indoteknik_custom/views/crm_lead.xml
@@ -44,6 +44,9 @@
                         </group>
                     </page>
                 </page>
+                <field name="message_bounce" position="after">
+                    <field name="order_id"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 3220c1da..fb85f4c1 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -25,6 +25,8 @@
                             string="Ask Approval"
                             type="object"
                     />
+                    <button name="indoteknik_custom.action_view_uangmuka_pembelian" string="UangMuka"
+                        type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index d6df24a0..203b2d13 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -15,6 +15,8 @@
                             string="Ask Approval"
                             type="object"
                     />
+                    <button name="indoteknik_custom.action_view_uangmuka_penjualan" string="UangMuka"
+                        type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
                 <field name="payment_term_id" position="after">
                     <field name="shipping_cost_covered"/>
@@ -44,7 +46,7 @@
                     </attribute>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
-                    <field name="vendor_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
+                    <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}"/>
                     <field name="purchase_price" attrs="
                         {
                             'readonly': [
@@ -54,7 +56,7 @@
                             ]
                         }
                     "/>
-                    <field name="purchase_tax_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}" domain="[('type_tax_use','=','purchase')]"/>
+                    <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]"/>
                     <field name="item_percent_margin"/>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before">
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 866c1aac..0ff79ea8 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -31,6 +31,11 @@
                             type="object"
                             attrs="{'invisible': ['|', ('state', '=', 'draft'), ('state', '=', 'cancel'), ('approval_return_status', '=', 'pengajuan1')]}"
                     />
+                    <button name="action_create_invoice_from_mr"
+                            string="Create Bill"
+                            type="object"
+                            attrs="{'invisible': [('state', '!=', 'done')]}"
+                    />
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="is_internal_use"
diff --git a/indoteknik_custom/views/uangmuka_pembelian.xml b/indoteknik_custom/views/uangmuka_pembelian.xml
new file mode 100644
index 00000000..7bc6e7a6
--- /dev/null
+++ b/indoteknik_custom/views/uangmuka_pembelian.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+        <record id="view_uangmuka_pembelian" model="ir.ui.view">
+            <field name="name">Uangmuka Pembelian</field>
+            <field name="model">uangmuka.pembelian</field>
+            <field name="arch" type="xml">
+                <form string="Invoice Sales Order">
+                    <p class="oe_grey">
+                        Pembuatan semi otomatis Uang Muka Pembelian, mohon dicek kembali
+                    </p>
+                    <group>
+                        <field name="pay_amt"/>
+                        <field name="ongkir_amt"/>
+                        <field name="selisih_amt"/>
+                        <field name="account_id" domain="[('name', 'ilike', 'intransit')]"/>
+                        <field name="total_amt" readonly="1"/>
+                    </group>
+                    <footer>
+                        <button name="create_uangmukapembelian" id="create_uangmukapembelian" string="Create" type="object" required="1"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_uangmuka_pembelian" model="ir.actions.act_window">
+            <field name="name">Create Uang Muka Pembelian</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">uangmuka.pembelian</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+</odoo>
diff --git a/indoteknik_custom/views/uangmuka_penjualan.xml b/indoteknik_custom/views/uangmuka_penjualan.xml
new file mode 100644
index 00000000..f2fc83bc
--- /dev/null
+++ b/indoteknik_custom/views/uangmuka_penjualan.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+        <record id="view_uangmuka_penjualan" model="ir.ui.view">
+            <field name="name">Uangmuka Penjualan</field>
+            <field name="model">uangmuka.penjualan</field>
+            <field name="arch" type="xml">
+                <form string="Invoice Sales Order">
+                    <p class="oe_grey">
+                        Pembuatan semi otomatis Uang Muka Penjualan, mohon dicek kembali
+                    </p>
+                    <group>
+                        <field name="pay_amt"/>
+                        <field name="ongkir_amt"/>
+                        <field name="selisih_amt"/>
+                        <field name="account_id" domain="[('name', 'ilike', 'intransit')]"/>
+                        <field name="total_amt" readonly="1"/>
+                    </group>
+                    <footer>
+                        <button name="create_uangmukapenjualan" id="create_uangmukapenjualan" string="Create" type="object" required="1"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_uangmuka_penjualan" model="ir.actions.act_window">
+            <field name="name">Create Uang Muka Penjualan</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">uangmuka.penjualan</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+</odoo>