diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index 594b0150be..da28eb3e0a 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -141,13 +141,13 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ toggle_group_by_checks: function() { this.make_account_by_name(); - this.filter_inputs.group_by_ledger - .parent().toggle(!!(this.account_by_name[this.account] - && this.account_by_name[this.account].group_or_ledger==="Group")); - - this.filter_inputs.group_by_voucher - .parent().toggle(!!(this.account_by_name[this.account] - && this.account_by_name[this.account].group_or_ledger==="Ledger")); + // this.filter_inputs.group_by_ledger + // .parent().toggle(!!(this.account_by_name[this.account] + // && this.account_by_name[this.account].group_or_ledger==="Group")); + // + // this.filter_inputs.group_by_voucher + // .parent().toggle(!!(this.account_by_name[this.account] + // && this.account_by_name[this.account].group_or_ledger==="Ledger")); }, prepare_data: function() { var me = this; diff --git a/controllers/selling_controller.py b/controllers/selling_controller.py index 9f99bf65d7..38274e6c96 100644 --- a/controllers/selling_controller.py +++ b/controllers/selling_controller.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import cint, flt, comma_or, _round +from webnotes.utils import cint, flt, comma_or, _round, add_days, cstr from setup.utils import get_company_currency from selling.utils import get_item_details from webnotes import msgprint, _ @@ -291,7 +291,7 @@ class SellingController(StockController): sr.doc.customer = self.doc.customer sr.doc.customer_name = self.doc.customer_name if sr.doc.warranty_period: - sr.doc.warranty_expiry_date = add_days(cstr(self.doc.delivery_date), + sr.doc.warranty_expiry_date = add_days(cstr(self.doc.posting_date), cint(sr.doc.warranty_period)) sr.doc.status = 'Delivered' diff --git a/patches/august_2013/p06_fix_sle_against_stock_entry.py b/patches/august_2013/p06_fix_sle_against_stock_entry.py index dbc2c94ecf..02588bec6d 100644 --- a/patches/august_2013/p06_fix_sle_against_stock_entry.py +++ b/patches/august_2013/p06_fix_sle_against_stock_entry.py @@ -4,10 +4,9 @@ cancelled = [] uncancelled = [] def execute(): - from stock.stock_ledger import update_entries_after - + global cancelled, uncancelled stock_entries = webnotes.conn.sql("""select * from `tabStock Entry` - where docstatus >= 1 and date(modified) >= "2013-08-16" and date(modified) <= "2013-08-21" + where docstatus >= 1 and date(modified) >= "2013-08-16" and ifnull(production_order, '') != '' and ifnull(bom_no, '') != '' order by modified desc, name desc""", as_dict=True) @@ -18,7 +17,6 @@ def execute(): where voucher_type='Stock Entry' and voucher_no=%s and is_cancelled='No'""", entry.name, as_dict=True) if res: - print entry make_stock_entry_detail(entry, res) if cancelled or uncancelled: @@ -98,11 +96,11 @@ def send_email(): if cancelled else "" subject = "[ERPNext] [Important] Cancellation undone for some Stock Entries" - content = """Dear user, + content = """Dear System Manager, -An error got introduced into the code that cleared the item table in Stock Entry associated to a Production Order. +An error got introduced into the code that cleared the item table in a Stock Entry associated to a Production Order. -Hence, +To undo its effect, %s %s @@ -114,6 +112,6 @@ Sorry for the inconvenience this has caused. Regards, Team ERPNext.""" % (uncancelled, cancelled) - print subject, content + # print subject, content - # sendmail_to_system_managers(subject, content) \ No newline at end of file + sendmail_to_system_managers(subject, content) \ No newline at end of file diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js index fe90b5b35b..dea94b8f3d 100644 --- a/selling/doctype/sales_common/sales_common.js +++ b/selling/doctype/sales_common/sales_common.js @@ -640,7 +640,7 @@ var set_sales_bom_help = function(doc) { $(cur_frm.fields_dict.packing_list.row.wrapper).toggle(true); if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) { - help_msg = "
\ + help_msg = "
\ For 'Sales BOM' items, warehouse, serial no and batch no \ will be considered from the 'Packing List' table. \ If warehouse and batch no are same for all packing items for any 'Sales BOM' item, \ diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index c9532e2f94..f39618685d 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -41,15 +41,15 @@ wn.pages.Setup.make = function(wrapper) { }) .appendTo(body); - $('
').appendTo(row); + $('
').appendTo(row); if(item.type==="Link") { - var col = $('
' +item.title+'
').appendTo(row); } else { - var col = $(repl('
\ + var col = $(repl('
\ %(count)s\ \ %(title)s\ @@ -73,9 +73,9 @@ wn.pages.Setup.make = function(wrapper) { } if(dependency) - col.addClass("col-offset-1"); + col.addClass("col-md-offset-1"); else - $('
').appendTo(row); + $('
').appendTo(row); if(item.doctype) { var badge = col.find(".badge, .data-link") @@ -94,7 +94,7 @@ wn.pages.Setup.make = function(wrapper) { } // tree - $links = $('
').appendTo(row); + $links = $('
').appendTo(row); if(item.tree) { $(' Browse\ diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt index 62fcdf7388..a2fa18f8a7 100644 --- a/stock/doctype/serial_no/serial_no.txt +++ b/stock/doctype/serial_no/serial_no.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-16 10:59:15", "docstatus": 0, - "modified": "2013-08-21 11:22:50", + "modified": "2013-08-21 13:37:01", "modified_by": "Administrator", "owner": "Administrator" }, @@ -35,8 +35,7 @@ "parenttype": "DocType", "permlevel": 0, "read": 1, - "report": 1, - "submit": 0 + "write": 1 }, { "doctype": "DocType", @@ -446,23 +445,22 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "role": "Material Master Manager", - "write": 1 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", + "report": 1, "role": "Material Manager", - "write": 0 + "submit": 0 }, { "amend": 0, "cancel": 0, + "create": 1, + "doctype": "DocPerm", + "report": 1, + "role": "Material User", + "submit": 0 + }, + { "create": 0, "doctype": "DocPerm", - "role": "Material User", - "write": 0 + "role": "Accounts User" } ] \ No newline at end of file diff --git a/utilities/doctype/rename_tool/rename_tool.js b/utilities/doctype/rename_tool/rename_tool.js index b339b85d48..0dc81a5848 100644 --- a/utilities/doctype/rename_tool/rename_tool.js +++ b/utilities/doctype/rename_tool/rename_tool.js @@ -18,7 +18,7 @@ cur_frm.cscript.select_doctype = function() { cur_frm.cscript.setup_upload = function() { var me = this; var $wrapper = $(cur_frm.fields_dict.upload_html.wrapper).empty() - .html("
" + + .html("
" + wn._("Upload a .csv file with two columns: the old name and the new name. Max 500 rows.") + "
"); var $log = $(cur_frm.fields_dict.rename_log.wrapper).empty(); diff --git a/website/css/website.css b/website/css/website.css index cdd277b429..91f1398b61 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -167,6 +167,7 @@ fieldset { .btn-default:focus, .btn-default:active, .btn-default.active { + color: #ffffff; background-color: #9a9c9d; border-color: #8d9091; } diff --git a/website/doctype/blog_post/blog_post.py b/website/doctype/blog_post/blog_post.py index ad8a0b8361..48b32069d8 100644 --- a/website/doctype/blog_post/blog_post.py +++ b/website/doctype/blog_post/blog_post.py @@ -30,6 +30,7 @@ class DocType: def prepare_template_args(self): import webnotes.utils + import markdown2 # this is for double precaution. usually it wont reach this code if not published if not webnotes.utils.cint(self.doc.published): @@ -65,3 +66,4 @@ class DocType: self.doc.comment_list = comment_list or [] for comment in self.doc.comment_list: comment['comment_date'] = webnotes.utils.global_date_format(comment['creation']) + comment['comment'] = markdown2.markdown(comment['comment']) diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css index b44298923e..2941061dc2 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -66,6 +66,10 @@ div.web-footer, div.web-footer a { } /* Bootstrap Navbar */ +.navbar-default { + border: 0px; +} + .navbar { box-shadow: none; border-radius: 0px; @@ -166,8 +170,8 @@ div.web-footer, div.web-footer a { } .navbar .nav li.dropdown > .dropdown-toggle:hover .caret { - border-top-color: #{{ doc.top_bar_background }}; - border-bottom-color: #{{ doc.top_bar_background }}; + border-top-color: #{{ doc.top_bar_foreground }}; + border-bottom-color: #{{ doc.top_bar_foreground }}; } .navbar .nav li.dropdown.open > .dropdown-toggle .caret, @@ -178,6 +182,10 @@ div.web-footer, div.web-footer a { } +.navbar-default .navbar-toggle .icon-bar { + background-color: #{{ doc.top_bar_foreground }}; +} + .breadcrumb { background-color: #{{ get_hex_shade(doc.page_background, 10) }}; } diff --git a/website/doctype/style_settings/style_settings.js b/website/doctype/style_settings/style_settings.js index 6ecdafa5a2..f94246d22c 100644 --- a/website/doctype/style_settings/style_settings.js +++ b/website/doctype/style_settings/style_settings.js @@ -6,7 +6,7 @@ cur_frm.cscript.onload_post_render = function() { wn.require('lib/public/js/lib/jscolor/jscolor.js'); $.each(["background_color", "page_background", "page_text", "page_links", "top_bar_background", "top_bar_foreground", "page_headings"], function(i, v) { - cur_frm.fields_dict[v].input.className = 'color'; + $(cur_frm.fields_dict[v].input).addClass('color'); }) jscolor.bind(); } \ No newline at end of file diff --git a/website/templates/html/blog_footer.html b/website/templates/html/blog_footer.html index 8a845725e2..b4a574cc90 100644 --- a/website/templates/html/blog_footer.html +++ b/website/templates/html/blog_footer.html @@ -1,4 +1,4 @@ -
+
{% if categories %}
Explore posts by categories
diff --git a/website/templates/html/blog_page.html b/website/templates/html/blog_page.html index ddb61d0278..90f6a79f2b 100644 --- a/website/templates/html/blog_page.html +++ b/website/templates/html/blog_page.html @@ -9,7 +9,7 @@ {% endblock %} {% block content %} -
+

{{ title }}

@@ -38,14 +38,16 @@ {% include 'app/website/templates/html/comment.html' %}
-