Merge pull request #16446 from Zlash65/jv-fix
fix(accounts): wrong filters sent to fetch reference name in Journal Entry
diff --git a/.travis.yml b/.travis.yml
index e21d595..9e63c0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,16 +30,16 @@
- cd ~/frappe-bench
- bench get-app erpnext $TRAVIS_BUILD_DIR
- bench use test_site
+ - bench reinstall --yes
+ - bench scheduler disable
+ - sed -i 's/9000/9001/g' sites/common_site_config.json
+ - bench start &
+ - sleep 10
jobs:
include:
- stage: test
script:
- - bench reinstall --yes
- - bench scheduler disable
- - sed -i 's/9000/9001/g' sites/common_site_config.json
- - bench start &
- - sleep 10
- set -e
- bench run-tests
env: Server Side Test
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 26755dd..8476182 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
-__version__ = '10.1.77'
+__version__ = '10.1.80'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/crm/doctype/lead/.py b/erpnext/crm/doctype/lead/.py
deleted file mode 100644
index 70a6b22..0000000
--- a/erpnext/crm/doctype/lead/.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class Lead(Document):
- pass
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 7afbc4d..eaef60c 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -3,7 +3,7 @@
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
- "autoname": "LAP/.#####",
+ "autoname": "naming_series:",
"beta": 0,
"creation": "2013-02-20 11:18:11",
"custom": 0,
@@ -796,7 +796,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 3,
- "modified": "2017-06-13 14:28:52.426044",
+ "modified": "2019-01-08 17:35:10.795225",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Application",
diff --git a/erpnext/manufacturing/doctype/production_order/.py b/erpnext/manufacturing/doctype/production_order/.py
deleted file mode 100644
index 4476b16..0000000
--- a/erpnext/manufacturing/doctype/production_order/.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import frappe
-
-def set_required_items(production_order):
- pass
-
-def reserve_for_production(production_order):
- '''Reserve pending raw materials for production'''
- pass
\ No newline at end of file
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index fd0eb34..d7a0258 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -5,7 +5,7 @@
from erpnext.controllers.taxes_and_totals import get_itemised_tax, get_itemised_taxable_amount
def validate_gstin_for_india(doc, method):
- if not hasattr(doc, 'gstin'):
+ if not hasattr(doc, 'gstin') or not doc.gstin:
return
doc.gstin = doc.gstin.upper().strip()