added number format, sent country info in boot, link options not extracted from cache
diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt
index 5eeb82d..dc1eb51 100644
--- a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt
+++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt
@@ -4,7 +4,7 @@
"docstatus": 0,
"creation": "2013-01-19 10:23:35",
"modified_by": "Administrator",
- "modified": "2013-01-19 10:31:03"
+ "modified": "2013-01-19 10:55:55"
},
{
"read_only": 1,
@@ -32,7 +32,7 @@
"doctype": "DocPerm",
"write": 1,
"parenttype": "DocType",
- "report": 1,
+ "report": 0,
"permlevel": 0,
"parentfield": "permissions"
},
diff --git a/patches/patch_list.py b/patches/patch_list.py
index d5d87a6..cf9e97f 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -151,4 +151,5 @@
"patches.january_2013.change_patch_structure",
"patches.january_2013.update_country_info",
"patches.january_2013.remove_tds_entry_from_gl_mapper",
+ "patches.january_2013.update_number_format",
]
\ No newline at end of file
diff --git a/setup/doctype/currency/currency.js b/setup/doctype/currency/currency.js
index cd42c18..9a18372 100644
--- a/setup/doctype/currency/currency.js
+++ b/setup/doctype/currency/currency.js
@@ -1,3 +1,2 @@
cur_frm.cscript.refresh = function(doc) {
- cur_frm.set_intro(doc.__islocal ? "" : "There is nothing to edit.")
}
\ No newline at end of file
diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt
index fd75525..c8dbb62 100644
--- a/setup/doctype/currency/currency.txt
+++ b/setup/doctype/currency/currency.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2013-01-17 12:30:28",
+ "creation": "2013-01-19 10:23:31",
"modified_by": "Administrator",
- "modified": "2013-01-17 16:24:59"
+ "modified": "2013-01-19 11:10:45"
},
{
"read_only": 0,
@@ -27,8 +27,12 @@
"name": "__common__",
"parent": "Currency",
"read": 1,
+ "create": 1,
+ "submit": 0,
"doctype": "DocPerm",
+ "write": 1,
"parenttype": "DocType",
+ "report": 1,
"permlevel": 0,
"parentfield": "permissions"
},
@@ -64,17 +68,26 @@
"fieldtype": "Data"
},
{
+ "doctype": "DocField",
+ "label": "Number Format",
+ "fieldname": "number_format",
+ "fieldtype": "Data"
+ },
+ {
+ "cancel": 1,
+ "role": "Accounts Manager",
+ "doctype": "DocPerm"
+ },
+ {
"amend": 0,
- "create": 1,
"doctype": "DocPerm",
- "submit": 0,
- "write": 1,
- "report": 1,
- "role": "System Manager",
+ "role": "Sales Master Manager",
"cancel": 1
},
{
- "role": "All",
- "doctype": "DocPerm"
+ "amend": 0,
+ "doctype": "DocPerm",
+ "role": "Purchase Master Manager",
+ "cancel": 0
}
]
\ No newline at end of file
diff --git a/startup/install.py b/startup/install.py
index e24f815..00b7b84 100644
--- a/startup/install.py
+++ b/startup/install.py
@@ -94,7 +94,8 @@
"currency_name": country.currency,
"fraction": country.currency_fraction,
"symbol": country.currency_symbol,
- "fraction_units": country.currency_fraction_units
+ "fraction_units": country.currency_fraction_units,
+ "number_format": country.number_format
}).insert()
def import_defaults():
diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js
index ab8fb43..6c2c882 100644
--- a/stock/doctype/item/item.js
+++ b/stock/doctype/item/item.js
@@ -36,20 +36,6 @@
if(!doc.description) cur_frm.set_value("description", doc.item_code);
}
-cur_frm.cscript.hide_website_fields = function(doc) {
- var website_fields_list = ['page_name', 'website_image', 'web_short_description',
- 'web_long_description'];
- if (doc && cint(doc.show_in_website)) {
- unhide_field(website_fields_list);
- } else {
- hide_field(website_fields_list);
- }
-}
-
-cur_frm.cscript.show_in_website = function(doc, dt, dn) {
- cur_frm.cscript.hide_website_fields(doc);
-}
-
cur_frm.fields_dict['default_bom'].get_query = function(doc) {
//var d = locals[this.doctype][this.docname];
return 'SELECT DISTINCT `tabBOM`.`name` FROM `tabBOM` WHERE `tabBOM`.`item` = "' + doc.item_code + '" AND ifnull(`tabBOM`.`is_active`, 0) = 0 and `tabBOM`.docstatus != 2 AND `tabBOM`.%(key)s LIKE "%s" ORDER BY `tabBOM`.`name` LIMIT 50'
diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py
index cca814f..748f01a 100644
--- a/stock/doctype/item/item.py
+++ b/stock/doctype/item/item.py
@@ -77,7 +77,12 @@
def update_website(self):
from website.utils import update_page_name
- update_page_name(self.doc, self.doc.name + " " + self.doc.item_name)
+ if self.doc.name==self.doc.item_name:
+ page_name_from = self.doc.name
+ else:
+ page_name_from = self.doc.name + " " + self.doc.item_name
+
+ update_page_name(self.doc, page_name_from)
from website.helpers.product import invalidate_cache_for
invalidate_cache_for(self.doc.item_group)
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index 1f623bb..43f9247 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-12-28 11:01:35",
+ "creation": "2013-01-16 11:35:56",
"modified_by": "Administrator",
- "modified": "2013-01-16 11:14:57"
+ "modified": "2013-01-19 12:09:54"
},
{
"allow_attach": 1,
@@ -32,8 +32,9 @@
"read": 1,
"submit": 0,
"doctype": "DocPerm",
- "report": 1,
"parenttype": "DocType",
+ "report": 1,
+ "permlevel": 0,
"parentfield": "permissions"
},
{
@@ -431,6 +432,7 @@
"permlevel": 1
},
{
+ "read_only": 1,
"no_copy": 1,
"oldfieldtype": "Currency",
"doctype": "DocField",
@@ -439,7 +441,7 @@
"fieldname": "last_purchase_rate",
"fieldtype": "Currency",
"depends_on": "eval:doc.is_purchase_item==\"Yes\"",
- "permlevel": 1
+ "permlevel": 0
},
{
"oldfieldtype": "Currency",
@@ -691,6 +693,7 @@
"permlevel": 0
},
{
+ "read_only": 1,
"no_copy": 1,
"oldfieldtype": "Link",
"doctype": "DocField",
@@ -700,7 +703,7 @@
"fieldname": "default_bom",
"fieldtype": "Link",
"depends_on": "eval:doc.is_manufactured_item==\"Yes\"",
- "permlevel": 1
+ "permlevel": 0
},
{
"description": "Selecting \"Yes\" will allow you to make a Production Order for this item.",
@@ -765,21 +768,23 @@
"permlevel": 0
},
{
+ "read_only": 1,
"description": "website page link",
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Page Name",
"fieldname": "page_name",
"fieldtype": "Data",
- "permlevel": 1
+ "permlevel": 0
},
{
"description": "Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.",
- "search_index": 1,
+ "depends_on": "show_in_website",
"doctype": "DocField",
"label": "Weightage",
"fieldname": "weightage",
"fieldtype": "Int",
+ "search_index": 1,
"permlevel": 0
},
{
@@ -863,56 +868,26 @@
"permlevel": 0
},
{
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "write": 0,
+ "role": "Material Manager",
+ "cancel": 0
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "write": 0,
+ "role": "Material User",
+ "cancel": 0
+ },
+ {
"create": 1,
"doctype": "DocPerm",
"write": 1,
"role": "Material Master Manager",
- "cancel": 1,
- "permlevel": 0
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "write": 0,
- "role": "Material Manager",
- "cancel": 0,
- "permlevel": 0
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "write": 0,
- "role": "Material User",
- "cancel": 0,
- "permlevel": 0
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "write": 0,
- "role": "Material Master Manager",
- "cancel": 0,
- "permlevel": 1
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "write": 0,
- "role": "Material Manager",
- "cancel": 0,
- "permlevel": 1
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "write": 0,
- "role": "Material User",
- "cancel": 0,
- "permlevel": 1
+ "cancel": 1
}
]
\ No newline at end of file