From a000ec95d7cd4f7ce429eceff4dae4ae1f6fdcc3 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 10 Jul 2013 20:48:00 +0530
Subject: [PATCH] [minor] converty types for single doctypes in load_from_db,
 moved some functions to number_format.js for use in website

---
 public/js/legacy/datatype.js          | 29 --------------------------
 public/js/legacy/widgets/form/form.js |  2 +-
 public/js/wn/app.js                   |  4 ++--
 public/js/wn/misc/number_format.js    | 30 +++++++++++++++++++++++++++
 webnotes/auth.py                      |  1 +
 webnotes/model/bean.py                | 20 ++++++++++++++----
 webnotes/model/mapper.py              |  5 +++--
 webnotes/webutils.py                  |  2 +-
 8 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/public/js/legacy/datatype.js b/public/js/legacy/datatype.js
index c21082b5b1..7b27c64116 100644
--- a/public/js/legacy/datatype.js
+++ b/public/js/legacy/datatype.js
@@ -68,17 +68,6 @@ function replace_newlines(t) {
 	return t?t.replace(/\n/g, '<br>'):'';
 }
 
-function cint(v, def) { 
-	if(v===true) 
-		return 1;
-	if(v===false)
-		return 0;
-	v=v+'';
-	v=lstrip(v, ['0']); 
-	v=parseInt(v); 
-	if(isNaN(v))v=def===undefined?0:def;
-	return v; 
-}
 function validate_email(txt) { 
 	return wn.utils.validate_type(txt, "email");
 }
@@ -116,17 +105,6 @@ var strip = function(s, chars) {
 	return s;
 }
 
-var lstrip = function(s, chars) {
-	if(!chars) chars = ['\n', '\t', ' '];
-	// strip left
-	var first_char = s.substr(0,1);
-	while(in_list(chars, first_char)) {
-		var s = s.substr(1);
-		first_char = s.substr(0,1);
-	}
-	return s;
-}
-
 var rstrip = function(s, chars) {
 	if(!chars) chars = ['\n', '\t', ' '];
 	var last_char = s.substr(s.length-1);
@@ -160,13 +138,6 @@ function values(obj) {
 	return myvalues;
 }
 
-function in_list(list, item) {
-	if(!list) return false;
-	for(var i=0, j=list.length; i<j; i++)
-		if(list[i]==item) return true;
-	return false;
-}
-
 function has_words(list, item) {
 	if(!item) return true;
 	if(!list) return false;
diff --git a/public/js/legacy/widgets/form/form.js b/public/js/legacy/widgets/form/form.js
index 78200445f4..8e5e70cfce 100644
--- a/public/js/legacy/widgets/form/form.js
+++ b/public/js/legacy/widgets/form/form.js
@@ -787,7 +787,7 @@ _f.Frm.prototype.disable_save = function() {
 
 _f.Frm.prototype.save_or_update = function() {
 	if(this.save_disabled) return;
-
+	
 	if(this.doc.docstatus===0) {
 		this.save();
 	} else if(this.doc.docstatus===1 && this.doc.__unsaved) {
diff --git a/public/js/wn/app.js b/public/js/wn/app.js
index 89f31fa0ad..e7e610f8f2 100644
--- a/public/js/wn/app.js
+++ b/public/js/wn/app.js
@@ -202,9 +202,9 @@ wn.Application = Class.extend({
 		$(document).keydown("meta+s ctrl+s", function(e) {
 			if(cur_frm) {
 				cur_frm.save_or_update();
-			}
-			else if(wn.container.page.save_action)
+			} else if(wn.container.page.save_action) {
 				wn.container.page.save_action();
+			}
 			return false;
 		});
 	},
diff --git a/public/js/wn/misc/number_format.js b/public/js/wn/misc/number_format.js
index 1d9fa1aae3..c60a0d5787 100644
--- a/public/js/wn/misc/number_format.js
+++ b/public/js/wn/misc/number_format.js
@@ -24,6 +24,18 @@ function flt(v, decimals, number_format) {
 	return v;
 }
 
+function cint(v, def) { 
+	if(v===true) 
+		return 1;
+	if(v===false)
+		return 0;
+	v=v+'';
+	v=lstrip(v, ['0']); 
+	v=parseInt(v); 
+	if(isNaN(v))v=def===undefined?0:def;
+	return v; 
+}
+
 function strip_number_groups(v, number_format) {
 	if(!number_format) number_format = get_number_format();
 	
@@ -163,4 +175,22 @@ function precision(fieldname, doc) {
 	var df = wn.meta.get_docfield(doc.doctype, fieldname, doc.parent || doc.name);
 	if(!df) console.log(fieldname + ": could not find docfield in method precision()");
 	return wn.meta.get_field_precision(df, doc);
+}
+
+var lstrip = function(s, chars) {
+	if(!chars) chars = ['\n', '\t', ' '];
+	// strip left
+	var first_char = s.substr(0,1);
+	while(in_list(chars, first_char)) {
+		var s = s.substr(1);
+		first_char = s.substr(0,1);
+	}
+	return s;
+}
+
+function in_list(list, item) {
+	if(!list) return false;
+	for(var i=0, j=list.length; i<j; i++)
+		if(list[i]==item) return true;
+	return false;
 }
\ No newline at end of file
diff --git a/webnotes/auth.py b/webnotes/auth.py
index a9d455aae8..771746cbf5 100644
--- a/webnotes/auth.py
+++ b/webnotes/auth.py
@@ -229,6 +229,7 @@ class LoginManager:
 			from webnotes.sessions import clear_sessions
 			clear_sessions(user)
 		webnotes.add_cookies["full_name"] = ""
+		webnotes.add_cookies["sid"] = ""
 			
 			
 class CookieManager:
diff --git a/webnotes/model/bean.py b/webnotes/model/bean.py
index 738722dc90..3aa2bbf341 100644
--- a/webnotes/model/bean.py
+++ b/webnotes/model/bean.py
@@ -30,7 +30,7 @@ Group actions like save, etc are performed on doclists
 
 import webnotes
 from webnotes import _, msgprint
-from webnotes.utils import cint, cstr
+from webnotes.utils import cint, cstr, flt
 from webnotes.model.doc import Document
 
 class DocstatusTransitionError(webnotes.ValidationError): pass
@@ -68,7 +68,7 @@ class Bean:
 		if not dn: dn = self.doc.name
 
 		doc = Document(dt, dn, prefix=prefix)
-
+		
 		# get all children types
 		tablefields = webnotes.model.meta.get_table_fields(dt)
 
@@ -78,6 +78,9 @@ class Bean:
 			doclist += getchildren(doc.name, t[0], t[1], dt, prefix=prefix)
 
 		self.set_doclist(doclist)
+		
+		if dt == dn:
+			self.convert_type(self.doc)
 
 	def __iter__(self):
 		return self.doclist.__iter__()
@@ -219,7 +222,7 @@ class Bean:
 			if d.parentfield:
 				if not webnotes.in_import:
 					if not d.parentfield in parentfields:
-						webnotes.msgprint("Bad parentfield %s" % parentfield, 
+						webnotes.msgprint("Bad parentfield %s" % d.parentfield, 
 							raise_exception=True)
 				d.parenttype = self.doc.doctype
 				d.parent = self.doc.name
@@ -377,7 +380,7 @@ class Bean:
 					msg = ""
 					if df.fieldtype == "Table":
 						if not self.doclist.get({"parentfield": df.fieldname}):
-							msg = _("Error") + ": " + _("Data missing in table") + ": " + _(label)
+							msg = _("Error") + ": " + _("Data missing in table") + ": " + _(df.label)
 				
 					elif doc.fields.get(df.fieldname) is None:
 						msg = _("Error") + ": "
@@ -394,6 +397,15 @@ class Bean:
 				msgprint(msg)
 
 			raise webnotes.MandatoryError, ", ".join([fieldname for msg, fieldname in missing])
+			
+	def convert_type(self, doc):
+		for df in self.meta.get({"doctype": "DocField", "parent": doc.doctype}):
+			if df.fieldtype in ("Int", "Check"):
+				doc.fields[df.fieldname] = cint(doc.fields.get(df.fieldname))
+			elif df.fieldtype in ("Float", "Currency"):
+				doc.fields[df.fieldname] = flt(doc.fields.get(df.fieldname))
+				
+		doc.docstatus = cint(doc.docstatus)
 					
 def clone(source_wrapper):
 	""" make a clone of a document"""
diff --git a/webnotes/model/mapper.py b/webnotes/model/mapper.py
index ddc0d8a2e3..6e326daca5 100644
--- a/webnotes/model/mapper.py
+++ b/webnotes/model/mapper.py
@@ -26,13 +26,14 @@ from webnotes import _
 from webnotes.utils import cstr
 from webnotes.model import default_fields
 
-def get_mapped_doclist(from_doctype, from_docname, table_maps, target_doclist=[], postprocess=None):
+def get_mapped_doclist(from_doctype, from_docname, table_maps, target_doclist=[], postprocess=None,
+		ignore_permissions=False):
 	if isinstance(target_doclist, basestring):
 		target_doclist = json.loads(target_doclist)
 	
 	source = webnotes.bean(from_doctype, from_docname)
 
-	if not webnotes.has_permission(from_doctype, doc=source.doc):
+	if not ignore_permissions and not webnotes.has_permission(from_doctype, doc=source.doc):
 		webnotes.msgprint("No Permission", raise_exception=webnotes.PermissionError)
 
 	source_meta = webnotes.get_doctype(from_doctype)
diff --git a/webnotes/webutils.py b/webnotes/webutils.py
index 650d087023..b5b2bcc895 100644
--- a/webnotes/webutils.py
+++ b/webnotes/webutils.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import os
 import conf
-from startup.website import *
+from startup.webutils import *
 import webnotes
 import webnotes.utils