nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-20 03:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge] v5-design

Browse Source
This commit is contained in:
Rushabh Mehta
2014-12-31 15:03:14 +05:30
parent cbdfb767a9 ee4b8bee33
commit 419ae33c3e
43 changed files with 317 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
erpnext/templates/form_grid/item_grid.html
View File

@@ -2,7 +2,7 @@
{% if(!doc) { %}
<div class="row">
<div class="col-sm-6">{%= __("Item") %}</div>
<div class="col-sm-6">{%= __("Items") %}</div>
<div class="col-sm-2 text-right">{%= __("Qty") %}</div>
<div class="col-sm-2 text-right">{%= __("Rate") %}</div>
<div class="col-sm-2 text-right">{%= __("Amount") %}</div>
@@ -14,13 +14,36 @@
<br>{%= doc.item_name %}{% } %}
{% if(doc.item_name != doc.description) { %}
<p>{%= doc.description %}</p>{% } %}
{% if(doc.sales_order || doc.against_sales_order) { %}
<p><span class="label label-default"
title="{%= __("Sales Order") %}">
<i class="icon-file"></i>
{%= doc.sales_order || doc.against_sales_order %}
</span></p>
{% } %}
<div>
{% if(doc.sales_order || doc.against_sales_order) { %}
<span class="label label-default"
title="{%= __("Sales Order") %}">
<i class="icon-file"></i>
{%= doc.sales_order || doc.against_sales_order %}
</span>
{% } %}
{% if(doc.warehouse) {
var label_class = "label-default",
title = "Warehouse",
actual_qty = (doc.doctype==="Sales Order"
? doc.projected_qty : doc.actual_qty);
if(actual_qty != undefined) {
if(actual_qty > doc.qty) {
var label_class = "label-success";
var title = "In Stock"
} else {
var title = "Not In Stock"
}
}
%}
<span style="margin-left: 10px;"
title="{%= title %}">
<span class="label {%= label_class %}">
{%= doc.warehouse %}
</span>
</span>
{% } %}
</div>
{% include "templates/form_grid/includes/visible_cols.html" %}
{% if(doc.schedule_date) { %}
<div><span title="{%= __("Reqd By Date") %}" class="label {%=
@@ -46,28 +69,6 @@
%}
{% include "templates/form_grid/includes/progress.html" %}
{% } %}
{% if(doc.warehouse) {
var label_class = "label-default",
title = "Warehouse",
actual_qty = (doc.doctype==="Sales Order"
? doc.projected_qty : doc.actual_qty);
if(actual_qty != undefined) {
if(actual_qty > doc.qty) {
var label_class = "label-success";
var title = "In Stock"
} else {
var title = "Not In Stock"
}
}
%}
<div style="overflow:hidden; min-height: 25px;
white-space:nowrap; text-overflow: ellipsis;"
title="{%= title %}">
<span class="label {%= label_class %}">
{%= doc.warehouse %}
</span>
</div>
{% } %}
</div>
<!-- rate -->

4
erpnext/templates/includes/cart.js
View File

@@ -8,7 +8,7 @@ frappe.provide("shopping_cart");
$.extend(shopping_cart, {
show_error: function(title, text) {
$("#cart-container").html('<div class="well"><h4>' + title + '</h4> ' + text + '</div>');
$("#cart-container").html('<div class="msg-box"><h4>' + title + '</h4> ' + text + '</div>');
},
bind_events: function() {
@@ -96,7 +96,7 @@ $.extend(shopping_cart, {
});
if(!(addresses && addresses.length)) {
$cart_shipping_address.html('<div class="well">'+frappe._("Hey! Go ahead and add an address")+'</div>');
$cart_shipping_address.html('<div class="msg-box">'+frappe._("Hey! Go ahead and add an address")+'</div>');
} else {
shopping_cart.render_address($cart_shipping_address, addresses, doc.shipping_address_name);
shopping_cart.render_address($cart_billing_address, addresses, doc.customer_address);