Merge remote-tracking branch 'origin/staging' into real-stock

6 files changed, 135 insertions, 1 deletions

diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
new file mode 100644
index 00000000..983fbd5a
--- /dev/null
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="due_extension_tree" model="ir.ui.view">
+        <field name="name">due.extension.tree</field>
+        <field name="model">due.extension</field>
+        <field name="arch" type="xml">
+            <tree create="false">
+                <field name="number"/>
+                <field name="partner_id"/>
+                <field name="day_extension"/>
+                <field name="description"/>
+                <field name="approval_status"/>
+                <field name="is_approve"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="due_extension_line_tree" model="ir.ui.view">
+        <field name="name">due.extension.line.tree</field>
+        <field name="model">due.extension.line</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="partner_id"/>
+                <field name="invoice_id"/>
+                <field name="date_invoice"/>
+                <field name="due_date"/>
+                <field name="day_to_due"/>
+                <field name="efaktur_id"/>
+                <field name="reference"/>
+                <field name="total_amt"/>
+                <field name="open_amt"/>
+            </tree>
+        </field>
+    </record>
+
+<record id="due_extension_form" model="ir.ui.view">
+    <field name="name">due.extension.form</field>
+    <field name="model">due.extension</field>
+    <field name="arch" type="xml">
+        <form create="false">
+            <header>
+                <button name="approve_new_due"
+                    string="Approve"
+                    type="object"
+                />
+                <button name="due_extension_approval"
+                        string="Ask Approval"
+                        type="object"
+                />
+                <button name="due_extension_cancel"
+                        string="Cancel"
+                        type="object"
+                />
+            </header>
+            <sheet>
+                <group>
+                    <group>
+                        <field name="partner_id" readonly="1"/>
+                        <field name="day_extension" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                    </group>
+                    <group>
+                        <field name="is_approve" readonly="1"/>
+                        <field name="order_id" readonly="1"/>
+                        <field name="counter" readonly="1"/>
+                        <field name="approval_status" readonly="1"/>
+                    </group>
+                </group>
+                <group>
+                    <field name="description" attrs="{'readonly': [('approval_status', '=', 'approved')]}"/>
+                </group>
+                <notebook>
+                    <page string="Invoices">
+                        <field name="due_line" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                    </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>
+
+    <record id="due_extension_action" model="ir.actions.act_window">
+        <field name="name">Due Extension</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">due.extension</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_due_extension"
+        name="Due Extension"
+        parent="sale.product_menu_catalog"
+        sequence="4"
+        action="due_extension_action"
+    />
+    <menuitem id="menu_due_extension" name="Due Extension"
+        parent="account.menu_finance_receivables"
+        action="due_extension_action" 
+        sequence="100"
+    />
+</odoo>
diff --git a/indoteknik_custom/views/delivery_order.xml b/indoteknik_custom/views/delivery_order.xml
index 29ca7365..0b2fd576 100644
--- a/indoteknik_custom/views/delivery_order.xml
+++ b/indoteknik_custom/views/delivery_order.xml
@@ -21,6 +21,7 @@
                             <field name="arrival_date" readonly="1"/>
                             <field name="carrier_id" readonly="1"/>
                             <field name="tracking_no"/>
+                            <field name="partner_id" readonly="1"/>
                         </tree>
                     </field>
                 </sheet>
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 9af85408..a8348772 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -31,6 +31,16 @@
             <field name="number_increment">1</field>
         </record>
 
+        <record id="sequence_due_extension" model="ir.sequence">
+            <field name="name">Due Extension</field>
+            <field name="code">due.extension</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">DE/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
+
         <record id="sequence_requisition" model="ir.sequence">
             <field name="name">Requisition</field>
             <field name="code">requisition</field>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 5b0c99ef..4efa8cf4 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -42,6 +42,11 @@
                     <field name="total_so_margin"/>
                     <field name="total_percent_margin"/>
                     <field name="total_so_percent_margin"/>
+                    <button name="re_calculate"
+                            string="Re Calculate"
+                            type="object"
+                            attrs="{'invisible': [('approval_status', '=', 'approved')]}"
+                    />
                 </field>
                 <field name="product_id" position="before">
                     <field name="line_no" attrs="{'readonly': 1}" optional="hide"/>
@@ -59,6 +64,8 @@
                 </page>
                 <field name="fiscal_position_id" position="after">
                     <field name="note_description"/>
+                    <field name="total_so_percent_margin"/>
+                    
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index a9372da0..d609fdd5 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -6,13 +6,18 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <field name="vat" position="after">
+                <field name="npwp" position="after">
+                    <field name="sppkp"/>
+                    <field name="counter"/>
                     <field name="reference_number"/>
                 </field>
                 <field name="industry_id" position="after">
                     <field name="company_type_id"/>
                     <field name="group_partner_id"/>
                 </field>
+                <field name="npwp" position="before">
+                    <field name="customer_type"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 85f687c1..70e3392f 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -27,6 +27,12 @@
                     <field name="fee_third_party"/>
                     <field name="total_percent_margin"/>
                 </field>
+                <field name="analytic_account_id" position="after">
+                    <field name="customer_type" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-28'), ('create_date', '=', False)]}"/>
+                    <field name="npwp" placeholder='99.999.999.9-999.999' attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-28'), ('create_date', '=', False)]}"/>
+                    <field name="sppkp" attrs="{'invisible': [('customer_type','!=','pkp')], 'required': [('customer_type', '=', 'pkp')]}"/>
+                    <field name="due_id" readonly="1"/>
+                </field>
                 <field name="partner_shipping_id" position="after">
                     <field name="real_shipping_id"/>
                     <field name="approval_status" />
@@ -63,6 +69,7 @@
                     <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]"/>
                     <field name="item_percent_margin"/>
                     <field name="note_procurement" optional="hide"/>
+                    <field name="vendor_subtotal" optional="hide"/>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before">
                     <field name="line_no" readonly="1" optional="hide"/>