diff --git a/patches/patch_list.py b/patches/patch_list.py index 3dc6c76401..1d382a56bd 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -228,7 +228,6 @@ patch_list = [ "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 @@ patch_list = [ "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 91f1398b61..88bf7fd318 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -148,8 +148,15 @@ div.web-footer { } } -.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 2941061dc2..7abdb4b89f 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -187,7 +187,7 @@ div.web-footer, div.web-footer a { } .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 b6a7a01e92..fc7d062d0d 100644 --- a/website/helpers/cart.py +++ b/website/helpers/cart.py @@ -228,6 +228,7 @@ def _get_cart_quotation(party=None): "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 ad69824d21..20090caec6 100644 --- a/website/templates/js/cart.js +++ b/website/templates/js/cart.js @@ -145,7 +145,7 @@ $.extend(wn.cart, {