Skip to content

PROJ-0053 - Khetan - Version upgrade v16 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vrajsatat merged 8 commits into from
Jul 16, 2026
Merged

PROJ-0053 - Khetan - Version upgrade v16 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3abe572
fix: v16 migration - rename qrcode to qr_utils, fix jinja path, fix s…
Om-satat24 May 21, 2026
96a8efc
fix: update sales invoice unit-1 print format
Om-satat24 May 22, 2026
1d3b3bf
fix: remove dead Jinja get_doc Salary Slip line causing DebugUndefine…
Om-satat24 May 22, 2026
9841caa
fix: update stock entry client script fix issue selecting stock entry…
Om-satat24 Jun 8, 2026
9fc27e8
fix: Sales Invoice company field fix for v16 - override class and hooks
Om-satat24 Jun 9, 2026
9a645b3
fix: Sales Order naming_series permlevel set to 0 - Issue 2
Om-satat24 Jun 9, 2026
5f2c0f7
chore: ignore local bench artifacts and workspace files
Om-satat24 Jul 15, 2026
6a972fd
Merge remote-tracking branch 'upstream/version-16' into version-16
Om-satat24 Jul 15, 2026
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: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
*.swp
tags
khetangroup/docs/current
node_modules/
node_modules/khetangroup/apps/
*.bak
*.code-workspace
48 changes: 46 additions & 2 deletions khetangroup/fixtures/client_script.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,48 @@
[
{
"docstatus": 0,
"doctype": "Client Script",
"dt": "Quotation",
"enabled": 0,
"modified": "2024-01-29 10:11:53.403319",
"module": "khetangroup",
"name": "Material Return",
"script": "\nfrappe.ui.form.on('Quotation', {\n refresh: function (frm) {\n var currentDate = frappe.datetime.get_today();\n var formattedDate = frappe.datetime.str_to_user(currentDate);\n\n \n\n if (formattedDate >= cur_frm.doc.valid_till && cur_frm.doc.docstatus == 1) {\n \t\n frm.add_custom_button(__('Material Return'), function () {\n \n frappe.call({\n method:\"quotation_value\",\n args:{\n \"name\": cur_frm.doc.name,\n \n \n }\n })\n \n \t})\n }\n }\n});\n",
"view": "Form"
},
{
"docstatus": 0,
"doctype": "Client Script",
"dt": "Sales Invoice",
"enabled": 0,
"modified": "2024-01-24 15:59:53.239993",
"module": "khetangroup",
"name": "quotation name",
"script": "frappe.ui.form.on('Sales Invoice', {\n after_save: function (frm) {\n $.each(frm.doc.items || [], function (i, d) {\n var sales_order = d.sales_order;\n var item_code = d.item_code;\n\n frappe.call({\n method: \"quotation\", // Replace with the actual app and module names\n args: {\n \"sales_order\": sales_order,\n \"item_code\": item_code},\n }).then(records => {\n var quotation = records['quotation']\n d.prevdoc_docname = quotation\n frm.save()\n frm.refresh_field(\"prevdoc_docname\");\n\t\t });\n\t\t \n\t });\n\t \n\t}\n});\n\n",
"view": "Form"
},
{
"docstatus": 0,
"doctype": "Client Script",
"dt": "Qr Code",
"enabled": 0,
"modified": "2024-03-27 16:40:07.503095",
"module": "khetangroup",
"name": "qrcode create",
"script": "frappe.ui.form.on('Qr Code', {\n\tafter_save:function(frm) {\n\tvar product_name = frm.doc.item_code;\n\tvar mrp = frm.doc.mrp;\n\t\n\tvar qrData = \"Product Name: \" + product_name + \", MRP: \" + mrp;\n\tconsole.log(qrData)\n\t\n\tvar qr = qrcode(0,'M');\n\tqr.addData(qrData);\n\tqr.make();\n\t\n\tvar qrimage = qr.createDataURL(8,0);\n\t\n\tconsole.log(qrimage)\n\t}\n})",
"view": "Form"
},
{
"docstatus": 0,
"doctype": "Client Script",
"dt": "Quotation",
"enabled": 0,
"modified": "2024-07-16 16:03:42.277039",
"module": "khetangroup",
"name": "Qrcode Scan",
"script": "frappe.ui.form.on('Quotation', {\n\tscan_barcode:function(frm) {\n\t\tif(frm.doc.material_transfer == \"Qrcode Against\"){\n\t\t var scan_barcode = frm.doc.scan_barcode;\n\n\t\t var existingItemIndex = -1;\n var itemValueRegex = /=\\s*([^,]+)/; // Regex pattern to match the value after '='\n var match = scan_barcode.match(itemValueRegex);\n var extractedValue = match ? match[1].trim() : null; \n console.log(extractedValue)\n frm.doc.items.forEach(function(item, index) {\n if (item.item_code === extractedValue) {\n existingItemIndex = index;\n console.log(\"hello\")\n }\n });\n if (existingItemIndex !== -1) {\n \n frappe.model.set_value(frm.doc.items[existingItemIndex].doctype, frm.doc.items[existingItemIndex].name, 'material_transfer', 1);\n } \n frm.refresh_field('items');\n frm.save()\n cur_frm.doc.new_scan_barcode = ''\n\t\t}\n\t}\n})",
"view": "Form"
},
{
"docstatus": 0,
"doctype": "Client Script",
Expand Down Expand Up @@ -147,10 +191,10 @@
"doctype": "Client Script",
"dt": "Stock Entry",
"enabled": 1,
"modified": "2024-01-23 13:20:05.532020",
"modified": "2026-06-04 17:13:34.888843",
"module": "khetangroup",
"name": "filter apply on bom base on item name in stock entry",
"script": "frappe.ui.form.on('Stock Entry', {\n\titem_name:function(frm) {\n\t \n frm.set_query(\"bom_no\", function(doc, cdn,cdt){\n let d = locals[cdn][cdt];\n return{\n filters:{\n 'item':d.item_name,\n 'docstatus':1,\n 'is_active':1,\n }\n };\n });\n\t},\n\t\n\t\n\tcompany:function(frm){\n\t var company = frm.doc.company;\n\t \n\t frm.set_query('item_code', 'items', function(doc, cdt, cdn) {\n let d = locals[cdt][cdn];\n return{\n\t\t\tfilters: {\n\t\t\t 'is_stock_item': 1,\n\t\t\t 'company': company, \n\t\t\t}\n };\n\t });\n\t \n\t \n\t frm.set_query(\"operation\", function(doc, cdn,cdt){\n let d = locals[cdn][cdt];\n return{\n filters:{\n \n 'company': company,\n }\n }\n });\n \n frm.set_query(\"stock_entry_type\", function(doc, cdn,cdt){\n let d = locals[cdn][cdt];\n return{\n filters:{\n \"company_\":frm.doc.company,\n }\n }\n })\n\t \n\t},\n\toperation:function(frm){\n\t frm.set_query(\"machine\", function(doc, cdn,cdt){\n let d = locals[cdn][cdt];\n return{\n filters:{\n \n 'operation': frm.doc.operation,\n }\n }\n })\n\t}\n\t\n\t\n});\n\nfrappe.ui.form.on('Stock Entry Detail', {\n\tis_finished__item:function(frm) {\n $.each(frm.doc.items || [], function(i,d){\n \n var finished = d.is_finished__item;\n if (finished == 1){\n \n d.is_scrap_item = 0;\n d.rejected_item = 0;\n d.short_length = 0;\n d.straightner = 0;\n frm.refresh_field(\"items\");\n }\n });\n\t},\n\tis_scrap_item:function(frm){\n\t $.each(frm.doc.items || [], function(i,d){\n \n var scrap = d.is_scrap_item;\n if (scrap == 1){\n d.is_finished__item = 0;\n d.rejected_item = 0;\n d.short_length = 0;\n d.straightner = 0;\n frm.refresh_field(\"items\");\n }\n });\n\t},\n\tshort_length:function(frm){\n\t $.each(frm.doc.items || [], function(i,d){\n \n var short_length = d.short_length;\n if (short_length == 1){\n d.is_finished__item = 0;\n d.is_scrap_item = 0;\n d.rejected_item = 0;\n d.straightner = 0;\n frm.refresh_field(\"items\");\n }\n });\n\t},\n\t\n\trejected_item:function(frm){\n\t $.each(frm.doc.items || [], function(i,d){\n\t var rejected = d.rejected_item;\n\t if(rejected == 1){\n\t d.is_finished__item = 0;\n\t d.is_scrap_item = 0;\n\t d.short_length = 0;\n\t d.straightner = 0;\n\t frm.refresh_field(\"items\");\n\t }\n\t })\n\t},\n\t\n\tstraightner:function(frm){\n\t $.each(frm.doc.items || [], function(i,d){\n\t var straightner = d.straightner;\n\t if(straightner == 1){\n\t d.is_finished__item = 0;\n\t d.is_scrap_item = 0;\n\t d.short_length = 0;\n\t d.rejected_item = 0;\n\t frm.refresh_field(\"items\");\n\t }\n\t })\n\t},\n\t\n\t\n\t\n\t\n});\n\n\n\n\n\n",
"script": "frappe.ui.form.on('Stock Entry', {\n \n onload: function(frm) {\n set_item_query(frm);\n },\n\n refresh: function(frm) {\n set_item_query(frm);\n },\n \n company: function(frm) {\n set_item_query(frm);\n },\n \n\titem_name:function(frm) {\n\t \n frm.set_query(\"bom_no\", function(doc, cdn,cdt){\n let d = locals[cdn][cdt];\n return{\n filters:{\n 'item':d.item_name,\n 'docstatus':1,\n 'is_active':1,\n }\n };\n });\n\t},\n\t\n\t\n// \tcompany:function(frm){\n// \t var company = frm.doc.company;\n\t \n// \t frm.set_query('item_code', 'items', function(doc, cdt, cdn) {\n// let d = locals[cdt][cdn];\n// return{\n// \t\t\tfilters: {\n// \t\t\t 'is_stock_item': 1,\n// \t\t\t 'company': company, \n// \t\t\t}\n// };\n// \t });\n\n company: function(frm) {\n set_item_query(frm);\n\n function set_item_query(frm) {\n var company = frm.doc.company;\n \n frm.set_query('item_code', 'items', function(doc, cdt, cdn) {\n return {\n filters: {\n 'is_stock_item': 1,\n 'company': frm.doc.company\n }\n };\n });\n }\n \n \n\n\t frm.set_query(\"operation\", function(){\n // let d = locals[cdn][cdt];\n return{\n filters:{\n \n 'company': company,\n }\n }\n });\n \n // frm.set_query(\"stock_entry_type\", function(doc, cdn,cdt){\n // let d = locals[cdn][cdt];\n // return{\n // filters:{\n // \"company_\":frm.doc.company,\n // }\n // }\n // })\n \n frappe.db.get_list(\"Company Child\", {\n filters: { company: company },\n fields: [\"parent\"],\n limit: 500\n }).then(function(data) {\n if (data && data.length) {\n let valid_types = data.map(d => d.parent);\n frm.set_query(\"stock_entry_type\", function() {\n return {\n filters: [\n [\"Stock Entry Type\", \"name\", \"in\", valid_types]\n ]\n };\n });\n } else {\n // No company-specific types found — show all\n frm.set_query(\"stock_entry_type\", function() {\n return {};\n });\n }\n });\n \n // v2\n // frappe.call({\n // method: \"frappe.client.get_list\",\n // args: {\n // doctype: \"Stock Entry Type\",\n // filters: [\n // [\"Company Child\", \"company\", \"=\", company]\n // ],\n // fields: [\"name\"],\n // limit: 500\n // },\n // callback: function(r) {\n // if (r.message && r.message.length) {\n // let valid_types = r.message.map(d => d.name);\n // frm.set_query(\"stock_entry_type\", function() {\n // return {\n // filters: [\n // [\"Stock Entry Type\", \"name\", \"in\", valid_types]\n // ]\n // };\n // });\n // } else {\n // frm.set_query(\"stock_entry_type\", function() {\n // return {};\n // });\n // }\n // }\n // });\n\t \n\t},\n\toperation:function(frm){\n\t frm.set_query(\"machine\", function(doc, cdn,cdt){\n let d = locals[cdn][cdt];\n return{\n filters:{\n \n 'operation': frm.doc.operation,\n }\n }\n })\n\t}\n\t\n\t\n});\n\nfrappe.ui.form.on('Stock Entry Detail', {\n\tis_finished__item:function(frm) {\n $.each(frm.doc.items || [], function(i,d){\n \n var finished = d.is_finished__item;\n if (finished == 1){\n \n d.is_scrap_item = 0;\n d.rejected_item = 0;\n d.short_length = 0;\n d.straightner = 0;\n frm.refresh_field(\"items\");\n }\n });\n\t},\n\tis_scrap_item:function(frm){\n\t $.each(frm.doc.items || [], function(i,d){\n \n var scrap = d.is_scrap_item;\n if (scrap == 1){\n d.is_finished__item = 0;\n d.rejected_item = 0;\n d.short_length = 0;\n d.straightner = 0;\n frm.refresh_field(\"items\");\n }\n });\n\t},\n\tshort_length:function(frm){\n\t $.each(frm.doc.items || [], function(i,d){\n \n var short_length = d.short_length;\n if (short_length == 1){\n d.is_finished__item = 0;\n d.is_scrap_item = 0;\n d.rejected_item = 0;\n d.straightner = 0;\n frm.refresh_field(\"items\");\n }\n });\n\t},\n\t\n\trejected_item:function(frm){\n\t $.each(frm.doc.items || [], function(i,d){\n\t var rejected = d.rejected_item;\n\t if(rejected == 1){\n\t d.is_finished__item = 0;\n\t d.is_scrap_item = 0;\n\t d.short_length = 0;\n\t d.straightner = 0;\n\t frm.refresh_field(\"items\");\n\t }\n\t })\n\t},\n\t\n\tstraightner:function(frm){\n\t $.each(frm.doc.items || [], function(i,d){\n\t var straightner = d.straightner;\n\t if(straightner == 1){\n\t d.is_finished__item = 0;\n\t d.is_scrap_item = 0;\n\t d.short_length = 0;\n\t d.rejected_item = 0;\n\t frm.refresh_field(\"items\");\n\t }\n\t })\n\t},\n\t\n\t\n\t\n\t\n});\n\n\n\n\n\n",
"view": "Form"
},
{
Expand Down
Loading
Loading