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

[fix] Price list rate applied via set_missing_values

Browse Source
This commit is contained in:
Nabin Hait 2016-01-19 16:48:25 +05:30
parent 34d2822483
commit 9824e22ce1
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/crm/doctype/opportunity/opportunity.py
View File

@ -9,7 +9,6 @@ from frappe.model.mapper import get_mapped_doc
from erpnext.setup.utils import get_exchange_rate
from erpnext.utilities.transaction_base import TransactionBase
from erpnext.accounts.party import get_party_account_currency
from erpnext.stock.get_item_details import apply_price_list
subject_field = "title"
sender_field = "contact_email"
@ -193,8 +192,6 @@ def make_quotation(source_name, target_doc=None):
quotation.currency = party_account_currency or company_currency
quotation.conversion_rate = exchange_rate
quotation.update(apply_price_list(quotation.as_dict(), as_doc = True))
quotation.run_method("set_missing_values")
quotation.run_method("calculate_taxes_and_totals")

3
erpnext/selling/doctype/quotation/quotation.js
View File

@ -25,7 +25,8 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
cur_frm.add_custom_button(__('Lost'),
cur_frm.cscript['Declare Order Lost'], __("Status"));
}
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
if (this.frm.doc.docstatus===0) {

9
erpnext/stock/doctype/material_request/material_request.py
View File

@ -11,7 +11,6 @@ from frappe.utils import cstr, flt, getdate
from frappe import _
from frappe.model.mapper import get_mapped_doc
from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty
from erpnext.stock.get_item_details import apply_price_list
from erpnext.controllers.buying_controller import BuyingController
@ -24,7 +23,7 @@ class MaterialRequest(BuyingController):
return _("{0}: {1}").format(self.status, self.material_request_type)
def check_if_already_pulled(self):
pass#if self.[d.sales_order_no for d in self.get('items')]
pass
def validate_qty_against_so(self):
so_items = {} # Format --> {'SO/00001': {'Item/001': 120, 'Item/002': 24}}
@ -183,7 +182,6 @@ def update_item(obj, target, source_parent):
@frappe.whitelist()
def make_purchase_order(source_name, target_doc=None):
def postprocess(source, target_doc):
target_doc.update(apply_price_list(target_doc.as_dict(), as_doc = True))
set_missing_values(source, target_doc)
doclist = get_mapped_doc("Material Request", source_name, {
@ -225,9 +223,7 @@ def make_purchase_order_based_on_supplier(source_name, target_doc=None):
target_doc.set("items", [d for d in target_doc.get("items")
if d.get("item_code") in supplier_items and d.get("qty") > 0])
target_doc.update(apply_price_list(target_doc.as_dict(), as_doc = True))
set_missing_values(source, target_doc)
for mr in material_requests:
@ -271,7 +267,6 @@ def get_material_requests_based_on_supplier(supplier):
@frappe.whitelist()
def make_supplier_quotation(source_name, target_doc=None):
def postprocess(source, target_doc):
target_doc.update(apply_price_list(target_doc.as_dict(), as_doc = True))
set_missing_values(source, target_doc)
doclist = get_mapped_doc("Material Request", source_name, {