From 846d47c3beffe50a262c566aca62c3a7d5e9d9eb Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 12 Jul 2012 16:02:55 +0530
Subject: [PATCH 1/2] fixes to sidebar and msgprint

---
 css/legacy/messages.css               |  5 ++++-
 js/legacy/utils/msgprint.js           |  2 +-
 js/legacy/widgets/form/form.js        | 21 ++++++++++++++++++++-
 js/legacy/widgets/form/form_header.js |  6 ++++++
 js/legacy/wn/widgets/form/sidebar.js  |  5 ++++-
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/css/legacy/messages.css b/css/legacy/messages.css
index 5ca3eacda4..6ef04b6621 100644
--- a/css/legacy/messages.css
+++ b/css/legacy/messages.css
@@ -39,8 +39,11 @@ div.notice {
 
 .help_box, .help-box {
 	background-color: #ffe;
-	color: #874;
 	padding: 9px 9px 9px 9px;
 	border: 1px dashed #fc7;
 	margin: 11px 0px;
 }
+
+.help-box, .help-box p, .help-box h1, .help-box h2, .help-box h3, .help-box h4 {
+	color: #643;
+}
diff --git a/js/legacy/utils/msgprint.js b/js/legacy/utils/msgprint.js
index 5c8925deb0..eaa77f2c87 100644
--- a/js/legacy/utils/msgprint.js
+++ b/js/legacy/utils/msgprint.js
@@ -44,7 +44,7 @@ function msgprint(msg, title) {
 			.appendTo(msg_dialog.body);
 	}
 
-	if(msg.search(/<br>|<p>/)==-1)
+	if(msg.search(/<br>|<p>|<li>/)==-1)
 		msg = replace_newlines(msg);
 
 	msg_dialog.set_title(title || 'Message')
diff --git a/js/legacy/widgets/form/form.js b/js/legacy/widgets/form/form.js
index 7eb1050677..925bdbcc53 100644
--- a/js/legacy/widgets/form/form.js
+++ b/js/legacy/widgets/form/form.js
@@ -324,9 +324,23 @@ _f.Frm.prototype.set_intro = function(txt) {
 		this.intro_area.remove();
 		this.intro_area = null;
 	}
-	
 }
 
+_f.Frm.prototype.set_footnote = function(txt) {
+	if(!this.footnote_area) {
+		this.footnote_area = $('<div class="help-box form-intro-area">')
+			.insertAfter(this.page_layout.body.lastChild);
+	}
+	if(txt) {
+		if(txt.search(/<p>/)==-1) txt = '<p>' + txt + '</p>';
+		this.footnote_area.html(txt);
+	} else {
+		this.footnote_area.remove();
+		this.footnote_area = null;
+	}
+}
+
+
 _f.Frm.prototype.setup_fields_std = function() {
 	var fl = wn.meta.docfield_list[this.doctype]; 
 
@@ -1163,4 +1177,9 @@ _f.Frm.prototype.enable_fields = function(fields, enable) {
 
 _f.Frm.prototype.call_server = function(method, args, callback) {
 	$c_obj(cur_frm.get_doclist(), method, args, callback);
+}
+
+_f.Frm.prototype.set_value = function(field, value) {
+	cur_frm.get_doc()[field] = value;
+	cur_frm.fields_dict[field].refresh();
 }
\ No newline at end of file
diff --git a/js/legacy/widgets/form/form_header.js b/js/legacy/widgets/form/form_header.js
index 90c1b72402..b6965d09ab 100644
--- a/js/legacy/widgets/form/form_header.js
+++ b/js/legacy/widgets/form/form_header.js
@@ -81,6 +81,12 @@ _f.FrmHeader = Class.extend({
 	},
 	refresh_toolbar: function() {
 		// clear
+		
+		if(cur_frm.meta.hide_toolbar) {
+			$('.appframe-toolbar').toggle(false);
+			return;
+		}
+		
 		this.appframe.clear_buttons();
 		var p = cur_frm.get_doc_perms();
 
diff --git a/js/legacy/wn/widgets/form/sidebar.js b/js/legacy/wn/widgets/form/sidebar.js
index 8a88671748..0a2c43034b 100644
--- a/js/legacy/wn/widgets/form/sidebar.js
+++ b/js/legacy/wn/widgets/form/sidebar.js
@@ -95,7 +95,10 @@ wn.widgets.form.sidebar = { Sidebar: function(form) {
 						icon: 'icon-remove-sign',
 						onclick: function() { me.form.savetrash() }
 					}
-				]
+				],
+				display: function() {
+					return me.form.meta.hide_toolbar ? false : true;
+				}
 			},
 
 			{

From 5de5b6efc5683713db7f5b9734d9aaf5872facee Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 12 Jul 2012 18:00:37 +0530
Subject: [PATCH 2/2] sales bom fixes and mandatory in table fields

---
 js/legacy/model/doclist.js     | 13 ++++++++++++-
 js/legacy/widgets/form/form.js | 15 ++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/js/legacy/model/doclist.js b/js/legacy/model/doclist.js
index bc7a41351f..7b37f1c78c 100644
--- a/js/legacy/model/doclist.js
+++ b/js/legacy/model/doclist.js
@@ -133,8 +133,19 @@ function check_required(dt, dn, parent_dt) {
 	for(var i=0;i<fl.length;i++) {
 		var key = fl[i].fieldname;
 		var v = doc[key];
+		
+		if(fl[i].fieldtype=='Table') {
+			var no_value = true;
+			$.each(locals[fl[i].options], function(k,d) {
+				if(d.parent==doc.name && d.parenttype==doc.doctype && d.parentfield==fl[i].fieldname) {
+					no_value = false;
+				}
+			});
+		} else {
+			var no_value = is_null(v);			
+		}
 				
-		if(fl[i].reqd && is_null(v) && fl[i].fieldname) {
+		if(fl[i].reqd && no_value && fl[i].fieldname) {
 			errfld[errfld.length] = fl[i].label;
 			
 			// Bring to front "Section"
diff --git a/js/legacy/widgets/form/form.js b/js/legacy/widgets/form/form.js
index 925bdbcc53..b0ca86b7f1 100644
--- a/js/legacy/widgets/form/form.js
+++ b/js/legacy/widgets/form/form.js
@@ -848,19 +848,8 @@ _f.Frm.prototype.save = function(save_action, call_back) {
  	
 	
 	var ret_fn = function(r) {
-		me.savingflag = false;
-		if(user=='Guest' && !r.exc) {
-			// if user is guest, show a message after succesful saving
-			$dh(me.page_layout.wrapper);
-			$ds(me.saved_wrapper);
-			me.saved_wrapper.innerHTML = 
-				'<div style="padding: 150px 16px; text-align: center; font-size: 14px;">' 
-				+ (cur_frm.message_after_save ? cur_frm.message_after_save : 'Your information has been sent. Thank you!') 
-				+ '</div>';
-			return; // no refresh
-		}
-		
-		if(!me.meta.istable) {
+		me.savingflag = false;		
+		if(!me.meta.istable && r) {
 			me.refresh(r.docname);
 		}