From bb4db5ae80b724fc0c7352228d25827d2f94ac49 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 9 Mar 2016 19:00:18 +0530 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20[hot]=20german=20translation=20for?= =?UTF-8?q?=20Sales=20Return=20=3D=20R=C3=BCcklieferung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erpnext/translations/de.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv index 64ffe0c89b..6986c0a7f5 100644 --- a/erpnext/translations/de.csv +++ b/erpnext/translations/de.csv @@ -481,7 +481,7 @@ DocType: Sales Order,Billing and Delivery Status,Abrechnungs- und Lieferstatus 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 From 25e947bef6d71a0b956c0efe55331fae6080e1cd Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 9 Mar 2016 19:34:54 +0600 Subject: [PATCH 2/2] bumped to version 6.25.2 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 476ae58feb..8e276e5d1b 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 0f43945238..e25a6235cd 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." 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/setup.py b/setup.py index e3f35682aa..950f85ce07 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(