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

Merge branch 'master' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	selling/doctype/sales_order/sales_order.txt
This commit is contained in:
Anand Doshi 2013-06-18 18:30:41 +05:30
commit ca628d9f54
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
selling/doctype/sales_order/sales_order.js
View File

@ -79,6 +79,29 @@ cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc
if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1); if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
} }
cur_frm.fields_dict.shipping_address_name.get_query = cur_frm.fields_dict['customer_address'].get_query;
cur_frm.cscript.shipping_address_name = function() {
if(cur_frm.doc.shipping_address_name) {
wn.model.with_doc("Address", cur_frm.doc.shipping_address_name, function(name) {
var address = wn.model.get_doc("Address", name);
var out = $.map(["address_line1", "address_line2", "city"],
function(f) { return address[f]; });
var state_pincode = $.map(["state", "pincode"], function(f) { return address[f]; }).join(" ");
if(state_pincode) out.push(state_pincode);
if(address["country"]) out.push(address["country"]);
out.concat($.map([["Phone:", address["phone"]], ["Fax:", address["fax"]]],
function(val) { return val[1] ? val.join(" ") : null; }));
cur_frm.set_value("shipping_address", out.join("\n"));
});
}
};
cur_frm.cscript.pull_quotation_details = function(doc,dt,dn) { cur_frm.cscript.pull_quotation_details = function(doc,dt,dn) {
var callback = function(r,rt){ var callback = function(r,rt){
var doc = locals[cur_frm.doctype][cur_frm.docname]; var doc = locals[cur_frm.doctype][cur_frm.docname];

26
selling/doctype/sales_order/sales_order.txt
View File

@ -1,8 +1,8 @@
[ [
{ {
"creation": "2013-05-24 19:29:08", "creation": "2013-06-18 12:39:59",
"docstatus": 0, "docstatus": 0,
"modified": "2013-06-05 18:59:41", "modified": "2013-06-18 17:49:11",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -236,7 +236,7 @@
"label": "Shipping Address Name", "label": "Shipping Address Name",
"options": "Address", "options": "Address",
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
@ -962,16 +962,6 @@
"options": "Sales Team", "options": "Sales Team",
"print_hide": 1 "print_hide": 1
}, },
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"report": 1,
"role": "Sales Manager",
"submit": 1,
"write": 1
},
{ {
"amend": 1, "amend": 1,
"cancel": 1, "cancel": 1,
@ -982,16 +972,6 @@
"submit": 1, "submit": 1,
"write": 1 "write": 1
}, },
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"report": 1,
"role": "Maintenance Manager",
"submit": 1,
"write": 1
},
{ {
"amend": 1, "amend": 1,
"cancel": 1, "cancel": 1,