nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Move patch that updates SO from WO to v13

Browse Source 
(cherry picked from commit 94a1016623)

# Conflicts:
#	erpnext/patches.txt
This commit is contained in:
marination
2022-02-16 17:40:16 +05:30
committed by mergify-bot
parent b46bd0d9d1
commit 6cf1049495
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/patches.txt
View File

@@ -349,8 +349,8 @@ erpnext.patches.v13_0.update_sane_transfer_against
erpnext.patches.v13_0.enable_provisional_accounting erpnext.patches.v13_0.enable_provisional_accounting
erpnext.patches.v13_0.update_disbursement_account erpnext.patches.v13_0.update_disbursement_account
erpnext.patches.v13_0.update_reserved_qty_closed_wo erpnext.patches.v13_0.update_reserved_qty_closed_wo
<<<<<<< HEAD
erpnext.patches.v13_0.amazon_mws_deprecation_warning erpnext.patches.v13_0.amazon_mws_deprecation_warning
<<<<<<< HEAD
======= =======
<<<<<<< HEAD <<<<<<< HEAD
erpnext.patches.v13_0.amazon_mws_deprecation_warning erpnext.patches.v13_0.amazon_mws_deprecation_warning
@@ -359,3 +359,6 @@ erpnext.patches.v14_0.delete_amazon_mws_doctype
erpnext.patches.v14_0.set_work_order_qty_in_so_from_mr erpnext.patches.v14_0.set_work_order_qty_in_so_from_mr
>>>>>>> 0ca58d7627 (chore: Patch to update SO work_order_qty and Linter fix) >>>>>>> 0ca58d7627 (chore: Patch to update SO work_order_qty and Linter fix)
>>>>>>> 98ce6a1c8d (chore: Patch to update SO work_order_qty and Linter fix) >>>>>>> 98ce6a1c8d (chore: Patch to update SO work_order_qty and Linter fix)
=======
erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
>>>>>>> 94a1016623 (chore: Move patch that updates SO from WO to v13)

0
erpnext/patches/v14_0/set_work_order_qty_in_so_from_mr.py → erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py
View File