From 069672e197e8797522f18691a370bd784122ddd1 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 28 Oct 2013 18:21:07 +0530 Subject: [PATCH] [minor] cleanup start --- accounts/doctype/sales_invoice/pos.js | 18 +++++++++------ .../doctype/workstation/workstation.txt | 22 +++++++------------ projects/doctype/project/project.txt | 19 +++++++++++----- public/js/startup.css | 7 +++--- stock/doctype/warehouse/warehouse.txt | 5 +++-- 5 files changed, 39 insertions(+), 32 deletions(-) diff --git a/accounts/doctype/sales_invoice/pos.js b/accounts/doctype/sales_invoice/pos.js index 043fe90fc1e..d771f4f780f 100644 --- a/accounts/doctype/sales_invoice/pos.js +++ b/accounts/doctype/sales_invoice/pos.js @@ -6,7 +6,7 @@ erpnext.POS = Class.extend({ this.wrapper = wrapper; this.frm = frm; this.wrapper.html('
\ -
\ +
\
\
\
\ @@ -115,7 +115,8 @@ erpnext.POS = Class.extend({ "fieldname": "pos_party", "placeholder": this.party }, - parent: this.wrapper.find(".party-area") + parent: this.wrapper.find(".party-area"), + only_input: true, }); this.party_field.make_input(); this.party_field.$input.on("change", function() { @@ -134,7 +135,8 @@ erpnext.POS = Class.extend({ "fieldname": "pos_item_group", "placeholder": "Item Group" }, - parent: this.wrapper.find(".item-group-area") + parent: this.wrapper.find(".item-group-area"), + only_input: true, }); this.item_group.make_input(); this.item_group.$input.on("change", function() { @@ -152,7 +154,8 @@ erpnext.POS = Class.extend({ "fieldname": "pos_item", "placeholder": "Item" }, - parent: this.wrapper.find(".search-area") + parent: this.wrapper.find(".search-area"), + only_input: true, }); this.search.make_input(); this.search.$input.on("change", function() { @@ -169,7 +172,8 @@ erpnext.POS = Class.extend({ "fieldname": "pos_barcode", "placeholder": "Barcode / Serial No" }, - parent: this.wrapper.find(".barcode-area") + parent: this.wrapper.find(".barcode-area"), + only_input: true, }); this.barcode.make_input(); this.barcode.$input.on("keypress", function() { @@ -194,12 +198,12 @@ erpnext.POS = Class.extend({ $.each(r.message, function(index, obj) { if (obj.image) image = ''; + style="border:1px solid #eee; max-height: 140px;">'; else image = '
'; $(repl('
\ -
%(item_image)s
\ +
%(item_image)s
\
%(item_code)s
\
%(item_name)s
\
%(item_price)s
\ diff --git a/manufacturing/doctype/workstation/workstation.txt b/manufacturing/doctype/workstation/workstation.txt index 038e2c9e45e..c9114ff85fe 100644 --- a/manufacturing/doctype/workstation/workstation.txt +++ b/manufacturing/doctype/workstation/workstation.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:17", "docstatus": 0, - "modified": "2013-07-05 15:04:25", + "modified": "2013-10-28 15:42:38", "modified_by": "Administrator", "owner": "Administrator" }, @@ -42,15 +42,6 @@ "doctype": "DocType", "name": "Workstation" }, - { - "doctype": "DocField", - "fieldname": "trash_reason", - "fieldtype": "Small Text", - "label": "Trash Reason", - "oldfieldname": "trash_reason", - "oldfieldtype": "Small Text", - "read_only": 1 - }, { "doctype": "DocField", "fieldname": "workstation_name", @@ -113,30 +104,33 @@ "doctype": "DocField", "fieldname": "over_heads", "fieldtype": "Section Break", - "label": "Over Heads", + "label": "Overheads", "oldfieldtype": "Section Break" }, { + "description": "Electricity cost per hour", "doctype": "DocField", "fieldname": "hour_rate_electricity", "fieldtype": "Float", - "label": "Hour Rate Electricity", + "label": "Electricity Cost", "oldfieldname": "hour_rate_electricity", "oldfieldtype": "Currency" }, { + "description": "Consumable cost per hour", "doctype": "DocField", "fieldname": "hour_rate_consumable", "fieldtype": "Float", - "label": "Hour Rate Consumable", + "label": "Consumable Cost", "oldfieldname": "hour_rate_consumable", "oldfieldtype": "Currency" }, { + "description": "Rent per hour", "doctype": "DocField", "fieldname": "hour_rate_rent", "fieldtype": "Float", - "label": "Hour Rate Rent", + "label": "Rent Cost", "oldfieldname": "hour_rate_rent", "oldfieldtype": "Currency" }, diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt index fc8accf1ee1..33e5fde2357 100644 --- a/projects/doctype/project/project.txt +++ b/projects/doctype/project/project.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:55:07", "docstatus": 0, - "modified": "2013-10-02 14:25:02", + "modified": "2013-10-28 17:17:17", "modified_by": "Administrator", "owner": "Administrator" }, @@ -41,6 +41,13 @@ "doctype": "DocType", "name": "Project" }, + { + "doctype": "DocField", + "fieldname": "overview", + "fieldtype": "Section Break", + "label": "Overview", + "options": "icon-file" + }, { "doctype": "DocField", "fieldname": "cb_project_status", @@ -148,7 +155,8 @@ "fieldname": "sb_milestones", "fieldtype": "Section Break", "label": "Milestones", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-flag" }, { "description": "Milestones will be added as Events in the Calendar", @@ -168,7 +176,7 @@ "fieldtype": "Section Break", "label": "Project Details", "oldfieldtype": "Section Break", - "options": "Simple" + "options": "icon-list" }, { "doctype": "DocField", @@ -201,7 +209,7 @@ "fieldtype": "Section Break", "label": "Project Costing", "oldfieldtype": "Section Break", - "options": "Simple" + "options": "icon-money" }, { "doctype": "DocField", @@ -264,7 +272,8 @@ "fieldname": "customer_details", "fieldtype": "Section Break", "label": "Customer Details", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-user" }, { "description": "Select name of Customer to whom project belongs", diff --git a/public/js/startup.css b/public/js/startup.css index c3b7276de4e..54c40d4cb0b 100644 --- a/public/js/startup.css +++ b/public/js/startup.css @@ -41,9 +41,8 @@ span, div, td, input, textarea, button, select { } .pos-bill { - padding: 20px 5px; + margin-left: -30px; + margin-top: -10px; + padding: 20px 10px; font-family: Monospace; - border: 1px solid #eee; - -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); - box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); } \ No newline at end of file diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt index 76ddac7930c..39e335fac5a 100644 --- a/stock/doctype/warehouse/warehouse.txt +++ b/stock/doctype/warehouse/warehouse.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 18:50:32", "docstatus": 0, - "modified": "2013-09-16 10:45:49", + "modified": "2013-10-28 16:42:07", "modified_by": "Administrator", "owner": "Administrator" }, @@ -76,7 +76,7 @@ "doctype": "DocField", "fieldname": "create_account_under", "fieldtype": "Link", - "label": "Create Account Under", + "label": "Parent Account", "options": "Account", "permlevel": 0 }, @@ -84,6 +84,7 @@ "doctype": "DocField", "fieldname": "column_break_4", "fieldtype": "Section Break", + "label": "Allow For Users", "permlevel": 0, "read_only": 0 },