Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 476ae58..8e276e5 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.25.1'
+__version__ = '6.25.2'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 0f43945..e25a623 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.25.1"
+app_version = "6.25.2"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 64ffe0c..6986c0a 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -481,7 +481,7 @@
DocType: Job Applicant,Resume Attachment,Resume-Anlage
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Bestandskunden
DocType: Leave Control Panel,Allocate,Zuweisen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,Sales Return,Umsatzrendite
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,Sales Return,Rücklieferung
DocType: Item,Delivered by Supplier (Drop Ship),Geliefert von Lieferant (Streckengeschäft)
apps/erpnext/erpnext/config/hr.py +128,Salary components.,Gehaltskomponenten
apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden
diff --git a/setup.py b/setup.py
index e3f3568..950f85c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
-version = "6.25.1"
+version = "6.25.2"
requirements = parse_requirements("requirements.txt", session="")
setup(