schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Conflicts

Browse Source 
(cherry picked from commit 3023757a60)
This commit is contained in:
marination
2022-01-19 13:06:52 +05:30
committed by mergify-bot
parent 4086f4f8d1
commit dd81d622dd
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
View File

@@ -50,14 +50,6 @@ frappe.ui.form.on('Maintenance Visit', {
frm.set_value({ status: 'Draft' }); frm.set_value({ status: 'Draft' });
} }
if (frm.doc.__islocal) { if (frm.doc.__islocal) {
<<<<<<< HEAD
<<<<<<< HEAD
frm.doc.maintenance_type == 'Unscheduled' && frm.clear_table("purposes");
=======
frm.clear_table("purposes");
>>>>>>> 4f52b86d7e (refactor: update_serial_no function and code cleanup)
=======
>>>>>>> b98c61f2a7 (refactor: moved purpose table mandatory check to server)
frm.set_value({ mntc_date: frappe.datetime.get_today() }); frm.set_value({ mntc_date: frappe.datetime.get_today() });
} }
}, },

4
erpnext/patches.txt
View File

@@ -336,13 +336,9 @@ erpnext.patches.v12_0.update_production_plan_status
erpnext.patches.v13_0.item_naming_series_not_mandatory erpnext.patches.v13_0.item_naming_series_not_mandatory
erpnext.patches.v13_0.update_category_in_ltds_certificate erpnext.patches.v13_0.update_category_in_ltds_certificate
erpnext.patches.v13_0.create_ksa_vat_custom_fields erpnext.patches.v13_0.create_ksa_vat_custom_fields
<<<<<<< HEAD
erpnext.patches.v13_0.rename_ksa_qr_field erpnext.patches.v13_0.rename_ksa_qr_field
erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021 erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021
erpnext.patches.v13_0.update_tax_category_for_rcm erpnext.patches.v13_0.update_tax_category_for_rcm
erpnext.patches.v13_0.convert_to_website_item_in_item_card_group_template erpnext.patches.v13_0.convert_to_website_item_in_item_card_group_template
erpnext.patches.v13_0.agriculture_deprecation_warning erpnext.patches.v13_0.agriculture_deprecation_warning
=======
erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit
erpnext.patches.v14_0.migrate_crm_settings
>>>>>>> c872aa43f8 (fix(patch): updates maintenance schedule field for old docs)