{{ no_result_message or _("Nothing to show") }}
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 2d7c0b3229eb7bdeed41db8e0652b3c102a753ae..62740e6e6e1c9c81370ec7b4292bdcb2664476e7 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -90,6 +90,10 @@ class PurchaseOrder(BuyingController):
self.reset_default_field_value("set_warehouse", "items", "warehouse")
def validate_with_previous_doc(self):
+ mri_compare_fields = [["project", "="], ["item_code", "="]]
+ if self.is_subcontracted:
+ mri_compare_fields = [["project", "="]]
+
super(PurchaseOrder, self).validate_with_previous_doc(
{
"Supplier Quotation": {
@@ -112,7 +116,7 @@ class PurchaseOrder(BuyingController):
},
"Material Request Item": {
"ref_dn_field": "material_request_item",
- "compare_fields": [["project", "="], ["item_code", "="]],
+ "compare_fields": mri_compare_fields,
"is_child_table": True,
},
}
@@ -286,23 +290,6 @@ class PurchaseOrder(BuyingController):
check_list.append(d.material_request)
check_on_hold_or_closed_status("Material Request", d.material_request)
- def update_requested_qty(self):
- material_request_map = {}
- for d in self.get("items"):
- if d.material_request_item:
- material_request_map.setdefault(d.material_request, []).append(d.material_request_item)
-
- for mr, mr_item_rows in material_request_map.items():
- if mr and mr_item_rows:
- mr_obj = frappe.get_doc("Material Request", mr)
-
- if mr_obj.status in ["Stopped", "Cancelled"]:
- frappe.throw(
- _("Material Request {0} is cancelled or stopped").format(mr), frappe.InvalidStatusError
- )
-
- mr_obj.update_requested_qty(mr_item_rows)
-
def update_ordered_qty(self, po_item_rows=None):
"""update requested qty (before ordered_qty is updated)"""
item_wh_list = []
@@ -345,7 +332,9 @@ class PurchaseOrder(BuyingController):
self.update_status_updater()
self.update_prevdoc_status()
- self.update_requested_qty()
+ if not self.is_subcontracted or self.is_old_subcontracting_flow:
+ self.update_requested_qty()
+
self.update_ordered_qty()
self.validate_budget()
self.update_reserved_qty_for_subcontract()
@@ -380,7 +369,9 @@ class PurchaseOrder(BuyingController):
# Must be called after updating ordered qty in Material Request
# bin uses Material Request Items to recalculate & update
- self.update_requested_qty()
+ if not self.is_subcontracted or self.is_old_subcontracting_flow:
+ self.update_requested_qty()
+
self.update_ordered_qty()
self.update_blanket_order()
@@ -682,21 +673,6 @@ def get_mapped_purchase_invoice(source_name, target_doc=None, ignore_permissions
return doc
-def get_item_details(items):
- item_details = {}
- for d in frappe.db.sql(
- """select item_code, description, allow_alternative_item from `tabItem`
- where name in ({0})""".format(
- ", ".join(["%s"] * len(items))
- ),
- items,
- as_dict=1,
- ):
- item_details[d.item_code] = d
-
- return item_details
-
-
def get_list_context(context=None):
from erpnext.controllers.website_list_for_contact import get_list_context
@@ -778,6 +754,8 @@ def get_mapped_subcontracting_order(source_name, target_doc=None):
"doctype": "Subcontracting Order Service Item",
"field_map": {
"name": "purchase_order_item",
+ "material_request": "material_request",
+ "material_request_item": "material_request_item",
},
"field_no_map": [],
},
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 44cc8cf4b7d58b09b1168e9b44d8605ce7c160ca..6948501af19c506316fe5b02baed69982e842132 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -8,6 +8,8 @@ from frappe.model.meta import get_field_precision
from frappe.utils import flt, format_datetime, get_datetime
import erpnext
+from erpnext.stock.serial_batch_bundle import get_batches_from_bundle
+from erpnext.stock.serial_batch_bundle import get_serial_nos as get_serial_nos_from_bundle
from erpnext.stock.utils import get_incoming_rate
@@ -69,8 +71,6 @@ def validate_return_against(doc):
def validate_returned_items(doc):
- from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
-
valid_items = frappe._dict()
select_fields = "item_code, qty, stock_qty, rate, parenttype, conversion_factor"
@@ -123,26 +123,6 @@ def validate_returned_items(doc):
)
)
- elif ref.batch_no and d.batch_no not in ref.batch_no:
- frappe.throw(
- _("Row # {0}: Batch No must be same as {1} {2}").format(
- d.idx, _(doc.doctype), doc.return_against
- )
- )
-
- elif ref.serial_no:
- if d.qty and not d.serial_no:
- frappe.throw(_("Row # {0}: Serial No is mandatory").format(d.idx))
- else:
- serial_nos = get_serial_nos(d.serial_no)
- for s in serial_nos:
- if s not in ref.serial_no:
- frappe.throw(
- _("Row # {0}: Serial No {1} does not match with {2} {3}").format(
- d.idx, s, _(doc.doctype), doc.return_against
- )
- )
-
if (
warehouse_mandatory
and not d.get("warehouse")
@@ -397,71 +377,92 @@ def make_return_doc(
else:
doc.run_method("calculate_taxes_and_totals")
- def update_item(source_doc, target_doc, source_parent):
+ def update_serial_batch_no(source_doc, target_doc, source_parent, item_details, qty_field):
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.serial_batch_bundle import SerialBatchCreation
- target_doc.qty = -1 * source_doc.qty
- item_details = frappe.get_cached_value(
- "Item", source_doc.item_code, ["has_batch_no", "has_serial_no"], as_dict=1
- )
-
returned_serial_nos = []
- if source_doc.get("serial_and_batch_bundle"):
- if item_details.has_serial_no:
- returned_serial_nos = get_returned_serial_nos(source_doc, source_parent)
-
- type_of_transaction = "Inward"
- if (
- frappe.db.get_value(
- "Serial and Batch Bundle", source_doc.serial_and_batch_bundle, "type_of_transaction"
- )
- == "Inward"
- ):
- type_of_transaction = "Outward"
-
- cls_obj = SerialBatchCreation(
- {
- "type_of_transaction": type_of_transaction,
- "serial_and_batch_bundle": source_doc.serial_and_batch_bundle,
- "returned_against": source_doc.name,
- "item_code": source_doc.item_code,
- "returned_serial_nos": returned_serial_nos,
- }
- )
-
- cls_obj.duplicate_package()
- if cls_obj.serial_and_batch_bundle:
- target_doc.serial_and_batch_bundle = cls_obj.serial_and_batch_bundle
+ returned_batches = frappe._dict()
+ serial_and_batch_field = (
+ "serial_and_batch_bundle" if qty_field == "stock_qty" else "rejected_serial_and_batch_bundle"
+ )
+ old_serial_no_field = "serial_no" if qty_field == "stock_qty" else "rejected_serial_no"
+ old_batch_no_field = "batch_no"
- if source_doc.get("rejected_serial_and_batch_bundle"):
+ if (
+ source_doc.get(serial_and_batch_field)
+ or source_doc.get(old_serial_no_field)
+ or source_doc.get(old_batch_no_field)
+ ):
if item_details.has_serial_no:
returned_serial_nos = get_returned_serial_nos(
- source_doc, source_parent, serial_no_field="rejected_serial_and_batch_bundle"
+ source_doc, source_parent, serial_no_field=serial_and_batch_field
+ )
+ else:
+ returned_batches = get_returned_batches(
+ source_doc, source_parent, batch_no_field=serial_and_batch_field
)
type_of_transaction = "Inward"
- if (
+ if source_doc.get(serial_and_batch_field) and (
frappe.db.get_value(
- "Serial and Batch Bundle", source_doc.rejected_serial_and_batch_bundle, "type_of_transaction"
+ "Serial and Batch Bundle", source_doc.get(serial_and_batch_field), "type_of_transaction"
)
== "Inward"
):
type_of_transaction = "Outward"
+ elif source_parent.doctype in [
+ "Purchase Invoice",
+ "Purchase Receipt",
+ "Subcontracting Receipt",
+ ]:
+ type_of_transaction = "Outward"
cls_obj = SerialBatchCreation(
{
"type_of_transaction": type_of_transaction,
- "serial_and_batch_bundle": source_doc.rejected_serial_and_batch_bundle,
+ "serial_and_batch_bundle": source_doc.get(serial_and_batch_field),
"returned_against": source_doc.name,
"item_code": source_doc.item_code,
"returned_serial_nos": returned_serial_nos,
+ "voucher_type": source_parent.doctype,
+ "do_not_submit": True,
+ "warehouse": source_doc.warehouse,
+ "has_serial_no": item_details.has_serial_no,
+ "has_batch_no": item_details.has_batch_no,
}
)
- cls_obj.duplicate_package()
- if cls_obj.serial_and_batch_bundle:
- target_doc.serial_and_batch_bundle = cls_obj.serial_and_batch_bundle
+ serial_nos = []
+ batches = frappe._dict()
+ if source_doc.get(old_batch_no_field):
+ batches = frappe._dict({source_doc.batch_no: source_doc.get(qty_field)})
+ elif source_doc.get(old_serial_no_field):
+ serial_nos = get_serial_nos(source_doc.get(old_serial_no_field))
+ elif source_doc.get(serial_and_batch_field):
+ if item_details.has_serial_no:
+ serial_nos = get_serial_nos_from_bundle(source_doc.get(serial_and_batch_field))
+ else:
+ batches = get_batches_from_bundle(source_doc.get(serial_and_batch_field))
+
+ if serial_nos:
+ cls_obj.serial_nos = sorted(list(set(serial_nos) - set(returned_serial_nos)))
+ elif batches:
+ for batch in batches:
+ if batch in returned_batches:
+ batches[batch] -= flt(returned_batches.get(batch))
+
+ cls_obj.batches = batches
+
+ if source_doc.get(serial_and_batch_field):
+ cls_obj.duplicate_package()
+ if cls_obj.serial_and_batch_bundle:
+ target_doc.set(serial_and_batch_field, cls_obj.serial_and_batch_bundle)
+ else:
+ target_doc.set(serial_and_batch_field, cls_obj.make_serial_and_batch_bundle().name)
+ def update_item(source_doc, target_doc, source_parent):
+ target_doc.qty = -1 * source_doc.qty
if doctype in ["Purchase Receipt", "Subcontracting Receipt"]:
returned_qty_map = get_returned_qty_map_for_row(
source_parent.name, source_parent.supplier, source_doc.name, doctype
@@ -561,6 +562,17 @@ def make_return_doc(
if default_warehouse_for_sales_return:
target_doc.warehouse = default_warehouse_for_sales_return
+ item_details = frappe.get_cached_value(
+ "Item", source_doc.item_code, ["has_batch_no", "has_serial_no"], as_dict=1
+ )
+
+ if not item_details.has_batch_no and not item_details.has_serial_no:
+ return
+
+ for qty_field in ["stock_qty", "rejected_qty"]:
+ if target_doc.get(qty_field):
+ update_serial_batch_no(source_doc, target_doc, source_parent, item_details, qty_field)
+
def update_terms(source_doc, target_doc, source_parent):
target_doc.payment_amount = -source_doc.payment_amount
@@ -716,6 +728,9 @@ def get_returned_serial_nos(
[parent_doc.doctype, "docstatus", "=", 1],
]
+ if serial_no_field == "rejected_serial_and_batch_bundle":
+ filters.append([child_doc.doctype, "rejected_qty", ">", 0])
+
# Required for POS Invoice
if ignore_voucher_detail_no:
filters.append([child_doc.doctype, "name", "!=", ignore_voucher_detail_no])
@@ -724,9 +739,57 @@ def get_returned_serial_nos(
for row in frappe.get_all(parent_doc.doctype, fields=fields, filters=filters):
ids.append(row.get("serial_and_batch_bundle"))
- if row.get(old_field):
+ if row.get(old_field) and not row.get(serial_no_field):
serial_nos.extend(get_serial_nos_from_serial_no(row.get(old_field)))
- serial_nos.extend(get_serial_nos(ids))
+ if ids:
+ serial_nos.extend(get_serial_nos(ids))
return serial_nos
+
+
+def get_returned_batches(
+ child_doc, parent_doc, batch_no_field=None, ignore_voucher_detail_no=None
+):
+ from erpnext.stock.serial_batch_bundle import get_batches_from_bundle
+
+ batches = frappe._dict()
+
+ old_field = "batch_no"
+ if not batch_no_field:
+ batch_no_field = "serial_and_batch_bundle"
+
+ return_ref_field = frappe.scrub(child_doc.doctype)
+ if child_doc.doctype == "Delivery Note Item":
+ return_ref_field = "dn_detail"
+
+ fields = [
+ f"`{'tab' + child_doc.doctype}`.`{batch_no_field}`",
+ f"`{'tab' + child_doc.doctype}`.`batch_no`",
+ f"`{'tab' + child_doc.doctype}`.`stock_qty`",
+ ]
+
+ filters = [
+ [parent_doc.doctype, "return_against", "=", parent_doc.name],
+ [parent_doc.doctype, "is_return", "=", 1],
+ [child_doc.doctype, return_ref_field, "=", child_doc.name],
+ [parent_doc.doctype, "docstatus", "=", 1],
+ ]
+
+ if batch_no_field == "rejected_serial_and_batch_bundle":
+ filters.append([child_doc.doctype, "rejected_qty", ">", 0])
+
+ # Required for POS Invoice
+ if ignore_voucher_detail_no:
+ filters.append([child_doc.doctype, "name", "!=", ignore_voucher_detail_no])
+
+ ids = []
+ for row in frappe.get_all(parent_doc.doctype, fields=fields, filters=filters):
+ ids.append(row.get("serial_and_batch_bundle"))
+ if row.get(old_field) and not row.get(batch_no_field):
+ batches.setdefault(row.get(old_field), row.get("stock_qty"))
+
+ if ids:
+ batches.update(get_batches_from_bundle(ids))
+
+ return batches
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 51b123b747cfd26bbc8f023d69b46045642a4a6a..f529c88273f7dc892109d01d71aa9eadac99f12b 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -308,6 +308,8 @@ class SellingController(StockController):
"warehouse": p.warehouse or d.warehouse,
"item_code": p.item_code,
"qty": flt(p.qty),
+ "serial_no": p.serial_no if self.docstatus == 2 else None,
+ "batch_no": p.batch_no if self.docstatus == 2 else None,
"uom": p.uom,
"serial_and_batch_bundle": p.serial_and_batch_bundle
or get_serial_and_batch_bundle(p, self),
@@ -330,6 +332,8 @@ class SellingController(StockController):
"warehouse": d.warehouse,
"item_code": d.item_code,
"qty": d.stock_qty,
+ "serial_no": d.serial_no if self.docstatus == 2 else None,
+ "batch_no": d.batch_no if self.docstatus == 2 else None,
"uom": d.uom,
"stock_uom": d.stock_uom,
"conversion_factor": d.conversion_factor,
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 1b2f0210cdd521b336dbb9e858c85f009d7da4bc..2c937c81d60343f289b42fdb4a509b78a915cdf6 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -455,6 +455,12 @@ class StockController(AccountsController):
sl_dict.update(args)
self.update_inventory_dimensions(d, sl_dict)
+ if self.docstatus == 2:
+ # To handle denormalized serial no records, will br deprecated in v16
+ for field in ["serial_no", "batch_no"]:
+ if d.get(field):
+ sl_dict[field] = d.get(field)
+
return sl_dict
def update_inventory_dimensions(self, row, sl_dict) -> None:
diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py
index f88e3ebf534efc94497e7511f475e6fbcb5b9fc0..9555902a74cd9defa8f4c5ee2d0aa2fd72a86aa6 100644
--- a/erpnext/controllers/subcontracting_controller.py
+++ b/erpnext/controllers/subcontracting_controller.py
@@ -953,6 +953,23 @@ class SubcontractingController(StockController):
return self._sub_contracted_items
+ def update_requested_qty(self):
+ material_request_map = {}
+ for d in self.get("items"):
+ if d.material_request_item:
+ material_request_map.setdefault(d.material_request, []).append(d.material_request_item)
+
+ for mr, mr_item_rows in material_request_map.items():
+ if mr and mr_item_rows:
+ mr_obj = frappe.get_doc("Material Request", mr)
+
+ if mr_obj.status in ["Stopped", "Cancelled"]:
+ frappe.throw(
+ _("Material Request {0} is cancelled or stopped").format(mr), frappe.InvalidStatusError
+ )
+
+ mr_obj.update_requested_qty(mr_item_rows)
+
def get_item_details(items):
item = frappe.qb.DocType("Item")
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index dca1f58ebd3dcc1db2e42e6a3c8bc9c182a8ce52..8ed554dfc1dd0a821594e658eb2b1978d57b91c4 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -336,7 +336,7 @@ class BOM(WebsiteGenerator):
)
args.update(item)
- rate = self.get_rm_rate(args)
+ rate = self.get_rm_rate(args) if self.rm_cost_as_per != "Manual" else (args.get("rate") or 0.0)
ret_item = {
"item_name": item and args["item_name"] or "",
"description": item and args["description"] or "",
@@ -732,7 +732,7 @@ class BOM(WebsiteGenerator):
def calculate_exploded_cost(self):
"Set exploded row cost from it's parent BOM."
- rm_rate_map = self.get_rm_rate_map()
+ rm_rate_map = self.get_rm_rate_map() if self.rm_cost_as_per != "Manual" else {}
for row in self.get("exploded_items"):
old_rate = flt(row.rate)
diff --git a/erpnext/manufacturing/doctype/bom/test_records.json b/erpnext/manufacturing/doctype/bom/test_records.json
index 38ea414b184d09da720733e1e2e37ac73588b548..86707a327569ecb8a1f879a3b60805b4e95a9701 100644
--- a/erpnext/manufacturing/doctype/bom/test_records.json
+++ b/erpnext/manufacturing/doctype/bom/test_records.json
@@ -36,16 +36,16 @@
"quantity": 1.0
},
{
- "scrap_items":[
- {
- "amount": 2000.0,
- "doctype": "BOM Scrap Item",
- "item_code": "_Test Item Home Desktop 100",
- "parentfield": "scrap_items",
- "stock_qty": 1.0,
- "rate": 2000.0,
- "stock_uom": "_Test UOM"
- }
+ "scrap_items": [
+ {
+ "amount": 2000.0,
+ "doctype": "BOM Scrap Item",
+ "item_code": "_Test Item Home Desktop 100",
+ "parentfield": "scrap_items",
+ "stock_qty": 1.0,
+ "rate": 2000.0,
+ "stock_uom": "_Test UOM"
+ }
],
"items": [
{
@@ -80,7 +80,8 @@
"currency": "USD",
"company": "_Test Company",
"item": "_Test FG Item",
- "quantity": 1.0
+ "quantity": 1.0,
+ "rm_cost_as_per": "Manual"
},
{
"operations": [
@@ -92,7 +93,7 @@
"time_in_mins": 60,
"operating_cost": 100
}
- ],
+ ],
"items": [
{
"amount": 5000.0,
@@ -140,7 +141,7 @@
"time_in_mins": 60,
"operating_cost": 140
}
- ],
+ ],
"items": [
{
"amount": 5000.0,
@@ -164,31 +165,31 @@
"item": "_Test Variant Item",
"quantity": 1.0,
"with_operations": 1
-},
-{
- "items": [
- {
- "amount": 5000.0,
- "doctype": "BOM Item",
- "item_code": "_Test Item",
- "parentfield": "items",
- "qty": 2.0,
- "rate": 3000.0,
- "uom": "_Test UOM",
- "stock_uom": "_Test UOM",
- "source_warehouse": "_Test Warehouse - _TC",
- "include_item_in_manufacturing": 1
- }
- ],
- "docstatus": 1,
- "doctype": "BOM",
- "is_active": 1,
- "is_default": 1,
- "currency": "USD",
- "item": "_Test Variant Item",
- "quantity": 1.0,
- "with_operations": 0,
- "fg_based_operating_cost": 1,
- "operating_cost_per_bom_quantity": 140
+ },
+ {
+ "items": [
+ {
+ "amount": 5000.0,
+ "doctype": "BOM Item",
+ "item_code": "_Test Item",
+ "parentfield": "items",
+ "qty": 2.0,
+ "rate": 3000.0,
+ "uom": "_Test UOM",
+ "stock_uom": "_Test UOM",
+ "source_warehouse": "_Test Warehouse - _TC",
+ "include_item_in_manufacturing": 1
+ }
+ ],
+ "docstatus": 1,
+ "doctype": "BOM",
+ "is_active": 1,
+ "is_default": 1,
+ "currency": "USD",
+ "item": "_Test Variant Item",
+ "quantity": 1.0,
+ "with_operations": 0,
+ "fg_based_operating_cost": 1,
+ "operating_cost_per_bom_quantity": 140
}
]
diff --git a/erpnext/patches/v15_0/delete_ecommerce_doctypes.py b/erpnext/patches/v15_0/delete_ecommerce_doctypes.py
index 90cdde136f5707519eb9e42e27cffb8364c62377..690c1e821aaf654efd3593b347f195a95ec14961 100644
--- a/erpnext/patches/v15_0/delete_ecommerce_doctypes.py
+++ b/erpnext/patches/v15_0/delete_ecommerce_doctypes.py
@@ -23,6 +23,8 @@ def execute():
for doctype in doctypes:
frappe.delete_doc("DocType", doctype, ignore_missing=True)
+ frappe.delete_doc("Workspace", "E Commerce", ignore_missing=True, force=True)
+
click.secho(
"E-commerce features were moved to a separate app.\n"
"Please install the Webshop app to continue using e-commerce features: https://gitlab.com/dokos/webshop",
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 71f2d622a4fb5692206edadd0295482d6878915f..28f28fb55b970c1c31a7aa17acd51549d32b1ebb 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -361,9 +361,14 @@ erpnext.buying = {
new erpnext.SerialBatchPackageSelector(
me.frm, item, (r) => {
if (r) {
+ let qty = Math.abs(r.total_qty);
+ if (doc.is_return) {
+ qty = qty * -1;
+ }
+
let update_values = {
"serial_and_batch_bundle": r.name,
- "qty": Math.abs(r.total_qty)
+ "qty": qty
}
if (r.warehouse) {
@@ -396,9 +401,14 @@ erpnext.buying = {
new erpnext.SerialBatchPackageSelector(
me.frm, item, (r) => {
if (r) {
+ let qty = Math.abs(r.total_qty);
+ if (doc.is_return) {
+ qty = qty * -1;
+ }
+
let update_values = {
"serial_and_batch_bundle": r.name,
- "rejected_qty": Math.abs(r.total_qty)
+ "rejected_qty": qty
}
if (r.warehouse) {
diff --git a/erpnext/public/js/utils/sales_common.js b/erpnext/public/js/utils/sales_common.js
index a4face54403b7852e9309c4b76390c6dcf81e2ef..7ab31b69121e96d74f58147b3178f01c0d8ae129 100644
--- a/erpnext/public/js/utils/sales_common.js
+++ b/erpnext/public/js/utils/sales_common.js
@@ -323,9 +323,14 @@ erpnext.sales_common = {
new erpnext.SerialBatchPackageSelector(
me.frm, item, (r) => {
if (r) {
+ let qty = Math.abs(r.total_qty);
+ if (doc.is_return) {
+ qty = qty * -1;
+ }
+
frappe.model.set_value(item.doctype, item.name, {
"serial_and_batch_bundle": r.name,
- "qty": Math.abs(r.total_qty)
+ "qty": qty
});
}
}
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 7b9cdfef2a9608e29d9374c67ddec5fb53a1f3c0..4abc8fa395130d521ff5fb592b5c75a8b11ca264 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -32,22 +32,39 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
});
this.dialog.show();
+ this.$scan_btn = this.dialog.$wrapper.find(".link-btn");
+ this.$scan_btn.css("display", "inline");
let qty = this.item.stock_qty || this.item.transfer_qty || this.item.qty;
- this.dialog.set_value("qty", qty).then(() => {
- if (this.item.serial_no) {
- this.dialog.set_value("scan_serial_no", this.item.serial_no);
- frappe.model.set_value(this.item.doctype, this.item.name, 'serial_no', '');
- } else if (this.item.batch_no) {
- this.dialog.set_value("scan_batch_no", this.item.batch_no);
- frappe.model.set_value(this.item.doctype, this.item.name, 'batch_no', '');
- }
- this.dialog.fields_dict.entries.grid.refresh();
- });
+ if (this.item?.is_rejected) {
+ qty = this.item.rejected_qty;
+ }
- this.$scan_btn = this.dialog.$wrapper.find(".link-btn");
- this.$scan_btn.css("display", "inline");
+ qty = Math.abs(qty);
+ if (qty > 0) {
+ this.dialog.set_value("qty", qty).then(() => {
+ if (this.item.serial_no && !this.item.serial_and_batch_bundle) {
+ let serial_nos = this.item.serial_no.split('\n');
+ if (serial_nos.length > 1) {
+ serial_nos.forEach(serial_no => {
+ this.dialog.fields_dict.entries.df.data.push({
+ serial_no: serial_no,
+ batch_no: this.item.batch_no
+ });
+ });
+ } else {
+ this.dialog.set_value("scan_serial_no", this.item.serial_no);
+ }
+ frappe.model.set_value(this.item.doctype, this.item.name, 'serial_no', '');
+ } else if (this.item.batch_no && !this.item.serial_and_batch_bundle) {
+ this.dialog.set_value("scan_batch_no", this.item.batch_no);
+ frappe.model.set_value(this.item.doctype, this.item.name, 'batch_no', '');
+ }
+
+ this.dialog.fields_dict.entries.grid.refresh();
+ });
+ }
}
get_serial_no_filters() {
@@ -467,13 +484,13 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
}
render_data() {
- if (!this.frm.is_new() && this.bundle) {
+ if (this.bundle) {
frappe.call({
method: 'erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.get_serial_batch_ledgers',
args: {
item_code: this.item.item_code,
name: this.bundle,
- voucher_no: this.item.parent,
+ voucher_no: !this.frm.is_new() ? this.item.parent : "",
}
}).then(r => {
if (r.message) {
diff --git a/erpnext/public/scss/website.scss b/erpnext/public/scss/website.scss
index c39681f7eba30c09f944349b4153971bfcba852a..e57caab18d0939bb789729c14e91e1ea0e1b1007 100644
--- a/erpnext/public/scss/website.scss
+++ b/erpnext/public/scss/website.scss
@@ -52,10 +52,6 @@
border-bottom: 1px solid var(--border-color);
position: relative;
- &:only-child, &:last-child {
- border: 0;
- }
-
a.transaction-item-link {
position: absolute;
top: 0;
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 94655747e430c50031d44df0a9f43ef683a688f0..3a581226cab7d44bc13ad021e40691243368dedd 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -174,6 +174,115 @@ class TestDeliveryNote(FrappeTestCase):
for field, value in field_values.items():
self.assertEqual(cstr(serial_no.get(field)), value)
+ def test_delivery_note_return_against_denormalized_serial_no(self):
+ from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+
+ frappe.flags.ignore_serial_batch_bundle_validation = True
+ sn_item = "Old Serial NO Item Return Test - 1"
+ make_item(
+ sn_item,
+ {
+ "has_serial_no": 1,
+ "serial_no_series": "OSN-.####",
+ "is_stock_item": 1,
+ },
+ )
+
+ frappe.flags.ignore_serial_batch_bundle_validation = True
+ serial_nos = [
+ "OSN-1",
+ "OSN-2",
+ "OSN-3",
+ "OSN-4",
+ "OSN-5",
+ "OSN-6",
+ "OSN-7",
+ "OSN-8",
+ "OSN-9",
+ "OSN-10",
+ "OSN-11",
+ "OSN-12",
+ ]
+
+ for sn in serial_nos:
+ if not frappe.db.exists("Serial No", sn):
+ sn_doc = frappe.get_doc(
+ {
+ "doctype": "Serial No",
+ "item_code": sn_item,
+ "serial_no": sn,
+ }
+ )
+ sn_doc.insert()
+
+ warehouse = "_Test Warehouse - _TC"
+ company = frappe.db.get_value("Warehouse", warehouse, "company")
+ se_doc = make_stock_entry(
+ item_code=sn_item,
+ company=company,
+ target="_Test Warehouse - _TC",
+ qty=12,
+ basic_rate=100,
+ do_not_submit=1,
+ )
+
+ se_doc.items[0].serial_no = "\n".join(serial_nos)
+ se_doc.submit()
+
+ self.assertEqual(sorted(get_serial_nos(se_doc.items[0].serial_no)), sorted(serial_nos))
+
+ dn = create_delivery_note(
+ item_code=sn_item,
+ qty=12,
+ rate=500,
+ warehouse=warehouse,
+ company=company,
+ expense_account="Cost of Goods Sold - _TC",
+ cost_center="Main - _TC",
+ do_not_submit=1,
+ )
+
+ dn.items[0].serial_no = "\n".join(serial_nos)
+ dn.submit()
+ dn.reload()
+
+ self.assertTrue(dn.items[0].serial_no)
+
+ frappe.flags.ignore_serial_batch_bundle_validation = False
+
+ # return entry
+ dn1 = make_sales_return(dn.name)
+
+ dn1.items[0].qty = -2
+
+ bundle_doc = frappe.get_doc("Serial and Batch Bundle", dn1.items[0].serial_and_batch_bundle)
+ bundle_doc.set("entries", bundle_doc.entries[:2])
+ bundle_doc.save()
+
+ dn1.save()
+ dn1.submit()
+
+ returned_serial_nos1 = get_serial_nos_from_bundle(dn1.items[0].serial_and_batch_bundle)
+ for serial_no in returned_serial_nos1:
+ self.assertTrue(serial_no in serial_nos)
+
+ dn2 = make_sales_return(dn.name)
+
+ dn2.items[0].qty = -2
+
+ bundle_doc = frappe.get_doc("Serial and Batch Bundle", dn2.items[0].serial_and_batch_bundle)
+ bundle_doc.set("entries", bundle_doc.entries[:2])
+ bundle_doc.save()
+
+ dn2.save()
+ dn2.submit()
+
+ returned_serial_nos2 = get_serial_nos_from_bundle(dn2.items[0].serial_and_batch_bundle)
+ for serial_no in returned_serial_nos2:
+ self.assertTrue(serial_no in serial_nos)
+ self.assertFalse(serial_no in returned_serial_nos1)
+
def test_sales_return_for_non_bundled_items_partial(self):
company = frappe.db.get_value("Warehouse", "Stores - TCP1", "company")
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index d173929dcc173ba8a6a04fe62b780d1a78de3240..b92d7f59cd6632da96111fbce7123919785d8fc5 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -992,8 +992,7 @@
"fieldname": "gross_profit_calculation_rule",
"fieldtype": "Select",
"label": "Gross Profit Calculation in Quotations and Sales Orders Based On",
- "options": "Valuation Rate\nLast Purchase Rate\nSupplier Cost Price",
- "reqd": 1
+ "options": "Valuation Rate\nLast Purchase Rate\nSupplier Cost Price"
},
{
"fieldname": "default_values_section",
@@ -1007,7 +1006,7 @@
"index_web_pages_for_search": 1,
"links": [],
"make_attachments_public": 1,
- "modified": "2023-12-14 11:52:58.865039",
+ "modified": "2023-12-16 20:49:39.541540",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
index cb5387ed65e349a90052081cabad7c8eb5492f62..54b63113d3677b3037e46801e0394642f749f65e 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
@@ -23,7 +23,11 @@ from frappe.utils import (
)
from frappe.utils.csvutils import build_csv_response
-from erpnext.stock.serial_batch_bundle import BatchNoValuation, SerialNoValuation
+from erpnext.stock.serial_batch_bundle import (
+ BatchNoValuation,
+ SerialNoValuation,
+ get_batches_from_bundle,
+)
from erpnext.stock.serial_batch_bundle import get_serial_nos as get_serial_nos_from_bundle
@@ -87,6 +91,11 @@ class SerialandBatchBundle(Document):
)
def validate_serial_nos_duplicate(self):
+ # Don't inward same serial number multiple times
+
+ if not self.warehouse:
+ return
+
if self.voucher_type in ["Stock Reconciliation", "Stock Entry"] and self.docstatus != 1:
return
@@ -110,7 +119,6 @@ class SerialandBatchBundle(Document):
kwargs["voucher_no"] = self.voucher_no
available_serial_nos = get_available_serial_nos(kwargs)
-
for data in available_serial_nos:
if data.serial_no in serial_nos:
self.throw_error_message(
@@ -291,6 +299,19 @@ class SerialandBatchBundle(Document):
):
values_to_set["posting_time"] = parent.posting_time
+ if parent.doctype in [
+ "Delivery Note",
+ "Purchase Receipt",
+ "Purchase Invoice",
+ "Sales Invoice",
+ ] and parent.get("is_return"):
+ return_ref_field = frappe.scrub(parent.doctype) + "_item"
+ if parent.doctype == "Delivery Note":
+ return_ref_field = "dn_detail"
+
+ if row.get(return_ref_field):
+ values_to_set["returned_against"] = row.get(return_ref_field)
+
if values_to_set:
self.db_set(values_to_set)
@@ -473,7 +494,6 @@ class SerialandBatchBundle(Document):
batch_nos = []
serial_batches = {}
-
for row in self.entries:
if self.has_serial_no and not row.serial_no:
frappe.throw(
@@ -554,6 +574,67 @@ class SerialandBatchBundle(Document):
f"Batch Nos {bold(incorrect_batch_nos)} does not belong to Item {bold(self.item_code)}"
)
+ def validate_serial_and_batch_no_for_returned(self):
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+
+ if not self.returned_against:
+ return
+
+ if self.voucher_type not in [
+ "Purchase Receipt",
+ "Purchase Invoice",
+ "Sales Invoice",
+ "Delivery Note",
+ ]:
+ return
+
+ data = self.get_orignal_document_data()
+ if not data:
+ return
+
+ serial_nos, batches = [], []
+ current_serial_nos = [d.serial_no for d in self.entries if d.serial_no]
+ current_batches = [d.batch_no for d in self.entries if d.batch_no]
+
+ for d in data:
+ if self.has_serial_no:
+ if d.serial_and_batch_bundle:
+ serial_nos = get_serial_nos_from_bundle(d.serial_and_batch_bundle)
+ else:
+ serial_nos = get_serial_nos(d.serial_no)
+
+ elif self.has_batch_no:
+ if d.serial_and_batch_bundle:
+ batches = get_batches_from_bundle(d.serial_and_batch_bundle)
+ else:
+ batches = frappe._dict({d.batch_no: d.stock_qty})
+
+ if batches:
+ batches = [d for d in batches if batches[d] > 0]
+
+ if serial_nos:
+ if not set(current_serial_nos).issubset(set(serial_nos)):
+ self.throw_error_message(
+ f"Serial Nos {bold(', '.join(serial_nos))} are not part of the original document."
+ )
+
+ if batches:
+ if not set(current_batches).issubset(set(batches)):
+ self.throw_error_message(
+ f"Batch Nos {bold(', '.join(batches))} are not part of the original document."
+ )
+
+ def get_orignal_document_data(self):
+ fields = ["serial_and_batch_bundle", "stock_qty"]
+ if self.has_serial_no:
+ fields.append("serial_no")
+
+ elif self.has_batch_no:
+ fields.append("batch_no")
+
+ child_doc = self.voucher_type + " Item"
+ return frappe.get_all(child_doc, fields=fields, filters={"name": self.returned_against})
+
def validate_duplicate_serial_and_batch_no(self):
serial_nos = []
batch_nos = []
@@ -652,9 +733,29 @@ class SerialandBatchBundle(Document):
for batch in batches:
frappe.db.set_value("Batch", batch.name, {"reference_name": None, "reference_doctype": None})
+ def before_submit(self):
+ self.validate_serial_and_batch_no_for_returned()
+ self.set_purchase_document_no()
+
def on_submit(self):
self.validate_serial_nos_inventory()
+ def set_purchase_document_no(self):
+ if not self.has_serial_no:
+ return
+
+ if self.total_qty > 0:
+ serial_nos = [d.serial_no for d in self.entries if d.serial_no]
+ sn_table = frappe.qb.DocType("Serial No")
+ (
+ frappe.qb.update(sn_table)
+ .set(
+ sn_table.purchase_document_no,
+ self.voucher_no if not sn_table.purchase_document_no else self.voucher_no,
+ )
+ .where(sn_table.name.isin(serial_nos))
+ ).run()
+
def validate_serial_and_batch_inventory(self):
self.check_future_entries_exists()
self.validate_batch_inventory()
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 408246339e09abad0eb74744e90655c3d192da40..708c8ce7cb53c1992b1896ae0b55cd95cd8fc8bb 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -27,8 +27,6 @@
"column_break_24",
"location",
"employee",
- "delivery_details",
- "delivery_document_type",
"warranty_amc_details",
"column_break6",
"warranty_expiry_date",
@@ -39,7 +37,8 @@
"more_info",
"company",
"column_break_2cmm",
- "work_order"
+ "work_order",
+ "purchase_document_no"
],
"fields": [
{
@@ -153,20 +152,6 @@
"options": "Employee",
"read_only": 1
},
- {
- "fieldname": "delivery_details",
- "fieldtype": "Section Break",
- "label": "Delivery Details",
- "oldfieldtype": "Column Break"
- },
- {
- "fieldname": "delivery_document_type",
- "fieldtype": "Link",
- "label": "Delivery Document Type",
- "no_copy": 1,
- "options": "DocType",
- "read_only": 1
- },
{
"fieldname": "warranty_amc_details",
"fieldtype": "Section Break",
@@ -275,12 +260,19 @@
{
"fieldname": "column_break_2cmm",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "purchase_document_no",
+ "fieldtype": "Data",
+ "label": "Creation Document No",
+ "no_copy": 1,
+ "read_only": 1
}
],
"icon": "fa fa-barcode",
"idx": 1,
"links": [],
- "modified": "2023-11-28 15:37:59.489945",
+ "modified": "2023-12-17 10:52:55.767839",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index ba9482a7ba87ee550eb114754b348fe15276c7f1..122664c2dde91e894e4939f1209a9ff2af0a12ad 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -27,6 +27,39 @@ class SerialNoWarehouseError(ValidationError):
class SerialNo(StockController):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ amc_expiry_date: DF.Date | None
+ asset: DF.Link | None
+ asset_status: DF.Literal["", "Issue", "Receipt", "Transfer"]
+ batch_no: DF.Link | None
+ brand: DF.Link | None
+ company: DF.Link
+ description: DF.Text | None
+ employee: DF.Link | None
+ item_code: DF.Link
+ item_group: DF.Link | None
+ item_name: DF.Data | None
+ location: DF.Link | None
+ maintenance_status: DF.Literal[
+ "", "Under Warranty", "Out of Warranty", "Under AMC", "Out of AMC"
+ ]
+ purchase_document_no: DF.Data | None
+ purchase_rate: DF.Float
+ serial_no: DF.Data
+ status: DF.Literal["", "Active", "Inactive", "Delivered", "Expired"]
+ warehouse: DF.Link | None
+ warranty_expiry_date: DF.Date | None
+ warranty_period: DF.Int
+ work_order: DF.Link | None
+ # end: auto-generated types
+
def __init__(self, *args, **kwargs):
super(SerialNo, self).__init__(*args, **kwargs)
self.via_stock_ledger = False
@@ -198,26 +231,6 @@ def auto_fetch_serial_number(
return sorted([d.get("name") for d in serial_numbers])
-def get_delivered_serial_nos(serial_nos):
- """
- Returns serial numbers that delivered from the list of serial numbers
- """
- from frappe.query_builder.functions import Coalesce
-
- SerialNo = frappe.qb.DocType("Serial No")
- serial_nos = get_serial_nos(serial_nos)
- query = (
- frappe.qb.select(SerialNo.name)
- .from_(SerialNo)
- .where((SerialNo.name.isin(serial_nos)) & (Coalesce(SerialNo.delivery_document_type, "") != ""))
- )
-
- result = query.run()
- if result and len(result) > 0:
- delivered_serial_nos = [row[0] for row in result]
- return delivered_serial_nos
-
-
@frappe.whitelist()
def get_pos_reserved_serial_nos(filters):
if isinstance(filters, str):
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index bc145040a27779e79b4ace87616338c73c475ea9..c1e324ba19ad084ef114b5cc13a66618a77b4ec7 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -141,6 +141,9 @@ class StockLedgerEntry(Document):
frappe.throw(_("Actual Qty is mandatory"))
def validate_serial_batch_no_bundle(self):
+ if self.is_cancelled == 1:
+ return
+
item_detail = frappe.get_cached_value(
"Item",
self.item_code,
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index f8337c18cc4d18ba9236eaf0eb0fc4d51d34280e..0104711639a809cffb4b6d19481343ffb48a4918 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -418,7 +418,7 @@ class StockReconciliation(StockController):
if len(data) == 1:
msg = _(
"{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation."
- ).format(bold(data[0][2]), bold(data[0][0]), bold(data[0][1]), self._action)
+ ).format(bold(data[0][2]), bold(data[0][0]), bold(data[0][1]), _(self._action))
else:
items_html = ""
for d in data:
@@ -428,7 +428,7 @@ class StockReconciliation(StockController):
msg = _(
"The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:
{1}"
- ).format(self._action, items_html)
+ ).format(_(self._action), items_html)
frappe.throw(
msg,
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index d1b9ea6c2f4dcb18a729b3cf5db805d60573cd0a..859496c2c4bd97cb5657383a4e7cd607f4d468d3 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -228,15 +228,16 @@ class SerialBatchBundle:
).validate_serial_and_batch_inventory()
def post_process(self):
- if not self.sle.serial_and_batch_bundle:
+ if not self.sle.serial_and_batch_bundle and not self.sle.serial_no and not self.sle.batch_no:
return
- docstatus = frappe.get_cached_value(
- "Serial and Batch Bundle", self.sle.serial_and_batch_bundle, "docstatus"
- )
+ if self.sle.serial_and_batch_bundle:
+ docstatus = frappe.get_cached_value(
+ "Serial and Batch Bundle", self.sle.serial_and_batch_bundle, "docstatus"
+ )
- if docstatus != 1:
- self.submit_serial_and_batch_bundle()
+ if docstatus != 1:
+ self.submit_serial_and_batch_bundle()
if self.item_details.has_serial_no == 1:
self.set_warehouse_and_status_in_serial_nos()
@@ -259,7 +260,12 @@ class SerialBatchBundle:
doc.submit()
def set_warehouse_and_status_in_serial_nos(self):
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos as get_parsed_serial_nos
+
serial_nos = get_serial_nos(self.sle.serial_and_batch_bundle)
+ if not self.sle.serial_and_batch_bundle and self.sle.serial_no:
+ serial_nos = get_parsed_serial_nos(self.sle.serial_no)
+
warehouse = self.warehouse if self.sle.actual_qty > 0 else None
if not serial_nos:
@@ -273,7 +279,14 @@ class SerialBatchBundle:
(
frappe.qb.update(sn_table)
.set(sn_table.warehouse, warehouse)
- .set(sn_table.status, "Active" if warehouse else status)
+ .set(
+ sn_table.status,
+ "Active"
+ if warehouse
+ else status
+ if (sn_table.purchase_document_no != self.sle.voucher_no and self.sle.is_cancelled != 1)
+ else "Inactive",
+ )
.where(sn_table.name.isin(serial_nos))
).run()
@@ -300,6 +313,8 @@ class SerialBatchBundle:
from erpnext.stock.doctype.batch.batch import get_available_batches
batches = get_batch_nos(self.sle.serial_and_batch_bundle)
+ if not self.sle.serial_and_batch_bundle and self.sle.batch_no:
+ batches = frappe._dict({self.sle.batch_no: self.sle.actual_qty})
batches_qty = get_available_batches(
frappe._dict(
@@ -322,13 +337,35 @@ def get_serial_nos(serial_and_batch_bundle, serial_nos=None):
if serial_nos:
filters["serial_no"] = ("in", serial_nos)
- entries = frappe.get_all("Serial and Batch Entry", fields=["serial_no"], filters=filters)
+ entries = frappe.get_all(
+ "Serial and Batch Entry", fields=["serial_no"], filters=filters, order_by="idx"
+ )
if not entries:
return []
return [d.serial_no for d in entries if d.serial_no]
+def get_batches_from_bundle(serial_and_batch_bundle, batches=None):
+ if not serial_and_batch_bundle:
+ return []
+
+ filters = {"parent": serial_and_batch_bundle, "batch_no": ("is", "set")}
+ if isinstance(serial_and_batch_bundle, list):
+ filters = {"parent": ("in", serial_and_batch_bundle)}
+
+ if batches:
+ filters["batch_no"] = ("in", batches)
+
+ entries = frappe.get_all(
+ "Serial and Batch Entry", fields=["batch_no", "qty"], filters=filters, order_by="idx", as_list=1
+ )
+ if not entries:
+ return frappe._dict({})
+
+ return frappe._dict(entries)
+
+
def get_serial_nos_from_bundle(serial_and_batch_bundle, serial_nos=None):
return get_serial_nos(serial_and_batch_bundle, serial_nos=serial_nos)
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
index 68c084547cb87fa52ff964c0c779df9b45d730dc..0fe8c13efbdf6da427d41bf328722061e1f0c14b 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
@@ -14,6 +14,90 @@ from erpnext.stock.utils import get_bin
class SubcontractingOrder(SubcontractingController):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ from erpnext.stock.doctype.landed_cost_taxes_and_charges.landed_cost_taxes_and_charges import (
+ LandedCostTaxesandCharges,
+ )
+ from erpnext.subcontracting.doctype.subcontracting_order_item.subcontracting_order_item import (
+ SubcontractingOrderItem,
+ )
+ from erpnext.subcontracting.doctype.subcontracting_order_service_item.subcontracting_order_service_item import (
+ SubcontractingOrderServiceItem,
+ )
+ from erpnext.subcontracting.doctype.subcontracting_order_supplied_item.subcontracting_order_supplied_item import (
+ SubcontractingOrderSuppliedItem,
+ )
+
+ additional_costs: DF.Table[LandedCostTaxesandCharges]
+ address_display: DF.SmallText | None
+ amended_from: DF.Link | None
+ billing_address: DF.Link | None
+ billing_address_display: DF.SmallText | None
+ company: DF.Link
+ contact_display: DF.SmallText | None
+ contact_email: DF.SmallText | None
+ contact_mobile: DF.SmallText | None
+ contact_person: DF.Link | None
+ cost_center: DF.Link | None
+ distribute_additional_costs_based_on: DF.Literal["Qty", "Amount"]
+ items: DF.Table[SubcontractingOrderItem]
+ letter_head: DF.Link | None
+ naming_series: DF.Literal["SC-ORD-.YYYY.-"]
+ per_received: DF.Percent
+ project: DF.Link | None
+ purchase_order: DF.Link
+ schedule_date: DF.Date | None
+ select_print_heading: DF.Link | None
+ service_items: DF.Table[SubcontractingOrderServiceItem]
+ set_reserve_warehouse: DF.Link | None
+ set_warehouse: DF.Link | None
+ shipping_address: DF.Link | None
+ shipping_address_display: DF.SmallText | None
+ status: DF.Literal[
+ "Draft",
+ "Open",
+ "Partially Received",
+ "Completed",
+ "Material Transferred",
+ "Partial Material Transferred",
+ "Cancelled",
+ ]
+ supplied_items: DF.Table[SubcontractingOrderSuppliedItem]
+ supplier: DF.Link
+ supplier_address: DF.Link | None
+ supplier_name: DF.Data
+ supplier_warehouse: DF.Link
+ title: DF.Data | None
+ total: DF.Currency
+ total_additional_costs: DF.Currency
+ total_qty: DF.Float
+ transaction_date: DF.Date
+ # end: auto-generated types
+
+ def __init__(self, *args, **kwargs):
+ super(SubcontractingOrder, self).__init__(*args, **kwargs)
+
+ self.status_updater = [
+ {
+ "source_dt": "Subcontracting Order Item",
+ "target_dt": "Material Request Item",
+ "join_field": "material_request_item",
+ "target_field": "ordered_qty",
+ "target_parent_dt": "Material Request",
+ "target_parent_field": "per_ordered",
+ "target_ref_field": "stock_qty",
+ "source_field": "qty",
+ "percent_join_field": "material_request",
+ }
+ ]
+
def before_validate(self):
super(SubcontractingOrder, self).before_validate()
@@ -27,11 +111,15 @@ class SubcontractingOrder(SubcontractingController):
self.reset_default_field_value("set_warehouse", "items", "warehouse")
def on_submit(self):
+ self.update_prevdoc_status()
+ self.update_requested_qty()
self.update_ordered_qty_for_subcontracting()
self.update_reserved_qty_for_subcontracting()
self.update_status()
def on_cancel(self):
+ self.update_prevdoc_status()
+ self.update_requested_qty()
self.update_ordered_qty_for_subcontracting()
self.update_reserved_qty_for_subcontracting()
self.update_status()
@@ -171,6 +259,8 @@ class SubcontractingOrder(SubcontractingController):
"stock_uom": item.stock_uom,
"bom": bom,
"purchase_order_item": si.purchase_order_item,
+ "material_request": si.material_request,
+ "material_request_item": si.material_request_item,
}
)
else:
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
index 3557858935134065568e5bb1d850d7e3f716d381..37dabf1bfbe71102fa815fadd93a9b4a4b536f10 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
@@ -628,6 +628,62 @@ class TestSubcontractingOrder(FrappeTestCase):
self.assertEqual(ordered_qty + 10, new_ordered_qty)
+ def test_requested_qty_for_subcontracting_order(self):
+ from erpnext.stock.doctype.material_request.material_request import make_purchase_order
+ from erpnext.stock.doctype.material_request.test_material_request import make_material_request
+
+ requested_qty = frappe.db.get_value(
+ "Bin",
+ filters={"warehouse": "_Test Warehouse - _TC", "item_code": "Subcontracted Item SA8"},
+ fieldname="indented_qty",
+ )
+ requested_qty = flt(requested_qty)
+
+ mr = make_material_request(
+ item_code="Subcontracted Item SA8",
+ material_request_type="Purchase",
+ qty=10,
+ )
+
+ self.assertTrue(mr.docstatus == 1)
+
+ new_requested_qty = frappe.db.get_value(
+ "Bin",
+ filters={"warehouse": "_Test Warehouse - _TC", "item_code": "Subcontracted Item SA8"},
+ fieldname="indented_qty",
+ )
+ new_requested_qty = flt(new_requested_qty)
+
+ self.assertEqual(requested_qty + 10, new_requested_qty)
+
+ po = make_purchase_order(mr.name)
+ po.is_subcontracted = 1
+ po.supplier = "_Test Supplier"
+ po.items[0].fg_item = "Subcontracted Item SA8"
+ po.items[0].fg_item_qty = 10
+ po.items[0].item_code = "Subcontracted Service Item 8"
+ po.items[0].item_name = "Subcontracted Service Item 8"
+ po.items[0].qty = 10
+ po.supplier_warehouse = "_Test Warehouse 1 - _TC"
+ po.save()
+ po.submit()
+
+ self.assertTrue(po.items[0].material_request)
+ self.assertTrue(po.items[0].material_request_item)
+
+ sco = create_subcontracting_order(po_name=po.name)
+ self.assertTrue(sco.items[0].material_request)
+ self.assertTrue(sco.items[0].material_request_item)
+
+ new_requested_qty = frappe.db.get_value(
+ "Bin",
+ filters={"warehouse": "_Test Warehouse - _TC", "item_code": "Subcontracted Item SA8"},
+ fieldname="indented_qty",
+ )
+ new_requested_qty = flt(new_requested_qty)
+
+ self.assertEqual(requested_qty, new_requested_qty)
+
def create_subcontracting_order(**args):
args = frappe._dict(args)
diff --git a/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json b/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
index d1f21ba7c96a87d102a47265fbd114a9dc962c8e..9ba595f830c5962671a24570861f8fe5beef9b43 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
@@ -40,13 +40,18 @@
"manufacture_section",
"manufacturer",
"manufacturer_part_no",
+ "column_break_impp",
+ "reference_section",
+ "material_request",
+ "column_break_fpyl",
+ "material_request_item",
"accounting_dimensions_section",
"cost_center",
"dimension_col_break",
"project",
"section_break_34",
- "page_break",
- "purchase_order_item"
+ "purchase_order_item",
+ "page_break"
],
"fields": [
{
@@ -334,6 +339,37 @@
"label": "Project",
"options": "Project"
},
+ {
+ "fieldname": "column_break_impp",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "material_request",
+ "fieldtype": "Link",
+ "label": "Material Request",
+ "no_copy": 1,
+ "options": "Material Request",
+ "read_only": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "material_request_item",
+ "fieldtype": "Data",
+ "label": "Material Request Item",
+ "no_copy": 1,
+ "read_only": 1,
+ "search_index": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "reference_section",
+ "fieldtype": "Section Break",
+ "label": "Reference"
+ },
+ {
+ "fieldname": "column_break_fpyl",
+ "fieldtype": "Column Break"
+ },
{
"fieldname": "purchase_order_item",
"fieldtype": "Data",
@@ -348,7 +384,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-11-23 16:56:22.182698",
+ "modified": "2023-11-30 15:29:43.744618",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Order Item",
diff --git a/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json b/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
index 2ca41da71e26cb4c3626a07516bd0fb4958705db..6ae310cf756818f182dba268c5fdafbe9f34b75b 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -19,7 +19,11 @@
"fg_item",
"column_break_12",
"fg_item_qty",
- "purchase_order_item"
+ "purchase_order_item",
+ "section_break_kphn",
+ "material_request",
+ "column_break_piqi",
+ "material_request_item"
],
"fields": [
{
@@ -122,11 +126,36 @@
"no_copy": 1,
"read_only": 1,
"search_index": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "section_break_kphn",
+ "fieldtype": "Section Break",
+ "label": "Reference"
+ },
+ {
+ "fieldname": "material_request",
+ "fieldtype": "Link",
+ "label": "Material Request",
+ "no_copy": 1,
+ "options": "Material Request",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_piqi",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "material_request_item",
+ "fieldtype": "Data",
+ "label": "Material Request Item",
+ "no_copy": 1,
+ "read_only": 1
}
],
"istable": 1,
"links": [],
- "modified": "2023-11-23 17:05:04.561948",
+ "modified": "2023-11-30 13:29:31.017440",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Order Service Item",
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 5199c1489e1ab6e2bb1d66e67e83a93438b4ca0b..6a0cbcd1951dbfd374dc05a5d3a1ab64aaab84ad 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -796,6 +796,7 @@ Account: {0} with currency: {1} can not be selected,Compte : {0} avec la devise
Account,Compte,
Accountant,Comptable,
Accounting Details,Détails comptables,
+Accounting Determination,Détermination comptable,
Accounting Dimension
{0} is required for 'Balance Sheet' account {1}.,La dimension comptable
{0} est obligatoire pour le compte de 'Bilan' {1},
Accounting Dimension
{0} is required for 'Profit and Loss' account {1}.,La dimension comptable
{0} est obligatoire pour le compte de 'Compte de résultat' {1},
Accounting Dimension Detail,Détails des dimensions comptables,
@@ -1031,6 +1032,8 @@ Addition Rules,Règles d'addition,
Additional Charges,Frais Supplémentaires,
Additional Cost Per Qty,Coût additionel par qté,
Additional Cost,Frais Supplémentaire,
+Additional Costs Amount,Montant des frais additionnels,
+Additional Costs Percentage,Pourcentage de frais additionnels,
Additional Costs,Frais Supplémentaires,
Additional DIscount Amount,Montant de la réduction additionnelle,
Additional DIscount Percentage,Pourcentage de réduction additionnel,
@@ -2935,6 +2938,7 @@ Cost Centers for Budgeting and Analysis,Centres de coûts pour la budgétisation
Cost Centers,Centres de Coûts,
Cost Configuration,Configuration des coûts,
Cost Per Unit,Coût par unité,
+Cost Price Based On,Prix de revient basé sur,
Cost Price,Coût de revient,
Cost Updated,Coût Mise à Jour,
Cost as on,Coût à partir de,
@@ -2956,6 +2960,7 @@ Costing Details,Détails des coûts,
Costing Rate,Coût unitaire,
Costing and Billing,Coûts et facturation,
Costing,Coût,
+Costs Calculation,Calcul des coûts,
Could not auto create Customer due to the following missing mandatory field(s):,Le client n'a pas pu être créé automatique car les champs obligatoires suivants sont manquants:,
"Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again","Impossible de créer une note de crédit automatiquement, décochez la case "Emettre une note de crédit" et soumettez à nouveau",
Could not detect the Company for updating Bank Accounts,Impossible de détecter la société pour mettre à jour les comptes bancaires,
@@ -2987,6 +2992,7 @@ Create Additional Salary,Créer des salaires additionnels,
Create BOM,Créer une nomenclature,
Create Chart Of Accounts Based On,Créer un plan comptable basé sur,
Create Chart of Accounts Based on,Créer un plan comptable basé sur,
+Create Contact,Créer un contact,
Create Delivery Trip,Créer une tournée de livraison,
Create Department,Créer un département,
Create Depreciation Entry,Créer une écriture d'amortissement,
@@ -3081,6 +3087,7 @@ Create a new Item,Créer un nouvel article,
Create a new composite asset,Créer un nouvel actif composé,
Create a new subscription,Créer un nouvel abonnement,
Create a new task for each item line in a sales order,Créer une nouvelle tâche pour chaque ligne d'une commande client,
+Create a prospect when creating an opportunity from a lead,Créer un prospect lors de la création d'une opportunité à partir d'une piste,
Create a quotation,Créer un devis,
Create a subscription based on,Créer un abonnement basé sur,
Create an Asset Category,Créer une catégorie d'actif,
@@ -5806,6 +5813,7 @@ Is Template,Est un modèle,
Is Term Loan,Prêt à terme,
Is Transporter,Est transporteur,
Is Working Capital,Est du capital,
+Is a debit/credit card,Est une carte de débit/crédit,
Is customer exempted from sales tax?,Est-ce que le client est exempté de taxes à la vente ?,
Is renewed every,Est renouvelé tous les,
Is the Default Account,Est-ce le compte par défaut,
@@ -6274,6 +6282,7 @@ Link to material requests,Lien vers les demandes de matériaux,
Link with Customer,Lien avec le client,
Link with Supplier,Lien avec le fournisseur,
Link,Lien,
+Linked Account,Compte lié,
Linked Document Type,Type de document lié,
Linked Document,Document lié,
Linked Documents,Documents liés,
@@ -7063,6 +7072,7 @@ No events to display for this item,Aucun créneau disponible pour cet article,
No events to display,Aucun événement à afficher,
No excess amount pending for refund,Aucun montant excédentaire en attente de remboursement,
No excess amount to refund.,Aucun montant en excès à rembourser,
+No fiscal year could be found to reverse this entry,Aucun excercice fiscal n'a pu être trouvé pour extourner cette écriture,
No gain or loss in the exchange rate,Aucun gain ou perte liés à ce taux de change,
No issue has been raised by the caller.,Aucun ticket ouvert par cet appelant,
No item available for transfer.,Aucun article disponible pour le transfert.,
@@ -7727,6 +7737,7 @@ Pay {0},Payer {0},
Pay,Sortant,Payment Entry
Pay,Payer,
Payable Account,Comptes créditeurs,
+Payable Accounts,Comptes fournisseurs,
Payable Amount,Montant à payer,
Payable Principal Amount,Montant du principal à payer,
Payable,A régler,Subscription
@@ -8746,6 +8757,7 @@ Proprietorship,Propriétaire,
Prorate last invoice,Facturer la dernière période au prorata,
Prorated Straight Line (360 Days),Linéaire au prorata (360 jours),
Prospect Lead,Prospect principal,
+Prospect Name,Nom du prospect,
Prospect Opportunity,Opportunité du prospect,
Prospect Owner,Responsable du prospect,
Prospect {0} already exists,Le prospect {0} existe déjà,
@@ -9090,6 +9102,7 @@ Reason for hold:,Raison de la mise en attente :,
Reason,Raison,
Recalculate Incoming/Outgoing Rate,Recalculer les prix unitaires d'entrée/sortie,
Recalculate Rate,Recalculer le prix unitaire,
+Recalculating Purchase Cost against this Project...,Recalcul des coûts d'achat liés à ce projet en cours...,
Receipt Document Type,Type de Reçu,
Receipt Document,Reçu,
Receipt document must be submitted,Le reçu doit être soumis,
@@ -9354,6 +9367,7 @@ Report Type is mandatory,Le Type de Rapport est nécessaire,
Report Type,Type de rapport,
Report an Issue,Signaler un Problème,
Report created successfully,Rapport créé avec succès,
+Report generation in progress.
You will receive an email with a link to download the zip file in a few minutes.,Génération du rapport en cours.
Vous recevrez un email avec un lien pour télécharger le fichier zip dans quelques minutes.,
Report,Rapport,
Reports To,Responsable hiérarchique,
Reports and Master Data,Rapports et Données de base,
@@ -9693,6 +9707,7 @@ Row #{0}: Finished Good reference is mandatory for Scrap Item {1}.,Ligne #{0}: L
"Row #{0}: For {1}, you can select a reference document only if account gets debited","Ligne #{0}: Pour {1}, vous pouvez sélectionner un document de référence seulement si le compte est débité",
Row #{0}: From Date cannot be before To Date,Ligne #{0} : La date de début ne peut pas être antérieure à la date de fin,
Row #{0}: Item added,Ligne #{0}: Article ajouté,
+Row #{0}: Item quantity cannot be zero,Ligne #{0}: La quantité de l'article ne peut pas être zéro,
Row #{0}: Item {1} does not exist,Ligne #{0} : L'élément {1} n'existe pas,
"Row #{0}: Item {1} has been picked, please reserve stock from the Pick List.","Ligne #{0}: L'article {1} a été sélectionné, veuillez réserver le stock depuis la liste de sélection.",
Row #{0}: Item {1} is already fully received in Purchase Order {2},Ligne #{0}: L'article {1} est déjà entièrement reçu dans la commande d'achat {2},
@@ -9930,6 +9945,7 @@ SAL,VEN,
SC-ORD-.YYYY.-,SC-ORD-.YYYY.-,
SCO Supplied Item,Article fourni par une commande sous-traitance,
SEPA XML,XML Sepa,
+SEPA credit transfer created in draft,Virement SEPA créé en brouillon,
SEPA payments generation error,Erreur de génération de paiements SEPA,
SEPA,SEPA,
SER-WRN-.YYYY.-,SER-WRN-.YYYY.-,
@@ -10386,6 +10402,7 @@ Sent On,Envoyé le,
Sent To,Envoyé À,
Sent via,Envoyé via,
Sent,Envoyé,
+Sepa Credit Transfer,Virement SEPA,
Sepa Direct Debit Details,Détails du prélèvement Sepa,
Sepa Direct Debit Settings,Paramètres de prélèvement Sepa,
Sepa Direct Debit,Prélèvement Sepa,
@@ -10418,7 +10435,9 @@ Serial No Warranty Expiry,Expiration des garanties liées aux numéros de série
Serial No and Batch for Finished Good,Numéro de série et lot pour les produits finis,
Serial No and Batch,N° de série et lot,
Serial No is mandatory for Item {0},N° de série est obligatoire pour l'Article {0},
+Serial No is mandatory,Le numéro de série est obligatoire,
Serial No {0} Created,N° de série {0} créé,
+Serial No {0} already exists,Le numéro de série {0} existe déjà,
Serial No {0} already scanned,Le numéro de série {0} a déjà été scanné,
Serial No {0} created,N° de série {0} créé,
Serial No {0} does not belong to Batch {1},Le numéro de série {0} n'appartient pas au lot {1},
@@ -10565,6 +10584,7 @@ Set Valuation Rate Based on Source Warehouse,Définir le taux de valorisation su
Set Warehouse,Définir l'entrepôt,
Set a Default Warehouse for Inventory Transactions. This will be fetched into the Default Warehouse in the Item master.,Définissez un entrepôt par défaut pour les transactions de stock. Il sera récupéré automatiquement dans les valeurs par défaut des données base d'articles.,
Set a Target,Définissez une cible,
+Set a custom gross profit percentage to recalculate your item selling rate,Entrez un pourcentage de marge brute personnalisé pour recalculer le prix de vente de votre article,
Set a monthly sales target for this company. It will be used to create the sales chart baseline at the top of this document.,Défini un objectif mensuel pour cette société. Sera utilisé pour créer le graphique de ventes en haut de ce document.,
Set a new date,Définir une nouvelle date,
Set a sales goal you'd like to achieve for your company.,Définissez l'objectif de ventes que vous souhaitez atteindre pour votre entreprise.,
@@ -10881,6 +10901,7 @@ Sourced by Supplier,Approvisionné par le fournisseur,
South Africa VAT Account,Compte TVA en Afrique du Sud,
South Africa VAT Settings,Paramètres de la TVA en Afrique du Sud,
"Special Characters except ""-"", ""#"", ""."", ""/"", ""{"" and ""}"" not allowed in naming series","Les caratères spéciaux, à l'exception de ""-"", ""#"", ""."", ""/"", ""{"" et ""}"" ne sont pas autorisés dans les noms de série",
+Specific Income and Expense Accounts,Compte de produits et de charges spécifiques,
Specified BOM {0} does not exist for Item {1},La nomenclature {0} spécifiée n'existe pas pour l'Article {1},
Specify Exchange Rate to convert one currency into another,Spécifier le Taux de change pour convertir une monnaie en une autre,
Specify conditions to calculate shipping amount,Spécifier les conditions pour calculer le montant de la livraison,
@@ -11230,6 +11251,7 @@ Subcontracting BOM,Nomenclature de sous-traitance,
Subcontracting Order Item,Article de commande de sous-traitance,
Subcontracting Order Service Item,Article de service de commande de sous-traitance,
Subcontracting Order Supplied Item,Article fourni de commande de sous-traitance,
+Subcontracting Order {0} created.,L'ordre de sous-traitance {0} a été créé.,
Subcontracting Order,Commande de sous-traitance,
Subcontracting Purchase Order,Commande fournisseur de sous-traitance,
Subcontracting Receipt Item,Article de réception de sous-traitance,
@@ -11240,6 +11262,7 @@ Subcontracting,Sous-traitance,
Subdivision,Subdivision,
Subject / Description,Sujet / Description,
Subject,Sujet,
+Submit Action Failed,L'action de validation a échoué,
Submit ERR Journals?,Valider l'écriture de journal d'ajustement de taux de change ?,
Submit Feedback,Soumettre un commentaire,
Submit Journal Entries,Valider les écritures de journal,
@@ -11789,6 +11812,7 @@ The shares don't exist with the {0},Les actions n'existent pas pour {0},
The shipping method is no longer applicable,Le mode de livraison n'est plus applicable,
The shopping cart has been emptied because none of the items are available in the selected company.,Le panier a été vidé car aucun des articles n'est disponible dans l'entreprise sélectionnée.,
The start time cannot be before {0},L'heure de début ne peut pas être avant {0},
+"The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:
{1}","Le stock a été réservé pour les articles et entrepôts suivants, libérez ceux-ci pour {0} la réconciliation de stock:
{1}",
The subscription has been created,L'abonnement a été créé,
"The sync has started in the background, please check the {0} list for new records.","La synchronisation a démarré en arrière plan, veuillez vérifier la liste {0} pour de nouvelles entrées.",
"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Entry and revert to the Draft stage","La tâche a été mise en file d'attente en tâche de fond. En cas d'erreur lors de son traitement en tâche de fond, le système ajoutera un commentaire concernant l'erreur dans cette écriture de stock et changera le statut à 'Brouillon'",
@@ -12072,6 +12096,7 @@ To cancel a {} you need to cancel the POS Closing Entry {}.,Pour annuler une {}
To create a Payment Request reference document is required,"Pour créer une Demande de Paiement, un document de référence est requis",
To date cannot be before From date,La date de fin ne peut pas être avant la date de début,
To date cannot be before from date,La date de fin ne peut être antérieure à la date de début,
+To date must be within fiscal year {0},La date doit être incluse dans l'exercice fiscal {0},
To date,Date de fin,
To duration (Mins),Durée maximum (Mins),
"To enable Capital Work in Progress Accounting,","Pour activer la comptabilisation des immobilisations en cours,",
@@ -12094,6 +12119,7 @@ To submit the invoice without purchase order please set {} ,"Pour valider la fac
To submit the invoice without purchase receipt please set {0} as {1} in {2},"Pour soumettre la facture sans reçu d'achat, veuillez définir {0} comme {1} dans {2}.",
To submit the invoice without purchase receipt please set {} ,"Pour valider la facture sans reçu d'achat, veuillez cocher {}",
"To use a different finance book, please uncheck 'Include Default Book Assets'","Pour utiliser un livre comptable différent, veuillez décocher 'Include les actifs du livre par défaut'",
+"To use a different finance book, please uncheck 'Include Default Book Entries'","Pour utiliser un livre comptable différent, veuillez décocher 'Inclure les écritures du livre par défaut'",
To view logs of Loyalty Points assigned to a Customer.,Pour afficher les journaux des points de fidélité attribués à un client.,
To {0} | {1} {2},À {0} | {1} {2},
To {0},À {0},
@@ -12414,6 +12440,7 @@ Trial,Essai,
Trigger Action,Action déclencheuse,
Trigger Document,Document déclencheur,
Triggers,Déclencheurs,
+Truncates 'Remarks' column to set character length,Tronque la colonne 'Remarques' pour limiter le nombre de caractères,
Try Again,Essayer à nouveau,
Try planning operations for X days in advance.,Essayez de planifer des opérations X jours à l'avance.,
Tuesday,Mardi,
@@ -12878,6 +12905,7 @@ Warn RFQs,Avertir lors des Appels d'Offres,
Warn for new Purchase Orders,Avertir lors des nouveaux Bons de Commande,
Warn for new Request for Quotations,Avertir lors d'une nouvelle Demande de Devis,
Warn,Avertir,
+Warning - Row {0}: Billing Hours are more than Actual Hours,Attention - Ligne {0}: Les heures facturés sont supérieures aux heures réelles,
Warning!,Attention !,
Warning: Another {0} # {1} exists against stock entry {2},Attention : Un autre {0} {1} # existe pour l'écriture de stock {2},
Warning: Insufficient leave balance for Leave Type {0} in this allocation.,Avertissement : Solde de congé insuffisant pour le type de congé {0} dans cette allocation.,
@@ -13140,6 +13168,7 @@ You can redeem upto {0}.,Vous pouvez déduire jusqu'à {0}.,
"You can set it as a machine name or operation type. For example, stiching machine 12","Vous pouvez le définir comme un nom de machine ou un type d'opération. Par exemple, machine à coudre 12",
You can set up subscriptions to automatically decrease the availability of booked items.,Vous pouvez configurer les abonnements pour faire diminuer automatiquement la disponibilité des articles réservables.,
You can use any valid Bootstrap 4 markup in this field. It will be shown on your Item Page.,Vous pouvez utilser n'importe quelle balise Bootstrap 4 dans ce champ. Elles seront affichées sur la page de l'article.,
+You can use the following fields to override the configuration set in Accounts > Default Values,Vous pouvez utiliser les champs suivants pour écraser la configuration définie dans Comptes > Valeurs par défaut,
You can't create accounting entries in the closed accounting period {0},Vous ne pouvez pas créer d'écritures comptables dans la période comptable clôturée {0},
You can't make any changes to Job Card since Work Order is closed.,Vous ne pouvez pas apporter de modifications à la fiche de travail puisque l'ordre de travail est fermé.,
You can't redeem Loyalty Points having more value than the Grand Total.,Vous ne pouvez pas échanger des points de fidélité ayant plus de valeur que le total général.,
@@ -13506,6 +13535,7 @@ you must select Capital Work in Progress Account in accounts table,Vous devez s
{0} entered twice {1} in Item Taxes,{0} a été entré en double {1} dans les taxes de l'article,
{0} entries are duplicates and have not been created,{0} entrées sont en double et n'ont pas été créées,
{0} for {1},{0} pour {1},
+{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section,{0} a une allocation basée sur les termes de paiement. Sélectionnez un terme de paiement pour la ligne #{1} dans la section des références de paiement,
{0} has been submitted successfully,{0} a été validé avec succès,
{0} has been use {1} times. Allowed quantity has been exceeded.,{0} a été utilisé {1} fois. La quantité autorisée est dépassée.,
{0} hours,{0} heures,
@@ -13555,6 +13585,7 @@ you must select Capital Work in Progress Account in accounts table,Vous devez s
{0} slots are still available for this item and this time slot.,{0} créneaux sont encore disponibles pour cet article et ces horaires.,
{0} submission before {1} is not allowed,La soumission de {0} avant {1} n'est pas autorisée.,
{0} types are not allowed. Only {1} are.,Les types {0} ne sont pas autorisés. Seuls les types {1} le sont.,
+"{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation.","{0} unités sont réservées pour l'article {1} dans l'entrepôt {2}, veuillez libérer cet article pour {3} la réconciliation de stock.",
{0} units of Item {1} is not available.,{0} unités du poste {1} ne sont pas disponibles.,
{0} units of Item {1} is picked in another Pick List.,{0} unités de l'article {1} sont déjà sélectionnés dans une autre liste de sélection.,
{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unités de [{1}] (#Formulaire/Article/{1}) trouvées dans [{2}] (#Formulaire/Entrepôt/{2}),