From ab8bde0149a0bc1d8b75ad0da4638b1f9125ffe7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 12 Aug 2014 15:15:39 +0530 Subject: [PATCH 1/3] [ux] added folds, show actual / projected qty in pos --- erpnext/accounts/doctype/account/account.js | 10 +- .../journal_voucher/journal_voucher.json | 8 +- .../purchase_invoice/purchase_invoice.json | 7 +- erpnext/accounts/doctype/sales_invoice/pos.js | 26 +- .../purchase_order/purchase_order.json | 7 +- erpnext/controllers/status_updater.py | 1 + .../hr/doctype/job_applicant/job_applicant.js | 8 +- erpnext/public/build.json | 3 +- erpnext/public/css/erpnext.css | 9 +- erpnext/public/js/transaction.js | 5 +- erpnext/selling/doctype/lead/lead.js | 5 - erpnext/selling/doctype/lead/lead.json | 8 +- .../doctype/opportunity/opportunity.json | 7 +- .../selling/doctype/quotation/quotation.json | 8 +- .../doctype/sales_order/sales_order.json | 52 +- .../doctype/delivery_note/delivery_note.json | 7 +- .../material_request/material_request.json | 8 +- .../purchase_receipt/purchase_receipt.json | 7 +- .../doctype/stock_entry/stock_entry.json | 1113 +++++++++-------- .../doctype/support_ticket/support_ticket.js | 7 - .../support_ticket/support_ticket.json | 465 +++---- .../doctype/support_ticket/test_records.json | 6 + .../support_ticket/test_support_ticket.py | 10 + 23 files changed, 933 insertions(+), 854 deletions(-) create mode 100644 erpnext/support/doctype/support_ticket/test_records.json create mode 100644 erpnext/support/doctype/support_ticket/test_support_ticket.py diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js index e185375389..aee2d3cf6a 100644 --- a/erpnext/accounts/doctype/account/account.js +++ b/erpnext/accounts/doctype/account/account.js @@ -60,17 +60,14 @@ cur_frm.cscript.account_type = function(doc, cdt, cdn) { } cur_frm.cscript.add_toolbar_buttons = function(doc) { - cur_frm.appframe.add_button(__('Chart of Accounts'), + cur_frm.add_custom_button(__('Chart of Accounts'), function() { frappe.set_route("Accounts Browser", "Account"); }, 'icon-sitemap') if (cstr(doc.group_or_ledger) == 'Group') { cur_frm.add_custom_button(__('Convert to Ledger'), function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet', 'btn-default'); } else if (cstr(doc.group_or_ledger) == 'Ledger') { - cur_frm.add_custom_button(__('Convert to Group'), - function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default') - - cur_frm.appframe.add_button(__('View Ledger'), function() { + cur_frm.add_custom_button(__('View Ledger'), function() { frappe.route_options = { "account": doc.name, "from_date": sys_defaults.year_start_date, @@ -79,6 +76,9 @@ cur_frm.cscript.add_toolbar_buttons = function(doc) { }; frappe.set_route("query-report", "General Ledger"); }, "icon-table"); + + cur_frm.add_custom_button(__('Convert to Group'), + function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default') } } diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json index 187c59a3fc..6ba2d44c3c 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json @@ -149,6 +149,12 @@ "permlevel": 0, "read_only": 0 }, + { + "fieldname": "view_details", + "fieldtype": "Fold", + "label": "View Details", + "permlevel": 0 + }, { "fieldname": "reference", "fieldtype": "Section Break", @@ -440,7 +446,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-07-31 05:05:03.294068", + "modified": "2014-08-11 07:29:48.343753", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Voucher", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 3a3b1a9b92..9d85cdb96b 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -533,6 +533,11 @@ "read_only": 0, "report_hide": 0 }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, { "fieldname": "advances", "fieldtype": "Section Break", @@ -753,7 +758,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-07-31 04:59:24.939856", + "modified": "2014-08-12 05:25:16.261614", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/pos.js b/erpnext/accounts/doctype/sales_invoice/pos.js index 843c32440e..8c6e3cdb82 100644 --- a/erpnext/accounts/doctype/sales_invoice/pos.js +++ b/erpnext/accounts/doctype/sales_invoice/pos.js @@ -21,9 +21,9 @@ erpnext.POS = Class.extend({ \ '+__("Item")+'\ \ - Qty\ + Qty\ \ - Rate\ + Rate\ \ \ \ @@ -387,14 +387,19 @@ erpnext.POS = Class.extend({ $(repl('\ %(item_code)s%(item_name)s\ - \ + \
\ \
\ \ - \ - \ + \ + \ +
' + +__("Stock: ")+'%(actual_qty)s%(projected_qty)s
\ + \ + \
\ \
\ @@ -405,6 +410,9 @@ erpnext.POS = Class.extend({ item_code: d.item_code, item_name: d.item_name===d.item_code ? "" : ("
" + d.item_name), qty: d.qty, + actual_qty: d.actual_qty, + projected_qty: d.projected_qty ? (" (" + d.projected_qty + ")") : "", rate: format_currency(d.rate, me.frm.doc.currency), amount: format_currency(d.amount, me.frm.doc.currency) } @@ -479,7 +487,11 @@ erpnext.POS = Class.extend({ }); me.refresh_delete_btn(); - this.barcode.$input.focus(); + if(me.frm.doc[this.party]) { + this.barcode.$input.focus(); + } else { + this.party_field.$input.focus(); + } }, increase_decrease_qty: function(tr, operation) { var item_code = tr.attr("id"); diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index f6ae167107..44bcacccc8 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -443,6 +443,11 @@ "print_hide": 0, "read_only": 1 }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, { "fieldname": "terms_section_break", "fieldtype": "Section Break", @@ -645,7 +650,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-07-31 04:59:24.561351", + "modified": "2014-08-12 05:22:53.496614", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 6a2dce00fc..1c5aaa014b 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -85,6 +85,7 @@ class StatusUpdater(Document): if update: frappe.db.set_value(self.doctype, self.name, "status", self.status) + self.add_comment("Label", self.status) def on_communication(self): if not self.get("communications"): return diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js index 759b9d77ae..762bd966f3 100644 --- a/erpnext/hr/doctype/job_applicant/job_applicant.js +++ b/erpnext/hr/doctype/job_applicant/job_applicant.js @@ -4,12 +4,6 @@ // For license information, please see license.txt cur_frm.cscript = { - onload: function(doc, dt, dn) { - if(in_list(user_roles,'System Manager')) { - cur_frm.footer.help_area.innerHTML = '

'+__("Jobs Email Settings")+'
\ - '+__('Automatically extract Job Applicants from a mail box ')+'e.g. "jobs@example.com"

'; - } - }, refresh: function(doc) { cur_frm.cscript.make_listing(doc); }, @@ -21,4 +15,4 @@ cur_frm.cscript = { recipients: doc.email_id }) }, -} \ No newline at end of file +} diff --git a/erpnext/public/build.json b/erpnext/public/build.json index 14a631fc08..0998c53821 100644 --- a/erpnext/public/build.json +++ b/erpnext/public/build.json @@ -7,10 +7,9 @@ ], "js/erpnext.min.js": [ "public/js/conf.js", - "public/js/toolbar.js", "public/js/feature_setup.js", "public/js/utils.js", "public/js/queries.js", "public/js/utils/party.js" ] -} \ No newline at end of file +} diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css index 3777f4c7b6..6d3f4750fe 100644 --- a/erpnext/public/css/erpnext.css +++ b/erpnext/public/css/erpnext.css @@ -14,8 +14,8 @@ /* toolbar */ .toolbar-splash { - width: 32px; - height: 32px; + width: 32px; + height: 32px; margin: -10px auto; } @@ -32,5 +32,6 @@ margin-left: -30px; margin-top: -10px; padding: 20px 10px; - font-family: Monospace; -} \ No newline at end of file + border-right: 1px solid #c7c7c7; + border-bottom: 1px solid #c7c7c7; +} diff --git a/erpnext/public/js/transaction.js b/erpnext/public/js/transaction.js index 915bbd9eb3..dd11fab6f9 100644 --- a/erpnext/public/js/transaction.js +++ b/erpnext/public/js/transaction.js @@ -57,8 +57,9 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ this.set_dynamic_labels(); // Show POS button only if it is enabled from features setup - if(cint(sys_defaults.fs_pos_view)===1 && this.frm.doctype!="Material Request") + if(cint(sys_defaults.fs_pos_view)===1 && this.frm.doctype!="Material Request") { this.make_pos_btn(); + } }, make_pos_btn: function() { @@ -77,6 +78,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ erpnext.open_as_pos = false; } + this.$pos_btn && this.$pos_btn.remove(); + this.$pos_btn = this.frm.appframe.add_primary_action(btn_label, function() { me.toggle_pos(); }, icon, "btn-default"); diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js index 24fbbf0f4d..ca6d007641 100644 --- a/erpnext/selling/doctype/lead/lead.js +++ b/erpnext/selling/doctype/lead/lead.js @@ -20,11 +20,6 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({ cur_frm.fields_dict.contact_by.get_query = function(doc, cdt, cdn) { return { query:"frappe.core.doctype.user.user.user_query" } } } - - if(in_list(user_roles,'System Manager')) { - cur_frm.footer.help_area.innerHTML = '

'+__('Sales Email Settings')+'
\ - '+__('Automatically extract Leads from a mail box e.g.')+' "sales@example.com"

'; - } }, refresh: function() { diff --git a/erpnext/selling/doctype/lead/lead.json b/erpnext/selling/doctype/lead/lead.json index 08efe5c71f..2d3d49c8f8 100644 --- a/erpnext/selling/doctype/lead/lead.json +++ b/erpnext/selling/doctype/lead/lead.json @@ -185,6 +185,12 @@ "oldfieldtype": "Table", "permlevel": 0 }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "label": "fold", + "permlevel": 0 + }, { "fieldname": "contact_info", "fieldtype": "Section Break", @@ -362,7 +368,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2014-05-27 03:49:12.570184", + "modified": "2014-08-12 05:22:18.801092", "modified_by": "Administrator", "module": "Selling", "name": "Lead", diff --git a/erpnext/selling/doctype/opportunity/opportunity.json b/erpnext/selling/doctype/opportunity/opportunity.json index dea15e060c..513fbc8bdb 100644 --- a/erpnext/selling/doctype/opportunity/opportunity.json +++ b/erpnext/selling/doctype/opportunity/opportunity.json @@ -154,6 +154,11 @@ "permlevel": 0, "read_only": 0 }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, { "depends_on": "eval:doc.lead || doc.customer", "fieldname": "contact_info", @@ -411,7 +416,7 @@ "icon": "icon-info-sign", "idx": 1, "is_submittable": 1, - "modified": "2014-07-30 03:37:31.687489", + "modified": "2014-08-12 05:21:51.282397", "modified_by": "Administrator", "module": "Selling", "name": "Opportunity", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index de02584152..0904f25516 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -538,6 +538,12 @@ "read_only": 1, "width": "200px" }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "label": "Fold", + "permlevel": 0 + }, { "fieldname": "terms_section_break", "fieldtype": "Section Break", @@ -827,7 +833,7 @@ "idx": 1, "is_submittable": 1, "max_attachments": 1, - "modified": "2014-07-31 06:34:26.339765", + "modified": "2014-08-12 05:04:36.157045", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 7b07e7d6e4..f4df6a8993 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -315,28 +315,6 @@ "print_hide": 0, "reqd": 1 }, - { - "description": "Display all the individual items delivered with the main items", - "fieldname": "packing_list", - "fieldtype": "Section Break", - "hidden": 0, - "label": "Packing List", - "oldfieldtype": "Section Break", - "options": "icon-suitcase", - "permlevel": 0, - "print_hide": 1 - }, - { - "fieldname": "packing_details", - "fieldtype": "Table", - "label": "Packing Details", - "oldfieldname": "packing_details", - "oldfieldtype": "Table", - "options": "Packed Item", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, { "fieldname": "section_break_31", "fieldtype": "Section Break", @@ -556,6 +534,34 @@ "read_only": 1, "width": "200px" }, + { + "fieldname": "view_details", + "fieldtype": "Fold", + "label": "View Details", + "permlevel": 0 + }, + { + "description": "Display all the individual items delivered with the main items", + "fieldname": "packing_list", + "fieldtype": "Section Break", + "hidden": 0, + "label": "Packing List", + "oldfieldtype": "Section Break", + "options": "icon-suitcase", + "permlevel": 0, + "print_hide": 1 + }, + { + "fieldname": "packing_details", + "fieldtype": "Table", + "label": "Packing Details", + "oldfieldname": "packing_details", + "oldfieldtype": "Table", + "options": "Packed Item", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, { "fieldname": "terms_section_break", "fieldtype": "Section Break", @@ -889,7 +895,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2014-07-31 06:34:14.727868", + "modified": "2014-08-11 07:28:11.362232", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 262ef48545..d9843b1c0b 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -572,6 +572,11 @@ "read_only": 1, "width": "150px" }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, { "fieldname": "terms_section_break", "fieldtype": "Section Break", @@ -1009,7 +1014,7 @@ "idx": 1, "in_create": 0, "is_submittable": 1, - "modified": "2014-07-31 06:34:59.028308", + "modified": "2014-08-12 05:23:55.104153", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json index 0f066dab3b..b7d9c33b1a 100644 --- a/erpnext/stock/doctype/material_request/material_request.json +++ b/erpnext/stock/doctype/material_request/material_request.json @@ -89,6 +89,12 @@ "options": "Material Request Item", "permlevel": 0 }, + { + "fieldname": "view_details", + "fieldtype": "Fold", + "label": "View Details", + "permlevel": 0 + }, { "fieldname": "more_info", "fieldtype": "Section Break", @@ -230,7 +236,7 @@ "icon": "icon-ticket", "idx": 1, "is_submittable": 1, - "modified": "2014-06-23 07:55:49.393708", + "modified": "2014-08-11 07:11:55.802625", "modified_by": "Administrator", "module": "Stock", "name": "Material Request", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 7d823c21b0..54233ba117 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -430,6 +430,11 @@ "print_hide": 0, "read_only": 1 }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, { "fieldname": "terms_section_break", "fieldtype": "Section Break", @@ -762,7 +767,7 @@ "icon": "icon-truck", "idx": 1, "is_submittable": 1, - "modified": "2014-07-31 04:59:25.379024", + "modified": "2014-08-12 05:23:28.960161", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json index 1a5bd180f4..cd4c0f292e 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.json +++ b/erpnext/stock/doctype/stock_entry/stock_entry.json @@ -1,646 +1,651 @@ { - "allow_attach": 0, - "allow_copy": 0, - "allow_import": 1, - "allow_rename": 0, - "autoname": "naming_series:", - "creation": "2013-04-09 11:43:55", - "docstatus": 0, - "doctype": "DocType", + "allow_attach": 0, + "allow_copy": 0, + "allow_import": 1, + "allow_rename": 0, + "autoname": "naming_series:", + "creation": "2013-04-09 11:43:55", + "docstatus": 0, + "doctype": "DocType", "fields": [ { - "fieldname": "col1", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "print_width": "50%", - "read_only": 0, + "fieldname": "col1", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "print_width": "50%", + "read_only": 0, "width": "50%" - }, + }, { - "allow_on_submit": 0, - "fieldname": "naming_series", - "fieldtype": "Select", - "hidden": 0, - "in_filter": 0, - "label": "Series", - "no_copy": 1, - "oldfieldname": "naming_series", - "oldfieldtype": "Select", - "options": "STE-", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 1, + "allow_on_submit": 0, + "fieldname": "naming_series", + "fieldtype": "Select", + "hidden": 0, + "in_filter": 0, + "label": "Series", + "no_copy": 1, + "oldfieldname": "naming_series", + "oldfieldtype": "Select", + "options": "STE-", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 1, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "default": "Material Issue", - "fieldname": "purpose", - "fieldtype": "Select", - "hidden": 0, - "in_filter": 1, - "in_list_view": 1, - "label": "Purpose", - "no_copy": 0, - "oldfieldname": "purpose", - "oldfieldtype": "Select", - "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nManufacture/Repack\nSubcontract\nSales Return\nPurchase Return", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 1, + "allow_on_submit": 0, + "default": "Material Issue", + "fieldname": "purpose", + "fieldtype": "Select", + "hidden": 0, + "in_filter": 1, + "in_list_view": 1, + "label": "Purpose", + "no_copy": 0, + "oldfieldname": "purpose", + "oldfieldtype": "Select", + "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nManufacture/Repack\nSubcontract\nSales Return\nPurchase Return", + "permlevel": 0, + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 1, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:doc.purpose==\"Sales Return\"", - "fieldname": "delivery_note_no", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 0, - "label": "Delivery Note No", - "no_copy": 1, - "oldfieldname": "delivery_note_no", - "oldfieldtype": "Link", - "options": "Delivery Note", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:doc.purpose==\"Sales Return\"", + "fieldname": "delivery_note_no", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 0, + "label": "Delivery Note No", + "no_copy": 1, + "oldfieldname": "delivery_note_no", + "oldfieldtype": "Link", + "options": "Delivery Note", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 1 - }, + }, { - "depends_on": "eval:doc.purpose==\"Sales Return\"", - "fieldname": "sales_invoice_no", - "fieldtype": "Link", - "hidden": 0, - "label": "Sales Invoice No", - "no_copy": 1, - "options": "Sales Invoice", - "permlevel": 0, - "print_hide": 1, + "depends_on": "eval:doc.purpose==\"Sales Return\"", + "fieldname": "sales_invoice_no", + "fieldtype": "Link", + "hidden": 0, + "label": "Sales Invoice No", + "no_copy": 1, + "options": "Sales Invoice", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:doc.purpose==\"Purchase Return\"", - "fieldname": "purchase_receipt_no", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 0, - "label": "Purchase Receipt No", - "no_copy": 1, - "oldfieldname": "purchase_receipt_no", - "oldfieldtype": "Link", - "options": "Purchase Receipt", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:doc.purpose==\"Purchase Return\"", + "fieldname": "purchase_receipt_no", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 0, + "label": "Purchase Receipt No", + "no_copy": 1, + "oldfieldname": "purchase_receipt_no", + "oldfieldtype": "Link", + "options": "Purchase Receipt", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 1 - }, + }, { - "fieldname": "col2", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "print_width": "50%", - "read_only": 0, + "fieldname": "col2", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "print_width": "50%", + "read_only": 0, "width": "50%" - }, + }, { - "allow_on_submit": 0, - "default": "Today", - "fieldname": "posting_date", - "fieldtype": "Date", - "hidden": 0, - "in_filter": 1, - "in_list_view": 0, - "label": "Posting Date", - "no_copy": 1, - "oldfieldname": "posting_date", - "oldfieldtype": "Date", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 1, + "allow_on_submit": 0, + "default": "Today", + "fieldname": "posting_date", + "fieldtype": "Date", + "hidden": 0, + "in_filter": 1, + "in_list_view": 0, + "label": "Posting Date", + "no_copy": 1, + "oldfieldname": "posting_date", + "oldfieldtype": "Date", + "permlevel": 0, + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 1, "search_index": 1 - }, + }, { - "allow_on_submit": 0, - "fieldname": "posting_time", - "fieldtype": "Time", - "hidden": 0, - "in_filter": 0, - "label": "Posting Time", - "no_copy": 1, - "oldfieldname": "posting_time", - "oldfieldtype": "Time", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 1, + "allow_on_submit": 0, + "fieldname": "posting_time", + "fieldtype": "Time", + "hidden": 0, + "in_filter": 0, + "label": "Posting Time", + "no_copy": 1, + "oldfieldname": "posting_time", + "oldfieldtype": "Time", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 1, "search_index": 0 - }, + }, { - "fieldname": "items_section", - "fieldtype": "Section Break", - "label": "Items", - "oldfieldtype": "Section Break", - "permlevel": 0, + "fieldname": "items_section", + "fieldtype": "Section Break", + "label": "Items", + "oldfieldtype": "Section Break", + "permlevel": 0, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "fieldname": "from_warehouse", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Default Source Warehouse", - "no_copy": 1, - "oldfieldname": "from_warehouse", - "oldfieldtype": "Link", - "options": "Warehouse", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "fieldname": "from_warehouse", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 0, + "in_list_view": 1, + "label": "Default Source Warehouse", + "no_copy": 1, + "oldfieldname": "from_warehouse", + "oldfieldtype": "Link", + "options": "Warehouse", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "fieldname": "cb0", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "cb0", + "fieldtype": "Column Break", + "permlevel": 0, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "fieldname": "to_warehouse", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Default Target Warehouse", - "no_copy": 1, - "oldfieldname": "to_warehouse", - "oldfieldtype": "Link", - "options": "Warehouse", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "fieldname": "to_warehouse", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 0, + "in_list_view": 1, + "label": "Default Target Warehouse", + "no_copy": 1, + "oldfieldname": "to_warehouse", + "oldfieldtype": "Link", + "options": "Warehouse", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "fieldname": "sb0", - "fieldtype": "Section Break", - "options": "Simple", - "permlevel": 0, + "fieldname": "sb0", + "fieldtype": "Section Break", + "options": "Simple", + "permlevel": 0, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "fieldname": "mtn_details", - "fieldtype": "Table", - "hidden": 0, - "in_filter": 0, - "label": "MTN Details", - "no_copy": 0, - "oldfieldname": "mtn_details", - "oldfieldtype": "Table", - "options": "Stock Entry Detail", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "fieldname": "mtn_details", + "fieldtype": "Table", + "hidden": 0, + "in_filter": 0, + "label": "MTN Details", + "no_copy": 0, + "oldfieldname": "mtn_details", + "oldfieldtype": "Table", + "options": "Stock Entry Detail", + "permlevel": 0, + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "description": "Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.", - "fieldname": "get_stock_and_rate", - "fieldtype": "Button", - "label": "Get Stock and Rate", - "oldfieldtype": "Button", - "options": "get_stock_and_rate", - "permlevel": 0, - "print_hide": 1, + "description": "Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.", + "fieldname": "get_stock_and_rate", + "fieldtype": "Button", + "label": "Get Stock and Rate", + "oldfieldtype": "Button", + "options": "get_stock_and_rate", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "depends_on": "eval:(doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")", - "fieldname": "sb1", - "fieldtype": "Section Break", - "label": "From Bill of Materials", - "permlevel": 0, + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, + { + "depends_on": "eval:(doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")", + "fieldname": "sb1", + "fieldtype": "Section Break", + "label": "From Bill of Materials", + "permlevel": 0, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:inList([\"Material Transfer\", \"Manufacture/Repack\"], doc.purpose)", - "fieldname": "production_order", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 1, - "label": "Production Order", - "no_copy": 0, - "oldfieldname": "production_order", - "oldfieldtype": "Link", - "options": "Production Order", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:inList([\"Material Transfer\", \"Manufacture/Repack\"], doc.purpose)", + "fieldname": "production_order", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 1, + "label": "Production Order", + "no_copy": 0, + "oldfieldname": "production_order", + "oldfieldtype": "Link", + "options": "Production Order", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 1 - }, + }, { - "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", - "fieldname": "bom_no", - "fieldtype": "Link", - "label": "BOM No", - "options": "BOM", - "permlevel": 0, + "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", + "fieldname": "bom_no", + "fieldtype": "Link", + "label": "BOM No", + "options": "BOM", + "permlevel": 0, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", - "description": "As per Stock UOM", - "fieldname": "fg_completed_qty", - "fieldtype": "Float", - "hidden": 0, - "in_filter": 0, - "label": "Manufacturing Quantity", - "no_copy": 0, - "oldfieldname": "fg_completed_qty", - "oldfieldtype": "Currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", + "description": "As per Stock UOM", + "fieldname": "fg_completed_qty", + "fieldtype": "Float", + "hidden": 0, + "in_filter": 0, + "label": "Manufacturing Quantity", + "no_copy": 0, + "oldfieldname": "fg_completed_qty", + "oldfieldtype": "Currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "fieldname": "cb1", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "cb1", + "fieldtype": "Column Break", + "permlevel": 0, "read_only": 0 - }, + }, { - "default": "1", - "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", - "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", - "fieldname": "use_multi_level_bom", - "fieldtype": "Check", - "label": "Use Multi-Level BOM", - "permlevel": 0, - "print_hide": 1, + "default": "1", + "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", + "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", + "fieldname": "use_multi_level_bom", + "fieldtype": "Check", + "label": "Use Multi-Level BOM", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", - "fieldname": "get_items", - "fieldtype": "Button", - "hidden": 0, - "in_filter": 0, - "label": "Get Items", - "no_copy": 0, - "oldfieldtype": "Button", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", + "fieldname": "get_items", + "fieldtype": "Button", + "hidden": 0, + "in_filter": 0, + "label": "Get Items", + "no_copy": 0, + "oldfieldtype": "Button", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "depends_on": "eval:(doc.purpose==\"Sales Return\" || doc.purpose==\"Purchase Return\")", - "fieldname": "contact_section", - "fieldtype": "Section Break", - "label": "Contact Info", - "permlevel": 0, + "depends_on": "eval:(doc.purpose==\"Sales Return\" || doc.purpose==\"Purchase Return\")", + "fieldname": "contact_section", + "fieldtype": "Section Break", + "label": "Contact Info", + "permlevel": 0, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:doc.purpose==\"Purchase Return\"", - "fieldname": "supplier", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 0, - "label": "Supplier", - "no_copy": 1, - "oldfieldname": "supplier", - "oldfieldtype": "Link", - "options": "Supplier", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:doc.purpose==\"Purchase Return\"", + "fieldname": "supplier", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 0, + "label": "Supplier", + "no_copy": 1, + "oldfieldname": "supplier", + "oldfieldtype": "Link", + "options": "Supplier", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:doc.purpose==\"Purchase Return\"", - "fieldname": "supplier_name", - "fieldtype": "Data", - "hidden": 0, - "in_filter": 0, - "label": "Supplier Name", - "no_copy": 1, - "oldfieldname": "supplier_name", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 0, - "read_only": 1, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:doc.purpose==\"Purchase Return\"", + "fieldname": "supplier_name", + "fieldtype": "Data", + "hidden": 0, + "in_filter": 0, + "label": "Supplier Name", + "no_copy": 1, + "oldfieldname": "supplier_name", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:doc.purpose==\"Purchase Return\"", - "fieldname": "supplier_address", - "fieldtype": "Small Text", - "hidden": 0, - "in_filter": 0, - "label": "Supplier Address", - "no_copy": 1, - "oldfieldname": "supplier_address", - "oldfieldtype": "Small Text", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:doc.purpose==\"Purchase Return\"", + "fieldname": "supplier_address", + "fieldtype": "Small Text", + "hidden": 0, + "in_filter": 0, + "label": "Supplier Address", + "no_copy": 1, + "oldfieldname": "supplier_address", + "oldfieldtype": "Small Text", + "permlevel": 0, + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:doc.purpose==\"Sales Return\"", - "fieldname": "customer", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 0, - "label": "Customer", - "no_copy": 1, - "oldfieldname": "customer", - "oldfieldtype": "Link", - "options": "Customer", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:doc.purpose==\"Sales Return\"", + "fieldname": "customer", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 0, + "label": "Customer", + "no_copy": 1, + "oldfieldname": "customer", + "oldfieldtype": "Link", + "options": "Customer", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:doc.purpose==\"Sales Return\"", - "fieldname": "customer_name", - "fieldtype": "Data", - "hidden": 0, - "in_filter": 0, - "label": "Customer Name", - "no_copy": 1, - "oldfieldname": "customer_name", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 0, - "read_only": 1, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:doc.purpose==\"Sales Return\"", + "fieldname": "customer_name", + "fieldtype": "Data", + "hidden": 0, + "in_filter": 0, + "label": "Customer Name", + "no_copy": 1, + "oldfieldname": "customer_name", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 0, + "read_only": 1, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "depends_on": "eval:doc.purpose==\"Sales Return\"", - "fieldname": "customer_address", - "fieldtype": "Small Text", - "hidden": 0, - "in_filter": 0, - "label": "Customer Address", - "no_copy": 1, - "oldfieldname": "customer_address", - "oldfieldtype": "Small Text", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "depends_on": "eval:doc.purpose==\"Sales Return\"", + "fieldname": "customer_address", + "fieldtype": "Small Text", + "hidden": 0, + "in_filter": 0, + "label": "Customer Address", + "no_copy": 1, + "oldfieldname": "customer_address", + "oldfieldtype": "Small Text", + "permlevel": 0, + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "fieldname": "more_info", - "fieldtype": "Section Break", - "label": "More Info", - "oldfieldtype": "Section Break", - "permlevel": 0, + "fieldname": "more_info", + "fieldtype": "Section Break", + "label": "More Info", + "oldfieldtype": "Section Break", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "project_name", - "fieldtype": "Link", - "in_filter": 1, - "label": "Project Name", - "oldfieldname": "project_name", - "oldfieldtype": "Link", - "options": "Project", - "permlevel": 0, + "fieldname": "project_name", + "fieldtype": "Link", + "in_filter": 1, + "label": "Project Name", + "oldfieldname": "project_name", + "oldfieldtype": "Link", + "options": "Project", + "permlevel": 0, "read_only": 0 - }, + }, { - "allow_on_submit": 0, - "fieldname": "remarks", - "fieldtype": "Text", - "hidden": 0, - "in_filter": 0, - "label": "Remarks", - "no_copy": 1, - "oldfieldname": "remarks", - "oldfieldtype": "Text", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "fieldname": "remarks", + "fieldtype": "Text", + "hidden": 0, + "in_filter": 0, + "label": "Remarks", + "no_copy": 1, + "oldfieldname": "remarks", + "oldfieldtype": "Text", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "fieldname": "col5", - "fieldtype": "Column Break", - "permlevel": 0, - "print_width": "50%", - "read_only": 0, + "fieldname": "col5", + "fieldtype": "Column Break", + "permlevel": 0, + "print_width": "50%", + "read_only": 0, "width": "50%" - }, + }, { - "fieldname": "total_amount", - "fieldtype": "Currency", - "label": "Total Amount", - "options": "Company:company:default_currency", - "permlevel": 0, + "fieldname": "total_amount", + "fieldtype": "Currency", + "label": "Total Amount", + "options": "Company:company:default_currency", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "fiscal_year", - "fieldtype": "Link", - "in_filter": 0, - "label": "Fiscal Year", - "options": "Fiscal Year", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "fieldname": "fiscal_year", + "fieldtype": "Link", + "in_filter": 0, + "label": "Fiscal Year", + "options": "Fiscal Year", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "reqd": 1 - }, + }, { - "allow_on_submit": 0, - "fieldname": "company", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 1, - "label": "Company", - "no_copy": 0, - "oldfieldname": "company", - "oldfieldtype": "Link", - "options": "Company", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, - "reqd": 1, + "allow_on_submit": 0, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 1, + "label": "Company", + "no_copy": 0, + "oldfieldname": "company", + "oldfieldtype": "Link", + "options": "Company", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, + "reqd": 1, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "fieldname": "select_print_heading", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 0, - "label": "Print Heading", - "no_copy": 0, - "oldfieldname": "select_print_heading", - "oldfieldtype": "Link", - "options": "Print Heading", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "fieldname": "select_print_heading", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 0, + "label": "Print Heading", + "no_copy": 0, + "oldfieldname": "select_print_heading", + "oldfieldtype": "Link", + "options": "Print Heading", + "permlevel": 0, + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "allow_on_submit": 0, - "fieldname": "amended_from", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 1, - "in_filter": 0, - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Link", - "options": "Stock Entry", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, - "report_hide": 0, - "reqd": 0, + "allow_on_submit": 0, + "fieldname": "amended_from", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "in_filter": 0, + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Link", + "options": "Stock Entry", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, + "report_hide": 0, + "reqd": 0, "search_index": 0 } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "icon-file-text", - "idx": 1, - "in_create": 0, - "in_dialog": 0, - "is_submittable": 1, - "issingle": 0, - "max_attachments": 0, - "modified": "2014-07-24 08:52:33.496200", - "modified_by": "Administrator", - "module": "Stock", - "name": "Stock Entry", - "owner": "Administrator", + ], + "hide_heading": 0, + "hide_toolbar": 0, + "icon": "icon-file-text", + "idx": 1, + "in_create": 0, + "in_dialog": 0, + "is_submittable": 1, + "issingle": 0, + "max_attachments": 0, + "modified": "2014-08-12 05:24:41.892586", + "modified_by": "Administrator", + "module": "Stock", + "name": "Stock Entry", + "owner": "Administrator", "permissions": [ { - "amend": 1, - "apply_user_permissions": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Material User", - "submit": 1, + "amend": 1, + "apply_user_permissions": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Material User", + "submit": 1, "write": 1 - }, + }, { - "amend": 1, - "apply_user_permissions": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Manufacturing User", - "submit": 1, + "amend": 1, + "apply_user_permissions": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Manufacturing User", + "submit": 1, "write": 1 - }, + }, { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Manufacturing Manager", - "submit": 1, + "amend": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Manufacturing Manager", + "submit": 1, "write": 1 - }, + }, { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Material Manager", - "submit": 1, + "amend": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Material Manager", + "submit": 1, "write": 1 } - ], - "read_only": 0, - "read_only_onload": 0, - "search_fields": "from_warehouse, to_warehouse, purpose, remarks", - "sort_field": "modified", + ], + "read_only": 0, + "read_only_onload": 0, + "search_fields": "transfer_date, from_warehouse, to_warehouse, purpose, remarks", + "sort_field": "modified", "sort_order": "DESC" -} +} \ No newline at end of file diff --git a/erpnext/support/doctype/support_ticket/support_ticket.js b/erpnext/support/doctype/support_ticket/support_ticket.js index 919ae65555..d4531dc8b7 100644 --- a/erpnext/support/doctype/support_ticket/support_ticket.js +++ b/erpnext/support/doctype/support_ticket/support_ticket.js @@ -9,13 +9,6 @@ frappe.provide("erpnext.support"); cur_frm.add_fetch("customer", "customer_name", "customer_name") $.extend(cur_frm.cscript, { - onload: function(doc, dt, dn) { - if(in_list(user_roles,'System Manager')) { - cur_frm.footer.help_area.innerHTML = '

'+__("Support Email Settings")+'
\ - '+__("Integrate incoming support emails to Support Ticket")+'

'; - } - }, - refresh: function(doc) { erpnext.toggle_naming_series(); cur_frm.cscript.make_listing(doc); diff --git a/erpnext/support/doctype/support_ticket/support_ticket.json b/erpnext/support/doctype/support_ticket/support_ticket.json index ff7867e727..6dd54a2b65 100644 --- a/erpnext/support/doctype/support_ticket/support_ticket.json +++ b/erpnext/support/doctype/support_ticket/support_ticket.json @@ -1,290 +1,295 @@ { - "allow_attach": 1, - "autoname": "naming_series:", - "creation": "2013-02-01 10:36:25", - "docstatus": 0, - "doctype": "DocType", + "allow_attach": 1, + "autoname": "naming_series:", + "creation": "2013-02-01 10:36:25", + "docstatus": 0, + "doctype": "DocType", "fields": [ { - "fieldname": "subject_section", - "fieldtype": "Section Break", - "label": "Subject", - "options": "icon-flag", + "fieldname": "subject_section", + "fieldtype": "Section Break", + "label": "Subject", + "options": "icon-flag", "permlevel": 0 - }, + }, { - "fieldname": "naming_series", - "fieldtype": "Select", - "hidden": 0, - "label": "Series", - "no_copy": 1, - "options": "SUP-", - "permlevel": 0, - "print_hide": 1, - "reqd": 0, + "fieldname": "naming_series", + "fieldtype": "Select", + "hidden": 0, + "label": "Series", + "no_copy": 1, + "options": "SUP-", + "permlevel": 0, + "print_hide": 1, + "reqd": 0, "search_index": 0 - }, + }, { - "fieldname": "subject", - "fieldtype": "Data", - "in_filter": 1, - "in_list_view": 1, - "label": "Subject", - "permlevel": 0, - "report_hide": 0, - "reqd": 1, + "fieldname": "subject", + "fieldtype": "Data", + "in_filter": 1, + "in_list_view": 1, + "label": "Subject", + "permlevel": 0, + "report_hide": 0, + "reqd": 1, "search_index": 0 - }, + }, { - "fieldname": "cb00", - "fieldtype": "Column Break", + "fieldname": "cb00", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "default": "Open", - "fieldname": "status", - "fieldtype": "Select", - "in_filter": 0, - "in_list_view": 1, - "label": "Status", - "no_copy": 1, - "oldfieldname": "status", - "oldfieldtype": "Select", - "options": "Open\nReplied\nHold\nClosed", - "permlevel": 0, - "read_only": 0, - "reqd": 0, + "default": "Open", + "fieldname": "status", + "fieldtype": "Select", + "in_filter": 0, + "in_list_view": 1, + "label": "Status", + "no_copy": 1, + "oldfieldname": "status", + "oldfieldtype": "Select", + "options": "Open\nReplied\nHold\nClosed", + "permlevel": 0, + "read_only": 0, + "reqd": 0, "search_index": 1 - }, + }, { - "depends_on": "eval:doc.__islocal", - "fieldname": "raised_by", - "fieldtype": "Data", - "in_filter": 1, - "in_list_view": 1, - "label": "Raised By (Email)", - "oldfieldname": "raised_by", - "oldfieldtype": "Data", - "permlevel": 0, + "depends_on": "eval:doc.__islocal", + "fieldname": "raised_by", + "fieldtype": "Data", + "in_filter": 1, + "in_list_view": 1, + "label": "Raised By (Email)", + "oldfieldname": "raised_by", + "oldfieldtype": "Data", + "permlevel": 0, "reqd": 1 - }, + }, { - "fieldname": "sb00", - "fieldtype": "Section Break", - "label": "Messages", - "options": "icon-comments", + "fieldname": "sb00", + "fieldtype": "Section Break", + "label": "Messages", + "options": "icon-comments", "permlevel": 0 - }, + }, { - "depends_on": "eval:doc.__islocal", - "fieldname": "description", - "fieldtype": "Text", - "label": "Description", - "oldfieldname": "problem_description", - "oldfieldtype": "Text", - "permlevel": 0, + "depends_on": "eval:doc.__islocal", + "fieldname": "description", + "fieldtype": "Text", + "label": "Description", + "oldfieldname": "problem_description", + "oldfieldtype": "Text", + "permlevel": 0, "reqd": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "thread_html", - "fieldtype": "HTML", - "label": "Thread HTML", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "thread_html", + "fieldtype": "HTML", + "label": "Thread HTML", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "additional_info", - "fieldtype": "Section Break", - "label": "Reference", - "options": "icon-pushpin", - "permlevel": 0, + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, + { + "fieldname": "additional_info", + "fieldtype": "Section Break", + "label": "Reference", + "options": "icon-pushpin", + "permlevel": 0, "read_only": 1 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "column_break0", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "read_only": 1, + "depends_on": "eval:!doc.__islocal", + "fieldname": "column_break0", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "read_only": 1, "width": "50%" - }, + }, { - "fieldname": "lead", - "fieldtype": "Link", - "label": "Lead", - "options": "Lead", + "fieldname": "lead", + "fieldtype": "Link", + "label": "Lead", + "options": "Lead", "permlevel": 0 - }, + }, { - "fieldname": "contact", - "fieldtype": "Link", - "label": "Contact", - "options": "Contact", + "fieldname": "contact", + "fieldtype": "Link", + "label": "Contact", + "options": "Contact", "permlevel": 0 - }, + }, { - "fieldname": "customer", - "fieldtype": "Link", - "in_filter": 1, - "label": "Customer", - "oldfieldname": "customer", - "oldfieldtype": "Link", - "options": "Customer", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 0, + "fieldname": "customer", + "fieldtype": "Link", + "in_filter": 1, + "label": "Customer", + "oldfieldname": "customer", + "oldfieldtype": "Link", + "options": "Customer", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 0, "search_index": 1 - }, + }, { - "fieldname": "customer_name", - "fieldtype": "Data", - "in_filter": 1, - "label": "Customer Name", - "oldfieldname": "customer_name", - "oldfieldtype": "Data", - "permlevel": 0, - "read_only": 1, - "reqd": 0, + "fieldname": "customer_name", + "fieldtype": "Data", + "in_filter": 1, + "label": "Customer Name", + "oldfieldname": "customer_name", + "oldfieldtype": "Data", + "permlevel": 0, + "read_only": 1, + "reqd": 0, "search_index": 0 - }, + }, { - "default": "Today", - "fieldname": "opening_date", - "fieldtype": "Date", - "label": "Opening Date", - "no_copy": 1, - "oldfieldname": "opening_date", - "oldfieldtype": "Date", - "permlevel": 0, + "default": "Today", + "fieldname": "opening_date", + "fieldtype": "Date", + "label": "Opening Date", + "no_copy": 1, + "oldfieldname": "opening_date", + "oldfieldtype": "Date", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "opening_time", - "fieldtype": "Time", - "label": "Opening Time", - "no_copy": 1, - "oldfieldname": "opening_time", - "oldfieldtype": "Time", - "permlevel": 0, + "fieldname": "opening_time", + "fieldtype": "Time", + "label": "Opening Time", + "no_copy": 1, + "oldfieldname": "opening_time", + "oldfieldtype": "Time", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "company", - "fieldtype": "Link", - "label": "Company", - "options": "Company", - "permlevel": 0, - "print_hide": 1, + "fieldname": "company", + "fieldtype": "Link", + "label": "Company", + "options": "Company", + "permlevel": 0, + "print_hide": 1, "reqd": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "column_break1", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "column_break1", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "first_responded_on", - "fieldtype": "Datetime", - "label": "First Responded On", + "fieldname": "first_responded_on", + "fieldtype": "Datetime", + "label": "First Responded On", "permlevel": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "resolution_date", - "fieldtype": "Datetime", - "in_filter": 0, - "label": "Resolution Date", - "no_copy": 1, - "oldfieldname": "resolution_date", - "oldfieldtype": "Date", - "permlevel": 0, - "read_only": 1, + "depends_on": "eval:!doc.__islocal", + "fieldname": "resolution_date", + "fieldtype": "Datetime", + "in_filter": 0, + "label": "Resolution Date", + "no_copy": 1, + "oldfieldname": "resolution_date", + "oldfieldtype": "Date", + "permlevel": 0, + "read_only": 1, "search_index": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "resolution_details", - "fieldtype": "Small Text", - "label": "Resolution Details", - "no_copy": 1, - "oldfieldname": "resolution_details", - "oldfieldtype": "Text", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "resolution_details", + "fieldtype": "Small Text", + "label": "Resolution Details", + "no_copy": 1, + "oldfieldname": "resolution_details", + "oldfieldtype": "Text", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "content_type", - "fieldtype": "Data", - "hidden": 1, - "label": "Content Type", + "fieldname": "content_type", + "fieldtype": "Data", + "hidden": 1, + "label": "Content Type", "permlevel": 0 - }, + }, { - "fieldname": "communications", - "fieldtype": "Table", - "hidden": 1, - "label": "Communications", - "options": "Communication", - "permlevel": 0, + "fieldname": "communications", + "fieldtype": "Table", + "hidden": 1, + "label": "Communications", + "options": "Communication", + "permlevel": 0, "print_hide": 1 } - ], - "icon": "icon-ticket", - "idx": 1, - "modified": "2014-06-03 10:49:47.781578", - "modified_by": "Administrator", - "module": "Support", - "name": "Support Ticket", - "owner": "Administrator", + ], + "icon": "icon-ticket", + "idx": 1, + "modified": "2014-08-12 05:25:45.420934", + "modified_by": "Administrator", + "module": "Support", + "name": "Support Ticket", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "create": 1, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Guest", - "submit": 0, + "amend": 0, + "create": 1, + "delete": 0, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Guest", + "submit": 0, "write": 1 - }, + }, { - "amend": 0, - "apply_user_permissions": 1, - "create": 1, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Customer", - "submit": 0, + "amend": 0, + "apply_user_permissions": 1, + "create": 1, + "delete": 0, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Customer", + "submit": 0, "write": 1 - }, + }, { - "amend": 0, - "apply_user_permissions": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Support Team", - "submit": 0, + "amend": 0, + "apply_user_permissions": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Support Team", + "submit": 0, "write": 1 } - ], - "search_fields": "status,customer,subject,raised_by", + ], + "search_fields": "status,customer,subject,raised_by", "title_field": "subject" -} +} \ No newline at end of file diff --git a/erpnext/support/doctype/support_ticket/test_records.json b/erpnext/support/doctype/support_ticket/test_records.json new file mode 100644 index 0000000000..85bd3a2410 --- /dev/null +++ b/erpnext/support/doctype/support_ticket/test_records.json @@ -0,0 +1,6 @@ +[ + { + "doctype": "Support Ticket", + "name": "_Test Support Ticket 1" + } +] diff --git a/erpnext/support/doctype/support_ticket/test_support_ticket.py b/erpnext/support/doctype/support_ticket/test_support_ticket.py new file mode 100644 index 0000000000..b5ce34af4b --- /dev/null +++ b/erpnext/support/doctype/support_ticket/test_support_ticket.py @@ -0,0 +1,10 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors +# See license.txt + +import frappe +import unittest + +test_records = frappe.get_test_records('Support Ticket') + +class TestSupportTicket(unittest.TestCase): + pass From 0d0f5f6c25a9e76e23a333d96ec45e7171687240 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Aug 2014 11:43:27 +0530 Subject: [PATCH 2/3] [ux] fixes to timeline --- .../journal_voucher/journal_voucher.json | 68 +++++++++---------- .../doctype/sales_invoice/sales_invoice.json | 7 +- erpnext/home/page/activity/activity.js | 6 +- .../doctype/support_ticket/test_records.json | 4 +- 4 files changed, 46 insertions(+), 39 deletions(-) diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json index 6ba2d44c3c..0351fd1da8 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json @@ -123,12 +123,6 @@ "permlevel": 0, "read_only": 1 }, - { - "fieldname": "column_break99", - "fieldtype": "Column Break", - "permlevel": 0, - "read_only": 0 - }, { "fieldname": "difference", "fieldtype": "Currency", @@ -150,16 +144,8 @@ "read_only": 0 }, { - "fieldname": "view_details", - "fieldtype": "Fold", - "label": "View Details", - "permlevel": 0 - }, - { - "fieldname": "reference", - "fieldtype": "Section Break", - "label": "Reference", - "options": "icon-pushpin", + "fieldname": "column_break99", + "fieldtype": "Column Break", "permlevel": 0, "read_only": 0 }, @@ -187,6 +173,31 @@ "permlevel": 0, "read_only": 0 }, + { + "fieldname": "user_remark", + "fieldtype": "Small Text", + "in_filter": 1, + "label": "User Remark", + "no_copy": 1, + "oldfieldname": "user_remark", + "oldfieldtype": "Small Text", + "permlevel": 0, + "read_only": 0 + }, + { + "fieldname": "view_details", + "fieldtype": "Fold", + "label": "View Details", + "permlevel": 0 + }, + { + "fieldname": "reference", + "fieldtype": "Section Break", + "label": "Reference", + "options": "icon-pushpin", + "permlevel": 0, + "read_only": 0 + }, { "fieldname": "clearance_date", "fieldtype": "Date", @@ -200,23 +211,6 @@ "read_only": 1, "search_index": 1 }, - { - "fieldname": "column_break98", - "fieldtype": "Column Break", - "permlevel": 0, - "read_only": 0 - }, - { - "fieldname": "user_remark", - "fieldtype": "Small Text", - "in_filter": 1, - "label": "User Remark", - "no_copy": 1, - "oldfieldname": "user_remark", - "oldfieldtype": "Small Text", - "permlevel": 0, - "read_only": 0 - }, { "description": "User Remark will be added to Auto Remark", "fieldname": "remark", @@ -230,6 +224,12 @@ "read_only": 1, "reqd": 0 }, + { + "fieldname": "column_break98", + "fieldtype": "Column Break", + "permlevel": 0, + "read_only": 0 + }, { "fieldname": "bill_no", "fieldtype": "Data", @@ -446,7 +446,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-08-11 07:29:48.343753", + "modified": "2014-08-14 01:37:14.822939", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Voucher", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index a7827bc73f..ae6437a8ac 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -714,6 +714,11 @@ "print_hide": 1, "read_only": 0 }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, { "fieldname": "terms_section_break", "fieldtype": "Section Break", @@ -1188,7 +1193,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-07-31 06:34:41.295337", + "modified": "2014-08-14 02:13:09.673510", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index 4562ca8e39..ac44b4d776 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -24,9 +24,9 @@ frappe.pages['activity'].onload = function(wrapper) { // Build Report Button if(frappe.boot.user.can_get_report.indexOf("Feed")!=-1) { - wrapper.appframe.add_primary_action(__('Build Report'), function() { + wrapper.appframe.add_button(__('Build Report'), function() { frappe.set_route('Report', "Feed"); - }, 'icon-th', true); + }, 'icon-th'); } } @@ -81,7 +81,7 @@ erpnext.ActivityFeed = Class.extend({ } else { pdate = dateutil.global_date_format(date); } - $(row).html(repl('
%(date)s
', {date: pdate})); + $(row).html(repl('
%(date)s
', {date: pdate})); } erpnext.last_feed_date = date; } diff --git a/erpnext/support/doctype/support_ticket/test_records.json b/erpnext/support/doctype/support_ticket/test_records.json index 85bd3a2410..30390b06d1 100644 --- a/erpnext/support/doctype/support_ticket/test_records.json +++ b/erpnext/support/doctype/support_ticket/test_records.json @@ -1,6 +1,8 @@ [ { "doctype": "Support Ticket", - "name": "_Test Support Ticket 1" + "name": "_Test Support Ticket 1", + "subject": "Test Support", + "raised_by": "test@example.com" } ] From c31a1eec5b123c7048079c53ec0bdc8a664c5999 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Aug 2014 11:47:31 +0530 Subject: [PATCH 3/3] [ux] fixes to timeline --- .../doctype/supplier_quotation/supplier_quotation.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index 235e4ebbc9..20aaf78d4f 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -433,6 +433,11 @@ "print_hide": 0, "read_only": 1 }, + { + "fieldname": "fold", + "fieldtype": "Fold", + "permlevel": 0 + }, { "fieldname": "terms_section_break", "fieldtype": "Section Break", @@ -571,7 +576,7 @@ "icon": "icon-shopping-cart", "idx": 1, "is_submittable": 1, - "modified": "2014-07-31 04:59:24.134759", + "modified": "2014-08-14 02:17:26.401532", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation",