Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Anand Doshi 2016-03-09 19:04:54 +05:30
commit 4147106c88
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.25.1' __version__ = '6.25.2'

2
erpnext/hooks.py
View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple""" app_description = """ERP made simple"""
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.25.1" app_version = "6.25.2"
app_email = "info@erpnext.com" app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)" app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"

2
erpnext/translations/de.csv
View File

@ -481,7 +481,7 @@ DocType: Sales Order,Billing and Delivery Status,Abrechnungs- und Lieferstatus
DocType: Job Applicant,Resume Attachment,Resume-Anlage 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 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Bestandskunden
DocType: Leave Control Panel,Allocate,Zuweisen 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) 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/hr.py +128,Salary components.,Gehaltskomponenten
apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden

1 DocType: Employee Salary Mode Gehaltsmodus
481 apps/erpnext/erpnext/config/crm.py +12 Database of potential customers. Datenbank von potentiellen Kunden
482 DocType: Authorization Rule Customer or Item Kunde oder Artikel
483 apps/erpnext/erpnext/config/crm.py +17 Customer database. Kundendatenbank
484 DocType: Quotation Quotation To Angebot für
485 DocType: Lead Middle Income Mittleres Einkommen
486 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58 Opening (Cr) Anfangssstand (Haben)
487 apps/erpnext/erpnext/stock/doctype/item/item.py +698 Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM. Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen.

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
from pip.req import parse_requirements from pip.req import parse_requirements
version = "6.25.1" version = "6.25.2"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(