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

[fix] fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2013-10-17 17:01:14 +05:30
parent 46eaa55f06
commit 096d363087
18 changed files with 130 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/buying_controller.py
View File

@@ -29,7 +29,7 @@ class BuyingController(StockController):
super(BuyingController, self).set_missing_values(for_validate)
self.set_supplier_from_item_default()
self.set_price_list_currency("Buying", for_validate)
self.set_price_list_currency("Buying")
# set contact and address details for supplier, if they are not mentioned
if self.doc.supplier and not (self.doc.contact_person and self.doc.supplier_address):