87a2c5cc69
Conflicts: erpnext/accounts/doctype/c_form/c_form.txt erpnext/patches/patch_list.py erpnext/setup/doctype/permission_control/permission_control.py |
||
---|---|---|
.. | ||
__init__.py | ||
add_fieldnames.py | ||
clean_property_setter.py | ||
cleanup_control_panel.py | ||
delete_docformat.py | ||
doctype_get_refactor.py | ||
earning_deduction_type_patch.py | ||
is_submittable_patch.py | ||
pos_invoice_fix.py | ||
so_rv_mapper_fix.py | ||
usertags.py |