From e651648b1be4c2b37062ecd69d6b599095838f08 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 6 Feb 2012 16:28:06 +0530 Subject: [PATCH] added missing icons --- .../page/accounts_browser/accounts_browser.js | 4 +- erpnext/home/page/my_company/my_company.js | 2 +- .../page/sales_browser/sales_browser.js | 4 +- erpnext/website/doctype/product/product.txt | 216 +++++++++--------- version.num | 2 +- wnf.py | 6 +- 6 files changed, 117 insertions(+), 117 deletions(-) diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index e5fca9f1fd9..13416e6a534 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -125,7 +125,7 @@ pscript.make_ac_tree = function() { var imgsrc=null; var has_children = true; if(cl[i].group_or_ledger=='Ledger') { - var imgsrc = 'lib/images/icons/page.gif'; + var imgsrc = 'lib/images/icons/page.png'; has_children = false; } var t = tree.addNode(n, cl[i].account_name, imgsrc,tree.std_onclick, has_children ? tree.std_onexp : null); @@ -138,7 +138,7 @@ pscript.make_ac_tree = function() { var imgsrc=null; var has_children = true; if(cl[i].group_or_ledger=='Ledger') { - var imgsrc = 'lib/images/icons/page.gif'; + var imgsrc = 'lib/images/icons/page.png'; has_children = false; } var t = tree.addNode(n, cl[i].cost_center_name, imgsrc,tree.std_onclick, has_children ? tree.std_onexp : null); diff --git a/erpnext/home/page/my_company/my_company.js b/erpnext/home/page/my_company/my_company.js index e85623f80c1..298b3138388 100644 --- a/erpnext/home/page/my_company/my_company.js +++ b/erpnext/home/page/my_company/my_company.js @@ -858,7 +858,7 @@ RoleObj.prototype.make_label = function(tbl, ridx, cidx, role){ var t = make_table($td(tbl, ridx, cidx),1,2,null,['16px', null],{marginRight:'5px'}); var ic = $a($td(t,0,0), 'img','',{cursor:'pointer', marginRight:'5px'}); - ic.src= 'lib/images/icons/help.gif'; + ic.src= 'lib/images/icons/help.png'; ic.role = role; ic.onclick = function(){ diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js index d2ba627afde..c7e400e4cc5 100644 --- a/erpnext/selling/page/sales_browser/sales_browser.js +++ b/erpnext/selling/page/sales_browser/sales_browser.js @@ -140,7 +140,7 @@ SalesBrowser.prototype.make_tree = function() { var has_children = true; if(cl[i].is_group=='No') { - var imgsrc = 'lib/images/icons/page.gif'; + var imgsrc = 'lib/images/icons/page.png'; has_children = false; } var t = me.tree.addNode(n, cl[i].name, imgsrc,me.tree.std_onclick, has_children ? me.tree.std_onexp : null); @@ -220,7 +220,7 @@ SalesBrowser.prototype.first_level_node = function(){ var has_children = true; if(cl[i].is_group=='No') { - var imgsrc = 'lib/images/icons/page.gif'; + var imgsrc = 'lib/images/icons/page.png'; has_children = false; } me.tree_area.innerHTML = ''; diff --git a/erpnext/website/doctype/product/product.txt b/erpnext/website/doctype/product/product.txt index fac4cfbda44..6258691a911 100644 --- a/erpnext/website/doctype/product/product.txt +++ b/erpnext/website/doctype/product/product.txt @@ -5,245 +5,245 @@ { 'creation': '2012-01-30 16:21:29', 'docstatus': 0, - 'modified': '2012-01-31 13:46:23', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-02-06 16:15:29', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - '_last_update': '1327995660', + '_last_update': u'1327997783', 'allow_attach': 1, - 'autoname': 'field:item', - 'colour': 'White:FFF', - 'description': 'A Product is shown on the website and is linked to an item.', + 'autoname': u'field:item', + 'colour': u'White:FFF', + 'description': u'A Product is shown on the website and is linked to an item.', 'doctype': 'DocType', 'max_attachments': 5, - 'module': 'Website', + 'module': u'Website', 'name': '__common__', - 'section_style': 'Simple', + 'section_style': u'Simple', 'show_in_menu': 0, - 'version': 10 + 'version': 11 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Product', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Product', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # These values are common for all DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'name': '__common__', - 'parent': 'Product', - 'parentfield': 'permissions', - 'parenttype': 'DocType', + 'parent': u'Product', + 'parentfield': u'permissions', + 'parenttype': u'DocType', 'read': 1, - 'role': 'Website Manager' + 'role': u'Website Manager' }, # DocType, Product { 'doctype': 'DocType', - 'name': 'Product' + 'name': u'Product' }, # DocPerm { 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, 'write': 1 }, # DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'item', - 'fieldtype': 'Link', - 'label': 'Item', - 'options': 'Item', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'item', + 'fieldtype': u'Link', + 'label': u'Item', + 'options': u'Item', 'permlevel': 0, 'reqd': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'title', - 'fieldtype': 'Link', - 'label': 'Title', + 'doctype': u'DocField', + 'fieldname': u'title', + 'fieldtype': u'Data', + 'label': u'Title', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'published', - 'fieldtype': 'Check', - 'label': 'Published', + 'doctype': u'DocField', + 'fieldname': u'published', + 'fieldtype': u'Check', + 'label': u'Published', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Select Price List for the web. Leave blank to hide price.', - 'doctype': 'DocField', - 'fieldname': 'price_list', - 'fieldtype': 'Link', - 'label': 'Price List', - 'options': 'Price List', + 'colour': u'White:FFF', + 'description': u'Select Price List for the web. Leave blank to hide price.', + 'doctype': u'DocField', + 'fieldname': u'price_list', + 'fieldtype': u'Link', + 'label': u'Price List', + 'options': u'Price List', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Select shipping warehouse to show "In Stock" or "Out of Stock". To hide, leave blank', - 'doctype': 'DocField', - 'fieldname': 'warehouse', - 'fieldtype': 'Link', - 'label': 'Warehouse', - 'options': 'Warehouse', + 'colour': u'White:FFF', + 'description': u'Select shipping warehouse to show "In Stock" or "Out of Stock". To hide, leave blank', + 'doctype': u'DocField', + 'fieldname': u'warehouse', + 'fieldtype': u'Link', + 'label': u'Warehouse', + 'options': u'Warehouse', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Image for listing (Width: 100px) (Attach First)', - 'doctype': 'DocField', - 'fieldname': 'thumbnail_image', - 'fieldtype': 'Select', - 'label': 'Thumbnail Image', - 'options': 'attach_files:', + 'colour': u'White:FFF', + 'description': u'Image for listing (Width: 100px) (Attach First)', + 'doctype': u'DocField', + 'fieldname': u'thumbnail_image', + 'fieldtype': u'Select', + 'label': u'Thumbnail Image', + 'options': u'attach_files:', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Image for listing (Width: 300px) (Attach First)', - 'doctype': 'DocField', - 'fieldname': 'full_image', - 'fieldtype': 'Select', - 'label': 'Full Image', - 'options': 'attach_files:', + 'colour': u'White:FFF', + 'description': u'Image for listing (Width: 300px) (Attach First)', + 'doctype': u'DocField', + 'fieldname': u'full_image', + 'fieldtype': u'Select', + 'label': u'Full Image', + 'options': u'attach_files:', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'short_description', - 'fieldtype': 'Text', - 'label': 'Short Description', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'short_description', + 'fieldtype': u'Text', + 'label': u'Short Description', 'permlevel': 0, 'reqd': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'description': 'Full description (formatted as markdown)', - 'doctype': 'DocField', - 'fieldname': 'long_description', - 'fieldtype': 'Code', - 'label': 'Long Description', + 'colour': u'White:FFF', + 'description': u'Full description (formatted as markdown)', + 'doctype': u'DocField', + 'fieldname': u'long_description', + 'fieldtype': u'Code', + 'label': u'Long Description', 'permlevel': 0, 'reqd': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'page_name', - 'fieldtype': 'Data', - 'label': 'Page Name', + 'doctype': u'DocField', + 'fieldname': u'page_name', + 'fieldtype': u'Data', + 'label': u'Page Name', 'permlevel': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'price', - 'fieldtype': 'Currency', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'price', + 'fieldtype': u'Currency', 'hidden': 0, - 'label': 'Price', + 'label': u'Price', 'permlevel': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'sales', - 'fieldtype': 'Currency', - 'label': 'Sales', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'sales', + 'fieldtype': u'Currency', + 'label': u'Sales', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'stock', - 'fieldtype': 'Currency', - 'label': 'Stock', + 'doctype': u'DocField', + 'fieldname': u'stock', + 'fieldtype': u'Currency', + 'label': u'Stock', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'currency', - 'fieldtype': 'Link', - 'label': 'Currency', - 'options': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'currency', + 'fieldtype': u'Link', + 'label': u'Currency', + 'options': u'Currency', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'file_list', - 'fieldtype': 'Text', + 'doctype': u'DocField', + 'fieldname': u'file_list', + 'fieldtype': u'Text', 'hidden': 1, - 'label': 'File List', + 'label': u'File List', 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 diff --git a/version.num b/version.num index b0e9f8d0ff9..755152b7ef4 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -358 \ No newline at end of file +359 \ No newline at end of file diff --git a/wnf.py b/wnf.py index bc113879291..368e5c88a81 100755 --- a/wnf.py +++ b/wnf.py @@ -50,13 +50,13 @@ def setup_options(): parser.add_option("-d", "--db", dest="db_name", help="Apply the patches on given db") - parser.add_option('-r', '--reload_doc', nargs=3, metavar = "module doctype docname", + parser.add_option('--reload_doc', nargs=3, metavar = "module doctype docname", help="reload doc") return parser.parse_args() def run(): - sys.path.append('.') + sys.path.append('lib') sys.path.append('lib/py') import webnotes import webnotes.defs @@ -122,7 +122,7 @@ def run(): # reload elif options.reload_doc: webnotes.modules.patch_handler.reload_doc(\ - {"module":args[0], "dt":args[1], "dn":args[2]}) + {"module":options.reload_doc[0], "dt":options.reload_doc[1], "dn":options.reload_doc[2]}) print '\n'.join(webnotes.modules.patch_handler.log_list) # run all pending