Merge branch 'bsc_finance' of https://bitbucket.org/altafixco/indoteknik-addons into bsc_finance

merge

4 files changed, 173 insertions, 12 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..cb6f6690 100644
--- a/indoteknik_custom/views/account_move_line.xml
+++ b/indoteknik_custom/views/account_move_line.xml
@@ -24,6 +24,19 @@
                 </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/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/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"
diff --git a/indoteknik_custom/views/upah_harian_office_views.xml b/indoteknik_custom/views/upah_harian_office_views.xml
new file mode 100644
index 00000000..f8260552
--- /dev/null
+++ b/indoteknik_custom/views/upah_harian_office_views.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- View upah.harian.office View Tree -->
+    <record id="view_upah_harian_tree" model="ir.ui.view">
+        <field name="name">view.upah.harian.tree</field>
+        <field name="model">upah.harian</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="pemohon"/>
+                <field name="tanggal"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- View upah.harian.office form -->
+    <record id="view_upah_harian_form" model="ir.ui.view">
+        <field name="name">view.upah.harian.form</field>
+        <field name="model">upah.harian</field>
+        <field name="arch" type="xml">
+            <form string="Upah Harian Office">
+                <header>
+                    <button name="action_create_journal_entries" class="btn-primary" type="object" string="Create Journal Entries" attrs="{'invisible': [('state', 'not in', ['done'])]}"/>
+                    <field name="state" widget="statusbar" readonly="1"/>
+                </header>
+
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="pemohon"/>
+                            <field name="departement_type"/>
+                            <field name="tanggal"/>
+                            <field name="upah_harian"/>
+                        </group>
+
+                        <group>
+                            <field name="attachment_type" attrs="{'readonly': [('state', '=', 'approved')]}"/>
+
+                            <field name="attachment_file_pdf" filename="attachment_filename"
+                                widget="pdf_viewer"
+                                attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('state', '=', 'approved')]}"/>
+
+                            <field name="attachment_file_image" filename="attachment_filename"
+                                widget="image"
+                                attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('state', '=', 'approved')]}"
+                                style="max-width:250px; max-height:250px; object-fit:contain;"/>
+
+                            <field name="total_upah"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Activity Line" name="activity_line">
+                            <field name="upah_harian_line">
+                                <tree editable="top">
+                                    <field name="hari" width="100px"/>
+                                    <field name="tanggal_line"/>
+                                    <field name="jam_masuk"/>
+                                    <field name="jam_keluar"/>
+                                    <field name="total_jam_kerja"/>
+                                    <field name="is_ganti_jam"/>
+                                    <field name="kegiatan"/>
+                                </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>
+
+    <!-- View upah.harian.office search -->
+    <record id="view_upah_harian_search" model="ir.ui.view">
+        <field name="name">view.upah.harian.search</field>
+        <field name="model">upah.harian</field>
+        <field name="arch" type="xml">
+            <search>
+                <group expand="1" string="Group By">
+                    <filter string="Name" name="name" domain="[]" context="{'group_by':'name'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_upah_harian" model="ir.actions.act_window">
+        <field name="name">Upah Harian</field>
+        <field name="res_model">upah.harian</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_upah_harian" name="Upah Harian" parent="account.menu_finance_entries" sequence="114" action="action_upah_harian" />
+
+
+</odoo>