Merge branch 'odoo-production' into iman/pengajuan-tempo

# Conflicts:
#	indoteknik_custom/security/ir.model.access.csv

6 files changed, 94 insertions, 8 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 2863af57..4cc35b6d 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -163,5 +163,13 @@
             <field name="state">code</field>
             <field name="code">action = records.open_form_multi_create_reklas_penjualan()</field>
         </record>
+
+         <record id="action_export_faktur" model="ir.actions.server">
+            <field name="name">Export Faktur ke XML</field>
+            <field name="model_id" ref="account.model_account_move" />
+            <field name="binding_model_id" ref="account.model_account_move" />
+            <field name="state">code</field>
+            <field name="code">action = records.export_faktur_to_xml()</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/coretax_faktur.xml b/indoteknik_custom/views/coretax_faktur.xml
new file mode 100644
index 00000000..45eea23f
--- /dev/null
+++ b/indoteknik_custom/views/coretax_faktur.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="act_coretax_faktur" model="ir.actions.act_window">
+            <field name="name">Export Faktur Pajak Keluaran XML Version</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">coretax.faktur</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+         <record id="view_coretax_faktur" model="ir.ui.view">
+            <field name="name">view coretax faktur</field>
+            <field name="model">coretax.faktur</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Export Pajak Keluaran">
+                    <p>
+                        Klik tombol Export di bawah untuk mulai export Faktur Pajak Keluaran.
+                        Data yang diexport adalah Customer Invoice yang berstatus Open dan belum diexport ke E-Faktur.
+                    </p>
+
+                    <p>
+                        Setelah proses export Faktur Pajak Keluaran selesai dilakukan,
+                        download file ini:
+                    </p>
+                    <group>
+                        <field name="export_file" filename="export_filename" readonly="1"/>
+                    </group>
+
+                    <p>
+                        Lalu import ke program E-Faktur DJP melalui menu <b>Referensi - Pajak Keluaran - Import</b>
+                    </p>
+
+                    <footer>
+                        <button string="Export" name="export_to_download" type="object" class="btn-primary"/>
+                        <button string="Cancel" class="btn-default" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <menuitem id="coretax_faktur_export"
+            parent="vit_efaktur.menu_vit_efaktur_keluaran"
+            sequence="80"
+            name="Export FP. Keluaran XML"
+            action="act_coretax_faktur" />
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 703b4d49..3539dbf3 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -107,6 +107,14 @@
                         {'readonly': [('state', 'in', ('done','cancel'))]}
                     </attribute>
                 </xpath>
+                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree" position="inside">
+                    <field name="desc_updatable" invisible="1"/>
+                </xpath>
+                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='name']" position="attributes">
+                    <attribute name="attrs">
+                        {'readonly': [('desc_updatable', '=', False)]}
+                    </attribute>
+                </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes">
                     <attribute name="attrs">
                         {
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 26fe7c1e..8acba608 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -61,6 +61,11 @@
                             type="object"
                             attrs="{'invisible': [('carrier_id', '!=', 151)]}"
                     />
+                    <button name="action_fetch_lalamove_order"
+                            string="Tracking Lalamove"
+                            type="object"
+                            attrs="{'invisible': [('carrier_id', '!=', 9)]}"
+                    />
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
@@ -81,6 +86,9 @@
                 <field name="partner_id" position="after">
                     <field name="real_shipping_id"/>
                 </field>
+                <field name="product_uom_qty" position="attributes">
+                    <attribute name="attrs">{'readonly': [('parent.picking_type_code', '=', 'incoming')]}</attribute>
+                </field>
                 <field name="date_done" position="after">
                     <field name="arrival_time"/>
                 </field>
@@ -152,7 +160,7 @@
                                 <field name="sj_documentation" widget="image" />
                                 <field name="paket_documentation" widget="image" />
                             </group>
-                            <group>
+                            <group attrs="{'invisible': [('carrier_id', '!=', 151)]}">
                                 <field name="envio_id" invisible="1"/>
                                 <field name="envio_code"/>
                                 <field name="envio_ref_code"/>
@@ -170,6 +178,17 @@
                                 <field name="envio_latest_longitude" invisible="1"/>
                                 <field name="tracking_by" invisible="1"/>
                             </group>
+                            <group attrs="{'invisible': [('carrier_id', '!=', 9)]}">
+                                <field name="lalamove_data" invisible="1"/>
+                                <field name="lalamove_order_id"/>
+                                <field name="lalamove_address"/>
+                                <field name="lalamove_name"/>
+                                <field name="lalamove_phone"/>
+                                <field name="lalamove_status"/>
+                                <field name="lalamove_delivered_at"/>
+                                <field name="lalamove_image_url" invisible="1"/>
+                                <field name="lalamove_image_html"/>
+                            </group>
                         </group>
                     </page>
                     <!-- <page string="Check Product" name="check_product">
@@ -184,8 +203,10 @@
             <field name="name">check.product.tree</field>
             <field name="model">check.product</field>
             <field name="arch" type="xml">
-                <tree editable="bottom">
+                <tree editable="bottom" decoration-warning="status == 'Pending'" decoration-success="status == 'Done'">
                     <field name="product_id"/>
+                    <field name="quantity"/>
+                    <field name="status"/>
                 </tree>
             </field>
         </record> -->
diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index 5b9e51cc..f9e747b3 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -202,8 +202,8 @@
             <field name="subject">Pengajuan Tempo Harus di Periksa!</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
             <field name="reply_to">sales@indoteknik.com</field>
-<!--            <field name="email_to">vita@indoteknik.co.id</field>-->
-            <field name="email_to">sapiabon768@gmail.com</field>
+            <field name="email_to">vita@indoteknik.co.id</field>
+<!--            <field name="email_to">sapiabon768@gmail.com</field>-->
             <field name="body_html" type="html">
                 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
                     <tr><td align="center">
@@ -269,8 +269,8 @@
             <field name="subject">Pengajuan Tempo Harus di Periksa!</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
             <field name="reply_to">sales@indoteknik.com</field>
-<!--            <field name="email_to">widyariyanti97@gmail.com, stephan@indoteknik.co.id</field>-->
-            <field name="email_to">sapiabon768@gmail.com</field>
+            <field name="email_to">widyariyanti97@gmail.com, stephan@indoteknik.co.id</field>
+<!--            <field name="email_to">sapiabon768@gmail.com</field>-->
             <field name="body_html" type="html">
                 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
                     <tr><td align="center">
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index 7ba87184..bb8262c9 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -200,8 +200,8 @@
             <field name="subject">Pengajuan Tempo Harus di Periksa!</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
             <field name="reply_to">sales@indoteknik.com</field>
-<!--            <field name="email_to">akbar@fixcomart.co.id</field>-->
-            <field name="email_to">sapiabon768@gmail.com</field>
+            <field name="email_to">akbar@fixcomart.co.id</field>
+<!--            <field name="email_to">sapiabon768@gmail.com</field>-->
             <field name="body_html" type="html">
                 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
                     <tr><td align="center">