From 3b0f0265229b4e3434ef463f5bf1341f283cf92c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sat, 24 May 2014 12:04:13 +0530 Subject: [PATCH 1/3] fix to sales parter --- .../doctype/sales_partner/sales_partner.js | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js index 8f12aa98906..b12c01b69e1 100644 --- a/erpnext/setup/doctype/sales_partner/sales_partner.js +++ b/erpnext/setup/doctype/sales_partner/sales_partner.js @@ -7,8 +7,8 @@ cur_frm.cscript.onload = function(doc,dt,dn){ } -cur_frm.cscript.refresh = function(doc,dt,dn){ - +cur_frm.cscript.refresh = function(doc,dt,dn){ + if(doc.__islocal){ hide_field(['address_html', 'contact_html']); } @@ -34,20 +34,13 @@ cur_frm.cscript.make_address = function() { address.address_title = cur_frm.doc.name; address.address_type = "Office"; frappe.set_route("Form", "Address", address.name); - }, + }, get_query: function() { return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where sales_partner='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc" }, as_dict: 1, no_results_message: __('No addresses created'), - render_row: function(wrapper, data) { - $(wrapper).css('padding','5px 0px'); - var link = $ln(wrapper,cstr(data.name), function() { loaddoc("Address", this.dn); }, {fontWeight:'bold'}); - link.dn = data.name - - $a(wrapper,'span','',{marginLeft:'5px', color: '#666'},(data.is_primary_address ? '[Primary]' : '') + (data.is_shipping_address ? '[Shipping]' : '')); - $a(wrapper,'div','',{marginTop:'5px', color:'#555'}, data.address_line1 + '
' + (data.address_line2 ? data.address_line2 + '
' : '') + data.city + '
' + (data.state ? data.state + ', ' : '') + data.country + '
' + (data.pincode ? 'Pincode: ' + data.pincode + '
' : '') + (data.phone ? 'Tel: ' + data.phone + '
' : '') + (data.fax ? 'Fax: ' + data.fax + '
' : '') + (data.email_id ? 'Email: ' + data.email_id + '
' : '')); - } + render_row: cur_frm.cscript.render_address_row, }); } cur_frm.address_list.run(); @@ -70,14 +63,7 @@ cur_frm.cscript.make_contact = function() { }, as_dict: 1, no_results_message: __('No contacts created'), - render_row: function(wrapper, data) { - $(wrapper).css('padding', '5px 0px'); - var link = $ln(wrapper, cstr(data.name), function() { loaddoc("Contact", this.dn); }, {fontWeight:'bold'}); - link.dn = data.name - - $a(wrapper,'span','',{marginLeft:'5px', color: '#666'},(data.is_primary_contact ? '[Primary]' : '')); - $a(wrapper,'div', '',{marginTop:'5px', color:'#555'}, data.first_name + (data.last_name ? ' ' + data.last_name + '
' : '
') + (data.phone ? 'Tel: ' + data.phone + '
' : '') + (data.mobile_no ? 'Mobile: ' + data.mobile_no + '
' : '') + (data.email_id ? 'Email: ' + data.email_id + '
' : '') + (data.department ? 'Department: ' + data.department + '
' : '') + (data.designation ? 'Designation: ' + data.designation + '
' : '')); - } + render_row: cur_frm.cscript.render_contact_row, }); } cur_frm.contact_list.run(); @@ -87,4 +73,4 @@ cur_frm.fields_dict['partner_target_details'].grid.get_field("item_group").get_q return{ filters:{ 'is_group': "No" } } -} \ No newline at end of file +} From b15d760406a45e5e623853cc2f5ba9a6b2af74a9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 26 May 2014 13:05:19 +0530 Subject: [PATCH 2/3] fix to packing slip (validation) --- .../doctype/packing_slip/packing_slip.js | 6 +- .../doctype/packing_slip/packing_slip.json | 408 +++++++++--------- .../doctype/packing_slip/packing_slip.py | 10 +- 3 files changed, 213 insertions(+), 211 deletions(-) diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.js b/erpnext/stock/doctype/packing_slip/packing_slip.js index 2f0bd81b125..acdd27e1ab4 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.js +++ b/erpnext/stock/doctype/packing_slip/packing_slip.js @@ -8,7 +8,7 @@ cur_frm.fields_dict['delivery_note'].get_query = function(doc, cdt, cdn) { } -cur_frm.fields_dict['item_details'].grid.get_field('item_code').get_query = +cur_frm.fields_dict['item_details'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) { return { query: "erpnext.stock.doctype.packing_slip.packing_slip.item_details", @@ -53,7 +53,7 @@ cur_frm.cscript.validate_case_nos = function(doc) { } else if(cint(doc.to_case_no) < cint(doc.from_case_no)) { msgprint(__("'To Case No.' cannot be less than 'From Case No.'")); validated = false; - } + } } @@ -88,7 +88,7 @@ cur_frm.cscript.validate_duplicate_items = function(doc, ps_detail) { // Calculate Net Weight of Package cur_frm.cscript.calc_net_total_pkg = function(doc, ps_detail) { var net_weight_pkg = 0; - doc.net_weight_uom = ps_detail?ps_detail[0].weight_uom:''; + doc.net_weight_uom = (ps_detail && ps_detail.length) ? ps_detail[0].weight_uom : ''; doc.gross_weight_uom = doc.net_weight_uom; for(var i=0; i Date: Mon, 26 May 2014 13:35:47 +0530 Subject: [PATCH 3/3] removed debug in query (packing_slip.py) --- erpnext/stock/doctype/packing_slip/packing_slip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py index 0b1258831ad..e3d01999f1f 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.py +++ b/erpnext/stock/doctype/packing_slip/packing_slip.py @@ -59,7 +59,7 @@ class PackingSlip(Document): OR (%(from_case_no)s BETWEEN from_case_no AND to_case_no)) """, {"delivery_note":self.delivery_note, "from_case_no":self.from_case_no, - "to_case_no":self.to_case_no}, debug=1) + "to_case_no":self.to_case_no}) if res: frappe.throw(_("""Case No(s) already in use. Try from Case No {0}""").format(self.get_recommended_case_no()))