feat: item wise tds calculation for purchase order

(cherry picked from commit 0fdde2e) # Conflicts: # erpnext/patches.txt
frappe · Nov 23, 2022 · 5f8f574 · 5f8f574
1 parent 2bd8bd2
commit 5f8f574
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
@@ -316,5 +316,9 @@ erpnext.patches.v14_0.create_accounting_dimensions_in_subcontracting_doctypes
 erpnext.patches.v14_0.fix_subcontracting_receipt_gl_entries
 erpnext.patches.v14_0.migrate_remarks_from_gl_to_payment_ledger
 erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization
+<<<<<<< HEAD
 erpnext.patches.v13_0.update_schedule_type_in_loans
-erpnext.patches.v14_0.update_tds_fields
+erpnext.patches.v14_0.update_tds_fields
+=======
+erpnext.patches.v14_0.update_partial_tds_fields
+>>>>>>> 0fdde2e5c0 (feat: item wise tds calculation for purchase order)