nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge]

Browse Source
This commit is contained in:
Rushabh Mehta
2013-06-24 15:47:02 +05:30
parent 847cfe2b07 82366d3bb8
commit 7925bd7079
28 changed files with 289 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
stock/doctype/delivery_note/delivery_note.js
View File

@@ -64,10 +64,7 @@ cur_frm.cscript.get_items = function(doc,dt,dn) {
if(doc.sales_order_no) {
unhide_field(['customer_address','contact_person','territory','customer_group']);
}
refresh_many(['delivery_note_details', 'customer', 'customer_address',
'contact_person', 'customer_name', 'address_display', 'contact_display',
'contact_mobile', 'contact_email', 'territory', 'customer_group']);
cur_frm.refresh_fields();
}
}
$c_obj(make_doclist(doc.doctype, doc.name),'pull_sales_order_details','',callback);

8
stock/doctype/purchase_receipt/purchase_receipt.js
View File

@@ -97,11 +97,9 @@ cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
// Get Purchase Order Button
// -----------------
cur_frm.cscript.pull_purchase_order_details = function(doc, dt, dn) {
var callback = function(r,rt) {
//unhide_field(['supplier_address','contact_person','supplier_name','address_display', 'contact_display', 'contact_mobile','contact_email']);
refresh_many(['supplier','supplier_address','contact_person', 'supplier_name', 'address_display', 'contact_display','contact_mobile', 'contact_email', 'purchase_receipt_details', 'purchase_tax_details']);
}
$c_obj(make_doclist(dt,dn),'get_po_details','',callback);
$c_obj(make_doclist(dt,dn),'get_po_details','',function(r,rt) {
cur_frm.refresh_fields();
});
}

12
stock/report/delivery_note_trends/delivery_note_trends.py
View File

@@ -21,14 +21,8 @@ from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
data = []
trans = "Delivery Note"
tab = ["tabDelivery Note","tabDelivery Note Item"]
conditions = get_columns(filters, trans)
data = get_data(filters, conditions)
details = get_columns(filters, trans)
data = get_data(filters, tab, details)
if not data :
webnotes.msgprint("Data not found for selected criterias")
return details["columns"], data
return conditions["columns"], data

9
stock/report/purchase_receipt_trends/purchase_receipt_trends.py
View File

@@ -21,14 +21,11 @@ from controllers.trends import get_columns,get_data
def execute(filters=None):
if not filters: filters ={}
data = []
trans = "Purchase Receipt"
tab = ["tabPurchase Receipt","tabPurchase Receipt Item"]
details = get_columns(filters, trans)
data = get_data(filters, tab, details)
conditions = get_columns(filters, trans)
data = get_data(filters, tab, conditions)
if not data :
webnotes.msgprint("Data not found for selected criterias")
return details["columns"], data
return conditions["columns"], data