Merge pull request #39868 from barredterra/fix-stock-value-diff
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index e900b81..ef1f6bd 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -14,23 +14,8 @@
super.setup(doc);
}
company() {
+ super.company();
erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype);
-
- let me = this;
- if (this.frm.doc.company) {
- frappe.call({
- method:
- "erpnext.accounts.party.get_party_account",
- args: {
- party_type: 'Customer',
- party: this.frm.doc.customer,
- company: this.frm.doc.company
- },
- callback: (response) => {
- if (response) me.frm.set_value("debit_to", response.message);
- },
- });
- }
}
onload() {
var me = this;
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 079350b..3daec20 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -748,7 +748,7 @@
fields=["total_time_in_mins", "hour_rate"],
filters={"is_corrective_job_card": 1, "docstatus": 1, "work_order": self.work_order},
):
- wo.corrective_operation_cost += flt(row.total_time_in_mins) * flt(row.hour_rate)
+ wo.corrective_operation_cost += flt(row.total_time_in_mins / 60) * flt(row.hour_rate)
wo.calculate_operating_cost()
wo.flags.ignore_validate_update_after_submit = True