mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-13 02:01:21 +00:00
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts: controllers/buying_controller.py
This commit is contained in:
@@ -249,4 +249,5 @@ patch_list = [
|
||||
"patches.may_2013.p01_selling_net_total_export",
|
||||
"patches.may_2013.repost_stock_for_no_posting_time",
|
||||
"patches.may_2013.p01_conversion_factor_and_aii",
|
||||
"patches.may_2013.p02_update_valuation_rate",
|
||||
]
|
||||
Reference in New Issue
Block a user