[minor] cleanup start

This commit is contained in:
Rushabh Mehta
2013-10-28 18:21:07 +05:30
parent 297041ed3e
commit 069672e197
5 changed files with 39 additions and 32 deletions

View File

@@ -6,7 +6,7 @@ erpnext.POS = Class.extend({
this.wrapper = wrapper; this.wrapper = wrapper;
this.frm = frm; this.frm = frm;
this.wrapper.html('<div class="container">\ this.wrapper.html('<div class="container">\
<div class="row">\ <div class="row" style="margin: -13px 0px 10px -30px; border-bottom: 3px solid #c7c7c7;">\
<div class="party-area col-sm-3 col-xs-6"></div>\ <div class="party-area col-sm-3 col-xs-6"></div>\
<div class="barcode-area col-sm-3 col-xs-6"></div>\ <div class="barcode-area col-sm-3 col-xs-6"></div>\
<div class="search-area col-sm-3 col-xs-6"></div>\ <div class="search-area col-sm-3 col-xs-6"></div>\
@@ -115,7 +115,8 @@ erpnext.POS = Class.extend({
"fieldname": "pos_party", "fieldname": "pos_party",
"placeholder": this.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.make_input();
this.party_field.$input.on("change", function() { this.party_field.$input.on("change", function() {
@@ -134,7 +135,8 @@ erpnext.POS = Class.extend({
"fieldname": "pos_item_group", "fieldname": "pos_item_group",
"placeholder": "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.make_input();
this.item_group.$input.on("change", function() { this.item_group.$input.on("change", function() {
@@ -152,7 +154,8 @@ erpnext.POS = Class.extend({
"fieldname": "pos_item", "fieldname": "pos_item",
"placeholder": "Item" "placeholder": "Item"
}, },
parent: this.wrapper.find(".search-area") parent: this.wrapper.find(".search-area"),
only_input: true,
}); });
this.search.make_input(); this.search.make_input();
this.search.$input.on("change", function() { this.search.$input.on("change", function() {
@@ -169,7 +172,8 @@ erpnext.POS = Class.extend({
"fieldname": "pos_barcode", "fieldname": "pos_barcode",
"placeholder": "Barcode / Serial No" "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.make_input();
this.barcode.$input.on("keypress", function() { this.barcode.$input.on("keypress", function() {
@@ -194,12 +198,12 @@ erpnext.POS = Class.extend({
$.each(r.message, function(index, obj) { $.each(r.message, function(index, obj) {
if (obj.image) if (obj.image)
image = '<img src="' + obj.image + '" class="img-responsive" \ image = '<img src="' + obj.image + '" class="img-responsive" \
style="border:1px solid #eee;height:140px;width:100%;">'; style="border:1px solid #eee; max-height: 140px;">';
else else
image = '<div class="missing-image"><i class="icon-camera"></i></div>'; image = '<div class="missing-image"><i class="icon-camera"></i></div>';
$(repl('<div class="col-xs-3 pos-item" data-item_code="%(item_code)s">\ $(repl('<div class="col-xs-3 pos-item" data-item_code="%(item_code)s">\
<div>%(item_image)s</div>\ <div style="height: 140px; overflow: hidden;">%(item_image)s</div>\
<div class="small">%(item_code)s</div>\ <div class="small">%(item_code)s</div>\
<div class="small">%(item_name)s</div>\ <div class="small">%(item_name)s</div>\
<div class="small">%(item_price)s</div>\ <div class="small">%(item_price)s</div>\

View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-01-10 16:34:17", "creation": "2013-01-10 16:34:17",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-05 15:04:25", "modified": "2013-10-28 15:42:38",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -42,15 +42,6 @@
"doctype": "DocType", "doctype": "DocType",
"name": "Workstation" "name": "Workstation"
}, },
{
"doctype": "DocField",
"fieldname": "trash_reason",
"fieldtype": "Small Text",
"label": "Trash Reason",
"oldfieldname": "trash_reason",
"oldfieldtype": "Small Text",
"read_only": 1
},
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "workstation_name", "fieldname": "workstation_name",
@@ -113,30 +104,33 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "over_heads", "fieldname": "over_heads",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Over Heads", "label": "Overheads",
"oldfieldtype": "Section Break" "oldfieldtype": "Section Break"
}, },
{ {
"description": "Electricity cost per hour",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "hour_rate_electricity", "fieldname": "hour_rate_electricity",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Hour Rate Electricity", "label": "Electricity Cost",
"oldfieldname": "hour_rate_electricity", "oldfieldname": "hour_rate_electricity",
"oldfieldtype": "Currency" "oldfieldtype": "Currency"
}, },
{ {
"description": "Consumable cost per hour",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "hour_rate_consumable", "fieldname": "hour_rate_consumable",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Hour Rate Consumable", "label": "Consumable Cost",
"oldfieldname": "hour_rate_consumable", "oldfieldname": "hour_rate_consumable",
"oldfieldtype": "Currency" "oldfieldtype": "Currency"
}, },
{ {
"description": "Rent per hour",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "hour_rate_rent", "fieldname": "hour_rate_rent",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Hour Rate Rent", "label": "Rent Cost",
"oldfieldname": "hour_rate_rent", "oldfieldname": "hour_rate_rent",
"oldfieldtype": "Currency" "oldfieldtype": "Currency"
}, },

View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-03-07 11:55:07", "creation": "2013-03-07 11:55:07",
"docstatus": 0, "docstatus": 0,
"modified": "2013-10-02 14:25:02", "modified": "2013-10-28 17:17:17",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -41,6 +41,13 @@
"doctype": "DocType", "doctype": "DocType",
"name": "Project" "name": "Project"
}, },
{
"doctype": "DocField",
"fieldname": "overview",
"fieldtype": "Section Break",
"label": "Overview",
"options": "icon-file"
},
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "cb_project_status", "fieldname": "cb_project_status",
@@ -148,7 +155,8 @@
"fieldname": "sb_milestones", "fieldname": "sb_milestones",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Milestones", "label": "Milestones",
"oldfieldtype": "Section Break" "oldfieldtype": "Section Break",
"options": "icon-flag"
}, },
{ {
"description": "Milestones will be added as Events in the Calendar", "description": "Milestones will be added as Events in the Calendar",
@@ -168,7 +176,7 @@
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Project Details", "label": "Project Details",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "Simple" "options": "icon-list"
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
@@ -201,7 +209,7 @@
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Project Costing", "label": "Project Costing",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "Simple" "options": "icon-money"
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
@@ -264,7 +272,8 @@
"fieldname": "customer_details", "fieldname": "customer_details",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Customer Details", "label": "Customer Details",
"oldfieldtype": "Section Break" "oldfieldtype": "Section Break",
"options": "icon-user"
}, },
{ {
"description": "Select name of Customer to whom project belongs", "description": "Select name of Customer to whom project belongs",

View File

@@ -41,9 +41,8 @@ span, div, td, input, textarea, button, select {
} }
.pos-bill { .pos-bill {
padding: 20px 5px; margin-left: -30px;
margin-top: -10px;
padding: 20px 10px;
font-family: Monospace; 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);
} }

View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-03-07 18:50:32", "creation": "2013-03-07 18:50:32",
"docstatus": 0, "docstatus": 0,
"modified": "2013-09-16 10:45:49", "modified": "2013-10-28 16:42:07",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -76,7 +76,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "create_account_under", "fieldname": "create_account_under",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Create Account Under", "label": "Parent Account",
"options": "Account", "options": "Account",
"permlevel": 0 "permlevel": 0
}, },
@@ -84,6 +84,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "column_break_4", "fieldname": "column_break_4",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Allow For Users",
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
}, },