Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Service job card fix #16

Open
wants to merge 2 commits into
base: version-14
Choose a base branch
from
Open

Service job card fix #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a21ef9
fix: fetch item price and price list
DaizyModi Feb 17, 2023
c4629b6
fix: remove `type:call` argument
DaizyModi Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion servicems/service_management/doctype/service_job_card/service_job_card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ frappe.ui.form.on('Service Job Card', {
},

create_parts_entry: function (frm) {
frm.call('create_parts_entry', { type: "call" }).then(r => {
frm.call('create_parts_entry').then(r => {
frm.reload_doc();
});
},
Expand Down
65 changes: 33 additions & 32 deletions servicems/service_management/doctype/service_job_card/service_job_card.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ def update_tables(self):
{
"item": part.item,
"qty": part.qty,
"rate": get_item_price(
"rate": self.get_item_price(
part.item,
self.get_price_list(service_template.price_list),
self.company,
service_template.price_list,
),
"is_billable": part.is_billable,
},
Expand All @@ -74,9 +73,7 @@ def set_totals(self):

if self.services:
for service in self.services:
service.rate = get_item_price(
service.item, self.get_price_list(service.price_list), self.company
)
service.rate = self.get_item_price(service.item, service.price_list)
if service.is_billable:
self.service_charges += service.rate
if self.parts:
Expand All @@ -96,7 +93,7 @@ def set_parts_rate(self):
if item.rate:
continue

item.rate = get_item_price(item.item, price_list, self.company)
item.rate = self.get_item_price(item.item, price_list)

@frappe.whitelist()
def create_parts_entry(self, type):
Expand Down Expand Up @@ -151,9 +148,7 @@ def create_parts_entry(self, type):
)

self.update_supplied_parts_details(supplied_items, service_parts_entry.name)

if type == "call":
self.save()
self.save()

def update_supplied_parts_details(self, supplied_items, parts_entry_no):
for row in self.parts:
Expand Down Expand Up @@ -303,34 +298,40 @@ def vaildate_complete(self):
if not task.completed:
frappe.throw(_("Row #{0}: The Tasks is not Completed").format(task.idx))

def get_price_list(self, template_price_list=None):
price_list = frappe.get_value("Customer", self.customer, "default_price_list")

if not price_list and template_price_list:
price_list = template_price_list
def get_price_list(self, price_list=None):
if not price_list and self.customer:
price_list = frappe.get_value(
"Customer", self.customer, "default_price_list"
)

if not price_list:
price_list = frappe.get_value(
"Service Settings", "Service Settings", "price_list"
)
return price_list or ""


def get_item_price(item_code, price_list, company):
company_currency = frappe.get_value("Company", company, "default_currency")
item_prices_data = frappe.db.get_value(
"Item Price",
filters={
"price_list": price_list,
"item_code": item_code,
"currency": company_currency,
},
fieldname=["item_code", "price_list_rate", "currency"],
as_dict=True,
order_by="valid_from desc",
)

return item_prices_data.price_list_rate if item_prices_data else 0
return price_list

def get_item_price(self, item_code, price_list, company=None):
if not price_list:
price_list = self.get_price_list()

if not company:
company = self.company

company_currency = frappe.get_value("Company", company, "default_currency")
item_prices_data = frappe.db.get_value(
"Item Price",
filters={
"price_list": price_list,
"item_code": item_code,
"currency": company_currency,
},
fieldname=["item_code", "price_list_rate", "currency"],
as_dict=True,
order_by="valid_from desc",
)

return item_prices_data.price_list_rate if item_prices_data else 0


@frappe.whitelist()
Expand Down