nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

code alignment

Browse Source
This commit is contained in:
pawan
2018-01-22 17:31:40 +05:30
parent 67867529c0
commit 4ab6ef89a1
3 changed files with 120 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -34,6 +34,12 @@ class PurchaseOrder(BuyingController):
'overflow_type': 'order' 'overflow_type': 'order'
}] }]
def onload(self):
super(PurchaseOrder, self).onload()
self.set_onload('disable_fetch_last_purchase_rate',
cint(frappe.db.get_single_value("Buying Settings", "disable_fetch_last_purchase_rate")))
def validate(self): def validate(self):
super(PurchaseOrder, self).validate() super(PurchaseOrder, self).validate()
@@ -393,6 +399,7 @@ def make_purchase_invoice(source_name, target_doc=None):
@frappe.whitelist() @frappe.whitelist()
def make_stock_entry(purchase_order, item_code): def make_stock_entry(purchase_order, item_code):
purchase_order = frappe.get_doc("Purchase Order", purchase_order) purchase_order = frappe.get_doc("Purchase Order", purchase_order)
stock_entry = frappe.new_doc("Stock Entry") stock_entry = frappe.new_doc("Stock Entry")
stock_entry.purpose = "Subcontract" stock_entry.purpose = "Subcontract"
stock_entry.purchase_order = purchase_order.name stock_entry.purchase_order = purchase_order.name
@@ -437,6 +444,7 @@ def make_rm_stock_entry(purchase_order, rm_items):
stock_entry.supplier_address = purchase_order.supplier_address stock_entry.supplier_address = purchase_order.supplier_address
stock_entry.address_display = purchase_order.address_display stock_entry.address_display = purchase_order.address_display
stock_entry.company = purchase_order.company stock_entry.company = purchase_order.company
stock_entry.docstatus = 0
stock_entry.from_bom = 1 stock_entry.from_bom = 1
po_item = [d for d in purchase_order.items if d.item_code == item_code][0] po_item = [d for d in purchase_order.items if d.item_code == item_code][0]
stock_entry.fg_completed_qty = po_item.qty stock_entry.fg_completed_qty = po_item.qty

2
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -676,7 +676,7 @@ class StockEntry(StockController):
# item dict = { item_code: {qty, description, stock_uom} } # item dict = { item_code: {qty, description, stock_uom} }
item_dict = get_bom_items_as_dict(self.bom_no, self.company, qty=qty, item_dict = get_bom_items_as_dict(self.bom_no, self.company, qty=qty,
fetch_exploded = self.use_multi_level_bom) fetch_exploded = self.use_multi_level_bom)
print item_dict
for item in item_dict.values(): for item in item_dict.values():
# if source warehouse presents in BOM set from_warehouse as bom source_warehouse # if source warehouse presents in BOM set from_warehouse as bom source_warehouse
item.from_warehouse = self.from_warehouse or item.source_warehouse or item.default_warehouse item.from_warehouse = self.from_warehouse or item.source_warehouse or item.default_warehouse