nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 16:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	selling/doctype/quotation/quotation.py
	utilities/transaction_base.py
This commit is contained in:
Anand Doshi
2013-07-10 20:55:15 +05:30
parent 2ac0a83bd8 208e4f59b7
commit 63d844b2d2
205 changed files with 2528 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/css/website.css
View File

@@ -41,6 +41,10 @@ img {
margin-left: 5px;
}
div.web-footer {
border-top: 1px solid #dddddd;
padding-top: 10px;
}
.web-footer-menu ul {
list-style: none;

3
website/doctype/about_us_team_member/about_us_team_member.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:55:11",
"docstatus": 0,
"modified": "2013-03-12 13:51:02",
"modified": "2013-07-10 14:54:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
"in_list_view": 1,
"name": "__common__",
"parent": "About Us Team Member",
"parentfield": "fields",

3
website/doctype/company_history/company_history.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:08",
"docstatus": 0,
"modified": "2013-03-07 07:03:19",
"modified": "2013-07-10 14:54:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
"in_list_view": 1,
"name": "__common__",
"parent": "Company History",
"parentfield": "fields",

3
website/doctype/shopping_cart_price_list/shopping_cart_price_list.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 16:00:18",
"docstatus": 0,
"modified": "2013-06-20 16:01:34",
"modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "price_list",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Price List",
"name": "__common__",
"options": "Price List",

3
website/doctype/shopping_cart_shipping_rule/shopping_cart_shipping_rule.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-07-03 13:15:34",
"docstatus": 0,
"modified": "2013-07-03 13:19:02",
"modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "shipping_rule",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Shipping Rule",
"name": "__common__",
"options": "Shipping Rule",

3
website/doctype/shopping_cart_taxes_and_charges_master/shopping_cart_taxes_and_charges_master.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 16:57:03",
"docstatus": 0,
"modified": "2013-06-20 16:57:03",
"modified": "2013-07-10 14:54:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
"doctype": "DocField",
"fieldname": "sales_taxes_and_charges_master",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Tax Master",
"name": "__common__",
"options": "Sales Taxes and Charges Master",

2
website/doctype/style_settings/custom_template.css
View File

@@ -9,7 +9,7 @@ body {
background-color: #{{ doc.background_color }};
background-image: none;
{% else %}
background-color: #edede7;
background-color: #ffffff;
{% endif %}
{% if doc.font or doc.google_web_font_for_text %}
font-family: '{{ doc.google_web_font_for_text or doc.font }}', 'Helvetica Neue', Arial, Sans !important;

3
website/doctype/top_bar_item/top_bar_item.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:08",
"docstatus": 0,
"modified": "2013-03-07 07:03:34",
"modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -14,6 +14,7 @@
},
{
"doctype": "DocField",
"in_list_view": 1,
"name": "__common__",
"parent": "Top Bar Item",
"parentfield": "fields",

3
website/doctype/website_item_group/website_item_group.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:09",
"docstatus": 0,
"modified": "2013-03-07 07:03:34",
"modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -18,6 +18,7 @@
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Item Group",
"name": "__common__",
"options": "Item Group",

2
website/doctype/website_settings/website_settings.js
View File

@@ -34,7 +34,7 @@ $.extend(cur_frm.cscript, {
url: function(doc, cdt, cdn) {
this.label(doc, cdt, cdn);
}
},
set_parent_label_options: function() {
wn.meta.get_docfield("Top Bar Item", "parent_label", cur_frm.docname).options =

2
website/doctype/website_settings/website_settings.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-04-30 12:58:46",
"docstatus": 0,
"modified": "2013-07-05 15:02:50",
"modified": "2013-07-10 20:37:38",
"modified_by": "Administrator",
"owner": "Administrator"
},

3
website/doctype/website_slideshow_item/website_slideshow_item.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 12:26:33",
"docstatus": 0,
"modified": "2013-03-07 07:03:34",
"modified": "2013-07-10 14:54:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -16,6 +16,7 @@
},
{
"doctype": "DocField",
"in_list_view": 1,
"name": "__common__",
"parent": "Website Slideshow Item",
"parentfield": "fields",

6
website/page/website_home/website_home.js
View File

@@ -77,12 +77,6 @@ wn.module_page["Website"] = [
icon: "icon-wrench",
right: true,
items: [
{
"route":"Form/Product Settings",
"label":wn._("Product Settings"),
"description":wn._("Settings for Product Catalog on the website."),
doctype:"Product Settings"
},
{
"route":"Form/About Us Settings",
"label":wn._("About Us Settings"),

2
website/templates/html/navbar.html
View File

@@ -1,4 +1,4 @@
<div class="navbar navbar-inverse" style="">
<div class="navbar" style="margin: 0px -15px">
{%- if brand_html %}<a class="navbar-brand" href="index">{{ brand_html }}</a>{% endif -%}
<div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse"