Moved patches and fixed method routing in pages
diff --git a/patches/1312/p02_update_user_properties.py b/erpnext/patches/1312/p02_update_user_properties.py
similarity index 100%
rename from patches/1312/p02_update_user_properties.py
rename to erpnext/patches/1312/p02_update_user_properties.py
diff --git a/patches/1312/p03_move_warehouse_user_to_restrictions.py b/erpnext/patches/1312/p03_move_warehouse_user_to_restrictions.py
similarity index 100%
rename from patches/1312/p03_move_warehouse_user_to_restrictions.py
rename to erpnext/patches/1312/p03_move_warehouse_user_to_restrictions.py
diff --git a/patches/1312/p04_new_permissions.py b/erpnext/patches/1312/p04_new_permissions.py
similarity index 100%
rename from patches/1312/p04_new_permissions.py
rename to erpnext/patches/1312/p04_new_permissions.py
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js
index 18cd6cc..c229d81 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.js
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.js
@@ -71,9 +71,7 @@
get_data: function(btn) {
var me = this;
wn.call({
- module: "selling",
- page: "sales_funnel",
- method: "get_funnel_data",
+ method: "erpnext.selling.sales_funnel.get_funnel_data",
args: {
from_date: this.options.from_date,
to_date: this.options.to_date
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index 4c91727..b2b45ed 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -237,9 +237,10 @@
])
}
+ // products
for(var i=1; i<6; i++) {
wizard_settings.slides[6].fields = wizard_settings.slides[6].fields.concat([
- {fieldtype:"Data", fieldname:"item_" + i, label:"Item " + 1,
+ {fieldtype:"Data", fieldname:"item_" + i, label:"Item " + i,
placeholder:"A Product or Service"},
{fieldtype:"Column Break"},
{fieldtype:"Attach", fieldname:"item_img_" + i, label:"Attach Image..."},