merge conflicts fixed

This commit is contained in:
Umair Sayed
2018-09-03 12:59:50 +05:30
parent 7f77f1bb26
commit 46de031a44
1949 changed files with 2862 additions and 234155 deletions

View File

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

View File

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

View File

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View File

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

@@ -4,6 +4,50 @@
{% from "templates/includes/media.html" import media %}
{% set platinum_sponsors = [
{
'image': '/assets/foundation/img/conf/sponsors/mnt-logo.png',
'title': 'MN Technique',
'website_url': 'https://www.mntechnique.com'
},
{
'image': '/assets/foundation/img/people/tux.png',
'title': 'Your Company',
'website_url': 'https://erpnext.org'
},
{
'image': '/assets/foundation/img/people/tux.png',
'title': 'Your Company',
'website_url': 'https://erpnext.org'
},
] %}
{% macro show_section(sponsors, with_img = False, color=False) %}
<div class='row'>
{% for sponsor in sponsors %}
<div class='col-sm-4 mb-4'>
<a href='{{ ("{}{}".format("" if sponsor.website_url.startswith("http") else "//", sponsor.website_url)) if sponsor.website_url else "#" }}' target='_blank' class='card h-100'>
{% if with_img %}
<div class='square-img'>
<img class="{% if not color %}greyscale{% endif %}"
src="{{ sponsor.image or "/assets/foundation/img/people/tux.png" }}"
alt="{{ sponsor.title }}">
</div>
{% endif %}
<div class="card-body">
<h5>
{{ sponsor.title }}
</h5>
</div>
</a>
</div>
{% if loop.index is divisibleby 3 %}
</div><div class='row'>
{% endif %}
{% endfor %}
</div>
{% endmacro %}
{% block page_content %}
<section class='section-padding splash'
style='background-image: url(/assets/foundation/img/conf/conf-1.png)'>
@@ -11,14 +55,44 @@
<section class='top-section after-splash'>
<div class='container'>
<h1>ERPNext Conference 2018</h1>
<p class='lead'>The biggest gathering of ERPNext enthusiasts from all over the World.</p>
<p class='lead'>October 26 & 27, Mumbai</p>
<p><a href='/buy-tickets-inr' class='btn btn-dark mt-4'>Buy Tickets Now (INR)</a> <a href='/buy-tickets-paypal' class='btn btn-dark mt-4'>Buy Tickets Now (USD)</a></p>
</div>
</section>
<section class='section-padding section-bg text-center'>
<div class='container'>
<h3 class='mt-5'>Propose a Talk</h3>
<h3>Propose a Talk</h3>
<p class='lead'>Talk about your experience in the using or developing for ERPNext. These talks are live streamed and watched by thousands online.</p>
<a href='mailto:foundation@erpnext.com' class='btn btn-dark btn-sm mt-4'>Send Your Proposal</a>
<a href='https://discuss.erpnext.com/t/conference-2018-propose-a-talk/38312' class='btn btn-dark btn-sm mt-4' target='_blank'>Propose A Talk</a>
</div>
</section>
<section class='section-padding text-center'>
<div class='container'>
<h3>Developer + Documentation Sprint</h3>
<p class='lead'>ERPNext Developer + Documentation Sprint will be held on 24th and 25th of October (2 days prior to the event).</p>
<a href='https://github.com/erpnext/foundation/wiki/Conference-2018:-Developer-Sprint' class='btn btn-dark btn-sm mt-4' target='_blank'>Add your Name</a>
</div>
</section>
<section class='section-padding section-bg text-center'>
<div class='container'>
<h3>Sponsored By</h3>
<p class='lead'>A big thanks to our awesome sponsors who make this event happen!</p>
{% if platinum_sponsors %}
<h4 class='mt-5'>Platinum Sponsors<h4>
{{ show_section(platinum_sponsors, color=True, with_img=True) }}
{% endif %}
{% if gold_sponsors %}
<h4>Gold Sponsors<h4>
{{ show_section(gold_sponsors, with_img=True) }}
{% endif %}
{% if silver_sponsors %}
<h4>Silver Sponsors<h4>
{{ show_section(silver_sponsors) }}
{% endif %}
<br>
<p class='lead'>Become a patron for the conference and get associated with a global community
of tens of thousands of users and developers. Sponsors also get complimentary passes for the conference!</p></p>
<a href='/contact' class='btn btn-dark btn-sm mt-4'>Become A Sponsor</a>
</div>
</section>
<section class='section-padding'>
@@ -38,10 +112,10 @@
</div>
</div>
<div class='text-center mt-5'>
Registrations to Open Soon. For any queries, <a href='mailto:foundation@erpnext,org'>please email us</a>.
For any queries, <a href='mailto:foundation@erpnext.org'>please email us</a> or call us at +91-80-339-23819.
</div>
</div>
</section>
{% endblock %}
{% endblock %}

View File

@@ -1,27 +1,27 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"route": "/docs",
"title": "Home"
},
{
"route": "/docs/user/manual/en",
"title": "Manual (English)"
},
{
"route": "/docs/user/manual/de",
"title": "Handbuch (Deutsch)"
},
{
"route": "/docs/user/videos/learn",
"title": "Videos"
},
{
"route": "/search_docs",
"title": "Search",
"type": "input"
},
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"route": "https://github.com/erpnext/foundation/tree/master/foundation/www/docs",
"title": "Improve Docs"
}
]
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 KiB

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

View File

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 425 KiB

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

Some files were not shown because too many files have changed in this diff Show More