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

5 files changed, 22 insertions, 4 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index c88effd5..ba86277a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -59,6 +59,10 @@
                     <attribute name="widget">pdf_viewer</attribute>
                 </field>
                 <field name="invoice_user_id" position="after">
+                    <field name="payment_difficulty" widget="badge"
+                        decoration-info="payment_difficulty == 'normal'"
+                        decoration-warning="payment_difficulty in ('agak_sulit', 'sulit')"
+                        decoration-danger="payment_difficulty == 'bermasalah'"/>
                     <field name="invoice_origin"/>
                     <field name="date_kirim_tukar_faktur"/>
                     <field name="shipper_faktur_id"/>
@@ -122,6 +126,11 @@
                     decoration-danger="mark_upload_efaktur == 'belum_upload'"  
                     decoration-success="mark_upload_efaktur == 'sudah_upload'" />
                     <field name="due_extension" optional="hide"/>
+                    <field name="payment_difficulty" widget="badge"
+                        decoration-info="payment_difficulty == 'normal'"
+                        decoration-warning="payment_difficulty in ('agak_sulit', 'sulit')"
+                        decoration-danger="payment_difficulty == 'bermasalah'"
+                        optional="hide"/>
                 </field>
                 <field name="payment_state" position="after">
                     <field name="invoice_payment_term_id" optional="hide"/>
diff --git a/indoteknik_custom/views/account_move_line.xml b/indoteknik_custom/views/account_move_line.xml
index 02b936f1..017a9eda 100644
--- a/indoteknik_custom/views/account_move_line.xml
+++ b/indoteknik_custom/views/account_move_line.xml
@@ -6,6 +6,9 @@
             <field name="model">account.move</field>
             <field name="inherit_id" ref="account.view_move_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']" position="attributes">
+                    <attribute name="attrs">{'readonly': [('refund_id','!=',False)]}</attribute>
+                </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>
diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index 51f3deab..afa7c1cb 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -217,6 +217,7 @@
                                     <field name="finance_note"/>
                                 </group>
                                 <group>
+                                    <field name="biaya_admin"/>
                                     <field name="bukti_refund_type"  reqiured="1"/>
                                     <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')]}"/>
                                     <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')]}"/>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index c32151d8..72751187 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -21,6 +21,7 @@
                     <field name="reference_number"/>
                 </field>
                 <field name="property_payment_term_id" position="after">
+                    <field name="previous_payment_term_id" readonly="1"/>
                     <field name="is_cbd_locked" readonly="1"/>
                     <field name="user_payment_terms_sales" readonly="1"/>
                     <field name="date_payment_terms_sales" readonly="1"/>
diff --git a/indoteknik_custom/views/unpaid_invoice_view.xml b/indoteknik_custom/views/unpaid_invoice_view.xml
index e56bbee7..ec6c749d 100644
--- a/indoteknik_custom/views/unpaid_invoice_view.xml
+++ b/indoteknik_custom/views/unpaid_invoice_view.xml
@@ -46,6 +46,10 @@
                             <field name="date_kirim_tukar_faktur"/>
                             <field name="date_terima_tukar_faktur"/>
                             <field name="payment_term_id"/>
+                            <button name="action_create_surat_piutang"
+                                type="object"
+                                string="Create Surat Piutang"
+                                class="oe_highlight"/>
                         </group>
                         <group>
                             <field name="sale_id"/>
@@ -57,10 +61,10 @@
                                 decoration-warning="payment_state == 'partial'"/>
                             <field name="amount_total"/>
                             <field name="amount_residual"/>
-                            <button name="action_create_surat_piutang"
-                                type="object"
-                                string="Create Surat Piutang"
-                                class="oe_highlight"/>
+                            <field name="payment_difficulty" widget="badge"
+                                decoration-info="payment_difficulty == 'normal'"
+                                decoration-warning="payment_difficulty in ('agak_sulit', 'sulit')"
+                                decoration-danger="payment_difficulty == 'bermasalah'"/>
                         </group>
                     </group>
                 </sheet>