Skip to content

Merge staging into version-12 #37

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
sahil28297 merged 3 commits into from
Jan 22, 2021
Merged

Merge staging into version-12 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d1c87a
fix: disable edit for warranty claim
hrwX Dec 31, 2020
7007e87
Merge pull request #35 from hrwX/disable_edit
sahil28297 Jan 21, 2021
402a2d3
Merge pull request #36 from DigiThinkIT/develop
sahil28297 Jan 22, 2021
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
3 changes: 3 additions & 0 deletions repairs/repairs/web_form/service_and_repair/service_and_repair.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
frappe.ready(function() {
// bind events here
})
146 changes: 77 additions & 69 deletions repairs/repairs/web_form/service_and_repair/service_and_repair.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,86 @@
{
"accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 1,
"allow_incomplete": 0,
"allow_multiple": 1,
"allow_print": 1,
"amount": 0.0,
"amount_based_on_field": 0,
"creation": "2018-10-09 02:44:14.026102",
"currency": "USD",
"doc_type": "Warranty Claim",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"introduction_text": "",
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2018-10-09 03:02:33.439604",
"modified_by": "Administrator",
"module": "Repairs",
"name": "service-and-repair",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "service-and-repair",
"show_sidebar": 1,
"sidebar_items": [],
"success_message": "",
"success_url": "/service-and-repair",
"title": "Service and Repair",
"accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 0,
"allow_incomplete": 0,
"allow_multiple": 1,
"allow_print": 1,
"amount": 0.0,
"amount_based_on_field": 0,
"button_label": "Save",
"creation": "2018-10-09 02:44:14.026102",
"currency": "USD",
"doc_type": "Warranty Claim",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"introduction_text": "",
"is_standard": 1,
"login_required": 1,
"max_attachment_size": 0,
"modified": "2020-12-31 07:39:01.411041",
"modified_by": "Administrator",
"module": "Repairs",
"name": "service-and-repair",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "service-and-repair",
"route_to_success_link": 0,
"show_attachments": 0,
"show_in_grid": 0,
"show_sidebar": 1,
"sidebar_items": [],
"success_message": "",
"success_url": "/service-and-repair",
"title": "Service and Repair",
"web_form_fields": [
{
"default": "Today",
"fieldname": "complaint_date",
"fieldtype": "Date",
"hidden": 0,
"label": "Issue Date",
"max_length": 0,
"max_value": 0,
"read_only": 1,
"reqd": 0
},
"default": "Today",
"fieldname": "complaint_date",
"fieldtype": "Date",
"hidden": 0,
"label": "Issue Date",
"max_length": 0,
"max_value": 0,
"read_only": 1,
"reqd": 0,
"show_in_filter": 0
},
{
"fieldname": "item_name",
"fieldtype": "Data",
"hidden": 0,
"label": "Item Name",
"max_length": 0,
"max_value": 0,
"read_only": 1,
"reqd": 0
},
"fieldname": "item_name",
"fieldtype": "Data",
"hidden": 0,
"label": "Item Name",
"max_length": 0,
"max_value": 0,
"read_only": 1,
"reqd": 0,
"show_in_filter": 0
},
{
"description": "",
"fieldname": "unlinked_serial_no",
"fieldtype": "Data",
"hidden": 0,
"label": "Serial No",
"max_length": 0,
"max_value": 0,
"read_only": 1,
"reqd": 0
},
"description": "",
"fieldname": "unlinked_serial_no",
"fieldtype": "Data",
"hidden": 0,
"label": "Serial No",
"max_length": 0,
"max_value": 0,
"read_only": 1,
"reqd": 0,
"show_in_filter": 0
},
{
"fieldname": "additional_comments",
"fieldtype": "Data",
"hidden": 0,
"label": "Additional Comments",
"max_length": 0,
"max_value": 0,
"read_only": 1,
"reqd": 0
"fieldname": "additional_comments",
"fieldtype": "Data",
"hidden": 0,
"label": "Additional Comments",
"max_length": 0,
"max_value": 0,
"read_only": 1,
"reqd": 0,
"show_in_filter": 0
}
]
}