From ee877763c73923f6da69ed5bdd2ae3eac06b1d26 Mon Sep 17 00:00:00 2001 From: aakvatech Date: Wed, 7 Aug 2024 12:47:50 +0300 Subject: [PATCH] feat: new changes --- .../clearing_agent/clearing_agent.json | 32 +++++- .../doctype/clearing_file/clearing_file.json | 100 +++++++++++++++--- .../physical_verification_booking.json | 9 +- .../shipment_vessel/shipment_vessel.json | 4 +- .../clearing_&_forwarding.json | 28 ++++- 5 files changed, 145 insertions(+), 28 deletions(-) diff --git a/av_freight/av_freight/doctype/clearing_agent/clearing_agent.json b/av_freight/av_freight/doctype/clearing_agent/clearing_agent.json index 38a4ed4..4b43f04 100644 --- a/av_freight/av_freight/doctype/clearing_agent/clearing_agent.json +++ b/av_freight/av_freight/doctype/clearing_agent/clearing_agent.json @@ -1,16 +1,20 @@ { "actions": [], "allow_rename": 1, - "autoname": "format:AGENT-{####}", + "autoname": "field:name1", "creation": "2024-06-03 23:00:58.947791", "doctype": "DocType", "engine": "InnoDB", "field_order": [ "name1", + "clearing_company", + "license_id", + "address", "column_break_fsitw", "employee_id", "contact_information", - "license_id", + "date_of_issue", + "expiry_date", "license", "passport_size" ], @@ -51,16 +55,36 @@ "fieldtype": "Attach Image", "hidden": 1, "label": "Passport Size" + }, + { + "fieldname": "address", + "fieldtype": "Small Text", + "label": "Address" + }, + { + "fieldname": "date_of_issue", + "fieldtype": "Date", + "label": "Date of Issue" + }, + { + "fieldname": "expiry_date", + "fieldtype": "Date", + "label": "Expiry Date" + }, + { + "fieldname": "clearing_company", + "fieldtype": "Data", + "label": "Clearing Company" } ], "image_field": "passport_size", "index_web_pages_for_search": 1, "links": [], - "modified": "2024-07-23 11:19:02.026389", + "modified": "2024-07-31 13:06:04.317715", "modified_by": "Administrator", "module": "Av Freight", "name": "Clearing Agent", - "naming_rule": "Expression", + "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ { diff --git a/av_freight/av_freight/doctype/clearing_file/clearing_file.json b/av_freight/av_freight/doctype/clearing_file/clearing_file.json index 533dbf4..969f1b5 100644 --- a/av_freight/av_freight/doctype/clearing_file/clearing_file.json +++ b/av_freight/av_freight/doctype/clearing_file/clearing_file.json @@ -17,20 +17,31 @@ "customer_address", "clearing_agent_section", "clearing_agent", + "delivery_agent", + "column_break_4v7kz", + "clearing_company", + "forwarder", "shipment_details_section", - "shipper", + "shipper_address", "shipment_type", "mode_of_transport", "arrival_date", "departure_date", + "port_of_loading", + "port_of_discharge", + "place_of_delivery", "column_break_b8in0", "carrier_name", "air_waybill", "airline", "voyage_flight_number", "airplane", + "shipment_ref_no", "bill_of_lading_number", + "bill_of_lading_place_of_issue", + "bill_of_lading_date_of_issue", "commercial_invoice_number", + "commercial_invoice_date", "documents_section", "documents", "cargo_details_section", @@ -58,19 +69,19 @@ "in_list_view": 1, "label": "Consignee", "options": "Customer", - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "fieldname": "customer_address", "fieldtype": "Link", + "hidden": 1, "label": "Consignee Address", "options": "Address" }, { "fieldname": "clearing_agent_section", "fieldtype": "Section Break", - "label": "Clearing Agent" + "label": "Agent Parties" }, { "fieldname": "clearing_agent", @@ -88,7 +99,7 @@ { "fieldname": "bill_of_lading_number", "fieldtype": "Data", - "label": "Bill of Lading Number" + "label": " BL/ MTD No " }, { "fieldname": "commercial_invoice_number", @@ -110,25 +121,24 @@ { "fieldname": "arrival_date", "fieldtype": "Date", - "label": "Arrival Date", - "reqd": 1 + "label": "Arrival Date" }, { "fieldname": "departure_date", "fieldtype": "Date", - "label": "Departure Date", - "reqd": 1 + "label": "Departure Date" }, { "fieldname": "carrier_name", "fieldtype": "Link", + "hidden": 1, "label": "Shipping line", "options": "Shipping Line" }, { "fieldname": "voyage_flight_number", "fieldtype": "Link", - "label": "Ship Vessel ", + "label": "Vessel & Voyage No.", "options": "Shipment Vessel" }, { @@ -148,7 +158,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Status", - "options": "Lodged to TRA\nPayment Pending\nPayment Completed\nCleared\nDelivered", + "options": "Open\nLodged to TRA\nPayment Pending\nPayment Completed\nCleared\nDelivered", "reqd": 1 }, { @@ -243,11 +253,6 @@ "fieldtype": "Data", "label": " Air Waybill" }, - { - "fieldname": "shipper", - "fieldtype": "Data", - "label": "Shipper" - }, { "fieldname": "connections_tab", "fieldtype": "Tab Break", @@ -267,12 +272,73 @@ "fieldname": "location", "fieldtype": "Geolocation", "label": "Location" + }, + { + "fieldname": "shipper_address", + "fieldtype": "Small Text", + "label": "Shipper " + }, + { + "fieldname": "bill_of_lading_place_of_issue", + "fieldtype": "Data", + "label": "Bill of Lading Place of Issue " + }, + { + "fieldname": "bill_of_lading_date_of_issue", + "fieldtype": "Date", + "label": "Bill of Lading Date of Issue" + }, + { + "fieldname": "shipment_ref_no", + "fieldtype": "Data", + "label": "Shipment Ref No " + }, + { + "fieldname": "port_of_loading", + "fieldtype": "Data", + "label": "Port of Loading" + }, + { + "fieldname": "port_of_discharge", + "fieldtype": "Data", + "label": "Port of Discharge" + }, + { + "fieldname": "place_of_delivery", + "fieldtype": "Data", + "label": "Place of delivery" + }, + { + "fieldname": "forwarder", + "fieldtype": "Small Text", + "label": "Forwarder" + }, + { + "fieldname": "delivery_agent", + "fieldtype": "Small Text", + "label": "Delivery Agent" + }, + { + "fieldname": "commercial_invoice_date", + "fieldtype": "Date", + "label": "Commercial Invoice Date" + }, + { + "fieldname": "column_break_4v7kz", + "fieldtype": "Column Break" + }, + { + "fetch_from": "clearing_agent.clearing_company", + "fieldname": "clearing_company", + "fieldtype": "Data", + "label": "Clearing Company", + "read_only": 1 } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-07-25 11:34:56.679719", + "modified": "2024-08-01 13:19:54.105894", "modified_by": "Administrator", "module": "Av Freight", "name": "Clearing File", diff --git a/av_freight/av_freight/doctype/physical_verification_booking/physical_verification_booking.json b/av_freight/av_freight/doctype/physical_verification_booking/physical_verification_booking.json index d81ee08..7c1a78d 100644 --- a/av_freight/av_freight/doctype/physical_verification_booking/physical_verification_booking.json +++ b/av_freight/av_freight/doctype/physical_verification_booking/physical_verification_booking.json @@ -7,6 +7,7 @@ "engine": "InnoDB", "field_order": [ "clearing_file_number", + "customs_clearance", "column_break_d4yrg", "cfs_charges_status", "column_break_uyof8", @@ -150,12 +151,18 @@ "print_hide": 1, "read_only": 1, "search_index": 1 + }, + { + "fieldname": "customs_clearance", + "fieldtype": "Link", + "label": "Customs Clearance ", + "options": "Customs Clearance" } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-07-23 11:46:52.561025", + "modified": "2024-08-01 12:20:34.930565", "modified_by": "Administrator", "module": "Av Freight", "name": "Physical Verification Booking", diff --git a/av_freight/av_freight/doctype/shipment_vessel/shipment_vessel.json b/av_freight/av_freight/doctype/shipment_vessel/shipment_vessel.json index b443e8c..e3fc385 100644 --- a/av_freight/av_freight/doctype/shipment_vessel/shipment_vessel.json +++ b/av_freight/av_freight/doctype/shipment_vessel/shipment_vessel.json @@ -19,7 +19,7 @@ { "fieldname": "name1", "fieldtype": "Data", - "label": "Name", + "label": "Vessel", "unique": 1 }, { @@ -63,7 +63,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-07-23 16:09:10.128711", + "modified": "2024-07-31 08:57:16.048677", "modified_by": "Administrator", "module": "Av Freight", "name": "Shipment Vessel", diff --git a/av_freight/av_freight/workspace/clearing_&_forwarding/clearing_&_forwarding.json b/av_freight/av_freight/workspace/clearing_&_forwarding/clearing_&_forwarding.json index c52e178..b05172c 100644 --- a/av_freight/av_freight/workspace/clearing_&_forwarding/clearing_&_forwarding.json +++ b/av_freight/av_freight/workspace/clearing_&_forwarding/clearing_&_forwarding.json @@ -16,7 +16,7 @@ "hidden": 0, "is_query_report": 0, "label": "Configuration Documents", - "link_count": 6, + "link_count": 7, "link_type": "DocType", "onboard": 0, "type": "Card Break" @@ -81,11 +81,21 @@ "onboard": 0, "type": "Link" }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Document Type", + "link_count": 0, + "link_to": "Document Type", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, { "hidden": 0, "is_query_report": 0, "label": "Clearance Documents", - "link_count": 3, + "link_count": 4, "link_type": "DocType", "onboard": 0, "type": "Card Break" @@ -110,6 +120,16 @@ "onboard": 0, "type": "Link" }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Physical Verification Booking", + "link_count": 0, + "link_to": "Physical Verification Booking", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, { "hidden": 0, "is_query_report": 0, @@ -132,7 +152,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "Clearing File", + "label": "File Registration", "link_count": 0, "link_to": "Clearing File", "link_type": "DocType", @@ -140,7 +160,7 @@ "type": "Link" } ], - "modified": "2024-07-28 13:18:13.724798", + "modified": "2024-08-02 09:59:29.577264", "modified_by": "Administrator", "module": "Av Freight", "name": "Clearing & Forwarding",