Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved patches and fixed method routing in pages

Browse Source
This commit is contained in:
Rushabh Mehta 2013-12-27 13:43:40 +05:30
parent e7fc25d6a8
commit 4ac68952e8
5 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
patches/1312/p02_update_user_properties.py → erpnext/patches/1312/p02_update_user_properties.py
View File

0
patches/1312/p03_move_warehouse_user_to_restrictions.py → erpnext/patches/1312/p03_move_warehouse_user_to_restrictions.py
View File

0
patches/1312/p04_new_permissions.py → erpnext/patches/1312/p04_new_permissions.py
View File

4
erpnext/selling/page/sales_funnel/sales_funnel.js
View File

@ -71,9 +71,7 @@ erpnext.SalesFunnel = Class.extend({
get_data: function(btn) { get_data: function(btn) {
var me = this; var me = this;
wn.call({ wn.call({
module: "selling", method: "erpnext.selling.sales_funnel.get_funnel_data",
page: "sales_funnel",
method: "get_funnel_data",
args: { args: {
from_date: this.options.from_date, from_date: this.options.from_date,
to_date: this.options.to_date to_date: this.options.to_date

3
erpnext/setup/page/setup_wizard/setup_wizard.js
View File

@ -237,9 +237,10 @@ wn.pages['setup-wizard'].onload = function(wrapper) {
]) ])
} }
// products
for(var i=1; i<6; i++) { for(var i=1; i<6; i++) {
wizard_settings.slides[6].fields = wizard_settings.slides[6].fields.concat([ 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"}, placeholder:"A Product or Service"},
{fieldtype:"Column Break"}, {fieldtype:"Column Break"},
{fieldtype:"Attach", fieldname:"item_img_" + i, label:"Attach Image..."}, {fieldtype:"Attach", fieldname:"item_img_" + i, label:"Attach Image..."},