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

Merge pull request #5000 from nabinhait/develop

Browse Source 
Minor fixes
This commit is contained in:
Nabin Hait 2016-03-17 19:19:19 +05:30
commit 21ade4a773
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/buying/doctype/purchase_common/purchase_common.js
View File

@ -174,8 +174,9 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
company: function() { company: function() {
var me = this; var me = this;
if (!this.frm.doc.shipping_address) { if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address")
erpnext.utils.get_shipping_address(this.frm) && !this.frm.doc.shipping_address) {
erpnext.utils.get_shipping_address(this.frm)
} }
}, },

3
erpnext/setup/setup_wizard/sample_data.py
View File

@ -15,6 +15,7 @@ def make_sample_data():
selling_items = frappe.get_all("Item", filters = {"is_sales_item": 1}) selling_items = frappe.get_all("Item", filters = {"is_sales_item": 1})
buying_items = frappe.get_all("Item", filters = {"is_purchase_item": 1}) buying_items = frappe.get_all("Item", filters = {"is_purchase_item": 1})
customers = frappe.get_all("Customer") customers = frappe.get_all("Customer")
warehouses = frappe.get_all("Warehouse")
if selling_items and customers: if selling_items and customers:
for i in range(3): for i in range(3):
@ -24,7 +25,7 @@ def make_sample_data():
make_projects() make_projects()
if buying_items: if buying_items and warehouses:
make_material_request(buying_items) make_material_request(buying_items)
frappe.db.commit() frappe.db.commit()