diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2023-12-18 09:31:54 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2023-12-18 09:31:54 +0700 |
| commit | 7099c4615aa3435273839c49ceee121306fec84d (patch) | |
| tree | 81d305474cb66747955aaf0c571a3ef81b8baad3 /indoteknik_custom/views | |
| parent | 07e8a51fc023025d2cbde83ab0333e5e53e2ad12 (diff) | |
| parent | 8fc9eddc57f76f62c3efaa70c9a3aee8be1911fa (diff) | |
Merge branch 'production' into purchasing-job
# Conflicts:
# indoteknik_custom/models/__init__.py
# indoteknik_custom/security/ir.model.access.csv
Diffstat (limited to 'indoteknik_custom/views')
| -rw-r--r-- | indoteknik_custom/views/account_move.xml | 3 | ||||
| -rw-r--r-- | indoteknik_custom/views/customer_commision.xml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index b0a206bf..7995b83b 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -56,6 +56,9 @@ </field> <field name="invoice_date_due" position="after"> <field name="invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}"/> + <field name="mark_upload_efaktur" optional="hide" widget="badge" + decoration-danger="mark_upload_efaktur == 'belum_upload'" + decoration-success="mark_upload_efaktur == 'sudah_upload'" /> <field name="due_extension" optional="hide"/> </field> <field name="payment_state" position="after"> diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml index 993521ca..88fe1cf1 100644 --- a/indoteknik_custom/views/customer_commision.xml +++ b/indoteknik_custom/views/customer_commision.xml @@ -8,7 +8,7 @@ <field name="number"/> <field name="date_from"/> <field name="date_to"/> - <field name="partner_id"/> + <field name="partner_ids"/> <field name="description"/> <field name="notification" readonly="1"/> <field name="status" readonly="1"/> @@ -48,7 +48,7 @@ <group> <field name="number"/> <field name="date_from"/> - <field name="partner_id"/> + <field name="partner_ids" widget="many2many_tags"/> <field name="description"/> <field name="commision_percent"/> <field name="commision_amt"/> |