Merge pull request #4251 from saurabh6790/hr
Leave allocation based on Date range
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 58e8a30..cb277f6 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.6.6'
+__version__ = '6.6.7'
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py
index 7ec10a6..030d6a2 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.py
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.py
@@ -42,6 +42,8 @@
items = []
for d in obj.get("items"):
if not d.qty:
+ if obj.doctype == "Purchase Receipt" and d.rejected_qty:
+ continue
frappe.throw(_("Please enter quantity for Item {0}").format(d.item_code))
# udpate with latest quantities
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 569572b..471b692 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -29,7 +29,7 @@
"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.6.6"
+app_version = "6.6.7"
github_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com"
diff --git a/erpnext/public/images/YouTube-icon-full_color.png b/erpnext/public/images/YouTube-icon-full_color.png
new file mode 100644
index 0000000..5322e65
--- /dev/null
+++ b/erpnext/public/images/YouTube-icon-full_color.png
Binary files differ
diff --git a/erpnext/public/images/erpnext-video-placeholder.jpg b/erpnext/public/images/erpnext-video-placeholder.jpg
new file mode 100644
index 0000000..7a0f843
--- /dev/null
+++ b/erpnext/public/images/erpnext-video-placeholder.jpg
Binary files differ
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index c588e74..998131f 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -658,7 +658,7 @@
return frappe.render_template("setup_wizard_message", {
image: "/assets/frappe/images/ui/bubble-tea-happy.svg",
title: __('Setup Complete'),
- message: __('Your setup is complete. Refreshing.') + ".."
+ message: ""
});
},
@@ -670,6 +670,7 @@
args: values,
callback: function(r) {
wiz.show_complete();
+ localStorage.setItem("session_last_route", "#welcome-to-erpnext");
setTimeout(function() {
window.location = "/desk";
}, 2000);
diff --git a/erpnext/setup/page/welcome_to_erpnext/__init__.py b/erpnext/setup/page/welcome_to_erpnext/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/setup/page/welcome_to_erpnext/__init__.py
diff --git a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.css b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.css
new file mode 100644
index 0000000..1fbb459
--- /dev/null
+++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.css
@@ -0,0 +1,13 @@
+#page-welcome-to-erpnext ul li {
+ margin: 7px 0px;
+}
+
+#page-welcome-to-erpnext .video-placeholder-image {
+ width: 100%;
+ cursor: pointer;
+}
+
+#page-welcome-to-erpnext .youtube-icon {
+ width: 10%;
+ cursor: pointer;
+}
diff --git a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html
new file mode 100644
index 0000000..032eab9
--- /dev/null
+++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html
@@ -0,0 +1,31 @@
+<div class="container welcome-to-erpnext text-center" style="padding: 30px 0px;">
+ <div class="row">
+ <div class="col-md-8 col-md-push-2 col-sm-12">
+ <h1>{%= __("Welcome to ERPNext") %}</h1>
+ <p class="text-muted">
+ {%= __("To get the best out of ERPNext, we recommend that you take some time and watch these help videos.") %}
+ <br><br>
+ </p>
+
+ <div class="embed-responsive embed-responsive-16by9">
+ <div class="video-placeholder embed-responsive-item">
+ <img class="video-placeholder-image"
+ src="/assets/erpnext/images/erpnext-video-placeholder.jpg">
+ <img class="centered youtube-icon"
+ src="/assets/erpnext/images/YouTube-icon-full_color.png">
+ </div>
+ </div>
+
+ <br>
+ <hr>
+ <h3>Next Steps</h3>
+ <ul class="list-unstyled">
+ <li><a class="text-muted" href="#">{%= __("Go to the Desktop and start using ERPNext") %}</a></li>
+ <li><a class="text-muted" href="#Module/Learn">{%= __("View a list of all the help videos") %}</a></li>
+ <li><a class="text-muted" href="https://manual.erpnext.com" target="_blank">{%= __("Read the ERPNext Manual") %}</a></li>
+ <li><a class="text-muted" href="https://discuss.erpnext.com" target="_blank">{%= __("Community Forum") %}</a></li>
+ </ul>
+
+ </div>
+ </div>
+</div>
diff --git a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.js b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.js
new file mode 100644
index 0000000..f072b8d
--- /dev/null
+++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.js
@@ -0,0 +1,20 @@
+frappe.pages['welcome-to-erpnext'].on_page_load = function(wrapper) {
+ var parent = $('<div class="welcome-to-erpnext"></div>').appendTo(wrapper);
+
+ parent.html(frappe.render_template("welcome_to_erpnext", {}));
+
+ parent.find(".video-placeholder").on("click", function() {
+ window.erpnext_welcome_video_started = true;
+ parent.find(".video-placeholder").addClass("hidden");
+ parent.find(".embed-responsive").append('<iframe class="embed-responsive-item video-playlist" src="https://www.youtube.com/embed/videoseries?list=PL3lFfCEoMxvxDHtYyQFJeUYkWzQpXwFM9&color=white&autoplay=1&enablejsapi=1" allowfullscreen></iframe>')
+ });
+
+ // pause video on page change
+ $(document).on("page-change", function() {
+ if (window.erpnext_welcome_video_started && parent) {
+ parent.find(".video-playlist").each(function() {
+ this.contentWindow.postMessage('{"event":"command","func":"' + 'pauseVideo' + '","args":""}', '*');
+ });
+ }
+ });
+}
diff --git a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.json b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.json
new file mode 100644
index 0000000..0f532aa
--- /dev/null
+++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.json
@@ -0,0 +1,17 @@
+{
+ "content": null,
+ "creation": "2015-10-28 16:27:02.197707",
+ "docstatus": 0,
+ "doctype": "Page",
+ "modified": "2015-10-28 16:27:02.197707",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "welcome-to-erpnext",
+ "owner": "Administrator",
+ "page_name": "welcome-to-erpnext",
+ "roles": [],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "title": "Welcome to ERPNext"
+}
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 888e3de..77cd04f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "6.6.6"
+version = "6.6.7"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()
