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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-12-27 18:41:21 +05:30
commit cd71c308a7
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buying/doctype/supplier/supplier.js
View File

@ -55,7 +55,11 @@ cur_frm.cscript.make_address = function() {
address.supplier = cur_frm.doc.name; address.supplier = cur_frm.doc.name;
address.supplier_name = cur_frm.doc.supplier_name; address.supplier_name = cur_frm.doc.supplier_name;
address.address_title = cur_frm.doc.supplier_name; address.address_title = cur_frm.doc.supplier_name;
address.address_type = "Office";
if(!(cur_frm.address_list.data && cur_frm.address_list.data.length)) {
address.address_type = "Office";
}
wn.set_route("Form", "Address", address.name); wn.set_route("Form", "Address", address.name);
}, },
get_query: function() { get_query: function() {

2
patches/december_2012/address_title.py
View File

@ -1,6 +1,8 @@
import webnotes import webnotes
def execute(): def execute():
webnotes.reload_doc("utilities", "doctype", "address")
webnotes.conn.sql("""update tabAddress set address_title = customer_name where ifnull(customer_name,'')!=''""") webnotes.conn.sql("""update tabAddress set address_title = customer_name where ifnull(customer_name,'')!=''""")
webnotes.conn.sql("""update tabAddress set address_title = supplier_name where ifnull(supplier_name,'')!=''""") webnotes.conn.sql("""update tabAddress set address_title = supplier_name where ifnull(supplier_name,'')!=''""")
webnotes.conn.sql("""update tabAddress set address_title = sales_partner where ifnull(sales_partner,'')!=''""") webnotes.conn.sql("""update tabAddress set address_title = sales_partner where ifnull(sales_partner,'')!=''""")

6
patches/patch_list.py
View File

@ -560,11 +560,11 @@ patch_list = [
}, },
{ {
'patch_module': 'patches.december_2012', 'patch_module': 'patches.december_2012',
<<<<<<< HEAD
'patch_file': 'address_title', 'patch_file': 'address_title',
======= },
{
'patch_module': 'patches.december_2012',
'patch_file': 'delete_form16_print_format', 'patch_file': 'delete_form16_print_format',
>>>>>>> a85b2e4ee349c544acb7a1949351e9a7c70f7b7c
}, },
{ {
'patch_module': 'patches.december_2012', 'patch_module': 'patches.december_2012',

6
selling/doctype/customer/customer.js
View File

@ -65,7 +65,11 @@ cur_frm.cscript.make_address = function() {
address.customer = cur_frm.doc.name; address.customer = cur_frm.doc.name;
address.customer_name = cur_frm.doc.customer_name; address.customer_name = cur_frm.doc.customer_name;
address.address_title = cur_frm.doc.customer_name; address.address_title = cur_frm.doc.customer_name;
address.address_type = "Office";
if(!(cur_frm.address_list.data && cur_frm.address_list.data.length)) {
address.address_type = "Office";
}
wn.set_route("Form", "Address", address.name); wn.set_route("Form", "Address", address.name);
}, },
get_query: function() { get_query: function() {