diff options
Diffstat (limited to 'indoteknik_custom/views')
| -rw-r--r-- | indoteknik_custom/views/advance_payment_request.xml | 14 | ||||
| -rw-r--r-- | indoteknik_custom/views/advance_payment_settlement.xml | 80 |
2 files changed, 49 insertions, 45 deletions
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml index 65138be2..297d2a7a 100644 --- a/indoteknik_custom/views/advance_payment_request.xml +++ b/indoteknik_custom/views/advance_payment_request.xml @@ -15,11 +15,11 @@ string="Reset to Draft" attrs="{'invisible': [('status', '!=', 'reject')]}" type="object"/> - <button name="action_reject" + <!-- <button name="action_reject" type="object" string="Reject" class="btn-danger" - attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/> + attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/> --> <button name="action_approval_check" type="object" string="Checking/Approval" @@ -67,7 +67,7 @@ <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/> <field name="is_represented" attrs="{'readonly': [('status', '=', 'approved')]}"/> <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/> - <field name="position_type" readonly="1"/> + <field name="position_type" force_save="1" readonly="1"/> <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/> <field name="bank_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/> <field name="account_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/> @@ -109,9 +109,9 @@ <page string="Rincian Reimburse"> <field name="reimburse_line_ids"> <tree> - <field name="account_id"/> <field name="date"/> <field name="description"/> + <field name="account_id"/> <!-- <field name="distance"/> --> <field name="quantity"/> <field name="price"/> @@ -187,21 +187,21 @@ </record> <record id="action_advance_payment_request" model="ir.actions.act_window"> - <field name="name">Advance Payment Request & Reimburse</field> + <field name="name">Advance Payment Request or Reimburse</field> <field name="type">ir.actions.act_window</field> <field name="res_model">advance.payment.request</field> <field name="view_mode">tree,form</field> </record> <menuitem id="menu_advance_payment_request_acct" - name="Advance Payment Request & Reimburse" + name="Advance Payment Request or Reimburse" parent="account.menu_finance_entries" sequence="114" action="action_advance_payment_request" /> <menuitem id="menu_advance_payment_request_sales" - name="Advance Payment Request & Reimburse" + name="Advance Payment Request or Reimburse" parent="sale.product_menu_catalog" sequence="101" action="action_advance_payment_request" diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml index a2bb31b2..a2ab5727 100644 --- a/indoteknik_custom/views/advance_payment_settlement.xml +++ b/indoteknik_custom/views/advance_payment_settlement.xml @@ -9,12 +9,12 @@ type="object" string="Validasi" class="btn-info" - attrs="{'invisible': [('done_status', '=', 'done_realized')]}"/> + attrs="{'invisible': [('status', '!=', 'approved')]}"/> <button name="action_cab" type="object" class="btn-info" - attrs="{'invisible': [('is_cab_visible', '=', True)]}" - string="AP Only"/> + attrs="{'invisible': [ '|', ('is_cab_visible', '=', True),('status', '!=', 'approved')]}" + string="Make CAB"/> <button name="action_approval_check" type="object" string="Checking/Approval" @@ -78,9 +78,9 @@ <page string="Rincian Pemberian"> <field name="pemberian_line_ids" nolabel="1"> <tree editable="false" create="false" delete="false"> - <field name="date" readonly="1"/> - <field name="description" readonly="1"/> - <field name="value" sum="Total Pemberian" readonly="1"/> + <field name="date" readonly="1" force_save="1"/> + <field name="description" readonly="1" force_save="1"/> + <field name="value" sum="Total Pemberian" readonly="1" force_save="1"/> </tree> </field> </page> @@ -95,39 +95,43 @@ </tree> <form> - <group> - <field name="lot_of_attachment" invisible="1"/> - <field name="date"/> - <field name="account_id"/> - <field name="description"/> - <field name="nominal"/> - <field name="attachment_type" - attrs="{ - 'invisible': [('lot_of_attachment', '=', 'one_for_all_line')] - }"/> - <field name="attachment_file_pdf" - filename="attachment_filename_pdf" - widget="pdf_viewer" - attrs="{ - 'invisible': [ - '|', - ('lot_of_attachment', '=', 'one_for_all_line'), - ('attachment_type', '!=', 'pdf') - ] - }"/> - <field name="attachment_file_image" - filename="attachment_filename_image" - widget="image" - attrs="{ - 'invisible': [ - '|', - ('lot_of_attachment', '=', 'one_for_all_line'), - ('attachment_type', '!=', 'image') - ] - }" - style="max-width:250px; max-height:250px; object-fit:contain;"/> + <group col="2"> + <group string = "Form"> + <field name="lot_of_attachment" invisible="1"/> + <field name="date"/> + <field name="description"/> + <field name="nominal"/> + <field name="attachment_type" + attrs="{ + 'invisible': [('lot_of_attachment', '=', 'one_for_all_line')] + }"/> + <field name="attachment_file_pdf" + filename="attachment_filename_pdf" + widget="pdf_viewer" + attrs="{ + 'invisible': [ + '|', + ('lot_of_attachment', '=', 'one_for_all_line'), + ('attachment_type', '!=', 'pdf') + ] + }"/> + <field name="attachment_file_image" + filename="attachment_filename_image" + widget="image" + attrs="{ + 'invisible': [ + '|', + ('lot_of_attachment', '=', 'one_for_all_line'), + ('attachment_type', '!=', 'image') + ] + }" + style="max-width:250px; max-height:250px; object-fit:contain;"/> - <field name="done_attachment"/> + </group> + <group string="Finance"> + <field name="account_id"/> + <field name="done_attachment"/> + </group> </group> </form> </field> |
