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

fix: undefined variables

Browse Source
This commit is contained in:
Ankush Menat 2021-09-01 15:02:06 +05:30
parent 9fec0a5c68
commit 2d62c500c4
No known key found for this signature in database
GPG Key ID: 8EA82E09BBD13AAF
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@ -203,13 +203,13 @@ def apply_pricing_rule(args, doc=None):
serialized_items = dict() serialized_items = dict()
for item_code, val in query_items: for item_code, val in query_items:
serialized_items.setdefault(item_code, val) serialized_items.setdefault(item_code, val)
for item in item_list: for item in item_list:
args_copy = copy.deepcopy(args) args_copy = copy.deepcopy(args)
args_copy.update(item) args_copy.update(item)
data = get_pricing_rule_for_item(args_copy, item.get('price_list_rate'), doc=doc) data = get_pricing_rule_for_item(args_copy, item.get('price_list_rate'), doc=doc)
out.append(data) out.append(data)
if serialized_items.get(item.get('item_code')) and not item.get("serial_no") and set_serial_nos_based_on_fifo and not args.get('is_return'): if serialized_items.get(item.get('item_code')) and not item.get("serial_no") and set_serial_nos_based_on_fifo and not args.get('is_return'):
out[0].update(get_serial_no_for_item(args_copy)) out[0].update(get_serial_no_for_item(args_copy))
@ -315,9 +315,8 @@ def update_args_for_pricing_rule(args):
if not (args.item_group and args.brand): if not (args.item_group and args.brand):
try: try:
args.item_group, args.brand = frappe.get_cached_value("Item", args.item_code, ["item_group", "brand"]) args.item_group, args.brand = frappe.get_cached_value("Item", args.item_code, ["item_group", "brand"])
except TypeError: except frappe.DoesNotExistError:
# invalid item_code return
return item_details
if not args.item_group: if not args.item_group:
frappe.throw(_("Item Group not mentioned in item master for item {0}").format(args.item_code)) frappe.throw(_("Item Group not mentioned in item master for item {0}").format(args.item_code))

4
erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py
View File

@ -28,10 +28,10 @@ class AppointmentBookingSettings(Document):
to_time = datetime.datetime.strptime( to_time = datetime.datetime.strptime(
self.min_date+record.to_time, self.format_string) self.min_date+record.to_time, self.format_string)
timedelta = to_time-from_time timedelta = to_time-from_time
self.validate_from_and_to_time(from_time, to_time) self.validate_from_and_to_time(from_time, to_time, record)
self.duration_is_divisible(from_time, to_time) self.duration_is_divisible(from_time, to_time)
def validate_from_and_to_time(self, from_time, to_time): def validate_from_and_to_time(self, from_time, to_time, record):
if from_time > to_time: if from_time > to_time:
err_msg = _('<b>From Time</b> cannot be later than <b>To Time</b> for {0}').format(record.day_of_week) err_msg = _('<b>From Time</b> cannot be later than <b>To Time</b> for {0}').format(record.day_of_week)
frappe.throw(_(err_msg)) frappe.throw(_(err_msg))

2
erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
View File

@ -96,8 +96,6 @@ def get_columns():
} }
] ]
return columns
def get_vehicle_log_data(filters): def get_vehicle_log_data(filters):
start_date, end_date = get_period_dates(filters) start_date, end_date = get_period_dates(filters)

1
erpnext/loan_management/doctype/sanctioned_loan_amount/sanctioned_loan_amount.py
View File

@ -4,6 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
class SanctionedLoanAmount(Document): class SanctionedLoanAmount(Document):