From 8aded138c7e08b2f21d79e7f9c1be30a64f618c0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 4 Jul 2013 12:50:52 +0530 Subject: [PATCH] [buying] started cleanup, [mapper] started rewrite --- .../purchase_common/purchase_common.js | 6 ++ .../doctype/purchase_order/purchase_order.txt | 44 +++++++++------ buying/doctype/supplier/supplier.js | 2 +- buying/doctype/supplier/supplier.txt | 15 +++-- .../supplier_quotation/supplier_quotation.txt | 56 +++++++++++-------- selling/doctype/lead/lead.js | 36 ++---------- selling/doctype/lead/lead.py | 22 +++++++- selling/doctype/lead/test_lead.py | 16 ++++++ selling/doctype/quotation/quotation.py | 7 ++- selling/doctype/quotation/quotation.txt | 3 +- selling/doctype/quotation/test_quotation.py | 49 ++++++++++++++++ selling/doctype/sales_common/sales_common.js | 6 ++ selling/doctype/sales_order/sales_order.txt | 3 +- stock/doctype/item/item.js | 8 +++ .../material_request/material_request.js | 10 ++++ .../material_request/material_request.txt | 22 +++++--- stock/page/stock_home/stock_home.js | 10 ++-- 17 files changed, 218 insertions(+), 97 deletions(-) create mode 100644 selling/doctype/quotation/test_quotation.py diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js index f9694d0695..c8e4aa3585 100644 --- a/buying/doctype/purchase_common/purchase_common.js +++ b/buying/doctype/purchase_common/purchase_common.js @@ -53,6 +53,12 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ }); }, + refresh: function(doc) { + this.frm.toggle_display("supplier_name", + (this.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier)); + this._super(); + }, + supplier: function() { if(this.frm.doc.supplier || this.frm.doc.credit_to) { if(!this.frm.doc.company) { diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index b78552f49f..b2bf1464aa 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-06-11 16:05:08", + "modified": "2013-07-04 10:48:54", "modified_by": "Administrator", "owner": "Administrator" }, @@ -39,6 +39,13 @@ "doctype": "DocType", "name": "Purchase Order" }, + { + "doctype": "DocField", + "fieldname": "supplier_section", + "fieldtype": "Section Break", + "label": "Supplier", + "options": "icon-user" + }, { "description": "To manage multiple series please go to Setup > Manage Series", "doctype": "DocField", @@ -67,7 +74,6 @@ "search_index": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "supplier_name", "fieldtype": "Data", @@ -77,38 +83,34 @@ "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "address_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Address", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Contact", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_mobile", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Mobile No", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_email", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Contact Email", "print_hide": 1, "read_only": 1 @@ -139,7 +141,8 @@ "fieldname": "items", "fieldtype": "Section Break", "label": "Items", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart" }, { "allow_on_submit": 1, @@ -155,8 +158,7 @@ { "doctype": "DocField", "fieldname": "sb_last_purchase", - "fieldtype": "Section Break", - "options": "Simple" + "fieldtype": "Section Break" }, { "doctype": "DocField", @@ -238,7 +240,8 @@ "doctype": "DocField", "fieldname": "price_list_and_currency", "fieldtype": "Section Break", - "label": "Currency & Price List" + "label": "Currency & Price List", + "options": "icon-tag" }, { "doctype": "DocField", @@ -309,6 +312,7 @@ "fieldtype": "Section Break", "label": "Taxes", "oldfieldtype": "Section Break", + "options": "icon-money", "print_hide": 0 }, { @@ -364,7 +368,8 @@ "fieldname": "totals", "fieldtype": "Section Break", "label": "Totals", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-money" }, { "doctype": "DocField", @@ -523,7 +528,8 @@ "fieldname": "terms_section_break", "fieldtype": "Section Break", "label": "Terms and Conditions", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-legal" }, { "doctype": "DocField", @@ -555,7 +561,8 @@ "doctype": "DocField", "fieldname": "contact_section", "fieldtype": "Section Break", - "label": "Contact Info" + "label": "Contact Info", + "options": "icon-bullhorn" }, { "doctype": "DocField", @@ -759,8 +766,9 @@ "doctype": "DocField", "fieldname": "raw_material_details", "fieldtype": "Section Break", - "label": "Raw Material Details", + "label": "Raw Materials Supplied", "oldfieldtype": "Section Break", + "options": "icon-truck", "print_hide": 1 }, { diff --git a/buying/doctype/supplier/supplier.js b/buying/doctype/supplier/supplier.js index 901b3cc4fa..5374d506fc 100644 --- a/buying/doctype/supplier/supplier.js +++ b/buying/doctype/supplier/supplier.js @@ -45,7 +45,7 @@ cur_frm.cscript.refresh = function(doc,dt,dn) { } cur_frm.cscript.make_dashboard = function(doc) { - cur_frm.dashboard.wrapper.empty().toggle(doc.__islocal ? false : true); + cur_frm.dashboard.reset(); if(doc.__islocal) return; cur_frm.dashboard.set_headline('Loading...') diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt index 95fa717cfb..3d71e1d1db 100644 --- a/buying/doctype/supplier/supplier.txt +++ b/buying/doctype/supplier/supplier.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:11", "docstatus": 0, - "modified": "2013-01-29 14:35:42", + "modified": "2013-07-04 10:13:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -46,7 +46,8 @@ "fieldname": "basic_info", "fieldtype": "Section Break", "label": "Basic Info", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-user" }, { "doctype": "DocField", @@ -91,7 +92,8 @@ "fieldname": "address_contacts", "fieldtype": "Section Break", "label": "Address & Contacts", - "oldfieldtype": "Column Break" + "oldfieldtype": "Column Break", + "options": "icon-map-marker" }, { "depends_on": "eval:doc.__islocal", @@ -132,7 +134,9 @@ { "doctype": "DocField", "fieldname": "communication_history", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Communication History", + "options": "icon-comments" }, { "doctype": "DocField", @@ -145,7 +149,8 @@ "fieldname": "more_info", "fieldtype": "Section Break", "label": "More Info", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-file-text" }, { "description": "Enter the company name under which Account Head will be created for this Supplier", diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt index 072b146871..d9ecf602de 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.txt +++ b/buying/doctype/supplier_quotation/supplier_quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:45", "docstatus": 0, - "modified": "2013-06-11 16:05:53", + "modified": "2013-07-04 10:51:05", "modified_by": "Administrator", "owner": "Administrator" }, @@ -39,6 +39,13 @@ "doctype": "DocType", "name": "Supplier Quotation" }, + { + "doctype": "DocField", + "fieldname": "supplier_section", + "fieldtype": "Section Break", + "label": "Supplier", + "options": "icon-user" + }, { "description": "To manage multiple series please go to Setup > Manage Series", "doctype": "DocField", @@ -67,7 +74,6 @@ "search_index": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "supplier_name", "fieldtype": "Data", @@ -77,38 +83,34 @@ "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "address_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Address", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Contact", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_mobile", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Mobile No", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_email", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Contact Email", "print_hide": 1, "read_only": 1 @@ -139,7 +141,8 @@ "fieldname": "items", "fieldtype": "Section Break", "label": "Items", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart" }, { "allow_on_submit": 1, @@ -155,8 +158,7 @@ { "doctype": "DocField", "fieldname": "section_break0", - "fieldtype": "Section Break", - "options": "Simple" + "fieldtype": "Section Break" }, { "doctype": "DocField", @@ -168,8 +170,7 @@ { "doctype": "DocField", "fieldname": "section_break_14", - "fieldtype": "Section Break", - "options": "Simple" + "fieldtype": "Section Break" }, { "description": "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", @@ -197,7 +198,8 @@ "doctype": "DocField", "fieldname": "currency_price_list", "fieldtype": "Section Break", - "label": "Currency & Price List" + "label": "Currency & Price List", + "options": "icon-tag" }, { "description": "Supplier's currency", @@ -264,7 +266,8 @@ "fieldname": "taxes", "fieldtype": "Section Break", "label": "Taxes", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-money" }, { "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", @@ -319,7 +322,8 @@ "fieldname": "totals", "fieldtype": "Section Break", "label": "Totals", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-money" }, { "doctype": "DocField", @@ -478,7 +482,8 @@ "fieldname": "terms_section_break", "fieldtype": "Section Break", "label": "Terms and Conditions", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-legal" }, { "allow_on_submit": 1, @@ -512,7 +517,7 @@ "doctype": "DocField", "fieldname": "terms", "fieldtype": "Text Editor", - "label": "Terms and Conditions1", + "label": "Terms and Conditions", "oldfieldname": "terms", "oldfieldtype": "Text Editor" }, @@ -521,7 +526,8 @@ "doctype": "DocField", "fieldname": "contact_section", "fieldtype": "Section Break", - "label": "Contact Info" + "label": "Contact Info", + "options": "icon-bullhorn" }, { "doctype": "DocField", @@ -546,7 +552,8 @@ "fieldname": "more_info", "fieldtype": "Section Break", "label": "More Info", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-file-text" }, { "doctype": "DocField", @@ -585,6 +592,11 @@ "read_only": 1, "report_hide": 0 }, + { + "doctype": "DocField", + "fieldname": "column_break_57", + "fieldtype": "Column Break" + }, { "description": "Select the relevant company name if you have multiple companies", "doctype": "DocField", diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js index 3aea4c8582..1b515053b6 100644 --- a/selling/doctype/lead/lead.js +++ b/selling/doctype/lead/lead.js @@ -99,38 +99,10 @@ erpnext.LeadController = wn.ui.form.Controller.extend({ $.extend(cur_frm.cscript, new erpnext.LeadController({frm: cur_frm})); cur_frm.cscript['Create Customer'] = function(){ - var doc = cur_frm.doc; - $c('runserverobj',args={ 'method':'check_status', 'docs':wn.model.compress(make_doclist(doc.doctype, doc.name))}, - function(r,rt){ - if(r.message == 'Converted'){ - msgprint("This lead is already converted to customer"); - } - else{ - n = wn.model.make_new_doc_and_get_name("Customer"); - $c('dt_map', args={ - 'docs':wn.model.compress([locals["Customer"][n]]), - 'from_doctype':'Lead', - 'to_doctype':'Customer', - 'from_docname':doc.name, - 'from_to_list':"[['Lead', 'Customer']]" - }, - function(r,rt) { - wn.model.with_doctype("Customer", function() { - var customer = wn.model.get_doc("Customer", n); - var customer_copy = $.extend({}, customer); - - var updated = wn.model.set_default_values(customer_copy); - $.each(updated, function(i, f) { - if(!customer[f]) customer[f] = customer_copy[f]; - }); - - loaddoc("Customer", n); - }); - } - ); - } - } - ); + wn.model.open_mapped_doc({ + method: "selling.doctype.lead.lead.make_customer", + source_name: cur_frm.doc.name + }) } // Create New Opportunity diff --git a/selling/doctype/lead/lead.py b/selling/doctype/lead/lead.py index 928eda7d85..c702375906 100644 --- a/selling/doctype/lead/lead.py +++ b/selling/doctype/lead/lead.py @@ -95,4 +95,24 @@ class DocType(SellingController): webnotes.conn.sql("""update `tabSupport Ticket` set lead='' where lead=%s""", self.doc.name) - self.delete_events() \ No newline at end of file + self.delete_events() + +@webnotes.whitelist() +def make_customer(source_name, target_doclist=None): + from webnotes.model.mapper import get_mapped_doclist + + if target_doclist: + target_doclist = json.loads(target_doclist) + + doclist = get_mapped_doclist("Lead", source_name, + {"Lead": { + "doctype": "Customer", + "field_map": { + "name": "lead_name", + "company_name": "customer_name", + "contact_no": "phone_1", + "fax": "fax_1" + } + }}) + + return [d.fields for d in doclist] \ No newline at end of file diff --git a/selling/doctype/lead/test_lead.py b/selling/doctype/lead/test_lead.py index e525547c24..3fc177f82d 100644 --- a/selling/doctype/lead/test_lead.py +++ b/selling/doctype/lead/test_lead.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + test_records = [ [{"doctype":"Lead", "lead_name": "_Test Lead", "status":"Open", "email_id":"test_lead@example.com"}], @@ -8,3 +10,17 @@ test_records = [ [{"doctype":"Lead", "lead_name": "_Test Lead 3", "status":"Converted", "email_id":"test_lead3@example.com"}], ] + +import webnotes +import unittest + +class TestLead(unittest.TestCase): + def test_make_customer(self): + from selling.doctype.lead.lead import make_customer + + customer = make_customer("_T-Lead-00001") + self.assertEquals(customer[0]["doctype"], "Customer") + self.assertEquals(customer[0]["lead_name"], "_T-Lead-00001") + + webnotes.bean(customer).insert() + \ No newline at end of file diff --git a/selling/doctype/quotation/quotation.py b/selling/doctype/quotation/quotation.py index 0cbc76e1ea..24242dec8e 100644 --- a/selling/doctype/quotation/quotation.py +++ b/selling/doctype/quotation/quotation.py @@ -154,8 +154,11 @@ class DocType(SellingController): super(DocType, self).validate() import utilities - utilities.validate_status(self.doc.status, ["Draft", "Submitted", - "Order Confirmed", "Order Lost", "Cancelled"]) + if not self.doc.status: + self.doc.status = "Draft" + else: + utilities.validate_status(self.doc.status, ["Draft", "Submitted", + "Order Confirmed", "Order Lost", "Cancelled"]) self.validate_fiscal_year() self.set_last_contact_date() diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt index cfe0881208..5aa3aa3c50 100644 --- a/selling/doctype/quotation/quotation.txt +++ b/selling/doctype/quotation/quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:08", "docstatus": 0, - "modified": "2013-07-03 16:12:44", + "modified": "2013-07-04 10:56:10", "modified_by": "Administrator", "owner": "Administrator" }, @@ -114,7 +114,6 @@ "read_only": 0 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "customer_name", "fieldtype": "Data", diff --git a/selling/doctype/quotation/test_quotation.py b/selling/doctype/quotation/test_quotation.py new file mode 100644 index 0000000000..2c9264dd07 --- /dev/null +++ b/selling/doctype/quotation/test_quotation.py @@ -0,0 +1,49 @@ +import webnotes +from webnotes.utils import flt +import unittest + +test_dependencies = ["Sales BOM"] + +class TestLead(unittest.TestCase): + def test_make_sales_order(self): + lead = webnotes.bean("Lead", "_T-Lead-00001") + lead.make_controller() + customer = lead.controller.make_customer() + self.assertEquals(customer[0].doctype, "Customer") + self.assertEquals(customer[0].lead_name, lead.doc.name) + webnotes.bean(customer).insert() + + +test_records = [ + [ + { + "company": "_Test Company", + "conversion_rate": 1.0, + "currency": "INR", + "customer": "_Test Customer", + "customer_name": "_Test Customer", + "customer_group": "_Test Customer Group", + "doctype": "Quotation", + "fiscal_year": "_Test Fiscal Year 2013", + "order_type": "Sales", + "plc_conversion_rate": 1.0, + "price_list_currency": "INR", + "price_list_name": "_Test Price List", + "territory": "_Test Territory", + "transaction_date": "2013-02-21", + "grand_total": 1000.0, + "grand_total_export": 1000.0, + }, + { + "description": "CPU", + "doctype": "Quotation Item", + "item_code": "_Test Item Home Desktop 100", + "item_name": "CPU", + "parentfield": "quotation_details", + "qty": 10.0, + "basic_rate": 100.0, + "export_rate": 100.0, + "amount": 1000.0, + } + ], +] \ No newline at end of file diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js index 77e77592e9..5534369b54 100644 --- a/selling/doctype/sales_common/sales_common.js +++ b/selling/doctype/sales_common/sales_common.js @@ -37,6 +37,12 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ this.toggle_rounded_total(); }, + refresh: function(doc) { + this.frm.toggle_display("customer_name", + (this.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer)); + this._super(); + }, + customer: function() { var me = this; if(this.frm.doc.customer || this.frm.doc.debit_to) { diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt index 2a78bf79b3..6ac7565042 100644 --- a/selling/doctype/sales_order/sales_order.txt +++ b/selling/doctype/sales_order/sales_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-18 12:39:59", "docstatus": 0, - "modified": "2013-07-03 16:12:26", + "modified": "2013-07-04 10:56:35", "modified_by": "Administrator", "owner": "Administrator" }, @@ -84,7 +84,6 @@ "search_index": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "customer_name", "fieldtype": "Data", diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js index 1dcd038f46..2cc0b07971 100644 --- a/stock/doctype/item/item.js +++ b/stock/doctype/item/item.js @@ -21,6 +21,8 @@ cur_frm.cscript.refresh = function(doc) { // make sensitive fields(has_serial_no, is_stock_item, valuation_method) // read only if any stock ledger entry exists + cur_frm.cscript.make_dashboard() + cur_frm.toggle_display("naming_series", sys_defaults.item_naming_by=="Naming Series" && doc.__islocal) cur_frm.toggle_display("item_code", sys_defaults.item_naming_by!="Naming Series" @@ -36,6 +38,12 @@ cur_frm.cscript.refresh = function(doc) { } } +cur_frm.cscript.make_dashboard = function() { + cur_frm.dashboard.reset(); + if(doc.__islocal) + return; +} + cur_frm.cscript.item_code = function(doc) { if(!doc.item_name) cur_frm.set_value("item_name", doc.item_code); if(!doc.description) cur_frm.set_value("description", doc.item_code); diff --git a/stock/doctype/material_request/material_request.js b/stock/doctype/material_request/material_request.js index 6c7b2a7b88..5c2eed5068 100644 --- a/stock/doctype/material_request/material_request.js +++ b/stock/doctype/material_request/material_request.js @@ -24,6 +24,16 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten refresh: function(doc) { this._super(); + // dashboard + cur_frm.dashboard.reset(); + if(doc.docstatus===1) { + if(doc.status==="Stopped") { + cur_frm.dashboard.set_headline_alert(wn._("Stopped"), "alert-danger", "icon-stop") + } + cur_frm.dashboard.add_progress(cint(doc.per_ordered) + "% " + + wn._("Fulfilled"), cint(doc.per_ordered)); + } + if(doc.docstatus == 1 && doc.status != 'Stopped'){ if(doc.material_request_type === "Purchase") cur_frm.add_custom_button("Make Supplier Quotation", cur_frm.cscript.make_supplier_quotation); diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt index e7bad7334b..7ebb1974e4 100644 --- a/stock/doctype/material_request/material_request.txt +++ b/stock/doctype/material_request/material_request.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 14:48:38", "docstatus": 0, - "modified": "2013-06-11 16:16:36", + "modified": "2013-07-04 10:24:53", "modified_by": "Administrator", "owner": "Administrator" }, @@ -44,6 +44,13 @@ "doctype": "DocType", "name": "Material Request" }, + { + "doctype": "DocField", + "fieldname": "type_section", + "fieldtype": "Section Break", + "label": "Type", + "options": "icon-pushpin" + }, { "doctype": "DocField", "fieldname": "material_request_type", @@ -76,7 +83,8 @@ "fieldname": "items", "fieldtype": "Section Break", "label": "Items", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart" }, { "allow_on_submit": 0, @@ -92,8 +100,7 @@ { "doctype": "DocField", "fieldname": "section_break1", - "fieldtype": "Section Break", - "options": "Simple" + "fieldtype": "Section Break" }, { "doctype": "DocField", @@ -131,12 +138,12 @@ }, { "default": "Give additional details about the indent.", - "description": "Filing in Additional Information about the Material Request will help you analyze your data better.", "doctype": "DocField", "fieldname": "more_info", "fieldtype": "Section Break", "label": "More Info", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-file-text" }, { "doctype": "DocField", @@ -287,7 +294,8 @@ "fieldname": "terms_section_break", "fieldtype": "Section Break", "label": "Terms and Conditions", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-legal" }, { "doctype": "DocField", diff --git a/stock/page/stock_home/stock_home.js b/stock/page/stock_home/stock_home.js index b17784fde4..a59fe07438 100644 --- a/stock/page/stock_home/stock_home.js +++ b/stock/page/stock_home/stock_home.js @@ -7,6 +7,11 @@ wn.module_page["Stock"] = [ top: true, icon: "icon-copy", items: [ + { + label: wn._("Item"), + description: wn._("All Products or Services."), + doctype:"Item" + }, { label: wn._("Material Request"), description: wn._("Requests for items."), @@ -33,11 +38,6 @@ wn.module_page["Stock"] = [ title: wn._("Masters"), icon: "icon-book", items: [ - { - label: wn._("Item"), - description: wn._("All Products or Services."), - doctype:"Item" - }, { label: wn._("Serial No"), description: wn._("Single unit of an Item."),