Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions icd_tz/icd_tz/api/accounting_dimensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ def validate_one_bill_of_lading(row, first_m_bl_no: str | None):
return

frappe.throw(
f"Container <b>{row.container_no}</b> appears on this manifest under two bills of lading: "
f"<b>{first_m_bl_no}</b> and <b>{row.m_bl_no}</b>."
f"Container <b>{row.container_no}</b> appears on this manifest under more than one bill of "
f"lading, including <b>{first_m_bl_no}</b> and <b>{row.m_bl_no}</b>."
"<br>Correct the manifest file, its costs cannot be attributed to one bill."
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"engine": "InnoDB",
"field_order": [
"m_bl_no",
"type_of_container",
"container_no",
"container_size",
"type_of_container",
"seal_no1",
"seal_no2",
"seal_no3",
Expand All @@ -36,6 +36,7 @@
{
"fieldname": "type_of_container",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Type of Container"
},
{
Expand Down Expand Up @@ -68,6 +69,7 @@
{
"fieldname": "freight_indicator",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Freight Indicator"
},
{
Expand Down Expand Up @@ -124,15 +126,18 @@
"label": "Has Order"
}
],
"grid_page_length": 50,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2024-09-12 12:35:45.069030",
"modified": "2026-09-23 12:59:49.797895",
"modified_by": "Administrator",
"module": "Icd Tz",
"name": "Containers Detail",
"owner": "Administrator",
"permissions": [],
"row_format": "Dynamic",
"rows_threshold_for_grid_search": 20,
"sort_field": "modified",
"sort_order": "DESC",
"states": []
Expand Down
12 changes: 8 additions & 4 deletions icd_tz/icd_tz/doctype/hbl_container/hbl_container.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"field_order": [
"m_bl_no",
"h_bl_no",
"type_of_container",
"container_no",
"type_of_container",
"freight_indicator",
"container_size",
"seal_no1",
"seal_no2",
"seal_no3",
"freight_indicator",
"no_of_packages",
"package_unit",
"volume",
Expand All @@ -42,6 +42,7 @@
{
"fieldname": "type_of_container",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Type of Container"
},
{
Expand All @@ -53,7 +54,6 @@
{
"fieldname": "container_size",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Container Size"
},
{
Expand All @@ -74,6 +74,7 @@
{
"fieldname": "freight_indicator",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Freight Indicator"
},
{
Expand Down Expand Up @@ -123,15 +124,18 @@
"label": "Maximum Temperature"
}
],
"grid_page_length": 50,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2024-09-11 21:49:07.781032",
"modified": "2026-09-23 13:01:35.215237",
"modified_by": "Administrator",
"module": "Icd Tz",
"name": "HBL Container",
"owner": "Administrator",
"permissions": [],
"row_format": "Dynamic",
"rows_threshold_for_grid_search": 20,
"sort_field": "modified",
"sort_order": "DESC",
"states": []
Expand Down
Loading