diff --git a/jey_erp/custom_fields.py b/jey_erp/custom_fields.py index d8e83c1..0819608 100644 --- a/jey_erp/custom_fields.py +++ b/jey_erp/custom_fields.py @@ -288,6 +288,12 @@ def create_custom_fields(): ) ], "Payment Entry": [ + dict( + fieldname='goods_provided_instead_of_salary', + label='Goods provided instead of salary', + fieldtype='Check', + insert_after='payment_type' + ), dict( fieldname='custom_note', label='Note', @@ -492,11 +498,17 @@ def create_custom_fields(): read_only=1 ), # Organizer and Seller checkboxes + dict( + fieldname='goods_provided_instead_of_salary', + label='Goods provided instead of salary', + fieldtype='Check', + insert_after='is_debit_note' + ), dict( fieldname='organizer', label='Organizer', fieldtype='Check', - insert_after='is_debit_note', + insert_after='goods_provided_instead_of_salary', depends_on='eval:doc.company_main_activity && ["92000", "9200003", "9200004", "9200001", "9200002", "9200005"].includes(doc.company_main_activity)', allow_on_submit=1 ), @@ -786,7 +798,20 @@ def create_custom_fields(): hidden=1, read_only=1 ) - ], + ], + "Journal Entry": [ + dict( + fieldname='expense_income_type', + label='Expense/Income', + fieldtype='Select', + options='\nIncome\nExpense', + insert_after='voucher_type', + in_list_view=1, + columns=2, + no_copy=1, + allow_on_submit=1 + ) + ], "Bank": [ dict( fieldname='bank_code',