Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 3dc6c76..1d382a5 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -228,7 +228,6 @@
"execute:webnotes.delete_doc('Report', 'Received Items To Be Billed')",
"patches.july_2013.p02_copy_shipping_address",
"patches.july_2013.p03_cost_center_company",
- "execute:webnotes.bean('Style Settings').save() #2013-07-16",
"patches.july_2013.p04_merge_duplicate_leads",
"patches.july_2013.p05_custom_doctypes_in_list_view",
"patches.july_2013.p06_same_sales_rate",
@@ -257,4 +256,5 @@
"patches.august_2013.p05_employee_birthdays",
"execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-08-16",
"patches.august_2013.p06_fix_sle_against_stock_entry",
+ "execute:webnotes.bean('Style Settings').save() #2013-08-20",
]
\ No newline at end of file
diff --git a/website/css/website.css b/website/css/website.css
index 91f1398..88bf7fd 100644
--- a/website/css/website.css
+++ b/website/css/website.css
@@ -148,8 +148,15 @@
}
}
-.accordion-heading, .accordion-inner {
- padding-left: 10px;
+.panel-heading,
+.panel-body {
+ padding-left: 15px;
+}
+
+
+.breadcrumb {
+ margin: 0px -20px;
+ margin-bottom: 20px;
}
fieldset {
diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css
index 2941061..7abdb4b 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -187,7 +187,7 @@
}
.breadcrumb {
- background-color: #{{ get_hex_shade(doc.page_background, 10) }};
+ background-color: #{{ get_hex_shade(doc.page_background, 5) }};
}
.breadcrumb > li {
diff --git a/website/helpers/cart.py b/website/helpers/cart.py
index b6a7a01..fc7d062 100644
--- a/website/helpers/cart.py
+++ b/website/helpers/cart.py
@@ -228,6 +228,7 @@
"company": webnotes.defaults.get_user_default("company"),
"order_type": "Shopping Cart",
"status": "Draft",
+ "docstatus": 0,
"__islocal": 1,
(party.doctype.lower()): party.name
})
diff --git a/website/templates/js/cart.js b/website/templates/js/cart.js
index ad69824..20090ca 100644
--- a/website/templates/js/cart.js
+++ b/website/templates/js/cart.js
@@ -145,7 +145,7 @@
<div class="col-md-3 col-sm-3 text-right">\
<div class="input-group item-update-cart">\
<input type="text" placeholder="Qty" value="%(qty)s" \
- data-item-code="%(item_code)s" class="text-right">\
+ data-item-code="%(item_code)s" class="text-right form-control">\
<div class="input-group-btn">\
<button class="btn btn-primary" data-item-code="%(item_code)s">\
<i class="icon-ok"></i></button>\
@@ -160,7 +160,7 @@
render_tax_row: function($cart_taxes, doc, shipping_rules) {
var shipping_selector;
if(shipping_rules) {
- shipping_selector = '<select>' + $.map(shipping_rules, function(rule) {
+ shipping_selector = '<select class="form-control">' + $.map(shipping_rules, function(rule) {
return '<option value="' + rule[0] + '">' + rule[1] + '</option>' }).join("\n") +
'</select>';
}
@@ -206,8 +206,8 @@
render_address: function($address_wrapper, addresses, address_name) {
$.each(addresses, function(i, address) {
- $(repl('<div class="accordion-group"> \
- <div class="accordion-heading"> \
+ $(repl('<div class="panel panel-default"> \
+ <div class="panel-heading"> \
<div class="row"> \
<div class="col-md-10 address-title" \
data-address-name="%(name)s"><strong>%(name)s</strong></div> \
@@ -215,23 +215,19 @@
data-address-name="%(name)s"></div> \
</div> \
</div> \
- <div class="accordion-body collapse" data-address-name="%(name)s"> \
- <div class="accordion-inner">%(display)s</div> \
+ <div class="panel-collapse collapse" data-address-name="%(name)s"> \
+ <div class="panel-body">%(display)s</div> \
</div> \
</div>', address))
.css({"margin": "10px auto"})
.appendTo($address_wrapper);
});
- $address_wrapper.find(".accordion-heading")
- .css({
- "background-color": "#eee",
- "padding": "10px",
- })
+ $address_wrapper.find(".panel-heading")
.find(".address-title")
.css({"cursor": "pointer"})
.on("click", function() {
- $address_wrapper.find('.accordion-body[data-address-name="'
+ $address_wrapper.find('.panel-collapse[data-address-name="'
+$(this).attr("data-address-name")+'"]').collapse("toggle");
});
@@ -265,12 +261,12 @@
$address_wrapper.find('input[type="checkbox"][data-address-name="'+ address_name +'"]')
.prop("checked", true);
- $address_wrapper.find(".accordion-body").collapse({
+ $address_wrapper.find(".panel-collapse").collapse({
parent: $address_wrapper,
toggle: false
});
- $address_wrapper.find('.accordion-body[data-address-name="'+ address_name +'"]')
+ $address_wrapper.find('.panel-collapse[data-address-name="'+ address_name +'"]')
.collapse("show");
},
diff --git a/website/templates/pages/address.html b/website/templates/pages/address.html
index 60e705b..faf7bb0 100644
--- a/website/templates/pages/address.html
+++ b/website/templates/pages/address.html
@@ -22,7 +22,7 @@
{% elif df.fieldtype == "Select" -%}
<fieldset>
<label>{{ df.label }}</label>
- <select data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}">
+ <select class="form-control" data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}">
{% for value in df.options.split("\n") -%}
{% if doc and doc.fields.get(df.fieldname) == value -%}
<option selected="selected">{{ value }}</option>
diff --git a/website/templates/pages/cart.html b/website/templates/pages/cart.html
index 70775ab..6708ad3 100644
--- a/website/templates/pages/cart.html
+++ b/website/templates/pages/cart.html
@@ -36,14 +36,14 @@
<div class="row">
<div class="col-md-6">
<h4>Shipping Address</h4>
- <div id="cart-shipping-address" class="accordion"
+ <div id="cart-shipping-address" class="panel-group"
data-fieldname="shipping_address_name"></div>
<button class="btn btn-default" type="button" id="cart-add-shipping-address">
<span class="icon icon-plus"></span> New Shipping Address</button>
</div>
<div class="col-md-6">
<h4>Billing Address</h4>
- <div id="cart-billing-address" class="accordion"
+ <div id="cart-billing-address" class="panel-group"
data-fieldname="customer_address"></div>
<button class="btn btn-default" type="button" id="cart-add-billing-address">
<span class="icon icon-plus"></span> New Billing Address</button>