nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44319 from vishakhdesai/hd-ticket-21161

Browse Source 
fix: use field precision in Sales and Purchase Order
This commit is contained in:
ruthra kumar
2024-11-26 11:46:50 +05:30
committed by GitHub
parent 1baed9f46e 1a1e2c7e01
commit 4983dac27b
2 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -57,8 +57,8 @@ frappe.ui.form.on("Sales Order", {
if (frm.doc.docstatus === 1) {
if (
frm.doc.status !== "Closed" &&
flt(frm.doc.per_delivered, 2) < 100 &&
flt(frm.doc.per_billed, 2) < 100 &&
flt(frm.doc.per_delivered, precision("per_delivered")) < 100 &&
flt(frm.doc.per_billed, precision("per_billed")) < 100 &&
frm.has_perm("write")
) {
frm.add_custom_button(__("Update Items"), () => {
@@ -75,7 +75,7 @@ frappe.ui.form.on("Sales Order", {
if (
frm.doc.__onload &&
frm.doc.__onload.has_unreserved_stock &&
flt(frm.doc.per_picked) === 0
flt(frm.doc.per_picked, precision("per_picked")) === 0
) {
frm.add_custom_button(
__("Reserve"),
@@ -604,7 +604,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
__("Status")
);
if (flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed, 2) < 100) {
if (
flt(doc.per_delivered, precision("per_delivered")) < 100 ||
flt(doc.per_billed, precision("per_billed")) < 100
) {
// close
this.frm.add_custom_button(__("Close"), () => this.close_sales_order(), __("Status"));
}
@@ -627,7 +630,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
) && !this.frm.doc.skip_delivery_note;
if (this.frm.has_perm("submit")) {
if (flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed, 2) < 100) {
if (
flt(doc.per_delivered, precision("per_delivered")) < 100 ||
flt(doc.per_billed, precision("per_billed")) < 100
) {
// hold
this.frm.add_custom_button(
__("Hold"),
@@ -645,8 +651,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
if (
(!doc.__onload || !doc.__onload.has_reserved_stock) &&
flt(doc.per_picked, 2) < 100 &&
flt(doc.per_delivered, 2) < 100 &&
flt(doc.per_picked, precision("per_picked")) < 100 &&
flt(doc.per_delivered, precision("per_delivered")) < 100 &&
frappe.model.can_create("Pick List")
) {
this.frm.add_custom_button(
@@ -664,7 +670,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
// delivery note
if (
flt(doc.per_delivered, 2) < 100 &&
flt(doc.per_delivered, precision("per_delivered")) < 100 &&
(order_is_a_sale || order_is_a_custom_sale) &&
allow_delivery
) {
@@ -686,7 +692,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
}
// sales invoice
if (flt(doc.per_billed, 2) < 100 && frappe.model.can_create("Sales Invoice")) {
if (
flt(doc.per_billed, precision("per_billed")) < 100 &&
frappe.model.can_create("Sales Invoice")
) {
this.frm.add_custom_button(
__("Sales Invoice"),
() => me.make_sales_invoice(),
@@ -698,7 +707,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
if (
(!doc.order_type ||
((order_is_a_sale || order_is_a_custom_sale) &&
flt(doc.per_delivered, 2) < 100)) &&
flt(doc.per_delivered, precision("per_delivered")) < 100)) &&
frappe.model.can_create("Material Request")
) {
this.frm.add_custom_button(
@@ -723,7 +732,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
}
// maintenance
if (flt(doc.per_delivered, 2) < 100 && (order_is_maintenance || order_is_a_custom_sale)) {
if (
flt(doc.per_delivered, precision("per_delivered")) < 100 &&
(order_is_maintenance || order_is_a_custom_sale)
) {
if (frappe.model.can_create("Maintenance Visit")) {
this.frm.add_custom_button(
__("Maintenance Visit"),
@@ -741,7 +753,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
}
// project
if (flt(doc.per_delivered, 2) < 100 && frappe.model.can_create("Project")) {
if (
flt(doc.per_delivered, precision("per_delivered")) < 100 &&
frappe.model.can_create("Project")
) {
this.frm.add_custom_button(__("Project"), () => this.make_project(), __("Create"));
}