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

5 files changed, 99 insertions, 13 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index c5f9580c..4b9f5316 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -218,6 +218,48 @@
             <field name="code">action = records.export_faktur_to_xml()</field>
         </record>
 
+        <record id="action_set_to_draft_journal_entry" model="ir.actions.server">
+            <field name="name">Set to Draft</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.button_draft()</field>
+        </record>
+
+        <!-- <record id="action_account_move_change_date_wizard" model="ir.actions.act_window">
+            <field name="name">Change Date</field>
+            <field name="res_model">account.move.change.date.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="binding_model_id" ref="account.model_account_move"/>
+            <field name="binding_view_types">list</field>
+        </record> -->
+
+        <record id="action_change_date" model="ir.actions.server">
+            <field name="name">Change Date</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.action_open_change_date_wizard()</field>
+        </record>
+
+        <record id="view_account_move_change_date_wizard_form" model="ir.ui.view">
+            <field name="name">account.move.change.date.wizard.form</field>
+            <field name="model">account.move.change.date.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Change Date">
+                    <p>Ubah tanggal journal yang dipilih, pastikan untuk memeriksa kembali tanggal yang akan diubah sebelum mengkonfirmasi perubahan.</p>
+                    <group>
+                        <field name="new_date"/>
+                    </group>
+                    <footer>
+                        <button name="action_change_date" string="Confirm" type="object" class="btn-primary"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
         <record id="view_sync_promise_date_wizard_form" model="ir.ui.view">
             <field name="name">sync.promise.date.wizard.form</field>
             <field name="model">sync.promise.date.wizard</field>
diff --git a/indoteknik_custom/views/account_move_line.xml b/indoteknik_custom/views/account_move_line.xml
index 346494f3..1e4b258e 100644
--- a/indoteknik_custom/views/account_move_line.xml
+++ b/indoteknik_custom/views/account_move_line.xml
@@ -24,6 +24,49 @@
                 </xpath>
             </field>
         </record>
+        <record id="view_move_line_tree_grouped_partner_inherit" model="ir.ui.view">
+            <field name="name">account.move.line.tree.grouped.partner.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_move_line_tree_grouped"/>
+            <field name="arch" type="xml">
+            <xpath expr="//field[@name='analytic_tag_ids']" position="replace">
+                <field name="analytic_tag_ids"
+                    widget="many2many_tags"
+                    optional="hide"/>
+            </xpath>
+            </field>
+        </record>
+        
+        <record id="view_account_move_line_filter_inherit" model="ir.ui.view">
+            <field name="name">account.move.line.filter.inherit</field>
+            <field name="model">account.move.line</field>  
+            <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//search" position="inside">
+                    <field name="analytic_tag_ids"
+                        string="Analytic Tag"
+                        filter_domain="[('analytic_tag_ids.name','ilike', self)]"/>
+                </xpath>
+                <!-- <xpath expr="//search" position="inside">
+                    <field name="analytic_account_id"
+                        string="Analytic Account"
+                        filter_domain="[('analytic_account_id.name','ilike', self)]"/>
+                    
+                </xpath>
+                <xpath expr="//search/group" position="inside">
+                    <filter string="Analytic Tag"
+                            name="group_by_analytic_tag"
+                            domain="[]"
+                            context="{'group_by': 'analytic_tag_ids'}"/>
+                </xpath>
+                <xpath expr="//search/group" position="inside">
+                    <filter string="Analytic Account"
+                            name="group_by_analytic_account"
+                            domain="[]"
+                            context="{'group_by': 'analytic_account_id'}"/>
+                </xpath> -->
+            </field>
+        </record>
     </data>
     <data>
         <record id="action_gl_reconcile_server" model="ir.actions.server">
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 9651cdd6..581690a1 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -51,6 +51,7 @@
                         string="Create Order Altama"
                         class="oe_highlight"
                         icon="fa-cloud-upload"
+                        confirm="Yakin ingin Membuat PO ini ke Altama?"
                         attrs="{'invisible': [('partner_id', '!=', 5571)]}"
                     />
                     <button name="action_get_order_altama"
diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index 8e1eb3b6..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="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"/>
+                <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"