Merge pull request #3966 from rmehta/calendar-for-sales-order
[enhancement] calendar for sales order and other related fixes #3542
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e0dd298..ed2d7c5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,6 +49,20 @@
Tabs!
+#### Release Checklist
+
+- Describe, in detail, what is in the pull request
+- How to use the new feature?
+- Test cases
+- Change log
+- Manual Pull Request Link
+- Screencast. Should include:
+ - New Forms
+ - Linked Forms
+ - Linked Reports
+ - Print Views
+
### Copyright
Please see README.md
+
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 36d1676..ef9bbac 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -221,8 +221,7 @@
item.item_code, item.item_name, item.description, item.warehouse,
item.item_group, item.brand, item.dn_detail, item.delivery_note,
item.qty, item.base_net_rate, item.base_net_amount, item.name as "item_row",
- sales.sales_person, sales.sales_designation, sales.allocated_amount,
- sales.incentives
+ sales.sales_person, sales.allocated_amount, sales.incentives
from `tabSales Invoice` si
inner join `tabSales Invoice Item` item on item.parent = si.name
left join `tabSales Team` sales on sales.parent = si.name
diff --git a/erpnext/setup/doctype/backup_manager/backup_manager.py b/erpnext/setup/doctype/backup_manager/backup_manager.py
index 8d9d48f..4b16330 100644
--- a/erpnext/setup/doctype/backup_manager/backup_manager.py
+++ b/erpnext/setup/doctype/backup_manager/backup_manager.py
@@ -4,7 +4,7 @@
# For license information, please see license.txt
from __future__ import unicode_literals
-from frappe.utils import get_site_path
+from frappe.utils import get_site_path, cint
from frappe.utils.data import convert_utc_to_user_timezone
import os
import datetime
@@ -42,7 +42,7 @@
take_backups_if("Weekly")
def take_backups_if(freq):
- if frappe.db.get_value("Backup Manager", None, "send_backups_to_dropbox"):
+ if cint(frappe.db.get_value("Backup Manager", None, "send_backups_to_dropbox")):
if frappe.db.get_value("Backup Manager", None, "upload_backups_to_dropbox")==freq:
take_backups_dropbox()