From 0e25c34e46a307d88d8cffd13a723316fdc34313 Mon Sep 17 00:00:00 2001 From: jkpatel09 Date: Mon, 10 Mar 2025 12:09:46 +0530 Subject: [PATCH] solve error for issue #1. --- .../doctype/supplier_survery_form/__init__.py | 0 .../supplier_survery_form.js | 8 + .../supplier_survery_form.json | 40 +++ .../supplier_survery_form.py | 9 + .../test_supplier_survery_form.py | 9 + .../report/hedging_details/hedging_details.py | 2 +- exim/exim/workspace/exim/exim.json | 306 ++++++++++++++++++ 7 files changed, 373 insertions(+), 1 deletion(-) create mode 100644 exim/exim/doctype/supplier_survery_form/__init__.py create mode 100644 exim/exim/doctype/supplier_survery_form/supplier_survery_form.js create mode 100644 exim/exim/doctype/supplier_survery_form/supplier_survery_form.json create mode 100644 exim/exim/doctype/supplier_survery_form/supplier_survery_form.py create mode 100644 exim/exim/doctype/supplier_survery_form/test_supplier_survery_form.py create mode 100644 exim/exim/workspace/exim/exim.json diff --git a/exim/exim/doctype/supplier_survery_form/__init__.py b/exim/exim/doctype/supplier_survery_form/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/exim/exim/doctype/supplier_survery_form/supplier_survery_form.js b/exim/exim/doctype/supplier_survery_form/supplier_survery_form.js new file mode 100644 index 0000000..9ea66f5 --- /dev/null +++ b/exim/exim/doctype/supplier_survery_form/supplier_survery_form.js @@ -0,0 +1,8 @@ +// Copyright (c) 2024, FinByz Tech Pvt Ltd and contributors +// For license information, please see license.txt + +// frappe.ui.form.on("Supplier Survery Form", { +// refresh(frm) { + +// }, +// }); diff --git a/exim/exim/doctype/supplier_survery_form/supplier_survery_form.json b/exim/exim/doctype/supplier_survery_form/supplier_survery_form.json new file mode 100644 index 0000000..c679e1b --- /dev/null +++ b/exim/exim/doctype/supplier_survery_form/supplier_survery_form.json @@ -0,0 +1,40 @@ +{ + "actions": [], + "allow_rename": 1, + "creation": "2024-09-05 17:46:39.788861", + "doctype": "DocType", + "engine": "InnoDB", + "field_order": [ + "section_break_wmst" + ], + "fields": [ + { + "fieldname": "section_break_wmst", + "fieldtype": "Section Break" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2024-09-05 17:46:39.788861", + "modified_by": "Administrator", + "module": "Exim", + "name": "Supplier Survery Form", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "states": [] +} \ No newline at end of file diff --git a/exim/exim/doctype/supplier_survery_form/supplier_survery_form.py b/exim/exim/doctype/supplier_survery_form/supplier_survery_form.py new file mode 100644 index 0000000..f70550d --- /dev/null +++ b/exim/exim/doctype/supplier_survery_form/supplier_survery_form.py @@ -0,0 +1,9 @@ +# Copyright (c) 2024, FinByz Tech Pvt Ltd and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + + +class SupplierSurveryForm(Document): + pass diff --git a/exim/exim/doctype/supplier_survery_form/test_supplier_survery_form.py b/exim/exim/doctype/supplier_survery_form/test_supplier_survery_form.py new file mode 100644 index 0000000..2ed39ea --- /dev/null +++ b/exim/exim/doctype/supplier_survery_form/test_supplier_survery_form.py @@ -0,0 +1,9 @@ +# Copyright (c) 2024, FinByz Tech Pvt Ltd and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestSupplierSurveryForm(FrappeTestCase): + pass diff --git a/exim/exim/report/hedging_details/hedging_details.py b/exim/exim/report/hedging_details/hedging_details.py index 57720c6..4d6f168 100644 --- a/exim/exim/report/hedging_details/hedging_details.py +++ b/exim/exim/report/hedging_details/hedging_details.py @@ -39,7 +39,7 @@ def get_data(self): base_grand_total as inr_amount, delivery_date, status from `tabSales Order` where docstatus = 1 and status not in ('Closed', 'Completed') - and amount_hedged < grand_total and currency {conditions} + and custom_amount_hedged < grand_total and currency {conditions} order by delivery_date """.format(conditions=conditions), currency, as_dict=1) self.forward_data = frappe.get_list("Forward Booking", diff --git a/exim/exim/workspace/exim/exim.json b/exim/exim/workspace/exim/exim.json new file mode 100644 index 0000000..6224494 --- /dev/null +++ b/exim/exim/workspace/exim/exim.json @@ -0,0 +1,306 @@ +{ + "charts": [], + "content": "[{\"id\":\"3xNxnMbiab\",\"type\":\"header\",\"data\":{\"text\":\"Exim Management\",\"col\":12}},{\"id\":\"vYtTB-aimp\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Item\",\"col\":3}},{\"id\":\"KsdbW2toHf\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customer\",\"col\":3}},{\"id\":\"gtksXy2vqq\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Supplier\",\"col\":3}},{\"id\":\"FHgMil2tOt\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Purchase Order\",\"col\":3}},{\"id\":\"CjLxgJBZQA\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Sales Order\",\"col\":12}},{\"id\":\"q8RUo0NtBS\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"ztxwMU9H_x\",\"type\":\"header\",\"data\":{\"text\":\"Masters & Reports\",\"col\":12}},{\"id\":\"2nLsnUz0Ai\",\"type\":\"card\",\"data\":{\"card_name\":\"General Documents\",\"col\":4}},{\"id\":\"a47fNwrTF5\",\"type\":\"card\",\"data\":{\"card_name\":\"Shipment Management\",\"col\":4}},{\"id\":\"7xXuIJa4wX\",\"type\":\"card\",\"data\":{\"card_name\":\"Port Management\",\"col\":4}},{\"id\":\"FmGdzdvjwm\",\"type\":\"card\",\"data\":{\"card_name\":\"Financial Documents\",\"col\":4}},{\"id\":\"e3o8Zd2ywH\",\"type\":\"card\",\"data\":{\"card_name\":\"Reports\",\"col\":4}}]", + "creation": "2024-09-11 15:35:20.299039", + "custom_blocks": [], + "docstatus": 0, + "doctype": "Workspace", + "for_user": "", + "hide_custom": 0, + "icon": "menu", + "idx": 0, + "indicator_color": "green", + "is_hidden": 0, + "label": "Exim", + "links": [ + { + "hidden": 0, + "is_query_report": 0, + "label": "General Documents", + "link_count": 4, + "link_type": "DocType", + "onboard": 0, + "type": "Card Break" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Packaging Material", + "link_count": 0, + "link_to": "Packaging Material", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Contract Term", + "link_count": 0, + "link_to": "Contract Term", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Document Paper", + "link_count": 0, + "link_to": "Document Paper", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Document Check", + "link_count": 0, + "link_to": "Document Check", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Shipment Management", + "link_count": 6, + "link_type": "DocType", + "onboard": 0, + "type": "Card Break" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Advance Authorisation License", + "link_count": 0, + "link_to": "Advance Authorisation License", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "LUT Detail", + "link_count": 0, + "link_to": "LUT Detail", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Pre Shipment", + "link_count": 0, + "link_to": "Pre Shipment", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Post Shipment", + "link_count": 0, + "link_to": "Post Shipment", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Export Document", + "link_count": 0, + "link_to": "Export Document", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "BRC Management", + "link_count": 0, + "link_to": "BRC Management", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Financial Documents", + "link_count": 2, + "link_type": "DocType", + "onboard": 0, + "type": "Card Break" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Sales Invoice Document Check", + "link_count": 0, + "link_to": "Sales Invoice Document Check", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Document Expiry", + "link_count": 0, + "link_to": "Document Expiry", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Port Management", + "link_count": 5, + "link_type": "DocType", + "onboard": 0, + "type": "Card Break" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Port Details", + "link_count": 0, + "link_to": "Port Details", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Forward Booking", + "link_count": 0, + "link_to": "Forward Booking", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Range and Division", + "link_count": 0, + "link_to": "Range and Division", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Rodtep Claim", + "link_count": 0, + "link_to": "Rodtep Claim", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Duty DrawBack Claim", + "link_count": 0, + "link_to": "Duty DrawBack Claim", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Reports", + "link_count": 2, + "link_type": "DocType", + "onboard": 0, + "type": "Card Break" + }, + { + "hidden": 0, + "is_query_report": 1, + "label": "Apeda Return Exim", + "link_count": 0, + "link_to": "APEDA RETURN EXIM", + "link_type": "Report", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 1, + "label": "Hedging Details", + "link_count": 0, + "link_to": "Hedging Details", + "link_type": "Report", + "onboard": 0, + "type": "Link" + } + ], + "modified": "2025-03-07 11:32:39.477407", + "modified_by": "Administrator", + "module": "Exim", + "name": "Exim", + "number_cards": [], + "owner": "Administrator", + "parent_page": "", + "public": 1, + "quick_lists": [], + "roles": [], + "sequence_id": 1.0, + "shortcuts": [ + { + "color": "Grey", + "doc_view": "List", + "label": "Item", + "link_to": "Item", + "stats_filter": "[]", + "type": "DocType" + }, + { + "color": "Grey", + "doc_view": "List", + "label": "Purchase Order", + "link_to": "Purchase Order", + "stats_filter": "[]", + "type": "DocType" + }, + { + "color": "Grey", + "doc_view": "List", + "label": "Customer", + "link_to": "Customer", + "stats_filter": "[]", + "type": "DocType" + }, + { + "color": "Grey", + "doc_view": "List", + "label": "Supplier", + "link_to": "Supplier", + "stats_filter": "[]", + "type": "DocType" + }, + { + "color": "Grey", + "doc_view": "List", + "label": "Sales Order", + "link_to": "Sales Order", + "stats_filter": "[]", + "type": "DocType" + } + ], + "title": "Exim" +} \ No newline at end of file