Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into refund_system

20 files changed, 440 insertions, 22 deletions

diff --git a/indoteknik_custom/views/account_move_line.xml b/indoteknik_custom/views/account_move_line.xml
index cb24a0f0..346494f3 100644
--- a/indoteknik_custom/views/account_move_line.xml
+++ b/indoteknik_custom/views/account_move_line.xml
@@ -9,6 +9,9 @@
                 <!-- <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']" position="attributes">
                     <attribute name="attrs">{'readonly': [('refund_id','!=',False)]}</attribute>
                 </xpath> -->
+                <xpath expr="//field[@name='line_ids']/tree/field[@name='credit']" position="after">
+                    <field name="date_maturity" optional="hide"/>
+                </xpath>
                 <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']/tree/field[@name='currency_id']" position="before">
                     <field name="is_required" invisible="1"/>
                 </xpath>
@@ -22,4 +25,16 @@
             </field>
         </record>
     </data>
+    <data>
+        <record id="action_gl_reconcile_server" model="ir.actions.server">
+            <field name="name">Reconcile Selected</field>
+            <field name="model_id" ref="account.model_account_move_line"/>
+            <field name="binding_model_id" ref="account.model_account_move_line"/>
+            <field name="binding_view_types">list</field>
+            <field name="state">code</field>
+            <field name="code">
+                action = records.action_gl_reconcile()
+            </field>
+        </record>
+    </data>
 </odoo>
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 7f422aa9..4faf905e 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -134,8 +134,28 @@
                                 <br/>
                         </group>
                     </group>
-                    <notebook attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
-                        <page string="Rincian Reimburse">
+                    <notebook>
+                        <page string="Rincian Estimasi PUM" attrs="{'invisible': [('type_request', '!=', 'pum')]}">
+                            <p style="font-size: 12px; color: grey; font-style: italic">*Masukkan estimasi alokasi biaya sebagai gambaran rencana penggunaan dana, tidak harus diisi dengan nominal yang akurat</p>
+                            <field name="estimate_line_ids">
+                                <tree>
+                                    <field name="category_estimate"/>
+                                    <field name="description"/>
+                                    <field name="nominal" sum="Total"/>
+                                    <field name="currency_id" invisible="1"/>
+                                </tree>
+                                <form>
+                                    <group col="2">
+                                        <field name="request_id" invisible="1"/>
+                                        <field name="category_estimate"/>
+                                        <field name="description" placeholder="Deskripsi tambahan untuk rincian estimasi..."/>
+                                        <field name="nominal"/>
+                                        <field name="currency_id" invisible="1"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Rincian Reimburse" attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
                             <field name="reimburse_line_ids">
                                 <tree>
                                     <field name="sequence" widget="handle"/>
@@ -236,6 +256,7 @@
                 <filter string="PUM" name="filter_pum" domain="[('type_request','=','pum')]"/>
                 <filter string="Reimburse" name="filter_reimburse" domain="[('type_request','=','reimburse')]"/>
                 <separator/>
+                <filter string="Cancelled" name="filter_cancelled" domain="[('status','=','cancel')]"/>
                 <filter string="Waiting for Approval" name="filter_waiting_approval" domain="[('status','in',['pengajuan1','pengajuan2','pengajuan3'])]"/>
                 <filter string="Approved" name="filter_approved" domain="[('status','=','approved')]"/>
                 <separator/>
diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml
index a8bf1de7..352c5b96 100644
--- a/indoteknik_custom/views/advance_payment_settlement.xml
+++ b/indoteknik_custom/views/advance_payment_settlement.xml
@@ -118,12 +118,26 @@
                                         <group string="Finance">
                                             <field name="is_current_user_ap" invisible="1"/>
                                             <field name="account_id" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
+                                            <field name="category_usage" invisible="1"/>
                                             <field name="done_attachment" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
                                         </group>
                                     </group>
                                 </form>
                             </field>
                         </page>
+                        <page string="Rincian Estimasi PUM">
+                            <p style="font-size: 12px; color: grey; font-style: italic">*Rincian estimasi PUM ini hanya sebagai gambaran umum untuk realisasi yang dilakukan, tidak harus diisi dengan nominal yang akurat.</p>
+                            <field name="pum_estimate_line_ids" nolabel="1">
+                                <tree>
+                                    <field name="category_estimate"/>
+                                    <field name="description"/>
+                                    <field name="nominal" sum="Total Estimasi"/>
+                                    <field name="frequency"/>
+                                    <field name="total_actual" sum="Total Actual"/>
+                                    <field name="currency_id" invisible="1"/>
+                                </tree>
+                            </field>
+                        </page>
                     </notebook>
 
                    <div style="text-align:right;">
diff --git a/indoteknik_custom/views/approval_date_doc.xml b/indoteknik_custom/views/approval_date_doc.xml
index 3d597aa8..a3aae3b4 100644
--- a/indoteknik_custom/views/approval_date_doc.xml
+++ b/indoteknik_custom/views/approval_date_doc.xml
@@ -14,6 +14,7 @@
                 <field name="approve_date"/>
                 <field name="approve_by"/>
                 <field name="create_uid"/>
+                <field name="create_date"/>
             </tree>
         </field>
     </record>
@@ -46,6 +47,7 @@
                             <field name="approve_date"/>
                             <field name="approve_by"/>
                             <field name="create_uid"/>
+                            <field name="create_date"/>
                             <field name="note" attrs="{'invisible': [('state', '!=', 'cancel')]}"/>
                             <field name="state" readonly="1"/>
                         </group>
diff --git a/indoteknik_custom/views/find_page.xml b/indoteknik_custom/views/find_page.xml
index c752aa98..fc9bddbb 100644
--- a/indoteknik_custom/views/find_page.xml
+++ b/indoteknik_custom/views/find_page.xml
@@ -25,7 +25,7 @@
                             <group>
                                 <field name="category_id"/>
                                 <field name="brand_id"/>
-                                <field name="url"/>
+                                <field name="url" />
                             </group>
                             <group>
                                 <field name="create_uid"/>
@@ -62,9 +62,18 @@
         <field name="view_mode">tree,form</field>
     </record>
 
+
+    <record id="ir_actions_server_find_page_sync_to_solr" model="ir.actions.server">
+        <field name="name">Sync to solr</field>
+        <field name="model_id" ref="indoteknik_custom.model_web_find_page"/>
+        <field name="binding_model_id" ref="indoteknik_custom.model_web_find_page"/>
+        <field name="state">code</field>
+        <field name="code">model._sync_to_solr()</field>
+    </record>
+
     <menuitem id="menu_web_find_page"
         name="Web Find Page"
         action="web_find_page_action"
         parent="website_sale.menu_orders"
         sequence="8"/>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/indoteknik_custom/views/gudang_service.xml b/indoteknik_custom/views/gudang_service.xml
new file mode 100644
index 00000000..769664c5
--- /dev/null
+++ b/indoteknik_custom/views/gudang_service.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+	<data>
+	<!-- Tree -->
+    <record id="view_gudang_service_tree" model="ir.ui.view">
+        <field name="name">gudang.serivice.tree</field>
+        <field name="model">gudang.service</field>
+        <field name="arch" type="xml">
+		<tree string="Monitoring Barang Service" decoration-danger="state in ('draft', 'received_from_cust')" decoration-warning="state in ('sent_to_vendor', 'received_from_vendor')" 
+			decoration-success="state == 'delivered_to_cust'" decoration-muted="state == 'cancel'" >
+				<field name="name"/>
+				<field name="partner_id"/>
+				<field name="vendor_id"/>
+				<field name="origin"/>
+				<field name="schedule_date"/>
+				<field name="start_date" optional="hide"/>
+				<field name="remaining_date"/>
+				<field name="state" widget="badge" decoration-danger="state in ('draft', 'received_from_cust')" decoration-warning="state in ('sent_to_vendor', 'received_from_vendor')" 
+				decoration-success="state == 'delivered_to_cust'" decoration-muted="state == 'cancel'" />
+				<field name="cancel_reason" optional="hide"/>
+				<field name="create_date" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+	<!-- Form -->
+    <record id="view_gudang_service_form" model="ir.ui.view">
+        <field name="name">gudang.service.form</field>
+        <field name="model">gudang.service</field>
+        <field name="arch" type="xml">
+            <form>
+			<header>
+				<button name="action_submit" string="Proceed" type="object"
+						class="btn-primary"
+						attrs="{'invisible': [('state', 'in', ['cancel', 'done', 'received_from_vendor', 'delivered_to_cust'])]}"/>
+				<button name="action_done" string="Set Done" type="object"
+						class="btn-primary"
+						attrs="{'invisible': [('state', 'not in', ['received_from_vendor'])]}"/>
+				<button name="action_cancel" string="Cancel" type="object"
+						class="btn-secondary"
+						attrs="{'invisible': [('state', 'in', ['cancel', 'delivered_to_cust'])]}"/>
+				<button name="action_draft" string="Set to Backlog" type="object"
+						class="btn-secondary"
+						attrs="{'invisible': [('state', 'not in', ['cancel'])]}"/>
+				<field name="state" widget="statusbar" readonly="1"/>
+			</header>
+			<sheet>
+				<div class="oe_title">
+					<h1>
+						<field name="name" readonly="1" class="oe_inline"/>
+					</h1>
+				</div>
+				<group>
+					<field name="origin" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
+					<field name="partner_id"/>
+					<field name="vendor_id"/>
+					<field name="remaining_date"/>
+					<field name="schedule_date" attrs="{'readonly': [('state', 'not in', ['draft', 'reveived_from_cust'])]}"/>
+					<field name="start_date" readonly="1"/>
+					<field name="done_date" attrs="{'invisible': [('state', 'not in', ['delivered_to_cust'])]}"/>
+					<field name="create_uid"/>
+					<field name="cancel_reason" 
+						attrs="{'invisible': [('state', 'in', ['delivered_to_cust', 'draft'])]}"/>
+				</group>
+					<notebook>
+						<page string="Product Lines" name="product_lines">
+							<field name="gudang_service_lines">
+								<tree string="Product Lines" editable="top" create="0" delete="1">
+									<field name="product_id"/>
+									<field name="quantity"/>
+								</tree>
+							</field>
+						</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>
+	<!-- Action -->
+	<record id="action_gudang_service" model="ir.actions.act_window">
+		<field name="name">Monitoring Barang Service</field>
+		<field name="type">ir.actions.act_window</field>
+		<field name="res_model">gudang.service</field>
+		<field name="view_mode">tree,form</field>
+	</record>
+
+	<!-- Menu -->
+	<menuitem
+			id="menu_gudang_service"
+			name="Monitoring Barang Service"
+			parent="indoteknik_custom.menu_monitoring_in_sale"
+			sequence="10"
+			action="action_gudang_service"
+	/>
+    </data>
+	<!-- Cron -->
+	<record id="ir_cron_gudang_service_logistik_notify" model="ir.cron">
+		<field name="name">Gudang Service Daily Notification</field>
+		<field name="model_id" ref="model_gudang_service"/>
+		<field name="state">code</field>
+		<field name="code">model.cron_notify_onprogress_gudang_service()</field>
+		<field name="interval_number">1</field>
+		<field name="interval_type">days</field>
+		<field name="numbercall">-1</field>
+		<field name="active">False</field>
+	</record>
+</odoo>
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 46148606..55e48300 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -260,5 +260,14 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+
+        <record id="seq_gudang_service" model="ir.sequence">
+            <field name="name">Gudang Service</field>
+            <field name="code">gudang.service</field>
+            <field name="prefix">MGS/%(year)s/%(month)s/</field>
+            <field name="padding">4</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/kartu_stock.xml b/indoteknik_custom/views/kartu_stock.xml
new file mode 100644
index 00000000..705d86a2
--- /dev/null
+++ b/indoteknik_custom/views/kartu_stock.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="kartu_stok_wizard_form_inherit_single_excel" model="ir.ui.view">
+            <field name="name">kartu.stok.wizard.form.inherit.single.excel</field>
+            <field name="model">kartu.stok.wizard</field>
+            <field name="inherit_id" ref="proweb_kartu_stok.print_kartu_stok_view_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//footer" position="inside">
+
+                    <button name="action_kartu_stok_excel_single_sheet" type="object" string="Print Excel (Single Sheet)" class="btn-primary"/>
+
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/keywords.xml b/indoteknik_custom/views/keywords.xml
new file mode 100644
index 00000000..a33edae0
--- /dev/null
+++ b/indoteknik_custom/views/keywords.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="keywords_tree" model="ir.ui.view">
+        <field name="name">keywords.tree</field>
+        <field name="model">keywords</field>
+        <field name="arch" type="xml">
+            <tree >
+                <field name="category_id" />
+                <field name="keywords" />
+                <field name="url" />
+                <field name="sum" />
+                <field name="solr_flag" readonly="1"/>
+                <field name="product_ids" widget="many2many_tags" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="keywords_form" model="ir.ui.view">
+        <field name="name">keywords.form</field>
+        <field name="model">keywords</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="generate_products" string="Generate Product Manual" type="object" class="oe_highlight"/>
+                    <button name="clear_products" string="Clear Generated Products" type="object" />
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" readonly="1" class="oe_inline"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <field name="category_id" />
+                        <field name="keywords" />
+                        <field name="url" />
+                        <field name="sum" />
+                        <field name="product_ids" widget="many2many_tags" />
+                        <field name="skip" />
+                        <field name="solr_flag" readonly="1"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_keywords_filter" model="ir.ui.view">
+        <field name="name">keywords.list.select</field>
+        <field name="model">keywords</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Search Keywords">
+                <field name="category_id"/>
+                <field name="keywords"/>
+                <field name="sum"/>
+                <field name="solr_flag" readonly="1"/>
+                <field name="product_ids" widget="many2many_tags"/>
+            </search>
+        </field>
+    </record>
+    <record id="action_keywords" model="ir.actions.act_window">
+        <field name="name">Keywords</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">keywords</field>
+        <field name="search_view_id" ref="view_keywords_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="ir_actions_server_keywords_sync_to_solr" model="ir.actions.server">
+        <field name="name">Sync to solr</field>
+        <field name="model_id" ref="indoteknik_custom.model_keywords"/>
+        <field name="binding_model_id" ref="indoteknik_custom.model_keywords"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_solr()</field>
+    </record>
+    <menuitem id="menu_keywords"
+        name="Keywords"
+        parent="website_sale.menu_orders"
+        action="action_keywords"
+        sequence="100"/>
+
+    <data noupdate="1">
+        <record id="cron_keywords_solr_flag_queue" model="ir.cron">
+            <field name="name">Sync Keywords To Solr: Queue Solr Flag 2</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="model_id" ref="model_keywords"/>
+            <field name="code">model.solr_flag_to_queue(limit=500)</field>
+            <field name="state">code</field>
+            <field name="priority">55</field>
+            <field name="active">False</field>
+        </record>
+    </data>
+</odoo>
diff --git a/indoteknik_custom/views/mail_template_efaktur.xml b/indoteknik_custom/views/mail_template_efaktur.xml
index b0637691..ea473364 100644
--- a/indoteknik_custom/views/mail_template_efaktur.xml
+++ b/indoteknik_custom/views/mail_template_efaktur.xml
@@ -11,7 +11,7 @@
             <field name="email_to">${object.partner_id.email|safe}</field>
             <field name="body_html" type="html">
                 <p>Dengan Hormat Bpk/Ibu ${object.partner_id.name},</p>
-                <p>Terlampir Faktur Pajak atas Invoice ${object.name}.</p>
+                <p>Terlampir Faktur Pajak atas Invoice ${object.name}${ ' (%s)' % ctx.get('cust_ref') if ctx.get('cust_ref') else '' }</p>
                 <p><strong>Keterangan:</strong></p>
                 <p>Mohon dicek langsung faktur pajak terlampir, terutama informasi nomor NPWP dan alamat NPWP serta nama pembelian barang. Jika ada yang tidak sesuai, mohon segera menginformasikan kepada kami paling lambat 1 (satu) minggu dari tanggal email ini. Revisi faktur pajak tidak dapat kami proses apabila sudah melewati 1 (satu) minggu. Harap maklum.</p>
                 <p>Mohon balas email ini jika sudah menerima, terima kasih.</p>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 16b8bd44..9651cdd6 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -46,6 +46,19 @@
                     </button>
                 </xpath>
                 <button id="draft_confirm" position="after">
+                    <button name="action_create_order_altama"
+                        type="object"
+                        string="Create Order Altama"
+                        class="oe_highlight"
+                        icon="fa-cloud-upload"
+                        attrs="{'invisible': [('partner_id', '!=', 5571)]}"
+                    />
+                    <button name="action_get_order_altama"
+                        type="object"
+                        string="Get Order Altama"
+                        class="oe_highlight"
+                        attrs="{'invisible': [('partner_id', '!=', 5571)]}"
+                        icon="fa-cloud-download"/>
                     <button name="po_approve"
                             string="Ask Approval"
                             type="object"
@@ -76,6 +89,10 @@
                 </field>
                 <field name="approval_status" position="after">
                     <field name="revisi_po"/>
+                    <field name="soo_number" attrs="{'invisible': [('partner_id', '!=', 5571)]}"/>
+                    <field name="soo_price" attrs="{'invisible': [('partner_id', '!=', 5571)]}"/>
+                    <field name="soo_discount" attrs="{'invisible': [('partner_id', '!=', 5571)]}"/>
+                    <field name="soo_tax" attrs="{'invisible': [('partner_id', '!=', 5571)]}"/>
                     <field name="not_update_purchasepricelist"/>
                 </field>
                 <field name="approval_status" position="after">
@@ -105,6 +122,7 @@
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
                     <field name="total_so_margin"/>
+                    <field name="amount_cashback"/>
                     <field name="total_percent_margin"/>
                     <field name="total_so_percent_margin"/>
                 </field>
@@ -152,8 +170,13 @@
                 </field>
                 <field name="price_unit" position="after">
                     <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/>
+                    <field name="description" optional="hide"/>
+                    <field name="docstatus_altama" optional="hide"/>
                 </field>
                 <field name="price_subtotal" position="after">
+                    <field name="altama_ordered" optional="hide" readonly="1"/>
+                    <field name="altama_delivered" optional="hide" readonly="1"/>
+                    <field name="altama_invoiced" optional="hide" readonly="1"/>
                     <field name="so_item_margin" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="so_item_percent_margin" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="item_margin" attrs="{'readonly': 1}" optional="hide"/>
diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index d303e5ea..16fbb01a 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -7,20 +7,20 @@
             <tree decoration-info="(check_pj == False)" create="false" multi_edit="1">
                 <field name="product_id"/>
                 <field name="vendor_id"/>
-                <field name="purchase_representative_id"/>
-                <field name="brand"/>
-                <field name="item_code"/>
-                <field name="product"/>
-                <field name="onhand"/>
-                <field name="incoming"/>
-                <field name="outgoing"/>
-                <field name="status_apo" invisible="1"/>
-                <field name="action"/>
-                <field name="note"/>
-                <field name="note_detail"/>
+                <field name="purchase_representative_id" optional="hide"/>
+                <field name="brand" optional="hide"/>
+                <field name="item_code" optional="hide"/>
+                <field name="product" optional="hide"/>
+                <field name="onhand" optional="hide"/>
+                <field name="incoming" optional="hide"/>
+                <field name="outgoing" optional="hide"/>
+                <field name="status_apo" optional="hide" invisible="1"/>
+                <field name="action" optional="hide"/>
+                <field name="note" optional="hide"/>
+                <field name="note_detail" optional="hide"/>
                 <field name="date_po" optional="hide"/>
-                <field name="so_number"/>
-                <field name="check_pj" invisible="1"/>
+                <field name="so_number" optional="hide"/>
+                <field name="check_pj" optional="hide" invisible="1"/>
                 <button name="action_open_job_detail"
                         string="📄"
                         type="object"
@@ -59,7 +59,7 @@
                             <field name="outgoing"/>
                             <field name="purchase_representative_id"/>
                             <field name="vendor_id"/>
-                            <field name="note"/>
+                            <!-- <field name="note"/> -->
                             <field name="note_detail"/>
                         </group>
                     </group>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 23fbe155..2d4488ab 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -302,6 +302,7 @@
                             ]
                         }
                     "/>
+                    <field name="amount_cashback"/>
                     <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id"
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
@@ -384,7 +385,7 @@
                         {
                             'readonly': [
                                 '|',
-                                ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
+                                ('approval_status', 'in', ['pengajuan0','pengajuan1', 'pengajuan2', 'approved']),
                                 ('state', 'not in', ['cancel', 'draft'])
                             ]
                         }
diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml
index c3f79bda..e348867c 100644
--- a/indoteknik_custom/views/shipment_group.xml
+++ b/indoteknik_custom/views/shipment_group.xml
@@ -7,6 +7,7 @@
             <tree default_order="create_date desc">
                 <field name="number"/>
                 <field name="partner_id"/>
+                <field name="partner_ids" widget="many2many_tags" optional="hide"/>
                 <field name="carrier_id"/>
                 <field name="total_colly_line"/>
             </tree>
@@ -42,9 +43,12 @@
                     <group>
                         <group>
                             <field name="number" readonly="1"/> 
+                            <field name="is_multi_partner" readonly="1"/> 
                         </group>
                         <group>
-                            <field name="partner_id" readonly="1"/> 
+                            <field name="partner_id" readonly="1" attrs="{'invisible': [('is_multi_partner', '=', True)]}"/> 
+                            <field name="partner_ids" readonly="1" widget="many2many_tags" attrs="{'invisible': [('is_multi_partner', '=', False)]}"/> 
+                            <field name="driver" attrs="{'invisible': [('carrier_id', '!=', 1)]}"/>
                             <field name="carrier_id" readonly="1"/> 
                             <field name="total_colly_line" readonly="1"/> 
                         </group>
diff --git a/indoteknik_custom/views/stock_inventory.xml b/indoteknik_custom/views/stock_inventory.xml
index db85f05c..ab1b6eec 100644
--- a/indoteknik_custom/views/stock_inventory.xml
+++ b/indoteknik_custom/views/stock_inventory.xml
@@ -9,6 +9,7 @@
             <xpath expr="//field[@name='location_ids']" position="after">
                 <field name="number" readonly="1"/>
                 <field name="adjusment_type" />
+                <field name="approval_state" />
             </xpath>
         </field>
     </record>
@@ -21,6 +22,8 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='date']" position="after">
                 <field name="number"/>
+                <field name="adjusment_type" />
+                <field name="approval_state"/>
             </xpath>
         </field>
     </record>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 9aa0581c..29a95626 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -133,6 +133,7 @@
                     <field name="total_mapping_koli" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
                     <field name="total_koli_display" readonly="1" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
                     <field name="linked_out_picking_id" readonly="1" attrs="{'invisible': [('location_id', '=', 60)]}"/>
+                    <field name="number_soo" attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
                 </field>
                 <field name="weight_uom_name" position="after">
                     <group>
@@ -245,6 +246,7 @@
                                 <field name="responsible"/>
                                 <field name="carrier_id"
                                        attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}"/>
+                                <field name="shipment_group_id"/>
                                 <field name="biteship_id" invisible="1"/>
                                 <field name="out_code" attrs="{'invisible': [['out_code', '=', False]]}"/>
                                 <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/>
diff --git a/indoteknik_custom/views/token_log.xml b/indoteknik_custom/views/token_log.xml
new file mode 100644
index 00000000..77e6dd48
--- /dev/null
+++ b/indoteknik_custom/views/token_log.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="token_log_tree" model="ir.ui.view">
+        <field name="name">token.log.tree</field>
+        <field name="model">token.log</field>
+        <field name="arch" type="xml">
+            <tree editable="top" default_order="create_date desc">
+                <field name="token"/>
+                <field name="expires_at"/>
+                <field name="token_from"/>
+                <field name="created_at"/>
+                <field name="created_by"/>
+                <field name="source"/>
+                <field name="is_active" widget="boolean_toggle"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="token_log_action" model="ir.actions.act_window">
+        <field name="name">Token Log</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">token.log</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            action="token_log_action"
+            id="token_log"
+            parent="base.menu_users"
+            name="Token Log"
+            sequence="1"
+    />
+</odoo>
diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 8cfb5680..609dea15 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -133,5 +133,29 @@
                 </form>
             </field>
         </record>
+        <record id="view_tukar_guling_filter" model="ir.ui.view">
+            <field name="name">tukar.guling.filter</field>
+            <field name="model">tukar.guling</field>
+            <field name="arch" type="xml">
+                <search string="Tukar Guling">
+                    <field name="name" string="No. Dokumen"/>
+                    <field name="partner_id" string="Customer"/>
+                    <field name="origin" string="SO Number"/>
+                    <field name="operations" string="Operations"/>
+                    <!-- <filter string="Pengajuan Saya" name="my_tukar_guling" domain="[('create_uid', '=', uid)]"/> -->
+                    <separator/>
+                    <filter string="Tukar Guling" name="tukar_guling" domain="[('return_type', '=', 'tukar_guling')]"/>
+                    <filter string="Return SO" name="return_so" domain="[('return_type', '=', 'retur_so')]"/>
+                    <separator/>
+                    <filter string="Approval Sales" name="approval_sales" domain="[('state', '=', 'approval_sales')]"/>
+                    <filter string="Approval Logistic" name="approval_logistic" domain="[('state', '=', 'approval_logistic')]"/>
+                    <filter string="Approval Finance" name="approval_finance" domain="[('state', '=', 'approval_finance')]"/>
+                    <filter string="Approved" name="approved" domain="[('state', '=', 'approved')]"/>
+                    <separator/>
+                    <filter string="Done" name="done" domain="[('state', '=', 'done')]"/>
+                    <filter string="Cancelled" name="cancel" domain="[('state', '=', 'cancel')]"/>
+                </search>
+            </field>
+        </record>
     </data>
 </odoo>
diff --git a/indoteknik_custom/views/update_depreciation_move_wizard_view.xml b/indoteknik_custom/views/update_depreciation_move_wizard_view.xml
new file mode 100644
index 00000000..ff128a71
--- /dev/null
+++ b/indoteknik_custom/views/update_depreciation_move_wizard_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_update_depreciation_move_wizard_form" model="ir.ui.view">
+      <field name="name">update.depreciation.move.wizard.form</field>
+      <field name="model">update.depreciation.move.wizard</field>
+      <field name="arch" type="xml">
+        <form string="Update Move Check">
+          <group>
+            <field name="target_date"/>
+          </group>
+          <footer>
+            <button string="Update" type="object" name="action_update_move_check" class="btn-primary"/>
+            <button string="Batal" special="cancel" class="btn-secondary"/>
+          </footer>
+        </form>
+      </field>
+    </record>
+
+    <record id="update_depreciation_move_wizard_action" model="ir.actions.act_window">
+      <field name="name">Update Depreciation Asset</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">update.depreciation.move.wizard</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+  <menuitem
+      id="menu_update_depreciation_move_wizard"
+      name="Update Depreciation Asset"
+      parent="account.menu_finance_entries_management"
+      sequence="4"
+      action="update_depreciation_move_wizard_action"
+  />
+</odoo>
+  
\ No newline at end of file
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index d5cec350..b52fe795 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -82,7 +82,7 @@
                                 <field name="x_negara_asal"/>
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>
-                                <!-- <field name="cashback_percent" widget="percentage"/> -->
+                                <field name="cashback_percent" widget="percentage"/>
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
                                 <field name="parent_id"/>