Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2013-11-22 18:10:46 +05:30
commit 4ccb2edbfd
21 changed files with 73 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/1311/p04_update_comments.py Normal file
View File

@ -0,0 +1,8 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
def execute():
import webnotes
for name in webnotes.conn.sql_list("""select name from tabComment"""):
webnotes.get_obj("Comment", name).update_comment_in_doc()

16
patches/1311/p05_website_brand_html.py Normal file
View File

@ -0,0 +1,16 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import webnotes
def execute():
bean = webnotes.bean("Website Settings")
for company in webnotes.conn.sql_list("select name from `tabCompany`"):
if bean.doc.banner_html == ("""<h3 style='margin-bottom: 20px;'>""" + company + "</h3>"):
bean.doc.banner_html = None
if not bean.doc.brand_html:
bean.doc.brand_html = company
bean.save()
break

6
patches/patch_list.py
View File

@ -245,9 +245,11 @@ patch_list = [
"execute:webnotes.reload_doc('core', 'doctype', 'comment') #2013-11-15",
"patches.1311.p02_index_singles",
"patches.1311.p01_make_gl_entries_for_si",
"patches.1311.p03_update_reqd_report_fields",
"patches.1311.p03_update_reqd_report_fields",
"execute:webnotes.reload_doc('website', 'doctype', 'website_sitemap_config') #2013-11-20",
"execute:webnotes.reload_doc('website', 'doctype', 'website_sitemap') #2013-11-20",
"execute:webnotes.bean('Style Settings').save() #2013-11-20",
"execute:webnotes.get_module('website.doctype.website_sitemap_config.website_sitemap_config').rebuild_website_sitemap_config()",
"execute:webnotes.get_module('website.doctype.website_sitemap_config.website_sitemap_config').rebuild_website_sitemap_config()",
"patches.1311.p04_update_comments",
"patches.1311.p05_website_brand_html",
]

18
portal/templates/includes/footer.html
View File

@ -1,16 +1,18 @@
{% extends "lib/website/templates/includes/footer.html" %}
{% block powered %}<a style="font-size: 90%; color: #aaa;" href="http://erpnext.org">ERPNext Powered</a>{% endblock %}
{% block powered %}<a href="http://erpnext.org" style="color: #aaa;">ERPNext Powered</a>{% endblock %}
{% block extension %}
<br>
<div class="input-group col-md-6 col-md-offset-3">
<input class="form-control" type="text" id="footer-subscribe-email" placeholder="Your email address...">
<span class="input-group-btn">
<button class="btn btn-default" type="button" id="footer-subscribe-button">Stay Updated</button>
</span>
<div class="container">
<div class="row">
<div class="input-group col-sm-6 col-sm-offset-3" style="margin-top: 7px;">
<input class="form-control" type="text" id="footer-subscribe-email" placeholder="Your email address...">
<span class="input-group-btn">
<button class="btn btn-default" type="button" id="footer-subscribe-button">Stay Updated</button>
</span>
</div>
</div>
</div>
<br>
<script>
$("#footer-subscribe-button").click(function() {

2
portal/templates/includes/transactions.html
View File

@ -1,7 +1,7 @@
{% extends base_template %}
{% block content -%}
<div class="col-md-12">
<div class="container content">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li class="active"><i class="{{ icon }} icon-fixed-width"></i> {{ title }}</li>

2
portal/templates/pages/cart.html
View File

@ -7,7 +7,7 @@
{% set title="Shopping Cart" %}
{% block content %}
<div class="col-md-12">
<div class="container content">
<h2><i class="icon-shopping-cart"></i> {{ title }}</h2>
<div class="progress progress-striped active">
<div class="progress-bar progress-bar-info" style="width: 100%;"></div>

2
portal/templates/pages/profile.html
View File

@ -3,7 +3,7 @@
{% set title="My Profile" %}
{% block content %}
<div class="col-md-12">
<div class="container content">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li class="active"><i class="icon-user icon-fixed-width"></i> My Profile</li>

2
portal/templates/sale.html
View File

@ -3,7 +3,7 @@
{% set title=doc.name %}
{% block content %}
<div class="col-md-12">
<div class="container content">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="{{ parent_link }}">{{ parent_title }}</a></li>

4
setup/doctype/company/company.py
View File

@ -80,7 +80,7 @@ class DocType:
# update in home page in settings
website_settings = webnotes.bean("Website Settings", "Website Settings")
website_settings.doc.home_page = webpage.doc.name
website_settings.doc.banner_html = """<h3 style='margin-bottom: 20px;'>""" + self.doc.name + "</h3>"
website_settings.doc.brand_html = self.doc.name
website_settings.doc.copyright = self.doc.name
website_settings.doclist.append({
"doctype": "Top Bar Item",
@ -336,4 +336,4 @@ def get_name_with_abbr(name, company):
if parts[-1].lower() != company_abbr.lower():
parts.append(company_abbr)
return " - ".join(parts)
return " - ".join(parts)

4
setup/doctype/email_settings/email_settings.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-03-25 17:53:21",
"docstatus": 0,
"modified": "2013-07-09 10:41:38",
"modified": "2013-11-22 12:30:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -86,7 +86,7 @@
"doctype": "DocField",
"fieldname": "always_use_login_id_as_sender",
"fieldtype": "Check",
"label": "Always use Login Id as sender"
"label": "Always use above Login Id as sender"
},
{
"doctype": "DocField",

4
setup/doctype/item_group/templates/generators/item_group.html
View File

@ -3,7 +3,7 @@
{% block content %}
{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
<div class="col-md-12">
<div class="container content">
{% if slideshow %}<!-- slideshow -->
{% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
{% endif %}
@ -13,7 +13,7 @@
<h3>{{ name }}</h3>
{% endif %}
</div>
<div class="col-md-12">
<div class="container content">
{% if sub_groups %}
<hr />
<div class="row">

2
setup/doctype/sales_partner/templates/generators/partner.html
View File

@ -1,7 +1,7 @@
{% extends base_template %}
{% block content %}
<div class="col-md-12" itemscope itemtype="http://schema.org/Organization">
<div class="container content" itemscope itemtype="http://schema.org/Organization">
<div class="row">
<div class="col-md-4">
{% if logo -%}

2
setup/doctype/sales_partner/templates/pages/partners.html
View File

@ -3,7 +3,7 @@
{% set title="Partners" %}
{% block content %}
<div class="col-md-12">
<div class="container content">
<h2 id="blog-title">{{ title }}</h2>
<hr>
{% for partner_info in partners %}

2
stock/doctype/item/templates/generators/item.html
View File

@ -24,7 +24,7 @@
{% block content %}
{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
<div class="col-md-12 product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="container content product-page-content" itemscope itemtype="http://schema.org/Product">
<div class="row">
<div class="col-md-6">
{% if slideshow %}

16
stock/doctype/item/templates/includes/product_breadcrumbs.html
View File

@ -1,12 +1,10 @@
{% if obj.parent_groups and (obj.parent_groups|length) > 1 %}
<div class="col-md-12">
<div class="clearfix">
<ul class="breadcrumb">
{% for ig in obj.parent_groups[:-1] %}
<li><a href="{{ ig.page_name }}.html">{{ ig.name }}</a></li>
{% endfor %}
<li class="active">{{ obj.parent_groups[-1].name }}</li>
</ul>
</div>
<div class="container">
<ul class="breadcrumb">
{% for ig in obj.parent_groups[:-1] %}
<li><a href="{{ ig.page_name }}.html">{{ ig.name }}</a></li>
{% endfor %}
<li class="active">{{ obj.parent_groups[-1].name }}</li>
</ul>
</div>
{% endif %}

2
stock/doctype/item/templates/includes/product_in_list.html
View File

@ -1,5 +1,5 @@
<!-- TODO product listing -->
<div class="col-md-12">
<div class="container content">
<div style="height: 120px; overflow: hidden;">
<a href="{{ page_name }}">
{%- if website_image -%}

22
stock/doctype/item/templates/includes/product_search_box.html
View File

@ -1,15 +1,13 @@
<div class="row clearfix">
<div class="pull-right" style="margin-top: 15px; margin-bottom: 15px;">
<form class="form-search">
<div class="input-group col-md-4 col-md-offset-8">
<input class="form-control" type="text" id="product-search" placeholder="Product Search...">
<span class="input-group-btn">
<button class="btn btn-default" type="button" id="btn-product-search">
<i class="icon-search"></i></button>
</span>
</div>
</form>
</div>
<div class="container" style="margin-bottom: 7px;">
<form class="form-inline form-search row">
<div class="input-group col-md-4 col-md-offset-8">
<input class="form-control" type="text" id="product-search" placeholder="Product Search...">
<span class="input-group-btn">
<button class="btn btn-default" type="button" id="btn-product-search">
<i class="icon-search"></i></button>
</span>
</div>
</form>
<script>
// redirect to product search page
$(document).ready(function() {

2
stock/doctype/item/templates/pages/product_search.html
View File

@ -18,7 +18,7 @@ $(document).ready(function() {
</script>
{% include "app/stock/doctype/item/templates/includes/product_search_box.html" %}
<div class="col-md-12">
<div class="container content">
<h3 class="search-results">Search Results</h3>
<div id="search-list" class="row">

2
support/doctype/support_ticket/templates/pages/ticket.html
View File

@ -9,7 +9,7 @@
} %}
{% block content %}
<div class="col-md-12">
<div class="container content">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="tickets">My Tickets</a></li>

2
utilities/doctype/address/templates/pages/address.html
View File

@ -37,7 +37,7 @@
{%- endmacro %}
{% block content %}
<div class="col-md-12">
<div class="container content">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="addresses">My Addresses</a></li>

2
utilities/doctype/address/templates/pages/addresses.html
View File

@ -3,7 +3,7 @@
{% set title="My Addresses" %}
{% block content %}
<div class="col-md-12">
<div class="container content">
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li class="active"><i class="icon-map-marker icon-fixed-width"></i> My Addresses</li>