Merge pull request #12602 from PawanMeh/fixes_8540
Select multiple raw material items for Sub Contract Stock Entries
diff --git a/.gitignore b/.gitignore
index 0d39ab2..d641ced 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
*.egg-info
dist/
erpnext/docs/current
+*.swp
+*.swo
+*~
diff --git a/.swp b/.swp
deleted file mode 100644
index 5a492bd..0000000
--- a/.swp
+++ /dev/null
Binary files differ
diff --git a/.travis.yml b/.travis.yml
index 03e75b6..b74289f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,6 @@
language: python
dist: trusty
-addons:
- apt:
- sources:
- - google-chrome
- packages:
- - google-chrome-stable
-
python:
- "2.7"
@@ -31,15 +24,6 @@
- cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
before_script:
- - wget http://chromedriver.storage.googleapis.com/2.33/chromedriver_linux64.zip
- - unzip chromedriver_linux64.zip
- - sudo apt-get install libnss3
- - sudo apt-get --only-upgrade install google-chrome-stable
- - sudo cp chromedriver /usr/local/bin/.
- - sudo chmod +x /usr/local/bin/chromedriver
- - export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
- - sleep 3
- mysql -u root -ptravis -e 'create database test_frappe'
- echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
- echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
@@ -62,24 +46,6 @@
env: Server Side Test
- # stage
script:
- - bench --verbose run-setup-wizard-ui-test
- - bench execute erpnext.setup.utils.enable_all_roles_and_domains
- - bench run-ui-tests --app erpnext
- env: Client Side Test
- - # stage
- script:
- - bench --verbose run-setup-wizard-ui-test
- - bench execute erpnext.setup.utils.enable_all_roles_and_domains
- - bench run-ui-tests --app erpnext --test-list erpnext/tests/ui/tests2.txt
- env: Client Side Test - 2
- - # stage
- script:
- - bench --verbose run-setup-wizard-ui-test
- - bench execute erpnext.setup.utils.enable_all_roles_and_domains
- - bench run-ui-tests --app erpnext --test-list erpnext/tests/ui/agriculture.txt
- env: Agriculture Client Side Test
- - # stage
- script:
- wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
- bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
- bench migrate
diff --git a/README.md b/README.md
index 74ea7fc..3d11089 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,10 @@
-# ERPNext - ERP made simple
+<div align="center">
+ <img src="https://github.com/frappe/design/blob/master/logos/erpnext-logo.svg" height="128">
+ <h2>ERPNext</h2>
+ <p align="center">
+ <p>ERP made simple</p>
+ </p>
+</div>
[](https://travis-ci.org/frappe/erpnext) [](https://gitter.im/frappe/erpnext?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 4beb35b..a16794b 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.0.12'
+__version__ = '10.0.23'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/import_from_openerp.py b/erpnext/accounts/doctype/account/chart_of_accounts/import_from_openerp.py
index 9e3388b..eb3e7ff 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/import_from_openerp.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/import_from_openerp.py
@@ -12,6 +12,8 @@
from frappe.utils.csvutils import read_csv_content
import frappe
+from six import iteritems
+
path = "/Users/nabinhait/projects/odoo/addons"
accounts = {}
@@ -137,7 +139,7 @@
def make_maps_for_xml(xml_roots, account_types, country_dir):
"""make maps for `charts` and `accounts`"""
- for model, root_list in xml_roots.iteritems():
+ for model, root_list in iteritems(xml_roots):
for root in root_list:
for node in root[0].findall("record"):
if node.get("model")=="account.account.template":
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json
index e109a3a..e29ad82 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json
@@ -176,7 +176,7 @@
"Eingeforderte Nachsch\u00fcsse (gegenkonto 2929)": {}
},
"Eingeforderte- noch ausstehende Kapitaleinlagen": {
- "Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Forderungen- nicht eingeforderte ausstehende Einlagen s. Konto 2910)": {}
+ "Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert": {}
},
"Forderungen aus Lieferungen und Leistungen H-Saldo": {
"Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr": {},
@@ -685,7 +685,6 @@
"Umsatzsteuer aus innergemeinschaftlichem Erwerb 16%": {},
"Umsatzsteuer aus innergemeinschaftlichem Erwerb 19%": {},
"Umsatzsteuer aus innergemeinschaftlichem Erwerb ohne Vorsteuerabzug": {},
- "Umsatzsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Umsatzsteuer-Identifikationsnummer": {},
"Umsatzsteuer fr\u00fchere Jahre": {},
"Umsatzsteuer laufendes Jahr": {},
"Umsatzsteuer nach \u00a713b UStG": {},
@@ -747,7 +746,7 @@
"Verbindlichkeiten gegen\u00fcber Kreditinstituten ": {
"Gegenkonto 3159-3209 bei Aufteilung der Konten 3210-3248": {}
},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten oder Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten - Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
"Verbindlichkeiten gegen\u00fcber Kreditinstituten 1": {
"(frei- in Bilanz kein Restlaufzeit vermerkt) 1": {},
"Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit 1 bis 5 Jahre": {},
@@ -778,8 +777,8 @@
},
"Gewinn u. Verlust - Aufwendungen": {
"Betriebliche Aufwendungen": {
- "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
- "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
+ "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Abschreibungen \u00fcberschreiten": {
+ "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Abschreibungen \u00fcberschreiten": {
"Abschreibungen auf Umlaufverm\u00f6gen- steuerrechtlich bedingt (soweit un\u00fcblich hoch)": {},
"Abschreibungen auf Verm\u00f6gensgegenst\u00e4nde des Umlaufverm\u00f6gens (soweit un\u00fcblich hoch)": {},
"Forderungsverluste (soweit un\u00fcblich hoch)": {},
@@ -852,7 +851,7 @@
"Sonstige betriebliche Aufwendungen 3": {
"Sonstige betriebliche Aufwendungen 4": {
"Abgaben f\u00fcr betrieblich genutzten Grundbesitz": {},
- "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.) nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
+ "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.) nach": {},
"Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
"Abschluss- und Pr\u00fcfungskosten": {},
"Abschreibung auf Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapieren des UV (\u00fcbliche H\u00f6he)": {},
@@ -867,7 +866,7 @@
"Aufwendungen aus Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.)": {},
"Aufwendungen aus Bewertung Finanzmittelfonds": {},
"Aufwendungen aus Kursdifferenzen": {},
- "Aufwendungen aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Aufwendungen aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig": {},
"Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten R\u00fcckstellungen": {},
"Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten Verbindlichkeiten": {},
"Aufwendungen f\u00fcr Abraum- und Abfallbeseitigung": {},
@@ -987,9 +986,9 @@
"Verg\u00fctungen an Mitunternehmer \u00a7 15 EStG": {},
"Verkaufsprovisionen": {},
"Verluste aus dem Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {},
- "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100% / 50% nicht anzugsf\u00e4hig (inlandische Kap. Ges.)": {},
+ "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100%/50% nicht anzugsf\u00e4hig": {},
"Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4te": {},
- "Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig": {},
"Verpackungsmaterial": {},
"Versicherungen": {},
"Versicherungen f\u00fcr Geb\u00e4ude": {},
@@ -1020,10 +1019,10 @@
},
"Abschreibungen auf Finanzanlagen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
"Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften": {},
- "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsf\u00e4hig": {},
"Abschreibungen auf Grund von Verlustanteilen an Mitunternehmerschaften \u00a7 8 GewStG": {},
"Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens": {},
- "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig": {},
"Vorwegnahme k\u00fcnftiger Wertschwankungen bei Wertpapieren des Umlaufverm\u00f6gens": {}
},
"account_type": "Depreciation"
@@ -1123,15 +1122,15 @@
}
},
"Erh\u00f6hung oder Verminderung des Bestands an fertigen und unfertige Erzeugnissen": {
- "Erh\u00f6hung des Bestands an fertigen und unfertigen Erzeugnissen oder Verminderung des Bestands an fertigen und unfertigen Erzeugnissen": {
+ "Erh\u00f6hung / Verminderung des Bestands an fertigen und unfertigen Erzeugnissen": {
"Bestandsver\u00e4nderungen - fertige Erzeugnisse": {},
"Bestandsver\u00e4nderungen - unfertige Erzeugnisse": {},
"Bestandsver\u00e4nderungen - unfertige Leistungen": {}
},
- "Erh\u00f6hung des Bestands in Arbeit befindlicher Auftr\u00e4ge oder Verminderung des Bestands in Arbeit befindlicher Auftr\u00e4ge": {
+ "Erh\u00f6hung / Verminderung des Bestands in Arbeit befindlicher Auftr\u00e4ge": {
"Bestandsver\u00e4nderungen in Arbeit befindlicher Auftr\u00e4ge": {}
},
- "Erh\u00f6hung des Bestands in Ausf\u00fchrung befindlicher Bauaftr\u00e4ge oder Verminderung des Bestands in Ausf\u00fchrung befindlicher Bauauftr\u00e4ge": {
+ "Erh\u00f6hung / Verminderung des Bestands in Ausf\u00fchrung befindlicher Bauaftr\u00e4ge": {
"Bestandsver\u00e4nderungen in Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {}
}
},
@@ -1384,8 +1383,8 @@
"Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 1": {
"Diskontertr\u00e4ge": {},
"Diskontertr\u00e4ge aus verbundenen Unternehmen": {},
- "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (Umlaufverm\u00f6gen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
- "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
+ "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei": {},
+ "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei": {},
"Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 2": {},
"Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {},
"Sonstige Zinsertr\u00e4ge": {},
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts.json
index 3ed6b1d..ea8ebf0 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts.json
@@ -588,7 +588,6 @@
"5592. Munk\u00e1ltat\u00f3 \u00e1ltal \u00f6nk\u00e9ntes p\u00e9nzt\u00e1rba befizetett munk\u00e1ltat\u00f3i tagd\u00edj hozz\u00e1j\u00e1rul\u00e1s": {},
"5593. Munk\u00e1ltat\u00f3t terhel\u0151 szem\u00e9lyi j\u00f6vedelemad\u00f3": {},
"5594. Munk\u00e1ltat\u00f3i hozz\u00e1j\u00e1rul\u00e1s a korengedm\u00e9nyes nyugd\u00edj ig\u00e9nybev\u00e9tel\u00e9hez": {},
- "5595. Tal\u00e1lm\u00e1nyi d\u00edj, szabadalom v\u00e9tel\u00e1ra \u00e9s hasznos\u00edt\u00e1si d\u00edja, az \u00faj\u00edt\u00e1si d\u00edj \u00e9s ezekkel kapcsolatos k\u00f6zrem\u0171k\u00f6d\u00e9si d\u00edjak": {},
"5596. Fizetett szerz\u0151i, \u00edr\u00f3i \u00e9s m\u00e1s jogv\u00e9delmet \u00e9lvez\u0151 munk\u00e1k d\u00edjai \u00e9s ezekkel kapcsolatos k\u00f6zrem\u0171k\u00f6d\u0151i d\u00edjak": {},
"5597. Fizetett \u00f6szt\u00f6nd\u00edjak": {},
"5598. Reprezent\u00e1ci\u00f3s k\u00f6lts\u00e9gek, \u00e9tkez\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {},
@@ -731,7 +730,7 @@
"8684. K\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se": {}
},
"869. K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00e1ford\u00edt\u00e1sok": {
- "8691. T\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kpap\u00edrnak vagy r\u00e9szesed\u00e9snek nem min\u0151s\u00fcl\u0151 vagyont. k\u00f6nyv szerinti \u00e9s l\u00e9t. okir. meghat. veszt. k\u00fcl\u00f6nb\u00f6zet": {},
+ "8691. T\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kpap\u00edrnak vagy r\u00e9szesed\u00e9snek nem min\u0151s\u00fcl\u0151 vagyont.": {},
"8692. Ellent\u00e9telez\u00e9s n\u00e9lk\u00fcl \u00e1tv\u00e1llalt k\u00f6telezetts\u00e9g szerz\u0151d\u00e9s szerinti \u00f6sszege": {},
"8693. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl \u00e1tadott, r\u00e9szesed\u00e9snek vagy \u00e9rt\u00e9kpap\u00edrnak nem min\u0151s\u00fcl\u0151 eszk\u00f6z\u00f6k nyilv\u00e1ntart\u00e1s szerinti \u00e9rt\u00e9ke": {},
"8694. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl ny\u00fajtott szolg\u00e1ltat\u00e1sok beker\u00fcl\u00e9si \u00e9rt\u00e9ke": {},
@@ -813,12 +812,7 @@
"9684. R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}
},
"969. K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {
- "9691. Gazdas\u00e1gi t\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kp. vagy r\u00e9szesed\u00e9snek nem min\u0151s\u00fcl\u0151 vagyont. \u00e9rt\u00e9ke \u00e9s l\u00e9tes\u00edt\u0151 okir. \u00e9rt. nyer. jell . k\u00fcl\u00f6nb.": {},
- "9692. El\u00e9v\u00fclt k\u00f6telezetts\u00e9g k\u00f6nyv szerinti \u00e9rt\u00e9ke": {},
- "9693. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl \u00e1tvett, aj\u00e1nd\u00e9kk\u00e9nt, hagyat\u00e9kk\u00e9nt kapott, fellelt eszk\u00f6z\u00f6k piaci vagy jogszab\u00e1ly szerinti \u00e9rt\u00e9ke": {},
- "9694. T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl kapott szolg\u00e1ltat\u00e1sok piaci vagy jogszab\u00e1ly szerinti \u00e9rt\u00e9ke": {},
- "9695. Elengedett \u00e9s ellent\u00e9telez\u00e9s n\u00e9lk\u00fcl \u00e1tv\u00e1llalt k\u00f6telezetts\u00e9g \u00e9rt\u00e9ke": {},
- "9696. Egy\u00e9b, vagyonn\u00f6veked\u00e9ssel j\u00e1r\u00f3 bev\u00e9telek": {}
+ "is_group": 1
}
},
"97. P\u00c9NZ\u00dcGYI M\u0170VELETEK BEV\u00c9TELEI": {
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
index 0aaed8f..e8b60ac 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -14,7 +14,7 @@
class BankReconciliation(Document):
def get_payment_entries(self):
if not (self.bank_account and self.from_date and self.to_date):
- msgprint("Bank Account, From Date and To Date are Mandatory")
+ msgprint(_("Bank Account, From Date and To Date are Mandatory"))
return
condition = ""
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 48062a3..60c974f 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -82,8 +82,8 @@
$.each(this.frm.doc.accounts || [], function(i, jvd) {
frappe.model.set_default_values(jvd);
});
-
- if(!this.frm.doc.amended_from) this.frm.doc.posting_date = this.frm.posting_date || frappe.datetime.get_today();
+ var posting_date = this.frm.posting_date;
+ if(!this.frm.doc.amended_from) this.frm.set_value('posting_date', posting_date || frappe.datetime.get_today());
}
},
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 5e67e44..addffac 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -11,6 +11,8 @@
from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
from erpnext.hr.doctype.employee_loan.employee_loan import update_disbursement_status
+from six import string_types, iteritems
+
class JournalEntry(AccountsController):
def __init__(self, *args, **kwargs):
super(JournalEntry, self).__init__(*args, **kwargs)
@@ -228,7 +230,7 @@
def validate_orders(self):
"""Validate totals, closed and docstatus for orders"""
- for reference_name, total in self.reference_totals.iteritems():
+ for reference_name, total in iteritems(self.reference_totals):
reference_type = self.reference_types[reference_name]
account = self.reference_accounts[reference_name]
@@ -260,7 +262,7 @@
def validate_invoices(self):
"""Validate totals and docstatus for invoices"""
- for reference_name, total in self.reference_totals.iteritems():
+ for reference_name, total in iteritems(self.reference_totals):
reference_type = self.reference_types[reference_name]
if reference_type in ("Sales Invoice", "Purchase Invoice"):
@@ -763,7 +765,7 @@
if not frappe.has_permission("Account"):
frappe.msgprint(_("No Permission"), raise_exception=1)
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
company_currency = erpnext.get_company_currency(args.get("company"))
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index c32acc1..913aa6e 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -14,6 +14,7 @@
from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
from erpnext.controllers.accounts_controller import AccountsController
+from six import string_types
class InvalidPaymentEntry(ValidationError):
pass
@@ -500,7 +501,7 @@
@frappe.whitelist()
def get_outstanding_reference_documents(args):
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
party_account_currency = get_account_currency(args.get("party_account"))
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 21ddb10..57ead28 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -246,7 +246,7 @@
"currency": ref_doc.currency,
"grand_total": grand_total,
"email_to": args.recipient_id or "",
- "subject": "Payment Request for %s"%args.dn,
+ "subject": _("Payment Request for {0}").format(args.dn),
"message": gateway_account.get("message") or get_dummy_message(ref_doc),
"reference_doctype": args.dt,
"reference_name": args.dn
diff --git a/erpnext/accounts/doctype/payment_term/payment_term.json b/erpnext/accounts/doctype/payment_term/payment_term.json
index 702319b..10cfcf2 100644
--- a/erpnext/accounts/doctype/payment_term/payment_term.json
+++ b/erpnext/accounts/doctype/payment_term/payment_term.json
@@ -1,8 +1,8 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
"autoname": "field:payment_term_name",
"beta": 0,
"creation": "2017-08-10 15:24:54.876365",
@@ -265,7 +265,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-08-10 16:26:03.581501",
+ "modified": "2018-01-24 11:13:42.800048",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Term",
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json
index 0959658..7a3483d 100644
--- a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json
@@ -1,8 +1,8 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
"autoname": "field:template_name",
"beta": 0,
"creation": "2017-08-10 15:34:28.058054",
@@ -85,7 +85,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-08-10 15:46:33.877884",
+ "modified": "2018-01-24 11:13:31.158613",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Terms Template",
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 2cb8e10..ed3de07 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -260,6 +260,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "allow_user_to_edit_discount",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Allow user to edit Discount",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "allow_print_before_pay",
"fieldtype": "Check",
"hidden": 0,
@@ -1476,7 +1506,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-01-03 17:30:45.198147",
+ "modified": "2018-01-31 19:33:11.765731",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Profile",
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 83045ea..1087878 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -11,6 +11,7 @@
from frappe.utils import flt, cint
from frappe.model.document import Document
+from six import string_types
class MultiplePricingRuleConflict(frappe.ValidationError): pass
@@ -96,7 +97,7 @@
"ignore_pricing_rule": "something"
}
"""
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
args = frappe._dict(args)
@@ -207,7 +208,7 @@
@frappe.whitelist()
def remove_pricing_rules(item_list):
- if isinstance(item_list, basestring):
+ if isinstance(item_list, string_types):
item_list = json.loads(item_list)
out = []
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 2fbf014..26cc598 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -8,6 +8,10 @@
setup: function(doc) {
this.setup_posting_date_time_check();
this._super(doc);
+
+ // formatter for material request item
+ this.frm.set_indicator_formatter('item_code',
+ function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
},
onload: function() {
this._super();
@@ -18,12 +22,8 @@
this.frm.set_df_property("credit_to", "print_hide", 0);
}
} else {
- this.frm.set_value("disable_rounded_total", frappe.sys_defaults.disable_rounded_total);
+ this.frm.set_value("disable_rounded_total", cint(frappe.sys_defaults.disable_rounded_total));
}
-
- // formatter for material request item
- this.frm.set_indicator_formatter('item_code',
- function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
},
refresh: function(doc) {
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 3f9bca7..21b71ff 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -96,7 +96,7 @@
if not self.credit_to:
self.credit_to = get_party_account("Supplier", self.supplier, self.company)
if not self.due_date:
- self.due_date = get_due_date(self.posting_date, "Supplier", self.supplier)
+ self.due_date = get_due_date(self.posting_date, "Supplier", self.supplier, self.company)
super(PurchaseInvoice, self).set_missing_values(for_validate)
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 63db16c..be6078a 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -2,23 +2,32 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe, json
-from frappe import _
-from frappe.utils import nowdate
-from erpnext.setup.utils import get_exchange_rate
-from frappe.core.doctype.communication.email import make
-from erpnext.stock.get_item_details import get_pos_profile
+
+import json
+
+import frappe
from erpnext.accounts.party import get_party_account_currency
from erpnext.controllers.accounts_controller import get_taxes_and_charges
+from erpnext.setup.utils import get_exchange_rate
+from erpnext.stock.get_item_details import get_pos_profile
+from frappe import _
+from frappe.core.doctype.communication.email import make
+from frappe.utils import nowdate
+
+from six import string_types
+
@frappe.whitelist()
def get_pos_data():
doc = frappe.new_doc('Sales Invoice')
- doc.is_pos = 1;
+ doc.is_pos = 1
pos_profile = get_pos_profile(doc.company) or {}
if not pos_profile:
frappe.throw(_("POS Profile is required to use Point-of-Sale"))
- if not doc.company: doc.company = pos_profile.get('company')
+
+ if not doc.company:
+ doc.company = pos_profile.get('company')
+
doc.update_stock = pos_profile.get('update_stock')
if pos_profile.get('name'):
@@ -30,18 +39,20 @@
update_multi_mode_option(doc, pos_profile)
default_print_format = pos_profile.get('print_format') or "Point of Sale"
print_template = frappe.db.get_value('Print Format', default_print_format, 'html')
+ items_list = get_items_list(pos_profile)
customers = get_customers_list(pos_profile)
return {
'doc': doc,
'default_customer': pos_profile.get('customer'),
- 'items': get_items_list(pos_profile),
+ 'items': items_list,
'item_groups': get_item_groups(pos_profile),
'customers': customers,
'address': get_customers_address(customers),
'contacts': get_contacts(customers),
'serial_no_data': get_serial_no_data(pos_profile, doc.company),
'batch_no_data': get_batch_no_data(),
+ 'barcode_data': get_barcode_data(items_list),
'tax_data': get_item_tax_data(),
'price_list_data': get_price_list_data(doc.selling_price_list),
'bin_data': get_bin_data(pos_profile),
@@ -51,20 +62,23 @@
'meta': get_meta()
}
+
def get_meta():
doctype_meta = {
'customer': frappe.get_meta('Customer'),
'invoice': frappe.get_meta('Sales Invoice')
}
- for row in frappe.get_all('DocField', fields = ['fieldname', 'options'],
- filters = {'parent': 'Sales Invoice', 'fieldtype': 'Table'}):
+ for row in frappe.get_all('DocField', fields=['fieldname', 'options'],
+ filters={'parent': 'Sales Invoice', 'fieldtype': 'Table'}):
doctype_meta[row.fieldname] = frappe.get_meta(row.options)
return doctype_meta
+
def get_company_data(company):
- return frappe.get_all('Company', fields = ["*"], filters= {'name': company})[0]
+ return frappe.get_all('Company', fields=["*"], filters={'name': company})[0]
+
def update_pos_profile_data(doc, pos_profile, company_data):
doc.campaign = pos_profile.get('campaign')
@@ -96,12 +110,14 @@
doc.terms = frappe.db.get_value('Terms and Conditions', pos_profile.get('tc_name'), 'terms') or doc.terms or ''
doc.offline_pos_name = ''
+
def get_root(table):
root = frappe.db.sql(""" select name from `tab%(table)s` having
- min(lft)"""%{'table': table}, as_dict=1)
+ min(lft)""" % {'table': table}, as_dict=1)
return root[0].name
+
def update_multi_mode_option(doc, pos_profile):
from frappe.model import default_fields
@@ -123,15 +139,18 @@
doc.append('payments', payment_mode)
+
def get_mode_of_payment(doc):
- return frappe.db.sql(""" select mpa.default_account, mpa.parent, mp.type as type from `tabMode of Payment Account` mpa,
- `tabMode of Payment` mp where mpa.parent = mp.name and mpa.company = %(company)s""", {'company': doc.company}, as_dict=1)
+ return frappe.db.sql(""" select mpa.default_account, mpa.parent, mp.type as type from `tabMode of Payment Account` mpa, \
+ `tabMode of Payment` mp where mpa.parent = mp.name and mpa.company = %(company)s""", {'company': doc.company}, as_dict=1)
+
def update_tax_table(doc):
taxes = get_taxes_and_charges('Sales Taxes and Charges Template', doc.taxes_and_charges)
for tax in taxes:
doc.append('taxes', tax)
+
def get_items_list(pos_profile):
cond = "1=1"
item_groups = []
@@ -139,19 +158,20 @@
# Get items based on the item groups defined in the POS profile
for d in pos_profile.get('item_groups'):
item_groups.extend([d.name for d in get_child_nodes('Item Group', d.item_group)])
- cond = "item_group in (%s)"%(', '.join(['%s']*len(item_groups)))
+ cond = "item_group in (%s)" % (', '.join(['%s'] * len(item_groups)))
- return frappe.db.sql("""
+ return frappe.db.sql("""
select
name, item_code, item_name, description, item_group, expense_account, has_batch_no,
- has_serial_no, expense_account, selling_cost_center, stock_uom, image,
- default_warehouse, is_stock_item, barcode, brand
+ has_serial_no, expense_account, selling_cost_center, stock_uom, image,
+ default_warehouse, is_stock_item, brand
from
tabItem
where
disabled = 0 and has_variants = 0 and is_sales_item = 1 and {cond}
""".format(cond=cond), tuple(item_groups), as_dict=1)
+
def get_item_groups(pos_profile):
item_group_dict = {}
item_groups = frappe.db.sql("""Select name,
@@ -161,6 +181,7 @@
item_group_dict[data.name] = [data.lft, data.rgt]
return item_group_dict
+
def get_customers_list(pos_profile={}):
cond = "1=1"
customer_groups = []
@@ -168,15 +189,16 @@
# Get customers based on the customer groups defined in the POS profile
for d in pos_profile.get('customer_groups'):
customer_groups.extend([d.name for d in get_child_nodes('Customer Group', d.customer_group)])
- cond = "customer_group in (%s)"%(', '.join(['%s']*len(customer_groups)))
+ cond = "customer_group in (%s)" % (', '.join(['%s'] * len(customer_groups)))
return frappe.db.sql(""" select name, customer_name, customer_group,
territory, customer_pos_id from tabCustomer where disabled = 0
and {cond}""".format(cond=cond), tuple(customer_groups), as_dict=1) or {}
+
def get_customers_address(customers):
customer_address = {}
- if isinstance(customers, basestring):
+ if isinstance(customers, string_types):
customers = [frappe._dict({'name': customers})]
for data in customers:
@@ -185,33 +207,37 @@
(select parent from `tabDynamic Link` where link_doctype = 'Customer' and link_name = %s
and parenttype = 'Address')""", data.name, as_dict=1)
address_data = {}
- if address: address_data = address[0]
+ if address:
+ address_data = address[0]
address_data.update({'full_name': data.customer_name, 'customer_pos_id': data.customer_pos_id})
customer_address[data.name] = address_data
return customer_address
+
def get_contacts(customers):
customer_contact = {}
- if isinstance(customers, basestring):
+ if isinstance(customers, string_types):
customers = [frappe._dict({'name': customers})]
for data in customers:
- contact = frappe.db.sql(""" select email_id, phone, mobile_no from `tabContact`
+ contact = frappe.db.sql(""" select email_id, phone, mobile_no from `tabContact`
where is_primary_contact =1 and name in
(select parent from `tabDynamic Link` where link_doctype = 'Customer' and link_name = %s
and parenttype = 'Contact')""", data.name, as_dict=1)
- if contact:
+ if contact:
customer_contact[data.name] = contact[0]
return customer_contact
+
def get_child_nodes(group_type, root):
lft, rgt = frappe.db.get_value(group_type, root, ["lft", "rgt"])
return frappe.db.sql(""" Select name, lft, rgt from `tab{tab}` where
lft >= {lft} and rgt <= {rgt} order by lft""".format(tab=group_type, lft=lft, rgt=rgt), as_dict=1)
+
def get_serial_no_data(pos_profile, company):
# get itemwise serial no data
# example {'Nokia Lumia 1020': {'SN0001': 'Pune'}}
@@ -232,6 +258,7 @@
return itemwise_serial_no
+
def get_batch_no_data():
# get itemwise batch no data
# exmaple: {'LED-GRE': [Batch001, Batch002]}
@@ -248,6 +275,26 @@
return itemwise_batch
+
+def get_barcode_data(items_list):
+ # get itemwise batch no data
+ # exmaple: {'LED-GRE': [Batch001, Batch002]}
+ # where LED-GRE is item code, SN0001 is serial no and Pune is warehouse
+
+ itemwise_barcode = {}
+ for item in items_list:
+ barcodes = frappe.db.sql("""
+ select barcode from `tabItem Barcode` where parent = '{0}'
+ """.format(item.item_code), as_dict=1)
+
+ for barcode in barcodes:
+ if item.item_code not in itemwise_barcode:
+ itemwise_barcode.setdefault(item.item_code, [])
+ itemwise_barcode[item.item_code].append(barcode)
+
+ return itemwise_barcode
+
+
def get_item_tax_data():
# get default tax of an item
# example: {'Consulting Services': {'Excise 12 - TS': '12.000'}}
@@ -262,17 +309,19 @@
return itemwise_tax
+
def get_price_list_data(selling_price_list):
itemwise_price_list = {}
price_lists = frappe.db.sql("""Select ifnull(price_list_rate, 0) as price_list_rate,
item_code from `tabItem Price` ip where price_list = %(price_list)s""",
- {'price_list': selling_price_list}, as_dict=1)
+ {'price_list': selling_price_list}, as_dict=1)
for item in price_lists:
itemwise_price_list[item.item_code] = item.price_list_rate
return itemwise_price_list
+
def get_bin_data(pos_profile):
itemwise_bin_data = {}
cond = "1=1"
@@ -289,6 +338,7 @@
return itemwise_bin_data
+
def get_pricing_rule_data(doc):
pricing_rules = ""
if doc.ignore_pricing_rule == 0:
@@ -297,18 +347,19 @@
and ifnull(company, '') in (%(company)s, '') and disable = 0 and %(date)s
between ifnull(valid_from, '2000-01-01') and ifnull(valid_upto, '2500-12-31')
order by priority desc, name desc""",
- {'company': doc.company, 'price_list': doc.selling_price_list, 'date': nowdate()}, as_dict=1)
+ {'company': doc.company, 'price_list': doc.selling_price_list, 'date': nowdate()}, as_dict=1)
return pricing_rules
+
@frappe.whitelist()
def make_invoice(doc_list={}, email_queue_list={}, customers_list={}):
- if isinstance(doc_list, basestring):
+ if isinstance(doc_list, string_types):
doc_list = json.loads(doc_list)
- if isinstance(email_queue_list, basestring):
+ if isinstance(email_queue_list, string_types):
email_queue_list = json.loads(email_queue_list)
- if isinstance(customers_list, basestring):
+ if isinstance(customers_list, string_types):
customers_list = json.loads(customers_list)
customers_list = make_customer_and_address(customers_list)
@@ -338,14 +389,15 @@
'synced_contacts': get_contacts(customers)
}
+
def validate_records(doc):
validate_item(doc)
+
def get_customer_id(doc, customer=None):
cust_id = None
if doc.get('customer_pos_id'):
- cust_id = frappe.db.get_value('Customer',
- {'customer_pos_id': doc.get('customer_pos_id')}, 'name')
+ cust_id = frappe.db.get_value('Customer',{'customer_pos_id': doc.get('customer_pos_id')}, 'name')
if not cust_id:
customer = customer or doc.get('customer')
@@ -356,6 +408,7 @@
return cust_id
+
def make_customer_and_address(customers):
customers_list = []
for customer, data in customers.items():
@@ -372,6 +425,7 @@
frappe.db.commit()
return customers_list
+
def add_customer(data):
customer_doc = frappe.new_doc('Customer')
customer_doc.customer_name = data.get('full_name') or data.get('customer')
@@ -380,28 +434,29 @@
customer_doc.customer_group = get_customer_group(data)
customer_doc.territory = get_territory(data)
customer_doc.flags.ignore_mandatory = True
- customer_doc.save(ignore_permissions = True)
+ customer_doc.save(ignore_permissions=True)
frappe.db.commit()
return customer_doc.name
+
def get_territory(data):
if data.get('territory'):
return data.get('territory')
- return frappe.db.get_single_value('Selling Settings',
- 'territory') or _('All Territories')
+ return frappe.db.get_single_value('Selling Settings','territory') or _('All Territories')
+
def get_customer_group(data):
if data.get('customer_group'):
return data.get('customer_group')
- return frappe.db.get_single_value('Selling Settings',
- 'customer_group') or frappe.db.get_value('Customer Group', {'is_group': 0}, 'name')
+ return frappe.db.get_single_value('Selling Settings', 'customer_group') or frappe.db.get_value('Customer Group', {'is_group': 0}, 'name')
-def make_contact(args,customer):
+
+def make_contact(args, customer):
if args.get('email_id') or args.get('phone'):
name = frappe.db.get_value('Dynamic Link',
- {'link_doctype': 'Customer', 'link_name': customer, 'parenttype': 'Contact'}, 'parent')
+ {'link_doctype': 'Customer', 'link_name': customer, 'parenttype': 'Contact'}, 'parent')
args = {
'first_name': args.get('full_name'),
@@ -416,16 +471,18 @@
doc.update(args)
doc.is_primary_contact = 1
if not name:
- doc.append('links',{
+ doc.append('links', {
'link_doctype': 'Customer',
'link_name': customer
})
doc.flags.ignore_mandatory = True
doc.save(ignore_permissions=True)
+
def make_address(args, customer):
- if not args.get('address_line1'): return
-
+ if not args.get('address_line1'):
+ return
+
name = args.get('name')
if not name:
@@ -437,7 +494,7 @@
else:
address = frappe.new_doc('Address')
address.country = frappe.db.get_value('Company', args.get('company'), 'country')
- address.append('links',{
+ address.append('links', {
'link_doctype': 'Customer',
'link_name': customer
})
@@ -446,7 +503,8 @@
address.is_shipping_address = 1
address.update(args)
address.flags.ignore_mandatory = True
- address.save(ignore_permissions = True)
+ address.save(ignore_permissions=True)
+
def make_email_queue(email_queue):
name_list = []
@@ -455,15 +513,16 @@
data = json.loads(data)
sender = frappe.session.user
print_format = "POS Invoice"
- attachments = [frappe.attach_print('Sales Invoice', name, print_format= print_format)]
+ attachments = [frappe.attach_print('Sales Invoice', name, print_format=print_format)]
- make(subject = data.get('subject'), content = data.get('content'), recipients = data.get('recipients'),
- sender=sender,attachments = attachments, send_email=True,
- doctype='Sales Invoice', name=name)
+ make(subject=data.get('subject'), content=data.get('content'), recipients=data.get('recipients'),
+ sender=sender, attachments=attachments, send_email=True,
+ doctype='Sales Invoice', name=name)
name_list.append(key)
return name_list
+
def validate_item(doc):
for item in doc.get('items'):
if not frappe.db.exists('Item', item.get('item_code')):
@@ -486,13 +545,15 @@
frappe.db.commit()
name_list.append(name)
except Exception as e:
- if frappe.message_log: frappe.message_log.pop()
+ if frappe.message_log:
+ frappe.message_log.pop()
frappe.db.rollback()
frappe.log_error(frappe.get_traceback())
name_list = save_invoice(doc, name, name_list)
return name_list
+
def save_invoice(doc, name, name_list):
try:
if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index ab40e8c..27ecbf7 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -15,1143 +15,1263 @@
"engine": "InnoDB",
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "customer_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "options": "fa fa-user",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "customer_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "options": "fa fa-user",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "{customer_name}",
- "fieldname": "title",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Title",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "{customer_name}",
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Title",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Series",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "SINV-\nSINV-RET-",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 1,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Series",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "SINV-\nSINV-RET-",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 1,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "customer",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 1,
- "label": "Customer",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "customer",
- "oldfieldtype": "Link",
- "options": "Customer",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Customer",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "customer",
+ "oldfieldtype": "Link",
+ "options": "Customer",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 1,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "customer",
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Name",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "customer_name",
- "oldfieldtype": "Data",
- "options": "customer.customer_name",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "customer",
+ "fieldname": "customer_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Name",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "customer_name",
+ "oldfieldtype": "Data",
+ "options": "customer.customer_name",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "tax_id",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Tax Id",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "tax_id",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Tax Id",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "project",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Project",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "project_name",
- "oldfieldtype": "Link",
- "options": "Project",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Project",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "project_name",
+ "oldfieldtype": "Link",
+ "options": "Project",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "is_pos",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Include Payment (POS)",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "is_pos",
- "oldfieldtype": "Check",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "is_pos",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Include Payment (POS)",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "is_pos",
+ "oldfieldtype": "Check",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_pos",
- "fieldname": "pos_profile",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "POS Profile",
- "length": 0,
- "no_copy": 0,
- "options": "POS Profile",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_pos",
+ "fieldname": "pos_profile",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "POS Profile",
+ "length": 0,
+ "no_copy": 0,
+ "options": "POS Profile",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "offline_pos_name",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Offline POS Name",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "offline_pos_name",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Offline POS Name",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "company",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 1,
- "label": "Company",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 1,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Company",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 1,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "default": "Today",
- "fieldname": "posting_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Date",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "posting_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "Today",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Date",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "posting_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 1,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "posting_time",
- "fieldtype": "Time",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Posting Time",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "posting_time",
- "oldfieldtype": "Time",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "posting_time",
+ "fieldtype": "Time",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Posting Time",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "posting_time",
+ "oldfieldtype": "Time",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.docstatus==0",
- "fieldname": "set_posting_time",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Edit Posting Date and Time",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.docstatus==0",
+ "fieldname": "set_posting_time",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Edit Posting Date and Time",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "due_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Payment Due Date",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "due_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "due_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Payment Due Date",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "due_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Amended From",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Link",
- "options": "Sales Invoice",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "amended_from",
+ "oldfieldtype": "Link",
+ "options": "Sales Invoice",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_return",
- "fieldname": "returns",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Returns",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_return",
+ "fieldname": "returns",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Returns",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_return",
- "fieldname": "is_return",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Is Return",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_return",
+ "fieldname": "is_return",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Return",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_return",
- "fieldname": "return_against",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Return Against Sales Invoice",
- "length": 0,
- "no_copy": 1,
- "options": "Sales Invoice",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_return",
+ "fieldname": "return_against",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Return Against Sales Invoice",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Sales Invoice",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "",
- "fieldname": "address_and_contact",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Address and Contact",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "po_no",
+ "columns": 0,
+ "fieldname": "customer_po_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer PO Details",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "customer_address",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Address",
- "length": 0,
- "no_copy": 0,
- "options": "Address",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "po_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer's Purchase Order",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "address_display",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Address",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_23",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "contact_person",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Contact Person",
- "length": 0,
- "no_copy": 0,
- "options": "Contact",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "po_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer's Purchase Order Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "contact_display",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Contact",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "address_and_contact",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Address and Contact",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "contact_mobile",
- "fieldtype": "Small Text",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Mobile No",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "customer_address",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Address",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Address",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "contact_email",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Contact Email",
- "length": 0,
- "no_copy": 0,
- "options": "Email",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "address_display",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Address",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "territory",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Territory",
- "length": 0,
- "no_copy": 0,
- "options": "Territory",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "contact_person",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Contact Person",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Contact",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "col_break4",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "contact_display",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Contact",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "shipping_address_name",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Shipping Address Name",
- "length": 0,
- "no_copy": 0,
- "options": "Address",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "contact_mobile",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Mobile No",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "shipping_address",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Shipping Address",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "contact_email",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Contact Email",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Email",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "company_address",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Company Address Name",
- "length": 0,
- "no_copy": 0,
- "options": "Address",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Territory",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Territory",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "company_address_display",
- "fieldtype": "Small Text",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Company Address",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "col_break4",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "customer",
- "fieldname": "currency_and_price_list",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Currency and Price List",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "shipping_address_name",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Shipping Address Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Address",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "currency",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Currency",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "currency",
- "oldfieldtype": "Select",
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "shipping_address",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Shipping Address",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Rate at which Customer Currency is converted to customer's base currency",
- "fieldname": "conversion_rate",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Exchange Rate",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "conversion_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "precision": "9",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company_address",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Company Address Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Address",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company_address_display",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Company Address",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "customer",
+ "fieldname": "currency_and_price_list",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Currency and Price List",
+ "length": 0,
+ "no_copy": 0,
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Currency",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "currency",
+ "oldfieldtype": "Select",
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Rate at which Customer Currency is converted to customer's base currency",
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Exchange Rate",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "conversion_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "precision": "9",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
},
{
@@ -4549,6 +4669,36 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "pos_total_qty",
+ "fieldtype": "Float",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Total Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 1,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
}
],
"has_web_view": 0,
@@ -4563,7 +4713,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2018-01-11 14:02:48.829906",
+ "modified": "2018-02-08 05:16:44.331093",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
@@ -4662,4 +4812,4 @@
"title_field": "title",
"track_changes": 1,
"track_seen": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index f6d43c7..ed2e3e4 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -224,12 +224,17 @@
from erpnext.selling.doctype.customer.customer import check_credit_limit
validate_against_credit_limit = False
+ bypass_credit_limit_check_at_sales_order = cint(frappe.db.get_value("Customer", self.customer,
+ "bypass_credit_limit_check_at_sales_order"))
+ if bypass_credit_limit_check_at_sales_order:
+ validate_against_credit_limit = True
+
for d in self.get("items"):
if not (d.sales_order or d.delivery_note):
validate_against_credit_limit = True
break
if validate_against_credit_limit:
- check_credit_limit(self.customer, self.company)
+ check_credit_limit(self.customer, self.company, bypass_credit_limit_check_at_sales_order)
def set_missing_values(self, for_validate=False):
pos = self.set_pos_fields(for_validate)
@@ -237,12 +242,16 @@
if not self.debit_to:
self.debit_to = get_party_account("Customer", self.customer, self.company)
if not self.due_date and self.customer:
- self.due_date = get_due_date(self.posting_date, "Customer", self.customer)
+ self.due_date = get_due_date(self.posting_date, "Customer", self.customer, self.company)
super(SalesInvoice, self).set_missing_values(for_validate)
if pos:
- return {"print_format": pos.get("print_format_for_online") }
+ return {
+ "print_format": pos.get("print_format_for_online"),
+ "allow_edit_rate": pos.get("allow_user_to_edit_rate"),
+ "allow_edit_discount": pos.get("allow_user_to_edit_discount")
+ }
def update_time_sheet(self, sales_invoice):
for d in self.timesheets:
@@ -304,6 +313,8 @@
self.account_for_change_amount = frappe.db.get_value('Company', self.company, 'default_cash_account')
if pos:
+ self.allow_print_before_pay = pos.allow_print_before_pay
+
if not for_validate and not self.customer:
self.customer = pos.customer
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/accounts/doctype/share_balance/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/accounts/doctype/share_balance/__init__.py
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.json b/erpnext/accounts/doctype/share_balance/share_balance.json
similarity index 62%
copy from erpnext/hub_node/doctype/hub_category/hub_category.json
copy to erpnext/accounts/doctype/share_balance/share_balance.json
index 4f8d66a..04d7bb7 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.json
+++ b/erpnext/accounts/doctype/share_balance/share_balance.json
@@ -3,9 +3,8 @@
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
- "autoname": "field:hub_category_name",
"beta": 0,
- "creation": "2017-08-22 11:31:10.410322",
+ "creation": "2018-01-10 13:03:35.544736",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
@@ -19,8 +18,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "hub_category_name",
- "fieldtype": "Data",
+ "fieldname": "share_type",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -28,14 +27,15 @@
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
- "label": "Category Name",
+ "label": "Share Type",
"length": 0,
"no_copy": 0,
+ "options": "Share Type",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
- "read_only": 0,
+ "read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
@@ -49,8 +49,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "parent_hub_category",
- "fieldtype": "Link",
+ "fieldname": "from_no",
+ "fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -58,10 +58,68 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Parent Category",
+ "label": "From No",
"length": 0,
"no_copy": 0,
- "options": "Hub Category",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "rate",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -80,23 +138,143 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "is_group",
+ "fieldname": "no_of_shares",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "No of Shares",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "to_no",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "To No",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "amount",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Amount",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_8",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "fieldname": "is_company",
"fieldtype": "Check",
- "hidden": 0,
+ "hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Is Group",
+ "label": "Is Company",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
- "read_only": 0,
+ "read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
@@ -110,113 +288,24 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
- "hidden": 0,
+ "fieldname": "current_state",
+ "fieldtype": "Select",
+ "hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Description",
+ "label": "Current State",
"length": 0,
"no_copy": 0,
+ "options": "\nIssued\nPurchased",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "lft",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Left",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "rgt",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Right",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "old_parent",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Old Parent",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
+ "read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
@@ -233,43 +322,21 @@
"in_create": 0,
"is_submittable": 0,
"issingle": 0,
- "istable": 0,
+ "istable": 1,
"max_attachments": 0,
- "modified": "2017-09-03 22:04:22.958831",
+ "modified": "2018-01-10 18:32:36.201124",
"modified_by": "Administrator",
- "module": "Hub Node",
- "name": "Hub Category",
+ "module": "Accounts",
+ "name": "Share Balance",
"name_case": "",
"owner": "Administrator",
- "permissions": [
- {
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
- "write": 1
- }
- ],
+ "permissions": [],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
- "title_field": "hub_category_name",
"track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/share_balance/share_balance.py b/erpnext/accounts/doctype/share_balance/share_balance.py
new file mode 100644
index 0000000..bd165cd
--- /dev/null
+++ b/erpnext/accounts/doctype/share_balance/share_balance.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class ShareBalance(Document):
+ pass
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/accounts/doctype/share_transfer/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/accounts/doctype/share_transfer/__init__.py
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.js b/erpnext/accounts/doctype/share_transfer/share_transfer.js
new file mode 100644
index 0000000..fbf12e5
--- /dev/null
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.js
@@ -0,0 +1,35 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.provide("erpnext.share_transfer");
+
+frappe.ui.form.on('Share Transfer', {
+ refresh: function(frm) {
+ // Don't show Parties which are a Company
+ let shareholders = ['from_shareholder', 'to_shareholder'];
+ shareholders.forEach((shareholder) => {
+ frm.fields_dict[shareholder].get_query = function() {
+ return {
+ filters: [
+ ["Shareholder", "is_company", "=", 0]
+ ]
+ };
+ };
+ });
+ },
+ no_of_shares: (frm) => {
+ if (frm.doc.rate != undefined || frm.doc.rate != null){
+ erpnext.share_transfer.update_amount(frm);
+ }
+ },
+ rate: (frm) => {
+ if (frm.doc.no_of_shares != undefined || frm.doc.no_of_shares != null){
+ erpnext.share_transfer.update_amount(frm);
+ }
+ }
+});
+
+erpnext.share_transfer.update_amount = function(frm) {
+ frm.doc.amount = frm.doc.no_of_shares * frm.doc.rate;
+ frm.refresh_field("amount");
+};
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.json b/erpnext/accounts/doctype/share_transfer/share_transfer.json
new file mode 100644
index 0000000..9e6f49d
--- /dev/null
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.json
@@ -0,0 +1,699 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "ST.######",
+ "beta": 0,
+ "creation": "2017-12-25 17:18:03.143726",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "transfer_type",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Transfer Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nIssue\nPurchase\nTransfer",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_1",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_1",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.transfer_type != 'Issue'",
+ "fieldname": "from_shareholder",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "From Shareholder",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Shareholder",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.transfer_type != 'Issue'",
+ "fieldname": "from_folio_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "From Folio No",
+ "length": 0,
+ "no_copy": 0,
+ "options": "from_shareholder.folio_no",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.transfer_type != 'Purchase'",
+ "fieldname": "to_shareholder",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "To Shareholder",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Shareholder",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.transfer_type != 'Purchase'",
+ "fieldname": "to_folio_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "To Folio No",
+ "length": 0,
+ "no_copy": 0,
+ "options": "to_shareholder.folio_no",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "share_type",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Share Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Share Type",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "(including)",
+ "fieldname": "from_no",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "From No",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_8",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "no_of_shares",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "No of Shares",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "(including)",
+ "fieldname": "to_no",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "To No",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amount",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_11",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Company",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "remarks",
+ "fieldtype": "Long Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Remarks",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-01-23 16:12:54.776896",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Share Transfer",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.py b/erpnext/accounts/doctype/share_transfer/share_transfer.py
new file mode 100644
index 0000000..2a2d9ff
--- /dev/null
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.py
@@ -0,0 +1,277 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.model.naming import make_autoname
+from frappe.exceptions import ValidationError
+
+class ShareDontExists(ValidationError): pass
+
+class ShareTransfer(Document):
+ def before_save(self):
+ if self.transfer_type == 'Issue':
+ company_doc = self.get_shareholder_doc(self.company)
+ company_doc.append('share_balance', {
+ 'share_type': self.share_type,
+ 'from_no': self.from_no,
+ 'to_no': self.to_no,
+ 'rate': self.rate,
+ 'amount': self.amount,
+ 'no_of_shares': self.no_of_shares,
+ 'is_company': 1,
+ 'current_state': 'Issued'
+ })
+ company_doc.save()
+
+ doc = frappe.get_doc('Shareholder', self.to_shareholder)
+ doc.append('share_balance', {
+ 'share_type': self.share_type,
+ 'from_no': self.from_no,
+ 'to_no': self.to_no,
+ 'rate': self.rate,
+ 'amount': self.amount,
+ 'no_of_shares': self.no_of_shares
+ })
+ doc.save()
+
+ elif self.transfer_type == 'Purchase':
+ self.remove_shares(self.from_shareholder)
+ self.remove_shares(self.get_shareholder_doc(self.company).name)
+
+ elif self.transfer_type == 'Transfer':
+ self.remove_shares(self.from_shareholder)
+ doc = frappe.get_doc('Shareholder', self.to_shareholder)
+ doc.append('share_balance', {
+ 'share_type': self.share_type,
+ 'from_no': self.from_no,
+ 'to_no': self.to_no,
+ 'rate': self.rate,
+ 'amount': self.amount,
+ 'no_of_shares': self.no_of_shares
+ })
+ doc.save()
+
+ def validate(self):
+ self.basic_validations()
+ self.folio_no_validation()
+ if self.transfer_type == 'Issue':
+ if not self.get_shareholder_doc(self.company):
+ company_doc = frappe.get_doc({
+ 'doctype': 'Shareholder',
+ 'title': self.company,
+ 'company': self.company,
+ 'is_company': 1
+ })
+ company_doc.insert()
+ # validate share doesnt exist in company
+ ret_val = self.share_exists(self.get_shareholder_doc(self.company).name)
+ if ret_val != False:
+ frappe.throw(_('The shares already exist'), frappe.DuplicateEntryError)
+ else:
+ # validate share exists with from_shareholder
+ ret_val = self.share_exists(self.from_shareholder)
+ if ret_val != True:
+ frappe.throw(_("The shares don't exist with the {0}")
+ .format(self.from_shareholder), ShareDontExists)
+
+ def basic_validations(self):
+ if self.transfer_type == 'Purchase':
+ self.to_shareholder = ''
+ if self.from_shareholder is None or self.from_shareholder is '':
+ frappe.throw(_('The field From Shareholder cannot be blank'))
+ if self.from_folio_no is None or self.from_folio_no is '':
+ self.to_folio_no = self.autoname_folio(self.to_shareholder)
+ elif (self.transfer_type == 'Issue'):
+ self.from_shareholder = ''
+ if self.to_shareholder is None or self.to_shareholder == '':
+ frappe.throw(_('The field To Shareholder cannot be blank'))
+ if self.to_folio_no is None or self.to_folio_no is '':
+ self.to_folio_no = self.autoname_folio(self.to_shareholder)
+ else:
+ if self.from_shareholder is None or self.to_shareholder is None:
+ frappe.throw(_('The fields From Shareholder and To Shareholder cannot be blank'))
+ if self.to_folio_no is None or self.to_folio_no is '':
+ self.to_folio_no = self.autoname_folio(self.to_shareholder)
+ if self.from_shareholder == self.to_shareholder:
+ frappe.throw(_('The seller and the buyer cannot be the same'))
+ if self.no_of_shares != self.to_no - self.from_no + 1:
+ frappe.throw(_('The number of shares and the share numbers are inconsistent'))
+ if self.amount is None:
+ self.amount = self.rate * self.no_of_shares
+ if self.amount != self.rate * self.no_of_shares:
+ frappe.throw(_('There are inconsistencies between the rate, no of shares and the amount calculated'))
+
+ def share_exists(self, shareholder):
+ # return True if exits,
+ # False if completely doesn't exist,
+ # 'partially exists' if partailly doesn't exist
+ ret_val = self.recursive_share_check(shareholder, self.share_type,
+ query = {
+ 'from_no': self.from_no,
+ 'to_no': self.to_no
+ }
+ )
+ if all(boolean == True for boolean in ret_val):
+ return True
+ elif True in ret_val:
+ return 'partially exists'
+ else:
+ return False
+
+ def recursive_share_check(self, shareholder, share_type, query):
+ # query = {'from_no': share_starting_no, 'to_no': share_ending_no}
+ # Recursive check if a given part of shares is held by the shareholder
+ # return a list containing True and False
+ # Eg. [True, False, True]
+ # All True implies its completely inside
+ # All False implies its completely outside
+ # A mix implies its partially inside/outside
+ does_share_exist = []
+ doc = frappe.get_doc('Shareholder', shareholder)
+ for entry in doc.share_balance:
+ if entry.share_type != share_type or \
+ entry.from_no > query['to_no'] or \
+ entry.to_no < query['from_no']:
+ continue # since query lies outside bounds
+ elif entry.from_no <= query['from_no'] and entry.to_no >= query['to_no']:
+ return [True] # absolute truth!
+ elif entry.from_no >= query['from_no'] and entry.to_no <= query['to_no']:
+ # split and check
+ does_share_exist.extend(self.recursive_share_check(shareholder,
+ share_type,
+ {
+ 'from_no': query['from_no'],
+ 'to_no': entry.from_no - 1
+ }
+ ))
+ does_share_exist.append(True)
+ does_share_exist.extend(self.recursive_share_check(shareholder,
+ share_type,
+ {
+ 'from_no': entry.to_no + 1,
+ 'to_no': query['to_no']
+ }
+ ))
+ elif query['from_no'] <= entry.from_no <= query['to_no'] and entry.to_no >= query['to_no']:
+ does_share_exist.extend(self.recursive_share_check(shareholder,
+ share_type,
+ {
+ 'from_no': query['from_no'],
+ 'to_no': entry.from_no - 1
+ }
+ ))
+ elif query['from_no'] <= entry.to_no <= query['to_no'] and entry.from_no <= query['from_no']:
+ does_share_exist.extend(self.recursive_share_check(shareholder,
+ share_type,
+ {
+ 'from_no': entry.to_no + 1,
+ 'to_no': query['to_no']
+ }
+ ))
+
+ does_share_exist.append(False)
+ return does_share_exist
+
+ def folio_no_validation(self):
+ shareholders = ['from_shareholder', 'to_shareholder']
+ shareholders = [shareholder for shareholder in shareholders if self.get(shareholder) is not '']
+ for shareholder in shareholders:
+ doc = frappe.get_doc('Shareholder', self.get(shareholder))
+ if doc.company != self.company:
+ frappe.throw(_('The shareholder does not belong to this company'))
+ if doc.folio_no is '' or doc.folio_no is None:
+ doc.folio_no = self.from_folio_no \
+ if (shareholder == 'from_shareholder') else self.to_folio_no;
+ doc.save()
+ else:
+ if doc.folio_no != (self.from_folio_no if (shareholder == 'from_shareholder') else self.to_folio_no):
+ frappe.throw(_('The folio numbers are not matching'))
+
+ def autoname_folio(self, shareholder, is_company=False):
+ if is_company:
+ doc = self.get_shareholder_doc(shareholder)
+ else:
+ doc = frappe.get_doc('Shareholder' , shareholder)
+ doc.folio_no = make_autoname('FN.#####')
+ doc.save()
+ return doc.folio_no
+
+ def remove_shares(self, shareholder):
+ self.iterative_share_removal(shareholder, self.share_type,
+ {
+ 'from_no': self.from_no,
+ 'to_no' : self.to_no
+ },
+ rate = self.rate,
+ amount = self.amount
+ )
+
+ def iterative_share_removal(self, shareholder, share_type, query, rate, amount):
+ # query = {'from_no': share_starting_no, 'to_no': share_ending_no}
+ # Shares exist for sure
+ # Iterate over all entries and modify entry if in entry
+ doc = frappe.get_doc('Shareholder', shareholder)
+ current_entries = doc.share_balance
+ new_entries = []
+
+ for entry in current_entries:
+ # use spaceage logic here
+ if entry.share_type != share_type or \
+ entry.from_no > query['to_no'] or \
+ entry.to_no < query['from_no']:
+ new_entries.append(entry)
+ continue # since query lies outside bounds
+ elif entry.from_no <= query['from_no'] and entry.to_no >= query['to_no']:
+ #split
+ if entry.from_no == query['from_no']:
+ if entry.to_no == query['to_no']:
+ pass #nothing to append
+ else:
+ new_entries.append(self.return_share_balance_entry(query['to_no']+1, entry.to_no, entry.rate))
+ else:
+ if entry.to_no == query['to_no']:
+ new_entries.append(self.return_share_balance_entry(entry.from_no, query['from_no']-1, entry.rate))
+ else:
+ new_entries.append(self.return_share_balance_entry(entry.from_no, query['from_no']-1, entry.rate))
+ new_entries.append(self.return_share_balance_entry(query['to_no']+1, entry.to_no, entry.rate))
+ elif entry.from_no >= query['from_no'] and entry.to_no <= query['to_no']:
+ # split and check
+ pass #nothing to append
+ elif query['from_no'] <= entry.from_no <= query['to_no'] and entry.to_no >= query['to_no']:
+ new_entries.append(self.return_share_balance_entry(query['to_no']+1, entry.to_no, entry.rate))
+ elif query['from_no'] <= entry.to_no <= query['to_no'] and entry.from_no <= query['from_no']:
+ new_entries.append(self.return_share_balance_entry(entry.from_no, query['from_no']-1, entry.rate))
+ else:
+ new_entries.append(entry)
+
+ doc.share_balance = []
+ for entry in new_entries:
+ doc.append('share_balance', entry)
+ doc.save()
+
+ def return_share_balance_entry(self, from_no, to_no, rate):
+ # return an entry as a dict
+ return {
+ 'share_type' : self.share_type,
+ 'from_no' : from_no,
+ 'to_no' : to_no,
+ 'rate' : rate,
+ 'amount' : self.rate * (to_no - from_no + 1),
+ 'no_of_shares' : to_no - from_no + 1
+ }
+
+ def get_shareholder_doc(self, shareholder):
+ # Get Shareholder doc based on the Shareholder title
+ doc = frappe.get_list('Shareholder',
+ filters = [
+ ('Shareholder', 'title', '=', shareholder)
+ ]
+ )
+ if len(doc) == 1:
+ return frappe.get_doc('Shareholder', doc[0]['name'])
+ else: #It will necessarily by 0 indicating it doesn't exist
+ return False
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/accounts/doctype/share_transfer/test_share_transfer.js
similarity index 71%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/accounts/doctype/share_transfer/test_share_transfer.js
index 73c06d5..e5530fa 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/accounts/doctype/share_transfer/test_share_transfer.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Share Transfer", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Share Transfer
+ () => frappe.tests.make('Share Transfer', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/accounts/doctype/share_transfer/test_share_transfer.py b/erpnext/accounts/doctype/share_transfer/test_share_transfer.py
new file mode 100644
index 0000000..b74d6d6
--- /dev/null
+++ b/erpnext/accounts/doctype/share_transfer/test_share_transfer.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.accounts.doctype.share_transfer.share_transfer import ShareDontExists
+
+test_dependencies = ["Share Type", "Shareholder"]
+
+class TestShareTransfer(unittest.TestCase):
+ def setUp(self):
+ frappe.db.sql("delete from `tabShare Transfer`")
+ frappe.db.sql("delete from `tabShare Balance`")
+ share_transfers = [
+ {
+ "doctype" : "Share Transfer",
+ "transfer_type" : "Issue",
+ "date" : "2018-01-01",
+ "to_shareholder" : "SH-00001",
+ "share_type" : "Equity",
+ "from_no" : 1,
+ "to_no" : 500,
+ "no_of_shares" : 500,
+ "rate" : 10,
+ "company" : "_Test Company"
+ },
+ {
+ "doctype" : "Share Transfer",
+ "transfer_type" : "Transfer",
+ "date" : "2018-01-02",
+ "from_shareholder" : "SH-00001",
+ "to_shareholder" : "SH-00002",
+ "share_type" : "Equity",
+ "from_no" : 101,
+ "to_no" : 200,
+ "no_of_shares" : 100,
+ "rate" : 15,
+ "company" : "_Test Company"
+ },
+ {
+ "doctype" : "Share Transfer",
+ "transfer_type" : "Transfer",
+ "date" : "2018-01-03",
+ "from_shareholder" : "SH-00001",
+ "to_shareholder" : "SH-00003",
+ "share_type" : "Equity",
+ "from_no" : 201,
+ "to_no" : 500,
+ "no_of_shares" : 300,
+ "rate" : 20,
+ "company" : "_Test Company"
+ },
+ {
+ "doctype" : "Share Transfer",
+ "transfer_type" : "Transfer",
+ "date" : "2018-01-04",
+ "from_shareholder" : "SH-00003",
+ "to_shareholder" : "SH-00002",
+ "share_type" : "Equity",
+ "from_no" : 201,
+ "to_no" : 400,
+ "no_of_shares" : 200,
+ "rate" : 15,
+ "company" : "_Test Company"
+ },
+ {
+ "doctype" : "Share Transfer",
+ "transfer_type" : "Purchase",
+ "date" : "2018-01-05",
+ "from_shareholder" : "SH-00003",
+ "share_type" : "Equity",
+ "from_no" : 401,
+ "to_no" : 500,
+ "no_of_shares" : 100,
+ "rate" : 25,
+ "company" : "_Test Company"
+ }
+ ]
+ for d in share_transfers:
+ frappe.get_doc(d).insert()
+
+ def test_invalid_share_transfer(self):
+ doc = frappe.get_doc({
+ "doctype" : "Share Transfer",
+ "transfer_type" : "Transfer",
+ "date" : "2018-01-05",
+ "from_shareholder" : "SH-00003",
+ "to_shareholder" : "SH-00002",
+ "share_type" : "Equity",
+ "from_no" : 1,
+ "to_no" : 100,
+ "no_of_shares" : 100,
+ "rate" : 15,
+ "company" : "_Test Company"
+ })
+ self.assertRaises(ShareDontExists, doc.insert)
+
+ doc = frappe.get_doc({
+ "doctype" : "Share Transfer",
+ "transfer_type" : "Purchase",
+ "date" : "2018-01-02",
+ "from_shareholder" : "SH-00001",
+ "share_type" : "Equity",
+ "from_no" : 1,
+ "to_no" : 200,
+ "no_of_shares" : 200,
+ "rate" : 15,
+ "company" : "_Test Company"
+ })
+ self.assertRaises(ShareDontExists, doc.insert)
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/accounts/doctype/share_type/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/accounts/doctype/share_type/__init__.py
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.js b/erpnext/accounts/doctype/share_type/share_type.js
similarity index 80%
copy from erpnext/hub_node/doctype/hub_category/hub_category.js
copy to erpnext/accounts/doctype/share_type/share_type.js
index 9f54166..1ae85e3 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.js
+++ b/erpnext/accounts/doctype/share_type/share_type.js
@@ -1,7 +1,7 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Hub Category', {
+frappe.ui.form.on('Share Type', {
refresh: function(frm) {
}
diff --git a/erpnext/accounts/doctype/share_type/share_type.json b/erpnext/accounts/doctype/share_type/share_type.json
new file mode 100644
index 0000000..3373e03
--- /dev/null
+++ b/erpnext/accounts/doctype/share_type/share_type.json
@@ -0,0 +1,123 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "field:title",
+ "beta": 0,
+ "creation": "2017-12-28 14:55:20.950877",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Title",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "description",
+ "fieldtype": "Long Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Description",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-12-28 14:55:20.950877",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Share Type",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/accounts/doctype/share_type/share_type.py
similarity index 76%
copy from erpnext/hub_node/doctype/hub_category/hub_category.py
copy to erpnext/accounts/doctype/share_type/share_type.py
index 5d19082..ab4b8bc 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/accounts/doctype/share_type/share_type.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils.nestedset import NestedSet
from frappe.model.document import Document
-class HubCategory(NestedSet):
+class ShareType(Document):
pass
diff --git a/erpnext/accounts/doctype/share_type/test_records.json b/erpnext/accounts/doctype/share_type/test_records.json
new file mode 100644
index 0000000..88cb8c0
--- /dev/null
+++ b/erpnext/accounts/doctype/share_type/test_records.json
@@ -0,0 +1,10 @@
+[
+ {
+ "doctype": "Share Type",
+ "title": "Class A"
+ },
+ {
+ "doctype": "Share Type",
+ "title": "Class B"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/accounts/doctype/share_type/test_share_type.js
similarity index 72%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/accounts/doctype/share_type/test_share_type.js
index 73c06d5..620afa2 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/accounts/doctype/share_type/test_share_type.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Share Type", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Share Type
+ () => frappe.tests.make('Share Type', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.py b/erpnext/accounts/doctype/share_type/test_share_type.py
similarity index 81%
rename from erpnext/hub_node/doctype/hub_category/test_hub_category.py
rename to erpnext/accounts/doctype/share_type/test_share_type.py
index 7df2088..1c1f051 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.py
+++ b/erpnext/accounts/doctype/share_type/test_share_type.py
@@ -6,5 +6,5 @@
import frappe
import unittest
-class TestHubCategory(unittest.TestCase):
+class TestShareType(unittest.TestCase):
pass
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/accounts/doctype/shareholder/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/accounts/doctype/shareholder/__init__.py
diff --git a/erpnext/accounts/doctype/shareholder/shareholder.js b/erpnext/accounts/doctype/shareholder/shareholder.js
new file mode 100644
index 0000000..c6f101e
--- /dev/null
+++ b/erpnext/accounts/doctype/shareholder/shareholder.js
@@ -0,0 +1,54 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Shareholder', {
+ refresh: function(frm) {
+ frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Shareholder' };
+
+ frm.toggle_display(['contact_html'], !frm.doc.__islocal);
+
+ if (frm.doc.__islocal) {
+ hide_field(['contact_html']);
+ frappe.contacts.clear_address_and_contact(frm);
+ }
+ else {
+ if (frm.doc.is_company){
+ hide_field(['company']);
+ } else {
+ unhide_field(['contact_html']);
+ frappe.contacts.render_address_and_contact(frm);
+ }
+ }
+
+ if (frm.doc.folio_no != undefined){
+ frm.add_custom_button(__("Share Balance"), function(){
+ frappe.route_options = {
+ "shareholder": frm.doc.name,
+ };
+ frappe.set_route("query-report", "Share Balance");
+ });
+ frm.add_custom_button(__("Share Ledger"), function(){
+ frappe.route_options = {
+ "shareholder": frm.doc.name,
+ };
+ frappe.set_route("query-report", "Share Ledger");
+ });
+ let fields = ['title', 'folio_no', 'company'];
+ fields.forEach((fieldname) => {
+ frm.fields_dict[fieldname].df.read_only = 1;
+ frm.refresh_fields(fieldname);
+ });
+ $(`.btn:contains("New Contact"):visible`).hide();
+ $(`.btn:contains("Edit"):visible`).hide();
+ }
+ },
+ validate: (frm) => {
+ let contact_list = {
+ contacts: []
+ };
+ $('div[data-fieldname=contact_html] > .address-box').each( (index, ele) => {
+ contact_list.contacts.push(ele.innerText.replace(' Edit', ''));
+ });
+ frm.doc.contact_list = JSON.stringify(contact_list);
+ }
+});
diff --git a/erpnext/accounts/doctype/shareholder/shareholder.json b/erpnext/accounts/doctype/shareholder/shareholder.json
new file mode 100644
index 0000000..22a3061
--- /dev/null
+++ b/erpnext/accounts/doctype/shareholder/shareholder.json
@@ -0,0 +1,519 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "naming_series:",
+ "beta": 0,
+ "creation": "2017-12-25 16:50:53.878430",
+ "custom": 0,
+ "description": "",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Title",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "SH-",
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Series",
+ "length": 0,
+ "no_copy": 0,
+ "options": "SH-",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_2",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "folio_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Folio no.",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 1
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Company",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "is_company",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Company",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "address_contacts",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Address and Contacts",
+ "length": 0,
+ "no_copy": 0,
+ "options": "fa fa-map-marker",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "address_html",
+ "fieldtype": "HTML",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Address HTML",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_9",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "contact_html",
+ "fieldtype": "HTML",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Contact HTML",
+ "length": 0,
+ "no_copy": 0,
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_3",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Share Balance",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "share_balance",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Share Balance",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Share Balance",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Hidden list maintaining the list of contacts linked to Shareholder",
+ "fieldname": "contact_list",
+ "fieldtype": "Code",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Contact List",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-02-13 06:43:36.319549",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Shareholder",
+ "name_case": "Title Case",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "folio_no",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "title",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shareholder/shareholder.py b/erpnext/accounts/doctype/shareholder/shareholder.py
new file mode 100644
index 0000000..c507fcf
--- /dev/null
+++ b/erpnext/accounts/doctype/shareholder/shareholder.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
+
+class Shareholder(Document):
+ def onload(self):
+ """Load address and contacts in `__onload`"""
+ load_address_and_contact(self)
+
+ def on_trash(self):
+ delete_contact_and_address('Shareholder', self.name)
+
+ def before_save(self):
+ for entry in self.share_balance:
+ entry.amount = entry.no_of_shares * entry.rate
diff --git a/erpnext/accounts/doctype/shareholder/test_records.json b/erpnext/accounts/doctype/shareholder/test_records.json
new file mode 100644
index 0000000..39b72d4
--- /dev/null
+++ b/erpnext/accounts/doctype/shareholder/test_records.json
@@ -0,0 +1,20 @@
+[
+ {
+ "doctype": "Shareholder",
+ "naming_series": "SH-",
+ "title": "Iron Man",
+ "company": "_Test Company"
+ },
+ {
+ "doctype": "Shareholder",
+ "naming_series": "SH-",
+ "title": "Thor",
+ "company": "_Test Company"
+ },
+ {
+ "doctype": "Shareholder",
+ "naming_series": "SH-",
+ "title": "Hulk",
+ "company": "_Test Company"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/accounts/doctype/shareholder/test_shareholder.js
similarity index 72%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/accounts/doctype/shareholder/test_shareholder.js
index 73c06d5..61c5312 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/accounts/doctype/shareholder/test_shareholder.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Shareholder", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Shareholder
+ () => frappe.tests.make('Shareholder', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.py b/erpnext/accounts/doctype/shareholder/test_shareholder.py
similarity index 81%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.py
copy to erpnext/accounts/doctype/shareholder/test_shareholder.py
index 7df2088..9ce0093 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.py
+++ b/erpnext/accounts/doctype/shareholder/test_shareholder.py
@@ -6,5 +6,5 @@
import frappe
import unittest
-class TestHubCategory(unittest.TestCase):
+class TestShareholder(unittest.TestCase):
pass
diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py
index 1103b70..480abd4 100644
--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -232,6 +232,8 @@
def send_notification(new_rv, subscription_doc, print_format='Standard'):
"""Notify concerned persons about recurring document generation"""
print_format = print_format
+ subject = subscription_doc.subject or ''
+ message = subscription_doc.message or ''
if not subscription_doc.subject:
subject = _("New {0}: #{1}").format(new_rv.doctype, new_rv.name)
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.py b/erpnext/accounts/doctype/tax_rule/tax_rule.py
index 9c091e8..028fa72 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.py
@@ -11,6 +11,8 @@
from frappe.utils.nestedset import get_root_of
from erpnext.setup.doctype.customer_group.customer_group import get_parent_customer_groups
+from six import iteritems
+
class IncorrectCustomerGroup(frappe.ValidationError): pass
class IncorrectSupplierType(frappe.ValidationError): pass
class ConflictingTaxRule(frappe.ValidationError): pass
@@ -130,10 +132,10 @@
def get_tax_template(posting_date, args):
"""Get matching tax rule"""
args = frappe._dict(args)
- conditions = ["""(from_date is null or from_date = '' or from_date <= '{0}')
- and (to_date is null or to_date = '' or to_date >= '{0}')""".format(posting_date)]
+ conditions = ["""(from_date is null or from_date <= '{0}')
+ and (to_date is null or to_date >= '{0}')""".format(posting_date)]
- for key, value in args.iteritems():
+ for key, value in iteritems(args):
if key=="use_for_shopping_cart":
conditions.append("use_for_shopping_cart = {0}".format(1 if value else 0))
if key == 'customer_group':
diff --git a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
index 54a7520..9a1fc7a 100644
--- a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
@@ -9,6 +9,8 @@
test_records = frappe.get_test_records('Tax Rule')
+from six import iteritems
+
class TestTaxRule(unittest.TestCase):
def setUp(self):
frappe.db.sql("delete from `tabTax Rule`")
@@ -129,7 +131,7 @@
tax_rule = frappe.new_doc("Tax Rule")
- for key, val in args.iteritems():
+ for key, val in iteritems(args):
if key != "save":
tax_rule.set(key, val)
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index c575d59..03a06cc 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -191,8 +191,9 @@
for entry in gl_entries:
validate_frozen_account(entry["account"], adv_adj)
validate_balance_type(entry["account"], adv_adj)
- validate_expense_against_budget(entry)
+ if not adv_adj:
+ validate_expense_against_budget(entry)
- if entry.get("against_voucher") and update_outstanding == 'Yes':
+ if entry.get("against_voucher") and update_outstanding == 'Yes' and not adv_adj:
update_outstanding_amt(entry["account"], entry.get("party_type"), entry.get("party"), entry.get("against_voucher_type"),
entry.get("against_voucher"), on_cancel=True)
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 558dd8d..ccb5553 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -15,6 +15,7 @@
cur_pos = wrapper.pos;
} else {
// online
+ frappe.flags.is_online = true
frappe.set_route('point-of-sale');
}
});
@@ -24,6 +25,10 @@
window.onbeforeunload = function () {
return wrapper.pos.beforeunload()
}
+
+ if (frappe.flags.is_online) {
+ frappe.set_route('point-of-sale');
+ }
}
erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
@@ -296,6 +301,7 @@
this.customers = r.message.customers;
this.serial_no_data = r.message.serial_no_data;
this.batch_no_data = r.message.batch_no_data;
+ this.barcode_data = r.message.barcode_data;
this.tax_data = r.message.tax_data;
this.contacts = r.message.contacts;
this.address = r.message.address || {};
@@ -410,7 +416,7 @@
});
this.serach_item.make_input();
-
+
this.serach_item.$input.on("keypress", function (event) {
clearTimeout(me.last_search_timeout);
@@ -418,7 +424,7 @@
if((me.serach_item.$input.val() != "") || (event.which == 13)) {
me.items = me.get_items();
me.make_item_list();
- }
+ }
}, 400);
});
@@ -1105,9 +1111,9 @@
search_status = false;
me.item_serial_no[item.item_code] = [me.serach_item.$input.val(), me.serial_no_data[item.item_code][me.serach_item.$input.val()]]
return true
- } else if (item.barcode == me.serach_item.$input.val()) {
+ } else if (in_list(me.barcode_data[item.item_code], me.serach_item.$input.val())) {
search_status = false;
- return item.barcode == me.serach_item.$input.val();
+ return true;
} else if (reg.test(item.item_code.toLowerCase()) || (item.description && reg.test(item.description.toLowerCase())) ||
reg.test(item.item_name.toLowerCase()) || reg.test(item.item_group.toLowerCase())) {
return true
@@ -1172,8 +1178,17 @@
$(this.wrapper).on("change", ".pos-item-disc", function () {
var item_code = $(this).parents(".pos-selected-item-action").attr("data-item-code");
var discount = $(this).val();
- me.update_discount(item_code, discount)
- me.update_value()
+ if(discount > 100){
+ discount = $(this).val('');
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Discount amount cannot be greater than 100%')
+ });
+ me.update_discount(item_code, discount);
+ }else{
+ me.update_discount(item_code, discount);
+ me.update_value();
+ }
})
},
@@ -1512,8 +1527,8 @@
me.print_document(html)
})
}
-
- if (this.frm.doc.docstatus == 1) {
+
+ if (this.frm.doc.docstatus == 1) {
this.page.add_menu_item(__("Email"), function () {
me.email_prompt()
})
@@ -1620,8 +1635,16 @@
var me = this;
var invoice_data = {};
this.si_docs = this.get_doc_from_localstorage();
+
if (this.frm.doc.offline_pos_name) {
- this.update_invoice();
+ this.update_invoice()
+ //to retrieve and set the default payment
+ invoice_data[this.frm.doc.offline_pos_name] = this.frm.doc;
+ invoice_data[this.frm.doc.offline_pos_name].payments[0].amount = this.frm.doc.net_total
+ invoice_data[this.frm.doc.offline_pos_name].payments[0].base_amount = this.frm.doc.net_total
+
+ this.frm.doc.paid_amount = this.frm.doc.net_total
+ this.frm.doc.outstanding_amount = 0
} else {
this.frm.doc.offline_pos_name = $.now();
this.frm.doc.posting_date = frappe.datetime.get_today();
@@ -2001,4 +2024,4 @@
frappe.throw(__("LocalStorage is full , did not save"))
}
}
-})
+})
\ No newline at end of file
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 7bccfe8..55d2c21 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -17,6 +17,7 @@
from erpnext.accounts.utils import get_fiscal_year
from erpnext import get_default_currency, get_company_currency
+from six import iteritems
class DuplicatePartyAccountError(frappe.ValidationError): pass
@@ -51,7 +52,7 @@
set_other_values(out, party, party_type)
set_price_list(out, party, party_type, price_list)
out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_type)
- out["payment_terms_template"] = get_pyt_term_template(party.name, party_type)
+ out["payment_terms_template"] = get_pyt_term_template(party.name, party_type, company)
if not out.get("currency"):
out["currency"] = currency
@@ -164,7 +165,7 @@
out = {
party_type.lower(): party,
account_fieldname : account,
- "due_date": get_due_date(posting_date, party_type, party)
+ "due_date": get_due_date(posting_date, party_type, party, company)
}
return out
@@ -267,12 +268,12 @@
@frappe.whitelist()
-def get_due_date(posting_date, party_type, party):
+def get_due_date(posting_date, party_type, party, company=None):
"""Get due date from `Payment Terms Template`"""
due_date = None
if posting_date and party:
due_date = posting_date
- template_name = get_pyt_term_template(party, party_type)
+ template_name = get_pyt_term_template(party, party_type, company)
if template_name:
due_date = get_due_date_from_template(template_name, posting_date).strftime("%Y-%m-%d")
else:
@@ -305,12 +306,11 @@
return due_date
-
-def validate_due_date(posting_date, due_date, party_type, party):
+def validate_due_date(posting_date, due_date, party_type, party, company=None):
if getdate(due_date) < getdate(posting_date):
frappe.throw(_("Due Date cannot be before Posting Date"))
else:
- default_due_date = get_due_date(posting_date, party_type, party)
+ default_due_date = get_due_date(posting_date, party_type, party, company)
if not default_due_date:
return
@@ -360,14 +360,32 @@
@frappe.whitelist()
-def get_pyt_term_template(party_name, party_type):
+def get_pyt_term_template(party_name, party_type, company=None):
+ if party_type not in ("Customer", "Supplier"):
+ return
+
template = None
- if party_type in ('Customer', 'Supplier'):
- template = frappe.db.get_value(party_type, party_name, fieldname='payment_terms')
+ if party_type == 'Customer':
+ customer = frappe.db.get_value("Customer", party_name,
+ fieldname=['payment_terms', "customer_group"], as_dict=1)
+ template = customer.payment_terms
+
+ if not template and customer.customer_group:
+ template = frappe.db.get_value("Customer Group",
+ customer.customer_group, fieldname='payment_terms')
+ else:
+ supplier = frappe.db.get_value("Supplier", party_name,
+ fieldname=['payment_terms', "supplier_type"], as_dict=1)
+ template = supplier.payment_terms
+
+ if not template and supplier.supplier_type:
+ template = frappe.db.get_value("Supplier Type", supplier.supplier_type, fieldname='payment_terms')
+
+ if not template and company:
+ template = frappe.db.get_value("Company", company, fieldname='payment_terms')
return template
-
def validate_party_frozen_disabled(party_type, party_name):
if party_type and party_name:
if party_type in ("Customer", "Supplier"):
@@ -395,7 +413,7 @@
timeline_items = dict(data)
- for date, count in timeline_items.iteritems():
+ for date, count in iteritems(timeline_items):
timestamp = get_timestamp(date)
out.update({ timestamp: count })
diff --git a/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json b/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json
index 8d6cf3e..0377ff9 100644
--- a/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json
+++ b/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json
@@ -2,15 +2,15 @@
"align_labels_right": 0,
"creation": "2017-08-08 12:33:04.773099",
"custom_format": 1,
- "disabled": 1,
+ "disabled": 0,
"doc_type": "Sales Invoice",
"docstatus": 0,
"doctype": "Print Format",
"font": "Default",
- "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ doc.company }}<br>\n\t{% if doc.company_address_display %}\n\t\t{% set company_address = doc.company_address_display.replace(\"\\n\", \" \").replace(\"<br>\", \" \") %}\n\t\t{% if \"GSTIN\" not in company_address %}\n\t\t\t{{ company_address }}\n\t\t\t<b>{{ _(\"GSTIN\") }}:</b>{{ doc.company_gstin }}\n\t\t{% else %}\n\t\t\t{{ company_address.replace(\"GSTIN\", \"<br>GSTIN\") }}\n\t\t{% endif %}\n\t{% endif %}\n\t<br>\n\t<b>{{ doc.select_print_heading or _(\"Invoice\") }}</b><br>\n</p>\n<p>\n\t<b>{{ _(\"Receipt No\") }}:</b> {{ doc.name }}<br>\n\t<b>{{ _(\"Date\") }}:</b> {{ doc.get_formatted(\"posting_date\") }}<br>\n\t{% if doc.grand_total > 50000 %}\n\t\t{% set customer_address = doc.address_display.replace(\"\\n\", \" \").replace(\"<br>\", \" \") %}\n\t\t<b>{{ _(\"Customer\") }}:</b><br>\n\t\t{{ doc.customer_name }}<br>\n\t\t{{ customer_address }}\n\t{% endif %}\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"40%\">{{ _(\"Item\") }}</b></th>\n\t\t\t<th width=\"30%\" class=\"text-right\">{{ _(\"Qty\") }}</th>\n\t\t\t<th width=\"30%\" class=\"text-right\">{{ _(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{%- for item in doc.items -%}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t<br>{{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.gst_hsn_code -%}\n\t\t\t\t\t<br><b>{{ _(\"HSN/SAC\") }}:</b> {{ item.gst_hsn_code }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t<br><b>{{ _(\"Serial No\") }}:</b> {{ item.serial_no }}\n\t\t\t\t{%- endif -%}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ item.rate }}</td>\n\t\t\t<td class=\"text-right\">{{ item.get_formatted(\"amount\") }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% else %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% endif %}\n\t\t</tr>\n\t\t{%- for row in doc.taxes -%}\n\t\t {%- if not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ row.description }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t</td>\n\t\t\t<tr>\n\t\t {%- endif -%}\n\t\t{%- endfor -%}\n\t\t{%- if doc.discount_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.rounded_total -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Rounded Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t</tbody>\n</table>\n<p><b>Tax Breakup:</b></p>\n<div style=\"font-size: 8px\">\n\t{{ doc.other_charges_calculation }}\n</div>\n<p>{{ doc.terms or \"\" }}</p>\n<p class=\"text-center\">{{ _(\"Thank you, please visit again.\") }}</p>",
+ "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ doc.company }}<br>\n\t{% if doc.company_address_display %}\n\t\t{% set company_address = doc.company_address_display.replace(\"\\n\", \" \").replace(\"<br>\", \" \") %}\n\t\t{% if \"GSTIN\" not in company_address %}\n\t\t\t{{ company_address }}\n\t\t\t<b>{{ _(\"GSTIN\") }}:</b>{{ doc.company_gstin }}\n\t\t{% else %}\n\t\t\t{{ company_address.replace(\"GSTIN\", \"<br>GSTIN\") }}\n\t\t{% endif %}\n\t{% endif %}\n\t<br>\n\t{% if doc.docstatus == 0 %}\n\t\t<b>{{ doc.status + \" \"+ (doc.select_print_heading or _(\"Invoice\")) }}</b><br>\n\t{% else %}\n\t\t<b>{{ doc.select_print_heading or _(\"Invoice\") }}</b><br>\n\t{% endif %}\n</p>\n<p>\n\t<b>{{ _(\"Receipt No\") }}:</b> {{ doc.name }}<br>\n\t<b>{{ _(\"Date\") }}:</b> {{ doc.get_formatted(\"posting_date\") }}<br>\n\t{% if doc.grand_total > 50000 %}\n\t\t{% set customer_address = doc.address_display.replace(\"\\n\", \" \").replace(\"<br>\", \" \") %}\n\t\t<b>{{ _(\"Customer\") }}:</b><br>\n\t\t{{ doc.customer_name }}<br>\n\t\t{{ customer_address }}\n\t{% endif %}\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"40%\">{{ _(\"Item\") }}</b></th>\n\t\t\t<th width=\"30%\" class=\"text-right\">{{ _(\"Qty\") }}</th>\n\t\t\t<th width=\"30%\" class=\"text-right\">{{ _(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{%- for item in doc.items -%}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t<br>{{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.gst_hsn_code -%}\n\t\t\t\t\t<br><b>{{ _(\"HSN/SAC\") }}:</b> {{ item.gst_hsn_code }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t<br><b>{{ _(\"Serial No\") }}:</b> {{ item.serial_no }}\n\t\t\t\t{%- endif -%}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ item.rate }}</td>\n\t\t\t<td class=\"text-right\">{{ item.get_formatted(\"amount\") }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% else %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% endif %}\n\t\t</tr>\n\t\t{%- for row in doc.taxes -%}\n\t\t {%- if not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ row.description }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t</td>\n\t\t\t<tr>\n\t\t {%- endif -%}\n\t\t{%- endfor -%}\n\t\t{%- if doc.discount_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.rounded_total -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Rounded Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t</tbody>\n</table>\n<p><b>Tax Breakup:</b></p>\n<div style=\"font-size: 8px\">\n\t{{ doc.other_charges_calculation }}\n</div>\n<p>{{ doc.terms or \"\" }}</p>\n<p class=\"text-center\">{{ _(\"Thank you, please visit again.\") }}</p>",
"idx": 0,
"line_breaks": 0,
- "modified": "2018-01-12 11:19:17.432600",
+ "modified": "2018-02-07 12:38:36.011318",
"modified_by": "Administrator",
"module": "Accounts",
"name": "GST POS Invoice",
diff --git a/erpnext/accounts/print_format/pos_invoice/pos_invoice.json b/erpnext/accounts/print_format/pos_invoice/pos_invoice.json
index 1613462..bef6a02 100644
--- a/erpnext/accounts/print_format/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/print_format/pos_invoice/pos_invoice.json
@@ -2,14 +2,14 @@
"align_labels_right": 0,
"creation": "2011-12-21 11:08:55",
"custom_format": 1,
- "disabled": 1,
+ "disabled": 0,
"doc_type": "Sales Invoice",
"docstatus": 0,
"doctype": "Print Format",
- "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ doc.company }}<br>\n\t{{ doc.select_print_heading or _(\"Invoice\") }}<br>\n</p>\n<p>\n\t<b>{{ _(\"Receipt No\") }}:</b> {{ doc.name }}<br>\n\t<b>{{ _(\"Date\") }}:</b> {{ doc.get_formatted(\"posting_date\") }}<br>\n\t<b>{{ _(\"Customer\") }}:</b> {{ doc.customer_name }}\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"50%\">{{ _(\"Item\") }}</b></th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ _(\"Qty\") }}</th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ _(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{%- for item in doc.items -%}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t<br>{{ item.item_name }}{%- endif -%}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ item.get_formatted(\"rate\") }}</td>\n\t\t\t<td class=\"text-right\">{{ item.get_formatted(\"amount\") }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% else %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% endif %}\n\t\t</tr>\n\t\t{%- for row in doc.taxes -%}\n\t\t {%- if not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ row.description }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t</td>\n\t\t\t<tr>\n\t\t {%- endif -%}\n\t\t{%- endfor -%}\n\n\t\t{%- if doc.discount_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.rounded_total -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Rounded Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t</tbody>\n</table>\n<hr>\n<p>{{ doc.terms or \"\" }}</p>\n<p class=\"text-center\">{{ _(\"Thank you, please visit again.\") }}</p>",
+ "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ doc.company }}<br>\n\t{% if doc.docstatus == 0 %}\n\t\t{{ doc.status + \" \" + (doc.select_print_heading or _(\"Invoice\")) }}<br>\n\t{% else %}\n\t\t{{ doc.select_print_heading or _(\"Invoice\") }}<br>\n\t{% endif %}\n</p>\n<p>\n\t<b>{{ _(\"Receipt No\") }}:</b> {{ doc.name }}<br>\n\t<b>{{ _(\"Date\") }}:</b> {{ doc.get_formatted(\"posting_date\") }}<br>\n\t<b>{{ _(\"Customer\") }}:</b> {{ doc.customer_name }}\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"50%\">{{ _(\"Item\") }}</b></th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ _(\"Qty\") }}</th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ _(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{%- for item in doc.items -%}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t<br>{{ item.item_name }}{%- endif -%}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ item.get_formatted(\"rate\") }}</td>\n\t\t\t<td class=\"text-right\">{{ item.get_formatted(\"amount\") }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% else %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% endif %}\n\t\t</tr>\n\t\t{%- for row in doc.taxes -%}\n\t\t {%- if not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ row.description }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t</td>\n\t\t\t<tr>\n\t\t {%- endif -%}\n\t\t{%- endfor -%}\n\n\t\t{%- if doc.discount_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.rounded_total -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Rounded Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t{%- if doc.pos_total_qty -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Total Qty\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"pos_total_qty\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t</tbody>\n</table>\n<hr>\n<p>{{ doc.terms or \"\" }}</p>\n<p class=\"text-center\">{{ _(\"Thank you, please visit again.\") }}</p>",
"idx": 1,
"line_breaks": 0,
- "modified": "2018-01-12 11:18:54.229254",
+ "modified": "2018-02-08 05:39:47.280705",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice",
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
index 9d872a4..b622ab4 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -1,3 +1,11 @@
+<style>
+@media screen {
+ .print-format {
+ padding: 8mm;
+ }
+}
+</style>
+
<h2 class="text-center">{%= __(report.report_name) %}</h2>
<h4 class="text-center">{%= filters.customer || filters.supplier %} </h4>
<h5 class="text-center">
@@ -6,17 +14,90 @@
{%= dateutil.str_to_user(filters.report_date) %}
</h5>
<hr>
+{% if(filters.show_pdc_in_print) { %}
+ {% var balance_row = data.slice(-1).pop();
+ var range1 = report.columns[11].label;
+ var range2 = report.columns[12].label;
+ var range3 = report.columns[13].label;
+ var range4 = report.columns[14].label;
+ %}
+ {% if(balance_row) { %}
+ <table class="table table-bordered table-condensed table-sm small">
+ <caption class="text-right">(Amount in {%= data[0][__("currency")] || "" %})</caption>
+ <colgroup>
+ <col style="width: 30mm;">
+ <col style="width: 18mm;">
+ <col style="width: 18mm;">
+ <col style="width: 18mm;">
+ <col style="width: 18mm;">
+ <col style="width: 18mm;">
+ <col style="width: 18mm;">
+ </colgroup>
+
+ <thead>
+ <tr>
+ <th>{%= __(" ") %}</th>
+ <th>{%= __(range1) %}</th>
+ <th>{%= __(range2) %}</th>
+ <th>{%= __(range3) %}</th>
+ <th>{%= __(range4) %}</th>
+ <th>{%= __("Total") %}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{%= __("Total Outstanding") %}</td>
+ <td class="text-right">{%= format_currency(balance_row[range1]) %}</td>
+ <td class="text-right">{%= format_currency(balance_row[range2]) %}</td>
+ <td class="text-right">{%= format_currency(balance_row[range3]) %}</td>
+ <td class="text-right">{%= format_currency(balance_row[range4]) %}</td>
+ <td class="text-right">
+ {%= format_currency(flt(balance_row[__("Outstanding Amount")]), data[data.length-1]["currency"]) %}
+ </td>
+ </tr>
+ <td>{%= __("PDC/LC") %}</td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td class="text-right">
+ {%= format_currency(flt(balance_row[__("PDC/LC Amount")]), data[data.length-1]["currency"]) %}
+ </td>
+ <tr class="cvs-footer">
+ <th class="text-left">{%= __("Cheques Required") %}</th>
+ <th></th>
+ <th></th>
+ <th></th>
+ <th></th>
+ <th class="text-right">
+ {%= format_currency(flt(balance_row[__("Outstanding Amount")]-balance_row[__("PDC/LC Amount")]), data[data.length-1]["currency"]) %}</th>
+ </tr>
+ </tbody>
+
+ </table>
+ {% } %}
+{% } %}
<table class="table table-bordered">
<thead>
<tr>
{% if(report.report_name === "Accounts Receivable" || report.report_name === "Accounts Payable") { %}
- <th style="width: 14%">{%= __("Date") %}</th>
- <th style="width: 16%">{%= __("Ref") %}</th>
- <th style="width: 30%">{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %}</th>
+ <th style="width: 10%">{%= __("Date") %}</th>
+ <th style="width: 10%">{%= __("Ref") %}</th>
+ <th style="width: 20%">{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %}</th>
<th style="width: 10%">{%= __("Invoiced Amount") %}</th>
- <th style="width: 10%">{%= __("Paid Amount") %}</th>
- <th style="width: 10%">{%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %}</th>
- <th style="width: 10%">{%= __("Outstanding Amount") %}</th>
+ {% if(!filters.show_pdc_in_print) { %}
+ <th style="width: 10%">{%= __("Paid Amount") %}</th>
+ <th style="width: 10%">{%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %}</th>
+ {% } %}
+ <th style="width: 6%">{%= __("Outstanding Amount") %}</th>
+ {% if(filters.show_pdc_in_print) { %}
+ {% if(report.report_name === "Accounts Receivable") { %}
+ <th style="width: 6%">{%= __("Customer LPO No.") %}</th>
+ {% } %}
+ <th style="width: 6%">{%= __("PDC/LC Date") %}</th>
+ <th style="width: 6%">{%= __("PDC/LC Ref") %}</th>
+ <th style="width: 6%">{%= __("PDC/LC Amount") %}</th>
+ {% } %}
{% } else { %}
<th style="width: 40%">{%= (filters.customer || filters.supplier) ? __("Remarks"): __("Party") %}</th>
<th style="width: 15%">{%= __("Total Invoiced Amount") %}</th>
@@ -48,23 +129,49 @@
</td>
<td style="text-align: right">
{%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"]) %}</td>
- <td style="text-align: right">
- {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td>
- <td style="text-align: right">
- {%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %}</td>
+
+ {% if(!filters.show_pdc_in_print) { %}
+ <td style="text-align: right">
+ {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td>
+ <td style="text-align: right">
+ {%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %}</td>
+ {% } %}
<td style="text-align: right">
{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %}</td>
+
+ {% if(filters.show_pdc_in_print) { %}
+ {% if(report.report_name === "Accounts Receivable") { %}
+ <td style="text-align: right">
+ {%= data[i][__("Customer LPO")] %}</td>
+ {% } %}
+ <td style="text-align: right">{%= frappe.datetime.str_to_user(data[i][__("PDC/LC Date")]) %}</td>
+ <td style="text-align: right">{%= data[i][__("PDC/LC Ref")] %}</td>
+ <td style="text-align: right">{%= format_currency(data[i][__("PDC/LC Amount")], data[i]["currency"]) %}</td>
+ {% } %}
{% } else { %}
<td></td>
<td></td>
<td><b>{%= __("Total") %}</b></td>
<td style="text-align: right">
{%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"] ) %}</td>
- <td style="text-align: right">
- {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td>
- <td style="text-align: right">{%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} </td>
+
+ {% if(!filters.show_pdc_in_print) { %}
+ <td style="text-align: right">
+ {%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td>
+ <td style="text-align: right">{%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"]) %} </td>
+ {% } %}
<td style="text-align: right">
{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %}</td>
+
+ {% if(filters.show_pdc_in_print) { %}
+ {% if(report.report_name === "Accounts Receivable") { %}
+ <td style="text-align: right">
+ {%= data[i][__("Customer LPO")] %}</td>
+ {% } %}
+ <td style="text-align: right">{%= frappe.datetime.str_to_user(data[i][__("PDC/LC Date")]) %}</td>
+ <td style="text-align: right">{%= data[i][__("PDC/LC Ref")] %}</td>
+ <td style="text-align: right">{%= format_currency(data[i][__("PDC/LC Amount")], data[i]["currency"]) %}</td>
+ {% } %}
{% } %}
{% } else { %}
{% if(data[i][__("Customer")] || data[i][__("Supplier")]|| " ") { %}
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index fd5241b..82f3507 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -29,6 +29,24 @@
"options": "Payment Terms Template"
},
{
+ "fieldname":"territory",
+ "label": __("Territory"),
+ "fieldtype": "Link",
+ "options": "Territory"
+ },
+ {
+ "fieldname":"sales_partner",
+ "label": __("Sales Partner"),
+ "fieldtype": "Link",
+ "options": "Sales Partner"
+ },
+ {
+ "fieldname":"sales_person",
+ "label": __("Sales Person"),
+ "fieldtype": "Link",
+ "options": "Sales Person"
+ },
+ {
"fieldtype": "Break",
},
{
@@ -64,6 +82,11 @@
"fieldtype": "Int",
"default": "90",
"reqd": 1
+ },
+ {
+ "fieldname":"show_pdc_in_print",
+ "label": __("Show PDC in Print"),
+ "fieldtype": "Check",
}
],
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 0732b7d..29beda0 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -72,6 +72,18 @@
"options": "Currency",
"width": 100
})
+
+ columns += [
+ _("PDC/LC Date") + ":Date:110",
+ _("PDC/LC Ref") + ":Data:110",
+ _("PDC/LC Amount") + ":Currency/currency:130",
+ _("Remaining Balance") + ":Currency/currency:130"
+ ]
+
+ if args.get('party_type') == 'Customer':
+ columns += [_("Customer LPO") + ":Data:100"]
+ columns += [_("Delivery Note") + ":Data:100"]
+
if args.get("party_type") == "Customer":
columns += [
_("Territory") + ":Link/Territory:80",
@@ -89,7 +101,8 @@
currency_precision = get_currency_precision() or 2
dr_or_cr = "debit" if args.get("party_type") == "Customer" else "credit"
- voucher_details = self.get_voucher_details(args.get("party_type"))
+ dn_details = get_dn_details(args.get("party_type"))
+ voucher_details = self.get_voucher_details(args.get("party_type"), dn_details)
future_vouchers = self.get_entries_after(self.filters.report_date, args.get("party_type"))
@@ -101,6 +114,8 @@
return_entries = self.get_return_entries(args.get("party_type"))
data = []
+ pdc_details = get_pdc_details(args.get("party_type"))
+
for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")):
if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
outstanding_amount, credit_note_amount = self.get_outstanding_amount(gle,
@@ -144,6 +159,18 @@
else:
row.append(company_currency)
+ pdc = pdc_details.get(gle.voucher_no, {})
+ remaining_balance = outstanding_amount - flt(pdc.get("pdc_amount"))
+ row += [pdc.get("pdc_date"), pdc.get("pdc_ref"),
+ flt(pdc.get("pdc_amount")), remaining_balance]
+
+ if args.get('party_type') == 'Customer':
+ # customer LPO
+ row += [voucher_details.get(gle.voucher_no, {}).get("po_no")]
+
+ # Delivery Note
+ row += [voucher_details.get(gle.voucher_no, {}).get("delivery_note")]
+
# customer territory / supplier type
if args.get("party_type") == "Customer":
row += [self.get_territory(gle.party), self.get_customer_group(gle.party)]
@@ -225,12 +252,13 @@
return self.party_map
- def get_voucher_details(self, party_type):
+ def get_voucher_details(self, party_type, dn_details):
voucher_details = frappe._dict()
if party_type == "Customer":
- for si in frappe.db.sql("""select name, due_date
+ for si in frappe.db.sql("""select name, due_date, po_no
from `tabSales Invoice` where docstatus=1""", as_dict=1):
+ si['delivery_note'] = dn_details.get(si.name)
voucher_details.setdefault(si.name, si)
if party_type == "Supplier":
@@ -282,11 +310,27 @@
conditions.append("""party in (select name from tabCustomer
where exists(select name from `tabCustomer Group` where lft >= {0} and rgt <= {1}
and name=tabCustomer.customer_group))""".format(lft, rgt))
+
+ if self.filters.get("territory"):
+ lft, rgt = frappe.db.get_value("Territory",
+ self.filters.get("territory"), ["lft", "rgt"])
+
+ conditions.append("""party in (select name from tabCustomer
+ where exists(select name from `tabTerritory` where lft >= {0} and rgt <= {1}
+ and name=tabCustomer.territory))""".format(lft, rgt))
if self.filters.get("payment_terms_template"):
conditions.append("party in (select name from tabCustomer where payment_terms=%s)")
values.append(self.filters.get("payment_terms_template"))
+ if self.filters.get("sales_partner"):
+ conditions.append("party in (select name from tabCustomer where default_sales_partner=%s)")
+ values.append(self.filters.get("sales_partner"))
+
+ if self.filters.get("sales_person"):
+ conditions.append("""party in (select parent
+ from `tabSales Team` where sales_person=%s and parenttype = 'Customer')""")
+ values.append(self.filters.get("sales_person"))
return " and ".join(conditions), values
def get_gl_entries_for(self, party, party_type, against_voucher_type, against_voucher):
@@ -347,3 +391,54 @@
outstanding_range[index] = outstanding_amount
return [age] + outstanding_range
+
+def get_pdc_details(party_type):
+ pdc_details = frappe._dict()
+
+ for pdc in frappe.db.sql("""
+ select
+ pref.reference_name as invoice_no, pent.party, pent.party_type,
+ max(pent.reference_date) as pdc_date, sum(ifnull(pref.allocated_amount,0)) as pdc_amount,
+ GROUP_CONCAT(pent.reference_no SEPARATOR ', ') as pdc_ref
+ from
+ `tabPayment Entry` as pent inner join `tabPayment Entry Reference` as pref
+ on
+ (pref.parent = pent.name)
+ where
+ pent.docstatus = 0 and pent.reference_date > pent.posting_date
+ and pent.party_type = %s
+ group by pref.reference_name""", party_type, as_dict=1):
+ pdc_details.setdefault(pdc.invoice_no, pdc)
+
+ for pdc in frappe.db.sql("""
+ select
+ jea.reference_name as invoice_no, jea.party, jea.party_type,
+ max(je.cheque_date) as pdc_date, sum(ifnull(je.total_amount,0)) as pdc_amount,
+ GROUP_CONCAT(je.cheque_no SEPARATOR ', ') as pdc_ref
+ from
+ `tabJournal Entry` as je inner join `tabJournal Entry Account` as jea
+ on
+ (jea.parent = je.name)
+ where
+ je.docstatus = 0 and je.cheque_date > je.posting_date
+ and jea.party_type = %s
+ group by jea.reference_name""", party_type, as_dict=1):
+ pdc_details.setdefault(pdc.invoice_no, pdc)
+
+ return pdc_details
+
+def get_dn_details(party_type):
+ dn_details = frappe._dict()
+
+ if party_type == "Customer":
+ for si in frappe.db.sql("""select parent, GROUP_CONCAT(delivery_note SEPARATOR ', ') as dn
+ from `tabSales Invoice Item`
+ where docstatus=1 and delivery_note is not null and delivery_note != '' group by parent
+ Union
+ select against_sales_invoice as parent, GROUP_CONCAT(parent SEPARATOR ', ') as dn
+ from `tabDelivery Note Item`
+ where docstatus=1 and against_sales_invoice is not null
+ and against_sales_invoice != '' group by against_sales_invoice""", as_dict=1):
+ dn_details.setdefault(si.parent, si.dn)
+
+ return dn_details
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.js b/erpnext/accounts/report/balance_sheet/balance_sheet.js
index 760fa64..f22f3a1 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.js
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.js
@@ -11,5 +11,3 @@
"default": 1
});
});
-
-
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.js b/erpnext/accounts/report/cash_flow/cash_flow.js
index 455664f..391f57b 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.js
+++ b/erpnext/accounts/report/cash_flow/cash_flow.js
@@ -5,6 +5,11 @@
frappe.query_reports["Cash Flow"] = $.extend({},
erpnext.financial_statements);
+ // The last item in the array is the definition for Presentation Currency
+ // filter. It won't be used in cash flow for now so we pop it. Please take
+ // of this if you are working here.
+ frappe.query_reports["Cash Flow"]["filters"].pop();
+
frappe.query_reports["Cash Flow"]["filters"].push({
"fieldname": "accumulated_values",
"label": __("Accumulated Values"),
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index b0c49df..5d2a35b 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -2,12 +2,14 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe
+
import re
-from frappe import _
-from frappe.utils import (flt, getdate, get_first_day, get_last_day, date_diff,
- add_months, add_days, formatdate, cint)
+
+import frappe
+from erpnext.accounts.report.utils import get_currency, convert_to_presentation_currency
from erpnext.accounts.utils import get_fiscal_year
+from frappe import _
+from frappe.utils import (flt, getdate, get_first_day, add_months, add_days, formatdate)
def get_period_list(from_fiscal_year, to_fiscal_year, periodicity, accumulated_values=False,
@@ -84,6 +86,7 @@
return period_list
+
def get_fiscal_year_data(from_fiscal_year, to_fiscal_year):
fiscal_year = frappe.db.sql("""select min(year_start_date) as year_start_date,
max(year_end_date) as year_end_date from `tabFiscal Year` where
@@ -92,16 +95,19 @@
return fiscal_year[0] if fiscal_year else {}
+
def validate_fiscal_year(fiscal_year, from_fiscal_year, to_fiscal_year):
if not fiscal_year.get('year_start_date') and not fiscal_year.get('year_end_date'):
frappe.throw(_("End Year cannot be before Start Year"))
+
def get_months(start_date, end_date):
diff = (12 * end_date.year + end_date.month) - (12 * start_date.year + start_date.month)
return diff + 1
+
def get_label(periodicity, from_date, to_date):
- if periodicity=="Yearly":
+ if periodicity == "Yearly":
if formatdate(from_date, "YYYY") == formatdate(to_date, "YYYY"):
label = formatdate(from_date, "YYYY")
else:
@@ -111,28 +117,34 @@
return label
-def get_data(company, root_type, balance_must_be, period_list, filters=None,
+
+def get_data(
+ company, root_type, balance_must_be, period_list, filters=None,
accumulated_values=1, only_current_fiscal_year=True, ignore_closing_entries=False,
ignore_accumulated_values_for_fy=False):
+
accounts = get_accounts(company, root_type)
if not accounts:
return None
accounts, accounts_by_name, parent_children_map = filter_accounts(accounts)
- company_currency = frappe.db.get_value("Company", company, "default_currency")
+ company_currency = get_appropriate_currency(company, filters)
gl_entries_by_account = {}
for root in frappe.db.sql("""select lft, rgt from tabAccount
where root_type=%s and ifnull(parent_account, '') = ''""", root_type, as_dict=1):
- set_gl_entries_by_account(company,
+ set_gl_entries_by_account(
+ company,
period_list[0]["year_start_date"] if only_current_fiscal_year else None,
period_list[-1]["to_date"],
root.lft, root.rgt, filters,
- gl_entries_by_account, ignore_closing_entries=ignore_closing_entries)
+ gl_entries_by_account, ignore_closing_entries=ignore_closing_entries
+ )
- calculate_values(accounts_by_name, gl_entries_by_account, period_list, accumulated_values, ignore_accumulated_values_for_fy)
+ calculate_values(
+ accounts_by_name, gl_entries_by_account, period_list, accumulated_values, ignore_accumulated_values_for_fy)
accumulate_values_into_parents(accounts, accounts_by_name, period_list, accumulated_values)
out = prepare_data(accounts, balance_must_be, period_list, company_currency)
out = filter_out_zero_value_rows(out, parent_children_map)
@@ -143,7 +155,15 @@
return out
-def calculate_values(accounts_by_name, gl_entries_by_account, period_list, accumulated_values, ignore_accumulated_values_for_fy):
+def get_appropriate_currency(company, filters=None):
+ if filters and filters.get("presentation_currency"):
+ return filters["presentation_currency"]
+ else:
+ return frappe.db.get_value("Company", company, "default_currency")
+
+
+def calculate_values(
+ accounts_by_name, gl_entries_by_account, period_list, accumulated_values, ignore_accumulated_values_for_fy):
for entries in gl_entries_by_account.values():
for entry in entries:
d = accounts_by_name.get(entry.account)
@@ -164,6 +184,7 @@
if entry.posting_date < period_list[0].year_start_date:
d["opening_balance"] = d.get("opening_balance", 0.0) + flt(entry.debit) - flt(entry.credit)
+
def accumulate_values_into_parents(accounts, accounts_by_name, period_list, accumulated_values):
"""accumulate children's values in parent accounts"""
for d in reversed(accounts):
@@ -175,6 +196,7 @@
accounts_by_name[d.parent_account]["opening_balance"] = \
accounts_by_name[d.parent_account].get("opening_balance", 0.0) + d.get("opening_balance", 0.0)
+
def prepare_data(accounts, balance_must_be, period_list, company_currency):
data = []
year_start_date = period_list[0]["year_start_date"].strftime("%Y-%m-%d")
@@ -192,10 +214,10 @@
"year_start_date": year_start_date,
"year_end_date": year_end_date,
"currency": company_currency,
- "opening_balance": d.get("opening_balance", 0.0) * (1 if balance_must_be=="Debit" else -1)
+ "opening_balance": d.get("opening_balance", 0.0) * (1 if balance_must_be == "Debit" else -1)
})
for period in period_list:
- if d.get(period.key) and balance_must_be=="Credit":
+ if d.get(period.key) and balance_must_be == "Credit":
# change sign based on Debit or Credit, since calculation is done using (debit - credit)
d[period.key] *= -1
@@ -212,6 +234,7 @@
return data
+
def filter_out_zero_value_rows(data, parent_children_map, show_zero_values=False):
data_with_value = []
for d in data:
@@ -228,6 +251,7 @@
return data_with_value
+
def add_total_row(out, root_type, balance_must_be, period_list, company_currency):
total_row = {
"account_name": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'",
@@ -246,16 +270,19 @@
total_row["total"] += flt(row["total"])
row["total"] = ""
- if total_row.has_key("total"):
+ if "total" in total_row:
out.append(total_row)
# blank row after Total
out.append({})
+
def get_accounts(company, root_type):
- return frappe.db.sql("""select name, parent_account, lft, rgt, root_type, report_type, account_name from `tabAccount`
+ return frappe.db.sql(
+ """select name, parent_account, lft, rgt, root_type, report_type, account_name from `tabAccount`
where company=%s and root_type=%s order by lft""", (company, root_type), as_dict=True)
+
def filter_accounts(accounts, depth=10):
parent_children_map = {}
accounts_by_name = {}
@@ -280,6 +307,7 @@
return filtered_accounts, accounts_by_name, parent_children_map
+
def sort_root_accounts(roots):
"""Sort root types as Asset, Liability, Equity, Income, Expense"""
@@ -299,13 +327,14 @@
roots.sort(compare_roots)
-def set_gl_entries_by_account(company, from_date, to_date, root_lft, root_rgt, filters, gl_entries_by_account,
- ignore_closing_entries=False):
+
+def set_gl_entries_by_account(
+ company, from_date, to_date, root_lft, root_rgt, filters, gl_entries_by_account, ignore_closing_entries=False):
"""Returns a dict like { "account": [gl entries], ... }"""
additional_conditions = get_additional_conditions(from_date, ignore_closing_entries, filters)
- gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening, fiscal_year from `tabGL Entry`
+ gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening, fiscal_year, debit_in_account_currency, credit_in_account_currency, account_currency from `tabGL Entry`
where company=%(company)s
{additional_conditions}
and posting_date <= %(to_date)s
@@ -321,11 +350,15 @@
},
as_dict=True)
+ if filters and filters.get('presentation_currency'):
+ convert_to_presentation_currency(gl_entries, get_currency(filters))
+
for entry in gl_entries:
gl_entries_by_account.setdefault(entry.account, []).append(entry)
return gl_entries_by_account
+
def get_additional_conditions(from_date, ignore_closing_entries, filters):
additional_conditions = []
@@ -337,15 +370,17 @@
if filters:
if filters.get("project"):
- additional_conditions.append("project = '%s'"%(frappe.db.escape(filters.get("project"))))
+ additional_conditions.append("project = '%s'" % (frappe.db.escape(filters.get("project"))))
if filters.get("cost_center"):
additional_conditions.append(get_cost_center_cond(filters.get("cost_center")))
return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
+
def get_cost_center_cond(cost_center):
lft, rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"])
- return (""" cost_center in (select name from `tabCost Center` where lft >=%s and rgt <=%s)"""%(lft, rgt))
+ return """ cost_center in (select name from `tabCost Center` where lft >=%s and rgt <=%s)""" % (lft, rgt)
+
def get_columns(periodicity, period_list, accumulated_values=1, company=None):
columns = [{
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index 83325aa..5cfdc9f 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -17,12 +17,12 @@
<table class="table table-bordered">
<thead>
<tr>
- <th style="width: 15%">{%= __("Date") %}</th>
+ <th style="width: 12%">{%= __("Date") %}</th>
<th style="width: 15%">{%= __("Ref") %}</th>
<th style="width: 25%">{%= __("Party") %}</th>
<th style="width: 15%">{%= __("Debit") %}</th>
<th style="width: 15%">{%= __("Credit") %}</th>
- <th style="width: 15%">{%= __("Balance") %}</th>
+ <th style="width: 18%">{%= __("Balance (Dr - Cr)") %}</th>
</tr>
</thead>
<tbody>
@@ -44,42 +44,24 @@
<br>{%= __("Supplier Invoice No") %}: {%= data[i].bill_no %}
{% } %}
</td>
- {% if(filters.print_in_account_currency) { %}
<td style="text-align: right">
- {%= format_currency(data[i].debit_in_account_currency, data[i].account_currency) %}
- </td>
+ {%= format_currency(data[i].debit, filters.presentation_currency) %}</td>
<td style="text-align: right">
- {%= format_currency(data[i].credit_in_account_currency, data[i].account_currency) %}
- </td>
- {% } else { %}
- <td style="text-align: right">
- {%= format_currency(data[i].debit) %}</td>
- <td style="text-align: right">
- {%= format_currency(data[i].credit) %}</td>
- {% } %}
+ {%= format_currency(data[i].credit, filters.presentation_currency) %}</td>
{% } else { %}
<td></td>
<td></td>
<td><b>{%= frappe.format(data[i].account, {fieldtype: "Link"}) || " " %}</b></td>
- {% if(filters.print_in_account_currency) { %}
- <td style="text-align: right">
- {%= data[i].account && format_currency(data[i].debit_in_account_currency, data[i].account_currency) %}</td>
- <td style="text-align: right">
- {%= data[i].account && format_currency(data[i].credit_in_account_currency, data[i].account_currency) %}</td>
- {% } else { %}
- <td style="text-align: right">
- {%= data[i].account && format_currency(data[i].debit) %}
- </td>
- <td style="text-align: right">
- {%= data[i].account && format_currency(data[i].credit) %}
- </td>
- {% } %}
- {% } %}
- {% if(filters.print_in_account_currency) { %}
- <td style="text-align: right">{%= data[i].balance_in_account_currency %}</td>
- {% } else { %}
- <td style="text-align: right">{%= data[i].balance %}</td>
- {% } %}
+ <td style="text-align: right">
+ {%= data[i].account && format_currency(data[i].debit, filters.presentation_currency) %}
+ </td>
+ <td style="text-align: right">
+ {%= data[i].account && format_currency(data[i].credit, filters.presentation_currency) %}
+ </td>
+ {% } %}
+ <td style="text-align: right">
+ {%= format_currency(data[i].balance, filters.presentation_currency) %}
+ </td>
</tr>
{% } %}
</tbody>
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index adefadd..d6a2aec 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.query_reports["General Ledger"] = {
@@ -107,9 +107,10 @@
"fieldtype": "Check",
},
{
- "fieldname":"print_in_account_currency",
- "label": __("Print in Account Currency"),
- "fieldtype": "Check",
+ "fieldname": "presentation_currency",
+ "label": __("Currency"),
+ "fieldtype": "Select",
+ "options": erpnext.get_presentation_currency_list()
}
]
}
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 72fe793..70ab67f 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -3,10 +3,13 @@
from __future__ import unicode_literals
import frappe
+from erpnext import get_company_currency, get_default_company
+from erpnext.accounts.report.utils import get_currency, convert_to_presentation_currency
from frappe.utils import getdate, cstr, flt, fmt_money
from frappe import _, _dict
from erpnext.accounts.utils import get_account_currency
+
def execute(filters=None):
account_details = {}
@@ -29,6 +32,7 @@
return columns, res
+
def validate_filters(filters, account_details):
if not filters.get('company'):
frappe.throw(_('{0} is mandatory').format(_('Company')))
@@ -37,7 +41,7 @@
frappe.throw(_("Account {0} does not exists").format(filters.account))
if filters.get("account") and filters.get("group_by_account") \
- and account_details[filters.account].is_group == 0:
+ and account_details[filters.account].is_group == 0:
frappe.throw(_("Can not filter based on Account, if grouped by Account"))
if filters.get("voucher_no") and filters.get("group_by_voucher"):
@@ -56,6 +60,7 @@
elif not frappe.db.exists(party_type, party):
frappe.throw(_("Invalid {0}: {1}").format(party_type, party))
+
def set_account_currency(filters):
if not (filters.get("account") or filters.get("party")):
return filters
@@ -66,8 +71,13 @@
if filters.get("account"):
account_currency = get_account_currency(filters.account)
elif filters.get("party"):
- gle_currency = frappe.db.get_value("GL Entry", {"party_type": filters.party_type,
- "party": filters.party, "company": filters.company}, "account_currency")
+ gle_currency = frappe.db.get_value(
+ "GL Entry", {
+ "party_type": filters.party_type, "party": filters.party, "company": filters.company
+ },
+ "account_currency"
+ )
+
if gle_currency:
account_currency = gle_currency
else:
@@ -90,29 +100,39 @@
return result
+
def get_gl_entries(filters):
+ currency_map = get_currency(filters)
select_fields = """, sum(debit_in_account_currency) as debit_in_account_currency,
sum(credit_in_account_currency) as credit_in_account_currency""" \
- if filters.get("show_in_account_currency") else ""
+
group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \
if filters.get("group_by_voucher") else "group by name"
- gl_entries = frappe.db.sql("""
+ gl_entries = frappe.db.sql(
+ """
select
posting_date, account, party_type, party,
sum(debit) as debit, sum(credit) as credit,
voucher_type, voucher_no, cost_center, project,
- against_voucher_type, against_voucher,
+ against_voucher_type, against_voucher, account_currency,
remarks, against, is_opening {select_fields}
from `tabGL Entry`
where company=%(company)s {conditions}
{group_by_condition}
- order by posting_date, account"""\
- .format(select_fields=select_fields, conditions=get_conditions(filters),
- group_by_condition=group_by_condition), filters, as_dict=1)
+ order by posting_date, account
+ """.format(
+ select_fields=select_fields, conditions=get_conditions(filters),
+ group_by_condition=group_by_condition
+ ),
+ filters, as_dict=1)
- return gl_entries
+ if filters.get('presentation_currency'):
+ return convert_to_presentation_currency(gl_entries, currency_map)
+ else:
+ return gl_entries
+
def get_conditions(filters):
conditions = []
@@ -132,16 +152,20 @@
if not (filters.get("account") or filters.get("party") or filters.get("group_by_account")):
conditions.append("posting_date >=%(from_date)s")
+ conditions.append("posting_date <=%(to_date)s")
if filters.get("project"):
conditions.append("project=%(project)s")
from frappe.desk.reportview import build_match_conditions
match_conditions = build_match_conditions("GL Entry")
- if match_conditions: conditions.append(match_conditions)
+
+ if match_conditions:
+ conditions.append(match_conditions)
return "and {}".format(" and ".join(conditions)) if conditions else ""
+
def get_data_with_opening_closing(filters, account_details, gl_entries):
data = []
gle_map = initialize_gle_map(gl_entries)
@@ -178,14 +202,15 @@
return data
+
def get_totals_dict():
def _get_debit_credit_dict(label):
return _dict(
- account = "'{0}'".format(label),
- debit = 0.0,
- credit = 0.0,
- debit_in_account_currency = 0.0,
- credit_in_account_currency = 0.0
+ account="'{0}'".format(label),
+ debit=0.0,
+ credit=0.0,
+ debit_in_account_currency=0.0,
+ credit_in_account_currency=0.0
)
return _dict(
opening = _get_debit_credit_dict(_('Opening')),
@@ -193,12 +218,14 @@
closing = _get_debit_credit_dict(_('Closing (Opening + Total)'))
)
+
def initialize_gle_map(gl_entries):
gle_map = frappe._dict()
for gle in gl_entries:
- gle_map.setdefault(gle.account, _dict(totals = get_totals_dict(), entries = []))
+ gle_map.setdefault(gle.account, _dict(totals=get_totals_dict(), entries=[]))
return gle_map
+
def get_accountwise_gle(filters, gl_entries, gle_map):
totals = get_totals_dict()
entries = []
@@ -210,13 +237,12 @@
data[key].debit_in_account_currency += flt(gle.debit_in_account_currency)
data[key].credit_in_account_currency += flt(gle.credit_in_account_currency)
-
from_date, to_date = getdate(filters.from_date), getdate(filters.to_date)
for gle in gl_entries:
if gle.posting_date < from_date or cstr(gle.is_opening) == "Yes":
update_value_in_dict(gle_map[gle.account].totals, 'opening', gle)
update_value_in_dict(totals, 'opening', gle)
-
+
update_value_in_dict(gle_map[gle.account].totals, 'closing', gle)
update_value_in_dict(totals, 'closing', gle)
@@ -233,28 +259,29 @@
return totals, entries
+
def get_result_as_list(data, filters):
balance, balance_in_account_currency = 0, 0
inv_details = get_supplier_invoice_details()
for d in data:
- if not d.posting_date:
+ if not d.get('posting_date'):
balance, balance_in_account_currency = 0, 0
- balance, label = get_balance(d, balance, 'debit', 'credit')
- d['balance'] = '{0} {1}'.format(fmt_money(abs(balance)), label)
+ balance = get_balance(d, balance, 'debit', 'credit')
+ d['balance'] = balance
if filters.get("show_in_account_currency"):
- balance_in_account_currency, label = get_balance(d, balance_in_account_currency,
+ balance_in_account_currency = get_balance(d, balance_in_account_currency,
'debit_in_account_currency', 'credit_in_account_currency')
- d['balance_in_account_currency'] = '{0} {1}'.format(fmt_money(abs(balance_in_account_currency)), label)
+ d['balance_in_account_currency'] = balance_in_account_currency
else:
d['debit_in_account_currency'] = d.get('debit', 0)
d['credit_in_account_currency'] = d.get('credit', 0)
d['balance_in_account_currency'] = d.get('balance')
d['account_currency'] = filters.account_currency
- d['bill_no'] = inv_details.get(d.against_voucher, '')
+ d['bill_no'] = inv_details.get(d.get('against_voucher'), '')
return data
@@ -268,11 +295,19 @@
def get_balance(row, balance, debit_field, credit_field):
balance += (row.get(debit_field, 0) - row.get(credit_field, 0))
- label = 'DR' if balance > 0 else 'CR'
- return balance, label
+ return balance
def get_columns(filters):
+ if filters.get("presentation_currency"):
+ currency = filters["presentation_currency"]
+ else:
+ if filters.get("company"):
+ currency = get_company_currency(filters["company"])
+ else:
+ company = get_default_company()
+ currency = get_company_currency(company)
+
columns = [
{
"label": _("Posting Date"),
@@ -288,47 +323,25 @@
"width": 180
},
{
- "label": _("Debit"),
+ "label": _("Debit ({0})".format(currency)),
"fieldname": "debit",
"fieldtype": "Float",
"width": 100
},
{
- "label": _("Credit"),
+ "label": _("Credit ({0})".format(currency)),
"fieldname": "credit",
"fieldtype": "Float",
"width": 100
},
{
- "label": _("Balance"),
+ "label": _("Balance ({0})".format(currency)),
"fieldname": "balance",
- "fieldtype": "Data",
- "width": 100
+ "fieldtype": "Float",
+ "width": 130
}
]
- if filters.get("show_in_account_currency"):
- columns.extend([
- {
- "label": _("Debit") + " (" + filters.account_currency + ")",
- "fieldname": "debit_in_account_currency",
- "fieldtype": "Float",
- "width": 100
- },
- {
- "label": _("Credit") + " (" + filters.account_currency + ")",
- "fieldname": "credit_in_account_currency",
- "fieldtype": "Float",
- "width": 100
- },
- {
- "label": _("Balance") + " (" + filters.account_currency + ")",
- "fieldname": "balance_in_account_currency",
- "fieldtype": "Data",
- "width": 100
- }
- ])
-
columns.extend([
{
"label": _("Voucher Type"),
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index ab5251f..8917c9f 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -168,11 +168,11 @@
for d in item_list:
invoice_item_row.setdefault(d.parent, []).append(d)
- item_row_map.setdefault(d.parent, {}).setdefault(d.item_code, []).append(d)
+ item_row_map.setdefault(d.parent, {}).setdefault(d.item_code or d.item_name, []).append(d)
conditions = ""
if doctype == "Purchase Invoice":
- conditions = " and category in ('Total', 'Valuation and Total')"
+ conditions = " and category in ('Total', 'Valuation and Total') and base_tax_amount_after_discount_amount != 0"
tax_details = frappe.db.sql("""
select
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
index bcac2df..a02c592 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
@@ -1,6 +1,7 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
+
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Profit and Loss Statement"] = $.extend({},
erpnext.financial_statements);
@@ -24,4 +25,4 @@
"fieldtype": "Check"
}
);
-});
\ No newline at end of file
+});
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py
index 37848d5..610475a 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.py
+++ b/erpnext/accounts/report/purchase_register/purchase_register.py
@@ -172,6 +172,7 @@
else sum(base_tax_amount_after_discount_amount) * -1 end as tax_amount
from `tabPurchase Taxes and Charges`
where parent in (%s) and category in ('Total', 'Valuation and Total')
+ and base_tax_amount_after_discount_amount != 0
group by parent, account_head, add_deduct_tax
""" % ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
diff --git a/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py b/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
index 2106bb2..9969c55 100644
--- a/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
+++ b/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
@@ -53,7 +53,7 @@
def get_conditions(filters):
conditions = "1=1"
- if filters.get("from_date"): conditions += "a.posting_date >= %(from_date)s"
+ if filters.get("from_date"): conditions += " and a.posting_date >= %(from_date)s"
if filters.get("to_date"): conditions += " and a.posting_date <= %(to_date)s"
if filters.get("company"): conditions += " and a.company=%(company)s"
if filters.get("customer"): conditions += " and a.customer = %(customer)s"
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/accounts/report/share_balance/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/accounts/report/share_balance/__init__.py
diff --git a/erpnext/accounts/report/share_balance/share_balance.js b/erpnext/accounts/report/share_balance/share_balance.js
new file mode 100644
index 0000000..6db5bdd
--- /dev/null
+++ b/erpnext/accounts/report/share_balance/share_balance.js
@@ -0,0 +1,22 @@
+// -*- coding: utf-8 -*-
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Share Balance"] = {
+ "filters": [
+ {
+ "fieldname":"date",
+ "label": __("Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.get_today(),
+ "reqd": 1
+ },
+ {
+ "fieldname":"shareholder",
+ "label": __("Shareholder"),
+ "fieldtype": "Link",
+ "options": "Shareholder"
+ }
+ ]
+}
diff --git a/erpnext/accounts/report/share_balance/share_balance.json b/erpnext/accounts/report/share_balance/share_balance.json
new file mode 100644
index 0000000..5477c09
--- /dev/null
+++ b/erpnext/accounts/report/share_balance/share_balance.json
@@ -0,0 +1,23 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2017-12-28 16:12:34.154787",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2017-12-28 16:12:37.155649",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Share Balance",
+ "owner": "Administrator",
+ "ref_doctype": "Share Transfer",
+ "report_name": "Share Balance",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "System Manager"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/share_balance/share_balance.py b/erpnext/accounts/report/share_balance/share_balance.py
new file mode 100644
index 0000000..9f22f81
--- /dev/null
+++ b/erpnext/accounts/report/share_balance/share_balance.py
@@ -0,0 +1,58 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import msgprint, _
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ if not filters.get("date"):
+ frappe.throw(_("Please select date"))
+
+ columns = get_columns(filters)
+
+ date = filters.get("date")
+
+ data = []
+
+ if not filters.get("shareholder"):
+ pass
+ else:
+ share_type, no_of_shares, rate, amount = 1, 2, 3, 4
+
+ all_shares = get_all_shares(filters.get("shareholder"))
+ for share_entry in all_shares:
+ row = False
+ for datum in data:
+ if datum[share_type] == share_entry.share_type:
+ datum[no_of_shares] += share_entry.no_of_shares
+ datum[amount] += share_entry.amount
+ if datum[no_of_shares] == 0:
+ datum[rate] = 0
+ else:
+ datum[rate] = datum[amount] / datum[no_of_shares]
+ row = True
+ break
+ # new entry
+ if not row:
+ row = [filters.get("shareholder"),
+ share_entry.share_type, share_entry.no_of_shares, share_entry.rate, share_entry.amount]
+
+ data.append(row)
+
+ return columns, data
+
+def get_columns(filters):
+ columns = [
+ _("Shareholder") + ":Link/Shareholder:150",
+ _("Share Type") + "::90",
+ _("No of Shares") + "::90",
+ _("Average Rate") + ":Currency:90",
+ _("Amount") + ":Currency:90"
+ ]
+ return columns
+
+def get_all_shares(shareholder):
+ return frappe.get_doc('Shareholder', shareholder).share_balance
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/accounts/report/share_ledger/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/accounts/report/share_ledger/__init__.py
diff --git a/erpnext/accounts/report/share_ledger/share_ledger.js b/erpnext/accounts/report/share_ledger/share_ledger.js
new file mode 100644
index 0000000..6d1c44a
--- /dev/null
+++ b/erpnext/accounts/report/share_ledger/share_ledger.js
@@ -0,0 +1,22 @@
+// -*- coding: utf-8 -*-
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Share Ledger"] = {
+ "filters": [
+ {
+ "fieldname":"date",
+ "label": __("Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.get_today(),
+ "reqd": 1
+ },
+ {
+ "fieldname":"shareholder",
+ "label": __("Shareholder"),
+ "fieldtype": "Link",
+ "options": "Shareholder"
+ }
+ ]
+};
diff --git a/erpnext/accounts/report/share_ledger/share_ledger.json b/erpnext/accounts/report/share_ledger/share_ledger.json
new file mode 100644
index 0000000..d374bb7
--- /dev/null
+++ b/erpnext/accounts/report/share_ledger/share_ledger.json
@@ -0,0 +1,23 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2017-12-27 16:15:52.615453",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2017-12-27 16:46:54.422356",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Share Ledger",
+ "owner": "Administrator",
+ "ref_doctype": "Share Transfer",
+ "report_name": "Share Ledger",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "Administrator"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/share_ledger/share_ledger.py b/erpnext/accounts/report/share_ledger/share_ledger.py
new file mode 100644
index 0000000..3ed3c91
--- /dev/null
+++ b/erpnext/accounts/report/share_ledger/share_ledger.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ if not filters.get("date"):
+ frappe.throw(_("Please select date"))
+
+ columns = get_columns(filters)
+
+ date = filters.get("date")
+
+ data = []
+
+ if not filters.get("shareholder"):
+ pass
+ else:
+ transfers = get_all_transfers(date, filters.get("shareholder"))
+ for transfer in transfers:
+ if transfer.transfer_type == 'Transfer':
+ if transfer.from_shareholder == filters.get("shareholder"):
+ transfer.transfer_type += ' to {}'.format(transfer.to_shareholder)
+ else:
+ transfer.transfer_type += ' from {}'.format(transfer.from_shareholder)
+ row = [filters.get("shareholder"), transfer.date, transfer.transfer_type,
+ transfer.share_type, transfer.no_of_shares, transfer.rate, transfer.amount,
+ transfer.company, transfer.name]
+
+ data.append(row)
+
+ return columns, data
+
+def get_columns(filters):
+ columns = [
+ _("Shareholder") + ":Link/Shareholder:150",
+ _("Date") + ":Date:100",
+ _("Transfer Type") + "::140",
+ _("Share Type") + "::90",
+ _("No of Shares") + "::90",
+ _("Rate") + ":Currency:90",
+ _("Amount") + ":Currency:90",
+ _("Company") + "::150",
+ _("Share Transfer") + ":Link/Share Transfer:90"
+ ]
+ return columns
+
+def get_all_transfers(date, shareholder):
+ condition = ' '
+ # if company:
+ # condition = 'AND company = %(company)s '
+ return frappe.db.sql("""SELECT * FROM `tabShare Transfer`
+ WHERE (DATE(date) <= %(date)s AND from_shareholder = %(shareholder)s {condition})
+ OR (DATE(date) <= %(date)s AND to_shareholder = %(shareholder)s {condition})
+ ORDER BY date""".format(condition=condition),
+ {'date': date, 'shareholder': shareholder}, as_dict=1)
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 5df2a65..7142c69 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -51,8 +51,8 @@
filters.to_date = filters.year_end_date
def get_data(filters):
- accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt
- from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True)
+ accounts = frappe.db.sql("""select name, parent_account, account_name, account_number, root_type, report_type, lft, rgt
+ from `tabAccount` where company=%s order by account_name, lft""", filters.company, as_dict=True)
company_currency = erpnext.get_company_currency(filters.company)
if not accounts:
@@ -175,6 +175,9 @@
def prepare_data(accounts, filters, total_row, parent_children_map, company_currency):
data = []
+ tmpaccnt = sorted(accounts)
+ if not (accounts[0].account_number is None):
+ accounts = tmpaccnt
for d in accounts:
has_value = False
diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py
new file mode 100644
index 0000000..4490398
--- /dev/null
+++ b/erpnext/accounts/report/utils.py
@@ -0,0 +1,128 @@
+import frappe
+from erpnext import get_company_currency, get_default_company
+from erpnext.setup.utils import get_exchange_rate
+from frappe.utils import cint
+
+__exchange_rates = {}
+P_OR_L_ACCOUNTS = list(
+ sum(frappe.get_list('Account', fields=['name'], or_filters=[{'root_type': 'Income'}, {'root_type': 'Expense'}], as_list=True), ())
+)
+
+
+def get_currency(filters):
+ """
+ Returns a dictionary containing currency information. The keys of the dict are
+ - company: The company for which we are fetching currency information. if no
+ company is specified, it will fallback to the default company.
+ - company currency: The functional currency of the said company.
+ - presentation currency: The presentation currency to use. Only currencies that
+ have been used for transactions will be allowed.
+ - report date: The report date.
+ :param filters: Report filters
+ :type filters: dict
+
+ :return: str - Currency
+ """
+ company = get_appropriate_company(filters)
+ company_currency = get_company_currency(company)
+ presentation_currency = filters['presentation_currency'] if filters.get('presentation_currency') else company_currency
+ report_date = filters.get('to_date') or filters.get('to_fiscal_year')
+
+ currency_map = dict(company=company, company_currency=company_currency, presentation_currency=presentation_currency, report_date=report_date)
+
+ return currency_map
+
+
+def convert(value, from_, to, date):
+ """
+ convert `value` from `from_` to `to` on `date`
+ :param value: Amount to be converted
+ :param from_: Currency of `value`
+ :param to: Currency to convert to
+ :param date: exchange rate as at this date
+ :return: Result of converting `value`
+ """
+ rate = get_rate_as_at(date, from_, to)
+ converted_value = value / (rate or 1)
+ return converted_value
+
+
+def get_rate_as_at(date, from_currency, to_currency):
+ """
+ Gets exchange rate as at `date` for `from_currency` - `to_currency` exchange rate.
+ This calls `get_exchange_rate` so that we can get the correct exchange rate as per
+ the user's Accounts Settings.
+ It is made efficient by memoising results to `__exchange_rates`
+ :param date: exchange rate as at this date
+ :param from_currency: Base currency
+ :param to_currency: Quote currency
+ :return: Retrieved exchange rate
+ """
+ rate = __exchange_rates.get('{0}-{1}@{2}'.format(from_currency, to_currency, date))
+ if not rate:
+ rate = get_exchange_rate(from_currency, to_currency, date) or 1
+ __exchange_rates['{0}-{1}@{2}'.format(from_currency, to_currency, date)] = rate
+
+ return rate
+
+
+def is_p_or_l_account(account_name):
+ """
+ Check if the given `account name` is an `Account` with `root_type` of either 'Income'
+ or 'Expense'.
+ :param account_name:
+ :return: Boolean
+ """
+ return account_name in P_OR_L_ACCOUNTS
+
+
+def convert_to_presentation_currency(gl_entries, currency_info):
+ """
+ Take a list of GL Entries and change the 'debit' and 'credit' values to currencies
+ in `currency_info`.
+ :param gl_entries:
+ :param currency_info:
+ :return:
+ """
+ converted_gl_list = []
+ presentation_currency = currency_info['presentation_currency']
+ company_currency = currency_info['company_currency']
+
+ for entry in gl_entries:
+ account = entry['account']
+ debit = cint(entry['debit'])
+ credit = cint(entry['credit'])
+ debit_in_account_currency = cint(entry['debit_in_account_currency'])
+ credit_in_account_currency = cint(entry['credit_in_account_currency'])
+ account_currency = entry['account_currency']
+
+ if account_currency != presentation_currency or (account_currency == presentation_currency and not is_p_or_l_account(account)):
+ value = debit or credit
+
+ date = currency_info['report_date'] if not is_p_or_l_account(account) else entry['posting_date']
+
+ converted_value = convert(value, presentation_currency, company_currency, date)
+
+ if entry.get('debit'):
+ entry['debit'] = converted_value
+ else:
+ entry['credit'] = converted_value
+
+ elif account_currency == presentation_currency:
+ if entry.get('debit'):
+ entry['debit'] = debit_in_account_currency
+ else:
+ entry['credit'] = credit_in_account_currency
+
+ converted_gl_list.append(entry)
+
+ return converted_gl_list
+
+
+def get_appropriate_company(filters):
+ if filters.get('company'):
+ company = filters['company']
+ else:
+ company = get_default_company()
+
+ return company
diff --git a/erpnext/agriculture/doctype/crop/crop.py b/erpnext/agriculture/doctype/crop/crop.py
index 7eeb8af..9121b54 100644
--- a/erpnext/agriculture/doctype/crop/crop.py
+++ b/erpnext/agriculture/doctype/crop/crop.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe
+from frappe import _
from frappe.model.document import Document
class Crop(Document):
@@ -12,7 +13,7 @@
for task in self.agriculture_task:
# validate start_day is not > end_day
if task.start_day > task.end_day:
- frappe.throw("Start day is greater than end day in task '{0}'".format(task.subject))
+ frappe.throw(_("Start day is greater than end day in task '{0}'").format(task.subject))
# to calculate the period of the Crop Cycle
if task.end_day > max_period: max_period = task.end_day
if max_period > self.period: self.period = max_period
diff --git a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py
index 21dfe31..1d9f324 100644
--- a/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py
+++ b/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe
+from frappe import _
from frappe.model.document import Document
import ast
@@ -31,7 +32,7 @@
old_disease.append(detected_disease.name)
if list(set(new_disease)-set(old_disease)) != []:
self.update_disease(list(set(new_disease)-set(old_disease)))
- frappe.msgprint("All tasks for the detected diseases were imported")
+ frappe.msgprint(_("All tasks for the detected diseases were imported"))
def update_disease(self, disease_hashes):
new_disease = []
diff --git a/erpnext/agriculture/doctype/disease/disease.py b/erpnext/agriculture/doctype/disease/disease.py
index 42005d6..8a0e6f3 100644
--- a/erpnext/agriculture/doctype/disease/disease.py
+++ b/erpnext/agriculture/doctype/disease/disease.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe
+from frappe import _
from frappe.model.document import Document
class Disease(Document):
@@ -12,7 +13,7 @@
for task in self.treatment_task:
# validate start_day is not > end_day
if task.start_day > task.end_day:
- frappe.throw("Start day is greater than end day in task '{0}'".format(task.task_name))
+ frappe.throw(_("Start day is greater than end day in task '{0}'").format(task.task_name))
# to calculate the period of the Crop Cycle
if task.end_day > max_period: max_period = task.end_day
self.treatment_period = max_period
\ No newline at end of file
diff --git a/erpnext/agriculture/doctype/soil_texture/soil_texture.py b/erpnext/agriculture/doctype/soil_texture/soil_texture.py
index 7345e86..b66d00c 100644
--- a/erpnext/agriculture/doctype/soil_texture/soil_texture.py
+++ b/erpnext/agriculture/doctype/soil_texture/soil_texture.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe
+from frappe import _
from frappe.model.document import Document
from frappe.utils import flt, cint
@@ -20,9 +21,9 @@
self.update_soil_edit('sand_composition')
for soil_type in self.soil_types:
if self.get(soil_type) > 100 or self.get(soil_type) < 0:
- frappe.throw("{0} should be a value between 0 and 100".format(soil_type))
+ frappe.throw(_("{0} should be a value between 0 and 100").format(soil_type))
if sum(self.get(soil_type) for soil_type in self.soil_types) != 100:
- frappe.throw('Soil compositions do not add up to 100')
+ frappe.throw(_('Soil compositions do not add up to 100'))
def update_soil_edit(self, soil_type):
self.soil_edit_order[self.soil_types.index(soil_type)] = max(self.soil_edit_order)+1
diff --git a/erpnext/agriculture/doctype/water_analysis/water_analysis.py b/erpnext/agriculture/doctype/water_analysis/water_analysis.py
index 81fdf14..bd2cd11 100644
--- a/erpnext/agriculture/doctype/water_analysis/water_analysis.py
+++ b/erpnext/agriculture/doctype/water_analysis/water_analysis.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe
+from frappe import _
from frappe.model.document import Document
class WaterAnalysis(Document):
@@ -18,6 +19,6 @@
def validate(self):
if self.collection_datetime > self.laboratory_testing_datetime:
- frappe.throw('Lab testing datetime cannot be before collection datetime')
+ frappe.throw(_('Lab testing datetime cannot be before collection datetime'))
if self.laboratory_testing_datetime > self.result_datetime:
- frappe.throw('Lab result datetime cannot be before testing datetime')
\ No newline at end of file
+ frappe.throw(_('Lab result datetime cannot be before testing datetime'))
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 8287401..236c4f9 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -198,6 +198,19 @@
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
}
})
+ },
+
+ calculate_depreciation: function(frm) {
+ frappe.db.get_value("Asset Settings", {'name':"Asset Settings"}, 'schedule_based_on_fiscal_year', (data) => {
+ if (data.schedule_based_on_fiscal_year == 1) {
+ frm.set_df_property("depreciation_method", "options", "\nStraight Line\nManual");
+ frm.toggle_reqd("available_for_use_date", true);
+ frm.toggle_display("frequency_of_depreciation", false);
+ frappe.db.get_value("Fiscal Year", {'name': frappe.sys_defaults.fiscal_year}, "year_end_date", (data) => {
+ frm.set_value("next_depreciation_date", data.year_end_date);
+ })
+ }
+ })
}
});
@@ -316,4 +329,4 @@
})
});
dialog.show();
-};
\ No newline at end of file
+};
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index 45c9a65..49b574d 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -513,6 +513,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "available_for_use_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Available-for-use Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "is_existing_asset",
"fieldtype": "Check",
"hidden": 0,
@@ -1221,7 +1251,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-19 12:58:44.137460",
+ "modified": "2018-01-05 09:53:05.945328",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset",
@@ -1277,4 +1307,4 @@
"sort_order": "DESC",
"track_changes": 0,
"track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 8bba0b6..bd33a1b 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
import frappe
from frappe import _
-from frappe.utils import flt, add_months, cint, nowdate, getdate, today
+from frappe.utils import flt, add_months, cint, nowdate, getdate, today, date_diff
from frappe.model.document import Document
from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import get_fixed_asset_account
from erpnext.assets.doctype.asset.depreciation \
@@ -90,11 +90,15 @@
if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.purchase_date):
frappe.throw(_("Next Depreciation Date cannot be before Purchase Date"))
+ if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.available_for_use_date):
+ frappe.throw(_("Next Depreciation Date cannot be before Available-for-use Date"))
+
if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life)
and not self.next_depreciation_date and self.calculate_depreciation):
frappe.throw(_("Please set Next Depreciation Date"))
def make_depreciation_schedule(self):
+
if self.depreciation_method != 'Manual':
self.schedules = []
@@ -104,18 +108,51 @@
number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
cint(self.number_of_depreciations_booked)
if number_of_pending_depreciations:
- for n in xrange(number_of_pending_depreciations):
- schedule_date = add_months(self.next_depreciation_date,
- n * cint(self.frequency_of_depreciation))
+ next_depr_date = getdate(add_months(self.available_for_use_date,
+ number_of_pending_depreciations * 12))
+ if (cint(frappe.db.get_value("Asset Settings", None, "schedule_based_on_fiscal_year")) == 1
+ and getdate(self.next_depreciation_date) < next_depr_date):
- depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
- if depreciation_amount:
- value_after_depreciation -= flt(depreciation_amount)
+ number_of_pending_depreciations += 1
+ for n in xrange(number_of_pending_depreciations):
+ if n == xrange(number_of_pending_depreciations)[-1]:
+ schedule_date = add_months(self.available_for_use_date, n * 12)
+ previous_scheduled_date = add_months(self.next_depreciation_date, (n-1) * 12)
+ depreciation_amount = \
+ self.get_depreciation_amount_prorata_temporis(value_after_depreciation,
+ previous_scheduled_date, schedule_date)
- self.append("schedules", {
- "schedule_date": schedule_date,
- "depreciation_amount": depreciation_amount
- })
+ elif n == xrange(number_of_pending_depreciations)[0]:
+ schedule_date = self.next_depreciation_date
+ depreciation_amount = \
+ self.get_depreciation_amount_prorata_temporis(value_after_depreciation,
+ self.available_for_use_date, schedule_date)
+
+ else:
+ schedule_date = add_months(self.next_depreciation_date, n * 12)
+ depreciation_amount = \
+ self.get_depreciation_amount_prorata_temporis(value_after_depreciation)
+
+ if value_after_depreciation != 0:
+ value_after_depreciation -= flt(depreciation_amount)
+
+ self.append("schedules", {
+ "schedule_date": schedule_date,
+ "depreciation_amount": depreciation_amount
+ })
+ else:
+ for n in xrange(number_of_pending_depreciations):
+ schedule_date = add_months(self.next_depreciation_date,
+ n * cint(self.frequency_of_depreciation))
+
+ depreciation_amount = self.get_depreciation_amount(value_after_depreciation)
+ if depreciation_amount:
+ value_after_depreciation -= flt(depreciation_amount)
+
+ self.append("schedules", {
+ "schedule_date": schedule_date,
+ "depreciation_amount": depreciation_amount
+ })
def set_accumulated_depreciation(self):
accumulated_depreciation = flt(self.opening_accumulated_depreciation)
@@ -125,12 +162,13 @@
value_after_depreciation -= flt(depreciation_amount)
if i==len(self.get("schedules"))-1 and self.depreciation_method == "Straight Line":
- depreciation_amount += flt(value_after_depreciation - flt(self.expected_value_after_useful_life),
- d.precision("depreciation_amount"))
+ depreciation_amount += flt(value_after_depreciation -
+ flt(self.expected_value_after_useful_life), d.precision("depreciation_amount"))
d.depreciation_amount = depreciation_amount
accumulated_depreciation += d.depreciation_amount
- d.accumulated_depreciation_amount = flt(accumulated_depreciation, d.precision("accumulated_depreciation_amount"))
+ d.accumulated_depreciation_amount = flt(accumulated_depreciation,
+ d.precision("accumulated_depreciation_amount"))
def get_depreciation_amount(self, depreciable_value):
if self.depreciation_method in ("Straight Line", "Manual"):
@@ -147,6 +185,21 @@
return depreciation_amount
+ def get_depreciation_amount_prorata_temporis(self, depreciable_value, start_date=None, end_date=None):
+ if start_date and end_date:
+ prorata_temporis = min(abs(flt(date_diff(str(end_date), str(start_date)))) / flt(frappe.db.get_value("Asset Settings", None, "number_of_days_in_fiscal_year")), 1)
+ else:
+ prorata_temporis = 1
+
+ if self.depreciation_method in ("Straight Line", "Manual"):
+ depreciation_amount = (flt(self.value_after_depreciation) -
+ flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) -
+ cint(self.number_of_depreciations_booked)) * prorata_temporis
+
+ return depreciation_amount
+ else:
+ self.get_depreciation_amount(depreciable_value)
+
def validate_expected_value_after_useful_life(self):
accumulated_depreciation_after_full_schedule = \
max([d.accumulated_depreciation_amount for d in self.get("schedules")])
@@ -178,7 +231,7 @@
def set_status(self, status=None):
'''Get and update status'''
if not status:
- status = self.get_status()
+ status = self.get_status()
self.db_set("status", status)
def get_status(self):
diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py
index 76c46cf..07ed0ba 100644
--- a/erpnext/assets/doctype/asset/test_asset.py
+++ b/erpnext/assets/doctype/asset/test_asset.py
@@ -12,24 +12,25 @@
class TestAsset(unittest.TestCase):
def setUp(self):
set_depreciation_settings_in_company()
+ remove_prorated_depreciation_schedule()
create_asset()
frappe.db.sql("delete from `tabTax Rule`")
def test_purchase_asset(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.submit()
-
+
pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount,
asset.company, asset.purchase_date)
pi.supplier = "_Test Supplier"
pi.insert()
pi.submit()
-
+
asset.load_from_db()
self.assertEqual(asset.supplier, "_Test Supplier")
self.assertEqual(asset.purchase_date, getdate("2015-01-01"))
self.assertEqual(asset.purchase_invoice, pi.name)
-
+
expected_gle = (
("_Test Fixed Asset - _TC", 100000.0, 0.0),
("Creditors - _TC", 0.0, 100000.0)
@@ -46,10 +47,10 @@
asset.load_from_db()
self.assertEqual(asset.supplier, None)
self.assertEqual(asset.purchase_invoice, None)
-
+
self.assertFalse(frappe.db.get_value("GL Entry",
{"voucher_type": "Purchase Invoice", "voucher_no": pi.name}))
-
+
def test_schedule_for_straight_line_method(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
@@ -66,14 +67,14 @@
for d in asset.get("schedules")]
self.assertEqual(schedules, expected_schedules)
-
+
def test_schedule_for_straight_line_method_for_existing_asset(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.is_existing_asset = 1
asset.number_of_depreciations_booked = 1
asset.opening_accumulated_depreciation = 40000
asset.save()
-
+
self.assertEqual(asset.status, "Draft")
expected_schedules = [
@@ -102,7 +103,7 @@
for d in asset.get("schedules")]
self.assertEqual(schedules, expected_schedules)
-
+
def test_schedule_for_double_declining_method_for_existing_asset(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.depreciation_method = "Double Declining Balance"
@@ -120,7 +121,7 @@
for d in asset.get("schedules")]
self.assertEqual(schedules, expected_schedules)
-
+
def test_schedule_for_manual_method(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.depreciation_method = "Manual"
@@ -145,6 +146,29 @@
self.assertEqual(schedules, expected_schedules)
+ def test_schedule_for_prorated_straight_line_method(self):
+ set_prorated_depreciation_schedule()
+ asset = frappe.get_doc("Asset", "Macbook Pro 1")
+ asset.is_existing_asset = 0
+ asset.available_for_use_date = "2020-01-30"
+ asset.next_depreciation_date = "2020-12-31"
+ asset.depreciation_method = "Straight Line"
+ asset.save()
+
+ expected_schedules = [
+ ["2020-12-31", 28000, 28000],
+ ["2021-12-31", 30000, 58000],
+ ["2022-12-31", 30000, 88000],
+ ["2023-01-30", 2000, 90000]
+ ]
+
+ schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
+ for d in asset.get("schedules")]
+
+ self.assertEqual(schedules, expected_schedules)
+
+ remove_prorated_depreciation_schedule()
+
def test_depreciation(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.submit()
@@ -172,23 +196,23 @@
self.assertEqual(gle, expected_gle)
self.assertEqual(asset.get("value_after_depreciation"), 70000)
-
+
def test_depreciation_entry_cancellation(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
asset.submit()
post_depreciation_entries(date="2021-01-01")
-
+
asset.load_from_db()
-
+
# cancel depreciation entry
depr_entry = asset.get("schedules")[0].journal_entry
self.assertTrue(depr_entry)
frappe.get_doc("Journal Entry", depr_entry).cancel()
-
+
asset.load_from_db()
depr_entry = asset.get("schedules")[0].journal_entry
self.assertFalse(depr_entry)
-
+
def test_scrap_asset(self):
asset = frappe.get_doc("Asset", "Macbook Pro 1")
@@ -283,7 +307,7 @@
if not frappe.db.exists("Item", "Macbook Pro"):
create_fixed_asset_item()
-
+
asset = frappe.get_doc({
"doctype": "Asset",
"asset_name": "Macbook Pro 1",
@@ -341,6 +365,21 @@
company.disposal_account = "_Test Gain/Loss on Asset Disposal - _TC"
company.depreciation_cost_center = "_Test Cost Center - _TC"
company.save()
-
+
# Enable booking asset depreciation entry automatically
- frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)
\ No newline at end of file
+ frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)
+
+def remove_prorated_depreciation_schedule():
+ asset_settings = frappe.get_doc("Asset Settings", "Asset Settings")
+ asset_settings.schedule_based_on_fiscal_year = 0
+ asset_settings.save()
+
+ frappe.db.commit()
+
+def set_prorated_depreciation_schedule():
+ asset_settings = frappe.get_doc("Asset Settings", "Asset Settings")
+ asset_settings.schedule_based_on_fiscal_year = 1
+ asset_settings.number_of_days_in_fiscal_year = 360
+ asset_settings.save()
+
+ frappe.db.commit()
diff --git a/erpnext/assets/doctype/asset_category/asset_category.py b/erpnext/assets/doctype/asset_category/asset_category.py
index 5279c37..542bd12 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.py
+++ b/erpnext/assets/doctype/asset_category/asset_category.py
@@ -12,4 +12,4 @@
def validate(self):
for field in ("total_number_of_depreciations", "frequency_of_depreciation"):
if cint(self.get(field))<1:
- frappe.throw(_("{0} must be greater than 0").format(self.meta.get_label(field)), frappe.MandatoryError)
\ No newline at end of file
+ frappe.throw(_("{0} must be greater than 0").format(self.meta.get_label(field)), frappe.MandatoryError)
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/assets/doctype/asset_settings/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/assets/doctype/asset_settings/__init__.py
diff --git a/erpnext/assets/doctype/asset_settings/asset_settings.js b/erpnext/assets/doctype/asset_settings/asset_settings.js
new file mode 100644
index 0000000..3b42148
--- /dev/null
+++ b/erpnext/assets/doctype/asset_settings/asset_settings.js
@@ -0,0 +1,5 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Asset Settings', {
+});
diff --git a/erpnext/assets/doctype/asset_settings/asset_settings.json b/erpnext/assets/doctype/asset_settings/asset_settings.json
new file mode 100644
index 0000000..d6ddd33
--- /dev/null
+++ b/erpnext/assets/doctype/asset_settings/asset_settings.json
@@ -0,0 +1,175 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2018-01-03 10:30:32.983381",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "depreciation_options",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Depreciation Options",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "schedule_based_on_fiscal_year",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Calculate Prorated Depreciation Schedule Based on Fiscal Year",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "360",
+ "depends_on": "eval:doc.schedule_based_on_fiscal_year",
+ "description": "This value is used for pro-rata temporis calculation",
+ "fieldname": "number_of_days_in_fiscal_year",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Number of Days in Fiscal Year",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-01-05 10:10:39.803255",
+ "modified_by": "Administrator",
+ "module": "Assets",
+ "name": "Asset Settings",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Accounts Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_settings/asset_settings.py b/erpnext/assets/doctype/asset_settings/asset_settings.py
new file mode 100644
index 0000000..e303ebd
--- /dev/null
+++ b/erpnext/assets/doctype/asset_settings/asset_settings.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class AssetSettings(Document):
+ pass
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/assets/doctype/asset_settings/test_asset_settings.js
similarity index 71%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/assets/doctype/asset_settings/test_asset_settings.js
index 73c06d5..eac2c92 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/assets/doctype/asset_settings/test_asset_settings.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Asset Settings", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Asset Settings
+ () => frappe.tests.make('Asset Settings', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/assets/doctype/asset_settings/test_asset_settings.py b/erpnext/assets/doctype/asset_settings/test_asset_settings.py
new file mode 100644
index 0000000..75f146a
--- /dev/null
+++ b/erpnext/assets/doctype/asset_settings/test_asset_settings.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestAssetSettings(unittest.TestCase):
+ pass
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index a19d8a0..3635b0b 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -12,7 +12,7 @@
'Purchase Invoice': 'Invoice',
'Stock Entry': 'Material to Supplier'
}
-
+
frm.set_query("reserve_warehouse", "supplied_items", function() {
return {
filters: {
@@ -21,6 +21,9 @@
}
}
});
+
+ frm.set_indicator_formatter('item_code',
+ function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
},
onload: function(frm) {
@@ -34,9 +37,6 @@
frm.toggle_display('get_last_purchase_rate',
frm.doc.__onload.disable_fetch_last_purchase_rate);
}
-
- frm.set_indicator_formatter('item_code',
- function(doc) { return (doc.qty<=doc.received_qty) ? "green" : "orange" })
},
});
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 01427c2..ce0b89b 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -68,12 +68,16 @@
},
"Supplier Quotation Item": {
"ref_dn_field": "supplier_quotation_item",
- "compare_fields": [["rate", "="], ["project", "="], ["item_code", "="],
+ "compare_fields": [["project", "="], ["item_code", "="],
["uom", "="], ["conversion_factor", "="]],
"is_child_table": True
}
})
+
+ if cint(frappe.db.get_single_value('Buying Settings', 'maintain_same_rate')):
+ self.validate_rate_with_reference_doc([["Supplier Quotation", "supplier_quotation", "supplier_quotation_item"]])
+
def validate_supplier(self):
prevent_po = frappe.db.get_value("Supplier", self.supplier, 'prevent_pos')
if prevent_po:
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index 97c4438..d57cd7d 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -16,6 +16,8 @@
from erpnext.controllers.buying_controller import BuyingController
from erpnext.buying.utils import validate_for_items
+from six import string_types
+
STANDARD_USERS = ("Guest", "Administrator")
class RequestforQuotation(BuyingController):
@@ -240,7 +242,7 @@
# This method is used to make supplier quotation from supplier's portal.
@frappe.whitelist()
def create_supplier_quotation(doc):
- if isinstance(doc, basestring):
+ if isinstance(doc, string_types):
doc = json.loads(doc)
try:
diff --git a/erpnext/buying/doctype/supplier/test_records.json b/erpnext/buying/doctype/supplier/test_records.json
index 7479f55..2536721 100644
--- a/erpnext/buying/doctype/supplier/test_records.json
+++ b/erpnext/buying/doctype/supplier/test_records.json
@@ -8,8 +8,7 @@
{
"doctype": "Supplier",
"supplier_name": "_Test Supplier P",
- "supplier_type": "_Test Supplier Type",
- "credit_days_based_on": "Fixed Days"
+ "supplier_type": "_Test Supplier Type"
},
{
"doctype": "Supplier",
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index c395d0c..b221a08 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -124,7 +124,8 @@
["name", "supplier_quotation_item"],
["parent", "supplier_quotation"],
["material_request", "material_request"],
- ["material_request_item", "material_request_item"]
+ ["material_request_item", "material_request_item"],
+ ["sales_order", "sales_order"]
],
"postprocess": update_item
},
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
index b3a55b6..da78c12 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -1332,6 +1332,37 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "sales_order",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Sales Order",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Sales Order",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 1,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "request_for_quotation",
"fieldtype": "Link",
"hidden": 0,
@@ -1614,7 +1645,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2017-12-14 09:37:47.427897",
+ "modified": "2018-01-25 15:04:40.171617",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation Item",
diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js
index a3a1414..e7a704a 100644
--- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js
+++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.js
@@ -4,14 +4,14 @@
/* global frappe, refresh_field */
frappe.ui.form.on("Supplier Scorecard", {
-
- onload: function(frm) {
-
+ setup: function(frm) {
if (frm.doc.indicator_color !== "") {
frm.set_indicator_formatter("status", function(doc) {
return doc.indicator_color.toLowerCase();
});
}
+ },
+ onload: function(frm) {
if (frm.doc.__unsaved == 1) {
loadAllCriteria(frm);
loadAllStandings(frm);
diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
index 0dc0ee6..41d9ef3 100644
--- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
+++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
@@ -94,7 +94,7 @@
},
freeze: true,
callback: (r) => {
- frappe.msgprint("Successfully Set Supplier");
+ frappe.msgprint(__("Successfully Set Supplier"));
dialog.hide();
}
});
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 9a71608..088a119 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -457,6 +457,34 @@
]
},
{
+ "label": _("Share Management"),
+ "icon": "fa fa-microchip ",
+ "items": [
+ {
+ "type": "doctype",
+ "name":"Shareholder",
+ "description": _("List of available Shareholders with folio numbers")
+ },
+ {
+ "type": "doctype",
+ "name":"Share Transfer",
+ "description": _("List of all share transactions"),
+ },
+ {
+ "type": "report",
+ "name": "Share Ledger",
+ "doctype": "Share Transfer",
+ "is_query_report": True
+ },
+ {
+ "type": "report",
+ "name": "Share Balance",
+ "doctype": "Share Transfer",
+ "is_query_report": True
+ }
+ ]
+ },
+ {
"label": _("Help"),
"icon": "fa fa-facetime-video",
"items": [
diff --git a/erpnext/config/assets.py b/erpnext/config/assets.py
index 1001e94..73c1aee 100644
--- a/erpnext/config/assets.py
+++ b/erpnext/config/assets.py
@@ -13,6 +13,10 @@
{
"type": "doctype",
"name": "Asset Category",
+ },
+ {
+ "type": "doctype",
+ "name": "Asset Settings",
}
]
},
@@ -74,4 +78,4 @@
},
]
}
- ]
\ No newline at end of file
+ ]
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index ffe9996..3c18844 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -283,7 +283,7 @@
"label": _("Education"),
"hidden": 1
},
- {
+ {
"module_name": "Healthcare",
"color": "#FF888B",
"icon": "fa fa-heartbeat",
@@ -292,29 +292,14 @@
"hidden": 1
},
{
- "module_name": "Lab Test",
- "color": "#7578f6",
- "icon": "octicon octicon-beaker",
- "doctype": "Lab Test",
- "type": "list",
- "link": "List/Lab Test",
- "label": _("Lab Test")
- },
- {
- "module_name": "Consultation",
- "color": "#2ecc71",
- "icon": "fa fa-stethoscope",
- "doctype": "Consultation",
- "type": "link",
- "label": _("Consultationt")
- },
- {
"module_name": "Patient",
"color": "#6BE273",
"icon": "fa fa-user",
"doctype": "Patient",
"type": "link",
- "label": _("Patient")
+ "link": "List/Patient",
+ "label": _("Patient"),
+ "hidden": 1
},
{
"module_name": "Patient Appointment",
@@ -322,14 +307,36 @@
"icon": "fa fa-calendar-plus-o",
"doctype": "Patient Appointment",
"type": "link",
- "label": _("Patient Appointment")
+ "link": "List/Patient Appointment",
+ "label": _("Patient Appointment"),
+ "hidden": 1
+ },
+ {
+ "module_name": "Consultation",
+ "color": "#2ecc71",
+ "icon": "fa fa-stethoscope",
+ "doctype": "Consultation",
+ "type": "link",
+ "link": "List/Consultation",
+ "label": _("Consultation"),
+ "hidden": 1
+ },
+ {
+ "module_name": "Lab Test",
+ "color": "#7578f6",
+ "icon": "octicon octicon-beaker",
+ "doctype": "Lab Test",
+ "type": "list",
+ "link": "List/Lab Test",
+ "label": _("Lab Test"),
+ "hidden": 1
},
{
"module_name": "Hub",
"color": "#009248",
"icon": "/assets/erpnext/images/hub_logo.svg",
"type": "page",
- "link": "hub",
+ "link": "Hub/Home",
"label": _("Hub")
},
{
@@ -353,6 +360,14 @@
"hidden": 1
},
{
+ "module_name": "Hotels",
+ "color": "#EA81E8",
+ "icon": "fa fa-bed",
+ "type": "module",
+ "label": _("Hotels"),
+ "hidden": 1
+ },
+ {
"module_name": "Agriculture",
"color": "#8BC34A",
"icon": "octicon octicon-globe",
diff --git a/erpnext/config/education.py b/erpnext/config/education.py
index 08846a2..e4e77f3 100644
--- a/erpnext/config/education.py
+++ b/erpnext/config/education.py
@@ -21,18 +21,7 @@
{
"type": "doctype",
"name": "Student Group"
- },
- {
- "type": "doctype",
- "name": "Student Group Creation Tool"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Student and Guardian Contact Details",
- "doctype": "Program Enrollment"
}
-
]
},
{
@@ -50,10 +39,6 @@
{
"type": "doctype",
"name": "Program Enrollment"
- },
- {
- "type": "doctype",
- "name": "Program Enrollment Tool"
}
]
},
@@ -69,10 +54,6 @@
"name": "Student Leave Application"
},
{
- "type": "doctype",
- "name": "Student Attendance Tool"
- },
- {
"type": "report",
"is_query_report": True,
"name": "Absent Student Report",
@@ -84,21 +65,26 @@
"name": "Student Batch-Wise Attendance",
"doctype": "Student Attendance"
},
- {
- "type": "report",
- "is_query_report": True,
- "name": "Student Monthly Attendance Sheet",
- "doctype": "Student Attendance"
- }
]
},
{
- "label": _("Schedule"),
+ "label": _("Tools"),
"items": [
{
"type": "doctype",
- "name": "Course Schedule",
- "route": "List/Course Schedule/Calendar"
+ "name": "Student Attendance Tool"
+ },
+ {
+ "type": "doctype",
+ "name": "Assessment Result Tool"
+ },
+ {
+ "type": "doctype",
+ "name": "Student Group Creation Tool"
+ },
+ {
+ "type": "doctype",
+ "name": "Program Enrollment Tool"
},
{
"type": "doctype",
@@ -125,15 +111,12 @@
{
"type": "doctype",
"name": "Assessment Criteria"
- },
- {
- "type": "doctype",
- "name": "Assessment Criteria Group"
- },
- {
- "type": "doctype",
- "name": "Assessment Result Tool"
- },
+ }
+ ]
+ },
+ {
+ "label": _("Assessment Reports"),
+ "items": [
{
"type": "report",
"is_query_report": True,
@@ -143,10 +126,15 @@
{
"type": "report",
"is_query_report": True,
+ "name": "Final Assessment Grades",
+ "doctype": "Assessment Result"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
"name": "Assessment Plan Status",
"doctype": "Assessment Plan"
},
-
]
},
{
@@ -167,17 +155,25 @@
{
"type": "doctype",
"name": "Fee Category"
- },
- {
- "type": "report",
- "name": "Student Fee Collection",
- "doctype": "Fees",
- "is_query_report": True
}
]
},
{
- "label": _("Setup"),
+ "label": _("Schedule"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Course Schedule",
+ "route": "List/Course Schedule/Calendar"
+ },
+ {
+ "type": "doctype",
+ "name": "Course Scheduling Tool"
+ }
+ ]
+ },
+ {
+ "label": _("Masters"),
"items": [
{
"type": "doctype",
@@ -194,7 +190,12 @@
{
"type": "doctype",
"name": "Room"
- },
+ }
+ ]
+ },
+ {
+ "label": _("Setup"),
+ "items": [
{
"type": "doctype",
"name": "Student Category"
@@ -221,4 +222,27 @@
}
]
},
+ {
+ "label": _("Other Reports"),
+ "items": [
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Student and Guardian Contact Details",
+ "doctype": "Program Enrollment"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Student Monthly Attendance Sheet",
+ "doctype": "Student Attendance"
+ },
+ {
+ "type": "report",
+ "name": "Student Fee Collection",
+ "doctype": "Fees",
+ "is_query_report": True
+ }
+ ]
+ }
]
diff --git a/erpnext/config/healthcare.py b/erpnext/config/healthcare.py
index 37d95ad..34a9b70 100644
--- a/erpnext/config/healthcare.py
+++ b/erpnext/config/healthcare.py
@@ -131,27 +131,27 @@
{
"type": "doctype",
"name": "Lab Test Sample",
- "label": _("Test Sample."),
+ "label": _("Lab Test Sample"),
},
{
"type": "doctype",
"name": "Lab Test UOM",
- "label": _("Lab Test UOM.")
+ "label": _("Lab Test UOM")
},
{
"type": "doctype",
"name": "Antibiotic",
- "label": _("Antibiotic.")
+ "label": _("Antibiotic")
},
{
"type": "doctype",
"name": "Sensitivity",
- "label": _("Sensitivity Naming.")
+ "label": _("Sensitivity")
},
{
"type": "doctype",
"name": "Lab Test Template",
- "label": _("Lab Test Template.")
+ "label": _("Lab Test Template")
}
]
}
diff --git a/erpnext/config/projects.py b/erpnext/config/projects.py
index b97e097..ac11c7e 100644
--- a/erpnext/config/projects.py
+++ b/erpnext/config/projects.py
@@ -15,7 +15,7 @@
{
"type": "doctype",
"name": "Task",
- "route": "Tree/Task",
+ "route": "List/Task",
"description": _("Project activity / task."),
},
{
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 8de1a12..b7017c1 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -12,7 +12,7 @@
from erpnext.accounts.party import get_party_account_currency, validate_party_frozen_disabled
from erpnext.exceptions import InvalidCurrency
-force_item_fields = ("item_group", "barcode", "brand", "stock_uom")
+force_item_fields = ("item_group", "brand", "stock_uom")
class AccountsController(TransactionBase):
def __init__(self, *args, **kwargs):
@@ -135,9 +135,9 @@
if not self.due_date:
frappe.throw(_("Due Date is mandatory"))
- validate_due_date(self.posting_date, self.due_date, "Customer", self.customer)
+ validate_due_date(self.posting_date, self.due_date, "Customer", self.customer, self.company)
elif self.doctype == "Purchase Invoice":
- validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier)
+ validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier, self.company)
def set_price_list_currency(self, buying_or_selling):
if self.meta.get_field("posting_date"):
@@ -484,7 +484,7 @@
max_allowed_amt = flt(ref_amt * (100 + tolerance) / 100)
if total_billed_amt - max_allowed_amt > 0.01:
- frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings").format(item.item_code, item.idx, max_allowed_amt))
+ frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings").format(item.item_code, item.idx, max_allowed_amt))
def get_company_default(self, fieldname):
from erpnext.accounts.utils import get_company_default
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 4b7b43c..b141455 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -218,7 +218,7 @@
if not exists:
rm = self.append(raw_material_table, {})
- required_qty = flt(flt(bom_item.qty_consumed_per_unit) * flt(item.qty) *
+ required_qty = flt(flt(bom_item.qty_consumed_per_unit) * (flt(item.qty) + getattr(item, 'rejected_qty', 0)) *
flt(item.conversion_factor), rm.precision("required_qty"))
rm.reference_name = item.name
rm.bom_detail_no = bom_item.name
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index 9eee6cc..e8260d9 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -7,6 +7,8 @@
from frappe.utils import cstr, flt
import json, copy
+from six import string_types
+
class ItemVariantExistsError(frappe.ValidationError): pass
class InvalidItemAttributeValueError(frappe.ValidationError): pass
class ItemTemplateCannotHaveStock(frappe.ValidationError): pass
@@ -26,7 +28,7 @@
return make_variant_based_on_manufacturer(item_template, manufacturer,
manufacturer_part_no)
else:
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
if not args:
@@ -50,7 +52,7 @@
return variant
def validate_item_variant_attributes(item, args=None):
- if isinstance(item, basestring):
+ if isinstance(item, string_types):
item = frappe.get_doc('Item', item)
if not args:
@@ -150,7 +152,7 @@
@frappe.whitelist()
def create_variant(item, args):
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
template = frappe.get_doc("Item", item)
@@ -177,7 +179,7 @@
item=item, args=args, now=frappe.flags.in_test);
def create_multiple_variants(item, args):
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
args_set = generate_keyed_value_combinations(args)
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 2f01915..9a93633 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -152,7 +152,7 @@
def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=False):
conditions = []
- return frappe.db.sql("""select tabItem.name, tabItem.item_group, tabItem.image,
+ return frappe.db.sql("""select tabItem.name, tabItem.item_group,
if(length(tabItem.item_name) > 40,
concat(substr(tabItem.item_name, 1, 40), "..."), item_name) as item_name,
if(length(tabItem.description) > 40, \
@@ -165,8 +165,8 @@
and (tabItem.`{key}` LIKE %(txt)s
or tabItem.item_group LIKE %(txt)s
or tabItem.item_name LIKE %(txt)s
- or tabItem.barcode LIKE %(txt)s
or tabItem.description LIKE %(txt)s)
+ or tabItem.item_code IN (select parent from `tabItem Barcode` where barcode LIKE %(txt)s)
{fcond} {mcond}
order by
if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999),
@@ -257,7 +257,7 @@
def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
cond = ""
if filters.get("posting_date"):
- cond = "and (ifnull(batch.expiry_date, '')='' or batch.expiry_date >= %(posting_date)s)"
+ cond = "and (batch.expiry_date is null or batch.expiry_date >= %(posting_date)s)"
batch_nos = None
args = {
@@ -270,13 +270,14 @@
}
if args.get('warehouse'):
- batch_nos = frappe.db.sql("""select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom, batch.expiry_date
+ batch_nos = frappe.db.sql("""select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom, concat('MFG-',batch.manufacturing_date), concat('EXP-',batch.expiry_date)
from `tabStock Ledger Entry` sle
INNER JOIN `tabBatch` batch on sle.batch_no = batch.name
where
sle.item_code = %(item_code)s
and sle.warehouse = %(warehouse)s
- and sle.batch_no like %(txt)s
+ and (sle.batch_no like %(txt)s
+ or batch.manufacturing_date like %(txt)s)
and batch.docstatus < 2
{0}
{match_conditions}
@@ -287,9 +288,10 @@
if batch_nos:
return batch_nos
else:
- return frappe.db.sql("""select name, expiry_date from `tabBatch` batch
+ return frappe.db.sql("""select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date) from `tabBatch` batch
where item = %(item_code)s
- and name like %(txt)s
+ and (name like %(txt)s
+ or manufacturing_date like %(txt)s)
and docstatus < 2
{0}
{match_conditions}
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 2ec6b83..6b18b82 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -150,6 +150,9 @@
if not frappe.db.get_single_value("Selling Settings", "validate_selling_price"):
return
+ if hasattr(self, "is_return") and self.is_return:
+ return
+
for it in self.get("items"):
if not it.item_code:
continue
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 4547ac1..699e1c6 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -415,13 +415,15 @@
self.doc.total_advance = flt(total_allocated_amount, self.doc.precision("total_advance"))
+ grand_total = self.doc.rounded_total or self.doc.grand_total
+
if self.doc.party_account_currency == self.doc.currency:
- invoice_total = flt(self.doc.grand_total - flt(self.doc.write_off_amount),
+ invoice_total = flt(grand_total - flt(self.doc.write_off_amount),
self.doc.precision("grand_total"))
else:
base_write_off_amount = flt(flt(self.doc.write_off_amount) * self.doc.conversion_rate,
self.doc.precision("base_write_off_amount"))
- invoice_total = flt(self.doc.grand_total * self.doc.conversion_rate,
+ invoice_total = flt(grand_total * self.doc.conversion_rate,
self.doc.precision("grand_total")) - base_write_off_amount
if invoice_total > 0 and self.doc.total_advance > invoice_total:
@@ -491,11 +493,13 @@
if self.doc.doctype == "Sales Invoice" \
and self.doc.paid_amount > self.doc.grand_total and not self.doc.is_return \
and any([d.type == "Cash" for d in self.doc.payments]):
+ grand_total = self.doc.rounded_total or self.doc.grand_total
+ base_grand_total = self.doc.base_rounded_total or self.doc.base_grand_total
- self.doc.change_amount = flt(self.doc.paid_amount - self.doc.grand_total +
+ self.doc.change_amount = flt(self.doc.paid_amount - grand_total +
self.doc.write_off_amount, self.doc.precision("change_amount"))
- self.doc.base_change_amount = flt(self.doc.base_paid_amount - self.doc.base_grand_total +
+ self.doc.base_change_amount = flt(self.doc.base_paid_amount - base_grand_total +
self.doc.base_write_off_amount, self.doc.precision("base_change_amount"))
def calculate_write_off_amount(self):
diff --git a/erpnext/controllers/tests/test_item_variant.py b/erpnext/controllers/tests/test_item_variant.py
index 34d6360..dfd9f9d 100644
--- a/erpnext/controllers/tests/test_item_variant.py
+++ b/erpnext/controllers/tests/test_item_variant.py
@@ -7,19 +7,10 @@
from erpnext.stock.doctype.item.test_item import set_item_variant_settings
from erpnext.controllers.item_variant import copy_attributes_to_variant, make_variant_item_code
-# python 3 compatibility stuff
-try:
- unicode = unicode
-except NameError:
- # Python 3
- basestring = (str, bytes)
-else:
- # Python 2
- basestring = basestring
-
+from six import string_types
def create_variant_with_tables(item, args):
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
template = frappe.get_doc("Item", item)
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index 2b3b5a9..6734cab 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -33,7 +33,6 @@
this.frm.add_custom_button(__("Customer"), this.create_customer, __("Make"));
this.frm.add_custom_button(__("Opportunity"), this.create_opportunity, __("Make"));
this.frm.add_custom_button(__("Quotation"), this.make_quotation, __("Make"));
- cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
if(!this.frm.doc.__islocal) {
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index ebef4b4..4aadd76 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -48,8 +48,6 @@
frm.add_custom_button(__('Quotation'),
cur_frm.cscript.create_quotation, __("Make"));
- frm.page.set_inner_btn_group_as_primary(__("Make"));
-
if(doc.status!=="Quotation") {
frm.add_custom_button(__('Lost'),
cur_frm.cscript['Declare Opportunity Lost']);
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 75f9dea..fc886ac 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -194,7 +194,7 @@
self.customer = None
elif self.enquiry_from == 'Customer':
if not self.customer:
- msgprint("Customer is mandatory if 'Opportunity From' is selected as Customer", raise_exception=1)
+ msgprint(_("Customer is mandatory if 'Opportunity From' is selected as Customer"), raise_exception=1)
else:
self.lead = None
diff --git a/erpnext/demo/data/drug_list.json b/erpnext/demo/data/drug_list.json
index 51b029c..f34ca57 100644
--- a/erpnext/demo/data/drug_list.json
+++ b/erpnext/demo/data/drug_list.json
@@ -65,7 +65,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -151,7 +150,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -237,7 +235,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -323,7 +320,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -409,7 +405,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -495,7 +490,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -581,7 +575,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -667,7 +660,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -753,7 +745,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -839,7 +830,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -925,7 +915,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1011,7 +1000,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1097,7 +1085,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1183,7 +1170,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1269,7 +1255,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1355,7 +1340,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1441,7 +1425,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1527,7 +1510,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1613,7 +1595,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1699,7 +1680,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1785,7 +1765,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1871,7 +1850,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -1957,7 +1935,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2043,7 +2020,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2129,7 +2105,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2215,7 +2190,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2301,7 +2275,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2387,7 +2360,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2473,7 +2445,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2559,7 +2530,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2645,7 +2615,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2731,7 +2700,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2817,7 +2785,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2903,7 +2870,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -2989,7 +2955,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3075,7 +3040,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3161,7 +3125,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3247,7 +3210,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3333,7 +3295,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3419,7 +3380,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3505,7 +3465,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3591,7 +3550,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3677,7 +3635,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3763,7 +3720,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3849,7 +3805,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -3935,7 +3890,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4021,7 +3975,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4107,7 +4060,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4193,7 +4145,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4279,7 +4230,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4365,7 +4315,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4451,7 +4400,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4537,7 +4485,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4623,7 +4570,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4709,7 +4655,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4795,7 +4740,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4881,7 +4825,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -4967,7 +4910,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -5053,7 +4995,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -5139,7 +5080,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -5225,7 +5165,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -5311,7 +5250,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
@@ -5397,7 +5335,6 @@
"taxes": [],
"thumbnail": null,
"tolerance": 0.0,
- "total_projected_qty": 0.0,
"uoms": [
{
"conversion_factor": 1.0,
diff --git a/erpnext/demo/setup/manufacture.py b/erpnext/demo/setup/manufacture.py
index 24ffd92..4d8c450 100644
--- a/erpnext/demo/setup/manufacture.py
+++ b/erpnext/demo/setup/manufacture.py
@@ -5,6 +5,8 @@
from frappe.utils import nowdate, add_days
from erpnext.demo.setup.setup_data import import_json
+from six import iteritems
+
def setup_data():
import_json("Asset Category")
setup_item()
@@ -122,7 +124,7 @@
}
for price_list in ("standard_buying", "standard_selling"):
- for item, rate in locals().get(price_list).iteritems():
+ for item, rate in iteritems(locals().get(price_list)):
frappe.get_doc({
"doctype": "Item Price",
"price_list": price_list.replace("_", " ").title(),
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 504478a..d61aa4e 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -172,7 +172,6 @@
"from_date": frappe.flags.current_date,
"to_date": to_date,
"leave_type": allocated_leave.leave_type,
- "status": "Approved"
})
try:
leave_application.insert()
@@ -191,8 +190,9 @@
"employee": employee.name,
"attendance_date": attendance_date
})
+
leave = frappe.db.sql("""select name from `tabLeave Application`
- where employee = %s and %s between from_date and to_date and status = 'Approved'
+ where employee = %s and %s between from_date and to_date
and docstatus = 1""", (employee.name, attendance_date))
if leave:
diff --git a/erpnext/docs/assets/img/accounts/shareholder/sharebalance_1.png b/erpnext/docs/assets/img/accounts/shareholder/sharebalance_1.png
new file mode 100644
index 0000000..3e22324
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/shareholder/sharebalance_1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/shareholder/sharebalance_2.png b/erpnext/docs/assets/img/accounts/shareholder/sharebalance_2.png
new file mode 100644
index 0000000..c33cae8
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/shareholder/sharebalance_2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/shareholder/shareholder_tonystark.png b/erpnext/docs/assets/img/accounts/shareholder/shareholder_tonystark.png
new file mode 100644
index 0000000..ee05b20
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/shareholder/shareholder_tonystark.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/shareholder/shareledger_1.png b/erpnext/docs/assets/img/accounts/shareholder/shareledger_1.png
new file mode 100644
index 0000000..a7cae31
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/shareholder/shareledger_1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/shareholder/shareledger_2.png b/erpnext/docs/assets/img/accounts/shareholder/shareledger_2.png
new file mode 100644
index 0000000..1d14ecc
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/shareholder/shareledger_2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/shareholder/sharetransfer_issue_tonystark.png b/erpnext/docs/assets/img/accounts/shareholder/sharetransfer_issue_tonystark.png
new file mode 100644
index 0000000..535353f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/shareholder/sharetransfer_issue_tonystark.png
Binary files differ
diff --git a/erpnext/docs/assets/img/asset/asset_prorated_depreciation.png b/erpnext/docs/assets/img/asset/asset_prorated_depreciation.png
new file mode 100644
index 0000000..d81699b
--- /dev/null
+++ b/erpnext/docs/assets/img/asset/asset_prorated_depreciation.png
Binary files differ
diff --git a/erpnext/docs/assets/img/education/module.png b/erpnext/docs/assets/img/education/module.png
index eae84b3..18259f0 100644
--- a/erpnext/docs/assets/img/education/module.png
+++ b/erpnext/docs/assets/img/education/module.png
Binary files differ
diff --git a/erpnext/docs/assets/img/education/student/schools-settings.png b/erpnext/docs/assets/img/education/setup/education-settings.png
similarity index 100%
rename from erpnext/docs/assets/img/education/student/schools-settings.png
rename to erpnext/docs/assets/img/education/setup/education-settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/education/setup/setup.png b/erpnext/docs/assets/img/education/setup/setup.png
new file mode 100644
index 0000000..11f3202
--- /dev/null
+++ b/erpnext/docs/assets/img/education/setup/setup.png
Binary files differ
diff --git a/erpnext/docs/assets/img/education/student/student-batch-validation.gif b/erpnext/docs/assets/img/education/setup/student-batch-validation.gif
similarity index 100%
rename from erpnext/docs/assets/img/education/student/student-batch-validation.gif
rename to erpnext/docs/assets/img/education/setup/student-batch-validation.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/education/setup/student-category.png b/erpnext/docs/assets/img/education/setup/student-category.png
new file mode 100644
index 0000000..dc12a0d
--- /dev/null
+++ b/erpnext/docs/assets/img/education/setup/student-category.png
Binary files differ
diff --git a/erpnext/docs/assets/img/education/student/student-course-validation.gif b/erpnext/docs/assets/img/education/setup/student-course-validation.gif
similarity index 100%
rename from erpnext/docs/assets/img/education/student/student-course-validation.gif
rename to erpnext/docs/assets/img/education/setup/student-course-validation.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/education/student/student group.gif b/erpnext/docs/assets/img/education/student/student-group.gif
similarity index 100%
rename from erpnext/docs/assets/img/education/student/student group.gif
rename to erpnext/docs/assets/img/education/student/student-group.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/hotels/hotel-room.png b/erpnext/docs/assets/img/hotels/hotel-room.png
new file mode 100644
index 0000000..7aad227
--- /dev/null
+++ b/erpnext/docs/assets/img/hotels/hotel-room.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/created-payroll.png b/erpnext/docs/assets/img/human-resources/created-payroll.png
new file mode 100644
index 0000000..2465e64
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/created-payroll.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/payroll-entry.png b/erpnext/docs/assets/img/human-resources/payroll-entry.png
new file mode 100644
index 0000000..345eef8
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/payroll-entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/payroll-journal-entry.png b/erpnext/docs/assets/img/human-resources/payroll-journal-entry.png
new file mode 100644
index 0000000..2e4f05e
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/payroll-journal-entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/payroll-make-bank-entry.png b/erpnext/docs/assets/img/human-resources/payroll-make-bank-entry.png
new file mode 100644
index 0000000..89873ec
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/payroll-make-bank-entry.png
Binary files differ
diff --git a/erpnext/docs/user/manual/de/CRM/contact.md b/erpnext/docs/user/manual/de/CRM/contact.md
index 49b5ffb..b937c65 100644
--- a/erpnext/docs/user/manual/de/CRM/contact.md
+++ b/erpnext/docs/user/manual/de/CRM/contact.md
@@ -7,11 +7,11 @@
> CRM > Dokumente > Kontakt > Neu
-<img class="screenshot" alt="Kontakt" src="/docs/assets/img/crm/contact.png">
+<img class="screenshot" alt="Kontakt" src="{{docs_base_url}}/assets/img/crm/contact.png">
Alternativ können Sie einen Kontakt oder eine Adresse auch direkt aus dem Kundendatensatz erstellen. Klicken Sie hierzu auf "Neuer Kontakt" oder "Neue Adresse".
-<img class="screenshot" alt="Kontakt" src="/docs/assets/img/crm/contact-from-cust.png">
+<img class="screenshot" alt="Kontakt" src="{{docs_base_url}}/assets/img/crm/contact-from-cust.png">
> Tipp: Wenn Sie in einer beliebigen Transaktion einen Kunden auswählen, wird ein Kontakt und eine Adresse vorselektiert. Das sind dann der Standardkontakt und die Standardadresse.
diff --git a/erpnext/docs/user/manual/de/CRM/customer.md b/erpnext/docs/user/manual/de/CRM/customer.md
index c7d6654..abd2298 100644
--- a/erpnext/docs/user/manual/de/CRM/customer.md
+++ b/erpnext/docs/user/manual/de/CRM/customer.md
@@ -7,7 +7,7 @@
> CRM > Dokumente > Kunde > Neu
-<img class="screenshot" alt="Kunde" src="/docs/assets/img/crm/create-customer.gif">
+<img class="screenshot" alt="Kunde" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
oder einen Upload über ein Datenimportwerkzeug durchführen.
diff --git a/erpnext/docs/user/manual/de/CRM/lead.md b/erpnext/docs/user/manual/de/CRM/lead.md
index 47a4492..8bb9ce4 100644
--- a/erpnext/docs/user/manual/de/CRM/lead.md
+++ b/erpnext/docs/user/manual/de/CRM/lead.md
@@ -16,6 +16,6 @@
> CRM > Dokumente > Lead > Neu
-<img class="screenshot" alt="Lead" src="/docs/assets/img/crm/lead.png">
+<img class="screenshot" alt="Lead" src="{{docs_base_url}}/assets/img/crm/lead.png">
{next}
diff --git a/erpnext/docs/user/manual/de/CRM/newsletter.md b/erpnext/docs/user/manual/de/CRM/newsletter.md
index bc7e989..8a18e64 100644
--- a/erpnext/docs/user/manual/de/CRM/newsletter.md
+++ b/erpnext/docs/user/manual/de/CRM/newsletter.md
@@ -7,8 +7,8 @@
Wählen Sie die Liste der Empfänger aus, an die Sie die E-Mail senden wollen. Tragen Sie Ihren Inhalt in das Nachrichtenfeld ein und versenden Sie den Newsletter. Wenn Sie die E-Mail vorher testen wollen, um zu sehen, wie sie für den Empfänger aussieht, können Sie die Testfunktion nutzen. Speichern Sie das Dokument vor dem Test. Eine Test-E-Mail wird dann an Ihr E-Mail-Konto gesendet. Sie können die E-Mail an alle vorgesehenen Empfänger senden, wenn Sie auf die Schaltfläche "Senden" klicken.
-<img class="screenshot" alt="Newsletter - Neu" src="/docs/assets/img/crm/newsletter-new.png">
+<img class="screenshot" alt="Newsletter - Neu" src="{{docs_base_url}}/assets/img/crm/newsletter-new.png">
-<img class="screenshot" alt="Newsletter - Test" src="/docs/assets/img/crm/newsletter-test.png">
+<img class="screenshot" alt="Newsletter - Test" src="{{docs_base_url}}/assets/img/crm/newsletter-test.png">
{next}
diff --git a/erpnext/docs/user/manual/de/CRM/opportunity.md b/erpnext/docs/user/manual/de/CRM/opportunity.md
index 181348f..c9122f3 100644
--- a/erpnext/docs/user/manual/de/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/de/CRM/opportunity.md
@@ -11,11 +11,11 @@
### Abbildung 1: Opportunity erstellen
-<img class="screenshot" alt="Opportunity" src="/docs/assets/img/crm/opportunity.png">
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/opportunity.png">
### Abbildung 2: Opportunity aus einem offenen Lead heraus erstellen
-<img class="screenshot" alt="Opportunity" src="/docs/assets/img/crm/lead-to-opportunity.png">
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/lead-to-opportunity.png">
Eine Opportunity kann auch aus einem bereits vorhandenen Kunden heraus entstehen. Sie können mehrere verschiedene Opportunities zum gleichen Lead erstellen. In einer Opportunity können Sie abgesehen von der Kommunikation auch die Artikel mit vermerken, nach denen der Lead oder Kontakt sucht.
diff --git a/erpnext/docs/user/manual/de/CRM/setup/campaign.md b/erpnext/docs/user/manual/de/CRM/setup/campaign.md
index 700bb32..2b5781d 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/campaign.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/campaign.md
@@ -3,7 +3,7 @@
Eine Kampagne ist eine groß angelegte Umsetzung einer Vertriebsstrategie um ein Produkt oder eine Dienstleistung zu bewerben. Dies erfolgt in einem Marktsegment in einer bestimmten geographischen Region um bestimmte Ziele zu erreichen.
-<img class="screenshot" alt="Kampagne" src="/docs/assets/img/crm/campaign.png">
+<img class="screenshot" alt="Kampagne" src="{{docs_base_url}}/assets/img/crm/campaign.png">
Sie können in einer Kampagne [Leads](/docs/user/manual/de/CRM/lead.html), [Opportunities](/docs/user/manual/de/CRM/opportunity.html) und [Angebote](/docs/user/manual/de/selling/quotation.html) nachverfolgen.
@@ -11,11 +11,11 @@
* Um einen Lead zu einer Kampagne nach zu verfolgen, wählen Sie "Leads anzeigen" aus.
-<img class="screenshot" alt="Kampange - Leads ansehen" src="/docs/assets/img/crm/campaign-view-leads.png">
+<img class="screenshot" alt="Kampange - Leads ansehen" src="{{docs_base_url}}/assets/img/crm/campaign-view-leads.png">
* Sie sollten jetzt eine gefilterte Übersicht aller Leads erhalten, die zu dieser Kampagne gehören.
* Sie können auch einen neuen Lead erstellen indem Sie auf "Neu" klicken.
-<img class="screenshot" alt="Kampagne - Neuer Lead" src="/docs/assets/img/crm/campaign-new-lead.png">
+<img class="screenshot" alt="Kampagne - Neuer Lead" src="{{docs_base_url}}/assets/img/crm/campaign-new-lead.png">
{next}
diff --git a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
index c7ec3e2..4cdeb22 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
@@ -3,10 +3,10 @@
Kundengruppen versetzen Sie in die Lage Ihre Kunden zu organisieren. Sie können auch Rabatte auf der Basis von Kundengruppen berechnen. Außerdem können Sie Trendanalysen für jede Gruppe erstellen. Typischerweise werden Kunden nach Marktsegmenten gruppiert (das basiert normalerweise auf Ihrer Domäne).
-<img class="screenshot" alt="Baumstruktur der Kundengruppen" src="/docs/assets/img/crm/customer-group-tree.png">
+<img class="screenshot" alt="Baumstruktur der Kundengruppen" src="{{docs_base_url}}/assets/img/crm/customer-group-tree.png">
> Tipp: Wenn Sie der Meinung sind, dass hier zu viel Aufwand getrieben wird, dann können Sie es bei einer Standard-Kundengruppe belassen. Aber der gesamte Aufwand wird sich dann auszahlen, wenn Sie die ersten Berichte erhalten. Ein Beispiel eines Berichts ist unten abgebildet.
-<img class="screenshot" alt="Vertriebsanalyse" src="/docs/assets/img/crm/sales-analytics-customer.gif">
+<img class="screenshot" alt="Vertriebsanalyse" src="{{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif">
{next}
diff --git a/erpnext/docs/user/manual/de/CRM/setup/sales-person.md b/erpnext/docs/user/manual/de/CRM/setup/sales-person.md
index f615da4..77d6ea0 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/sales-person.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/sales-person.md
@@ -3,7 +3,7 @@
Vertriebsmitarbeiter verhalten sich wie Regionen. Sie können ein Organigramm der Vertriebsmitarbeiter erstellen, in dem individuell das Vertriebsziel des Vertriebsmitarbeiters vermerkt werden kann. Genauso wie in der Region muss das Ziel einer Artikelgruppe zugeordnet werden.
-<img class="screenshot" alt="Baumstruktur der Vertriebsmitarbeiter" src="/docs/assets/img/crm/sales-person-tree.png">
+<img class="screenshot" alt="Baumstruktur der Vertriebsmitarbeiter" src="{{docs_base_url}}/assets/img/crm/sales-person-tree.png">
### Vertriebspersonen in Transaktionen
diff --git a/erpnext/docs/user/manual/de/accounts/accounting-reports.md b/erpnext/docs/user/manual/de/accounts/accounting-reports.md
index deab83b..b9f0fca 100644
--- a/erpnext/docs/user/manual/de/accounts/accounting-reports.md
+++ b/erpnext/docs/user/manual/de/accounts/accounting-reports.md
@@ -8,7 +8,7 @@
Das Hauptbuch basiert auf der Tabelle der Hauptbucheinträge und kann nach einem Konto und einem Zeitraum gefiltert werden. Das hilft Ihnen dabei einen Überblick über alle Buchungen zu erhalten, die zu einem Konto in einem bestimmten Zeitraum getätigt wurden.
<img alt="Hauptbuch" class="screenshot"
- src="/docs/assets/img/accounts/general-ledger.png">
+ src="{{docs_base_url}}/assets/img/accounts/general-ledger.png">
### Probebilanz
@@ -19,7 +19,7 @@
* Summe Haben
* Schlußstand
-<img alt="Probebilanz" class="screenshot" src="/docs/assets/img/accounts/trial-balance.png">
+<img alt="Probebilanz" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/trial-balance.png">
Die Summe aller Schlußstände in einer Probebilanz muss 0 sein.
@@ -27,12 +27,12 @@
Diese Berichte helfen Ihnen dabei, die offenen Posten bei Rechnungen von Kunden und Lieferanten nachzuverfolgen. In diesem Bericht sehen Sie die offenen Beträge nach Zeiträumen geordnet, d. h. 0-30 Tage, 30-60 Tage und so weiter.
-<img alt="Forderungskonten" class="screenshot" src="/docs/assets/img/accounts/accounts-receivable.png">
+<img alt="Forderungskonten" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
### Auflistung der Verkäufe und Einkäufe
In diesem Bericht wird jedes Steuerkonto in Spalten dargestellt. Für jede Rechnung und jeden Rechnungsposten erhalten Sie den Betrag und die individuelle Steuer, die gezahlt wurde, basierend auf der Tabelle der Steuern und Abgaben.
-<img alt="Übersicht Verkäufe" class="screenshot" src="/docs/assets/img/accounts/sales-register.png">
+<img alt="Übersicht Verkäufe" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/sales-register.png">
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md
index 54633b2..288b35e 100644
--- a/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md
@@ -15,7 +15,7 @@
#### Abbildung 1: Journalbuchung bei Vorkasse
-<img class="screenshot" alt="Anzahlung" src="/docs/assets/img/accounts/advance-payment-1.png">
+<img class="screenshot" alt="Anzahlung" src="{{docs_base_url}}/assets/img/accounts/advance-payment-1.png">
### Doppelte Buchführung
@@ -23,7 +23,7 @@
#### Abbildung 2: Transaktion und Ausgleichsbuchung
-<img class="screenshot" alt="Anzahlung" src="/docs/assets/img/accounts/advance-payment-2.png">
+<img class="screenshot" alt="Anzahlung" src="{{docs_base_url}}/assets/img/accounts/advance-payment-2.png">
Speichern und übertragen Sie den Buchungssatz. Wenn das Dokument nicht gespeichert wird, dann wird es in anderen Buchungsdokumenten nicht übernommen.
@@ -33,7 +33,7 @@
#### Abbildung 3: Anzahlung erhalten
-<img class="screenshot" alt="Anzahlung" src="/docs/assets/img/accounts/advance-payment-3.png">
+<img class="screenshot" alt="Anzahlung" src="{{docs_base_url}}/assets/img/accounts/advance-payment-3.png">
Speichern und übertragen Sie die Ausgangsrechnung
diff --git a/erpnext/docs/user/manual/de/accounts/budgeting.md b/erpnext/docs/user/manual/de/accounts/budgeting.md
index 7495e3c..88ef179 100644
--- a/erpnext/docs/user/manual/de/accounts/budgeting.md
+++ b/erpnext/docs/user/manual/de/accounts/budgeting.md
@@ -11,29 +11,29 @@
#### Schritt 1: Klicken Sie auf "Öffnen
-<img class="screenshot" alt="Budget" src="/docs/assets/img/accounts/budgeting-cost-center.png">
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budgeting-cost-center.png">
#### Schritt 2: Monatliche Verteilung eingeben
-<img class="screenshot" alt="Budget" src="/docs/assets/img/accounts/budget-account.png">
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budget-account.png">
Wenn Sie die Verteilungs-ID leer lassen, kalkuliert ERPNext auf einer jährlichen Basis und bricht auf die Monate herunter.
#### Schritt 3: Fügen Sie eine neue Zeile hinzu und wählen Sie das Budget-Konto
-<img class="screenshot" alt="Budget" src="/docs/assets/img/accounts/budget-account.png">
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budget-account.png">
### Anlegen einer neuen Verteilungs-ID
ERPNext erlaubt es Ihnen einige Aktionen für Budgets einzustellen. Das legt fest, ob bei Überschreiten des Budgets gestoppt, gewarnte oder ignoriert werden soll.
-<img class="screenshot" alt="Monthly Distribution" src="/docs/assets/img/accounts/monthly-budget-distribution.png">
+<img class="screenshot" alt="Monthly Distribution" src="{{docs_base_url}}/assets/img/accounts/monthly-budget-distribution.png">
Das kann über die Firmenstammdaten eingestellt werden.
-<img class="screenshot" alt="Budget Variance Report" src="/docs/assets/img/accounts/budget-variance-report.png">
+<img class="screenshot" alt="Budget Variance Report" src="{{docs_base_url}}/assets/img/accounts/budget-variance-report.png">
Auch dann, wenn Sie für überschrittene Budgets "ignorieren" auswählen, bekommen Sie eine Fülle von Informationen über den Bericht zur Abweichung zwischen Budget und Istwert. Dieser Bericht zeigt Ihnen auf monatlicher Basis die tatsächlichen Ausgaben verglichen mit den budgetierten Ausgaben.
diff --git a/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md
index b9e93e0..551367e 100644
--- a/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md
+++ b/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md
@@ -17,7 +17,7 @@
Sie können in ERPNext leicht die finanzielle Lage Ihres Unternehmens einsehen. Ein Beispiel für eine Finanzanalyse sehen Sie unten abgebildet.
-<img class="screenshot" alt="Finanzanalyse Bilanz" src="/docs/assets/img/accounts/financial-analytics-bl.png">
+<img class="screenshot" alt="Finanzanalyse Bilanz" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-bl.png">
Um Ihren Kontenplan in ERPNext zu bearbeiten gehen Sie zu:
@@ -27,7 +27,7 @@
Lassen Sie uns die Hauptgruppen des Kontenplans besser verstehen lernen.
-<img class="screenshot" alt="Kontenplan" src="/docs/assets/img/accounts/chart-of-accounts-1.png">
+<img class="screenshot" alt="Kontenplan" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-1.png">
### Bilanzkonten
@@ -47,7 +47,7 @@
In ERPNext ist es einfach eine graphische Auswertung von Gewinn und Verlust zu erstellen. Im Folgenden ist ein Beispiel einer GuV-Analyse abgebildet:
-<img class="screenshot" alt="Finanzanalyse GuV" src="/docs/assets/img/accounts/financial-analytics-pl.png">
+<img class="screenshot" alt="Finanzanalyse GuV" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-pl.png">
(Am ersten Tag eines Jahres haben Sie noch keinen Gewinn oder Verlust gemacht, aber Sie haben bereits Vermögen, deshalb haben Bestandskonten zum Anfang oder Ende eines Zeitraums einen Wert.)
@@ -61,7 +61,7 @@
> Anmerkung: Ein Kontenbuch wird manchmal auch als Kontokopf bezeichnet.
-<img class="screenshot" alt="Kontenplan" src="/docs/assets/img/accounts/chart-of-accounts-2.png">
+<img class="screenshot" alt="Kontenplan" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-2.png">
### Andere Kontentypen
@@ -71,7 +71,7 @@
Um ein neues Konto zu erstellen, gehen Sie Ihren Kontenplan durch und klicken Sie auf die Kontengruppe unter der Sie das neue Konto erstellen wollen. Auf der rechten Seite finden Sie die Option ein neues Konto zu "öffnen" oder ein Unterkonto zu erstellen.
-<img class="screenshot" alt="Kontenplan" src="/docs/assets/img/accounts/chart-of-accounts-3.png">
+<img class="screenshot" alt="Kontenplan" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-3.png">
Die Option zum Erstellen erscheint nur dann, wenn Sie auf ein Konto vom Typ Gruppe (Ordner) klicken.
diff --git a/erpnext/docs/user/manual/de/accounts/credit-limit.md b/erpnext/docs/user/manual/de/accounts/credit-limit.md
index b769817..dc13819 100644
--- a/erpnext/docs/user/manual/de/accounts/credit-limit.md
+++ b/erpnext/docs/user/manual/de/accounts/credit-limit.md
@@ -9,7 +9,7 @@
### Abbildung 1: Kreditlinie
-<img class="screenshot" alt="Kreditlimit" src="/docs/assets/img/accounts/credit-limit-1.png">
+<img class="screenshot" alt="Kreditlimit" src="{{docs_base_url}}/assets/img/accounts/credit-limit-1.png">
Gehen Sie zum Abschnitt "Kreditlimit" und geben Sie den Betrag in das Feld "Kreditlimit" ein.
@@ -21,7 +21,7 @@
### Abbildung 2: Kredit-Controller
-<img class="screenshot" alt="Kreditlimit" src="/docs/assets/img/accounts/credit-limit-2.png">
+<img class="screenshot" alt="Kreditlimit" src="{{docs_base_url}}/assets/img/accounts/credit-limit-2.png">
Speichern Sie die Änderungen
diff --git a/erpnext/docs/user/manual/de/accounts/journal-entry.md b/erpnext/docs/user/manual/de/accounts/journal-entry.md
index 3ccc049..0885130 100644
--- a/erpnext/docs/user/manual/de/accounts/journal-entry.md
+++ b/erpnext/docs/user/manual/de/accounts/journal-entry.md
@@ -7,7 +7,7 @@
> Rechnungswesen > Dokumente > Journalbuchung > Neu
-<img class="screenshot" alt="Buchungssatz" src="/docs/assets/img/accounts/journal-entry.png">
+<img class="screenshot" alt="Buchungssatz" src="{{docs_base_url}}/assets/img/accounts/journal-entry.png">
In einem Buchungssatz müssen Sie folgendes tun:
diff --git a/erpnext/docs/user/manual/de/accounts/making-payments.md b/erpnext/docs/user/manual/de/accounts/making-payments.md
index 00c8d10..0c2e041 100644
--- a/erpnext/docs/user/manual/de/accounts/making-payments.md
+++ b/erpnext/docs/user/manual/de/accounts/making-payments.md
@@ -8,7 +8,7 @@
1. Geben Sie Schecknummer und Scheckdatum ein.
1. Speichern und Übertragen Sie.
-<img class="screenshot" alt="Zahlungen durchführen" src="/docs/assets/img/accounts/make-payment.png">
+<img class="screenshot" alt="Zahlungen durchführen" src="{{docs_base_url}}/assets/img/accounts/make-payment.png">
Zahlungen können auch unabhängig von Rechnungen erstellt werden, indem Sie einen neuen Journalbeleg erstellen und die Zahlungsart auswählen.
@@ -30,7 +30,7 @@
### Beispiel eines Buchungssatzes für eine Zahlung
-<img class="screenshot" alt="Zahlungen durchführen" src="/docs/assets/img/accounts/new-bank-entry.png">
+<img class="screenshot" alt="Zahlungen durchführen" src="{{docs_base_url}}/assets/img/accounts/new-bank-entry.png">
---
diff --git a/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md
index 0b0adaa..ad9eaaf 100644
--- a/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md
@@ -7,15 +7,15 @@
Um mit Buchungen in unterschiedlichen Währungen zu beginnen, müssen Sie die Buchungswährung im Datensatz des Kontos einstellen. Sie können bei der Anlage eine Währung aus dem Kontenplan auswählen.
-<img class="screenshot" alt="Währung über den Kontenplan einstellen" src="/docs/assets/img/accounts/multi-currency/chart-of-accounts.png">
+<img class="screenshot" alt="Währung über den Kontenplan einstellen" src="{{docs_base_url}}/assets/img/accounts/multi-currency/chart-of-accounts.png">
Sie können die Währung auch zuordnen oder bearbeiten, indem Sie den jeweiligen Datensatz für bereits angelegte Konten öffnen.
-<img class="screenshot" alt="Kontenwährung anpassen" src="/docs/assets/img/accounts/multi-currency/account.png">
+<img class="screenshot" alt="Kontenwährung anpassen" src="{{docs_base_url}}/assets/img/accounts/multi-currency/account.png">
Für Kunden/Lieferanten können Sie die Buchungswährung auch im Gruppendatensatz einstellen. Wenn sich die Buchungswährung der Gruppe von der Firmenwährung unterscheidet, müssen Sie die Standardkonten für Forderungen und Verbindlichkeiten auf diese Währung einstellen.
-<img class="screenshot" alt="Währung des Kundenkontos" src="/docs/assets/img/accounts/multi-currency/customer.png">
+<img class="screenshot" alt="Währung des Kundenkontos" src="{{docs_base_url}}/assets/img/accounts/multi-currency/customer.png">
Wenn Sie die Buchungswährung für einen Artikel oder eine Gruppe eingestellt haben, können Sie Buchungen zu ihnen erstellen. Wenn sich die Buchungswährung der Gruppe von der Firmenwährung unterscheidet, dann beschränkt das System beim Erstellen von Transaktionen für diese Gruppe Buchungen auf diese Währung. Wenn die Buchungswährung die selbe wie die Firmenwährung ist, können Sie Transaktionen für diese Guppe in jeder beliebigen Währung erstellen. Aber die Hauptbuch-Buchungen werden immer in der Buchungswährung der Gruppe vorliegen. In jedem Fall ist die Wärung des Verbindlichkeitenkontos immer gleich der Buchungswährung der Gruppe.
@@ -33,7 +33,7 @@
Der ausstehende Betrag und Anzahlungsbeträge werden immer in der Währung des Kundenkontos kalkuliert und angezeigt.
-<img class="screenshot" alt="Offene Ausgangsrechnung" src="/docs/assets/img/accounts/multi-currency/sales-invoice.png">
+<img class="screenshot" alt="Offene Ausgangsrechnung" src="{{docs_base_url}}/assets/img/accounts/multi-currency/sales-invoice.png">
#### Eingangsrechnung
@@ -43,13 +43,13 @@
In einer Journalbuchung können Sie Transaktionen in unterschiedlichen Währungen erstellen. Es gibt ein Auswahlfeld "Unterschiedliche Währungen" um Buchungen in mehreren Währungen zu aktivieren. Wenn die Option "Unterschiedliche Währungen" ausgewählt wurde, können Sie Konten mit unterschiedlichen Währungen auswählen.
-<img class="screenshot" alt="Wechselkurs im Buchungssatz" src="/docs/assets/img/accounts/multi-currency/journal-entry-multi-currency.png">
+<img class="screenshot" alt="Wechselkurs im Buchungssatz" src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-multi-currency.png">
In der Kontenübersicht zeigt das System den Abschnitt Währung an und holt sich die Kontenwährung und den Wechselkurs automatisch, wenn Sie ein Konto mit ausländischer Währung auswählen. Sie können den Wechselkurs später manuell ändern/anpassen.
In einem einzelnen Buchungssatz können Sie nur Konten mit einer alternativen Währung auswählen, abweichend von Konten in der Firmenwährung. Die Beträge für Soll und Haben sollten in der Kontenwährung eingegeben werden, das System berechnet und zeigt dann den Betrag für Soll und Haben automatisch in der Firmenwährung.
-<img class="screenshot" alt="Buchungssatz mit verschiedenen Währungen" src="/docs/assets/img/accounts/multi-currency/journal-entry-row.png">
+<img class="screenshot" alt="Buchungssatz mit verschiedenen Währungen" src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-row.png">
#### Beispiel 1: Zahlungsbuchung eines Kunden in alternativer Währung
@@ -57,7 +57,7 @@
Der Wechselkurs in der Zahlungsbuchung sollte immer der selbe wie auf der Rechnung (60) sein, auch dann, wenn der Wechselkurs am Tag der Zahlung 62 beträgt. Dem Bankkonto wird der Betrag mit einem Wechselkurs von 62 gut geschrieben. Deshalb wird ein Wechelkursgewinn bzw. -verlust basierend auf dem Unterschied im Wechselkurs gebucht.
-<img class="screenshot" alt="Zahlungsbuchung" src="/docs/assets/img/accounts/multi-currency/payment-entry.png">
+<img class="screenshot" alt="Zahlungsbuchung" src="{{docs_base_url}}/assets/img/accounts/multi-currency/payment-entry.png">
#### Beispiel 2: Überweisung zwischen Banken (US-Dollar -> Indische Rupien)
@@ -100,7 +100,7 @@
Angenommen, der Wechselkurs am Zahlungstag ist 62, dann schaut die Buchung zur Banküberweisung wie folgt aus:
-<img class="screenshot" alt="Übertrag zwischen den Banken" src="/docs/assets/img/accounts/multi-currency/bank-transfer.png">
+<img class="screenshot" alt="Übertrag zwischen den Banken" src="{{docs_base_url}}/assets/img/accounts/multi-currency/bank-transfer.png">
### Berichte
@@ -108,12 +108,12 @@
Im Hauptbuch zeigt das System den Betrag einer Gutschrift/Lastschrift in beiden Währungen an, wenn nach Konto gefiltert wurde, und wenn die Kontenwährung unterschiedlich zur Firmenwährung ist.
-<img class="screenshot" alt="Bericht zum Hauptbuch" src="/docs/assets/img/accounts/multi-currency/general-ledger.png">
+<img class="screenshot" alt="Bericht zum Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/multi-currency/general-ledger.png">
#### Forderungs- und Verbindlichkeitenkonten
Im Bericht zu den Konten Forderungen und Verbindlichkeiten zeigt das System alle Beträge in der Währung der Gruppe/in der Kontenwährung an.
-<img class="screenshot" alt="Bericht zu den Forderungen" src="/docs/assets/img/accounts/multi-currency/accounts-receivable.png">
+<img class="screenshot" alt="Bericht zu den Forderungen" src="{{docs_base_url}}/assets/img/accounts/multi-currency/accounts-receivable.png">
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/opening-accounts.md b/erpnext/docs/user/manual/de/accounts/opening-accounts.md
index 3edcadc..f264fc8 100644
--- a/erpnext/docs/user/manual/de/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/de/accounts/opening-accounts.md
@@ -20,7 +20,7 @@
Sie können Konten basierend auf Belegarten auswählen. In so einem Szenario sollte Ihre Bilanz ausgeglichen sein.
-<img class="screenshot" alt="Eröffnungskonto" src="/docs/assets/img/accounts/opening-account-1.png">
+<img class="screenshot" alt="Eröffnungskonto" src="{{docs_base_url}}/assets/img/accounts/opening-account-1.png">
Beachten Sie bitte auch, dass das System abstürzt, wenn es mehr als 300 Bücher gibt. Um so eine Situation zu vermeiden, können Sie Konten über temporäre Konten eröffnen.
@@ -38,13 +38,13 @@
Vervollständigen Sie die Buchungssätze auf der Soll- und Haben-Seite.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-6.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-6.png">
Um einen Eröffnungsstand einzupflegen, erstellen Sie einen Buchungssatz für ein Konto oder eine Gruppe von Konten.
Beispiel: Wenn Sie die Kontenstände von drei Bankkonten einpflegen möchten, dann erstellen Sie Buchungssätze der folgenden Art und Weise:
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-3.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-3.png">
Um einen Ausgleich herzustellen, wird ein temporäres Konto für Vermögen und Verbindlichkeiten verwendet. Wenn Sie einen Anfangsbestand in einem Verbindlichkeitenkonto einpflegen, können Sie zum Ausgleich ein temporäres Vermögenskonto verwenden.
@@ -59,7 +59,7 @@
Wenn Sie die Buchungen erstellt haben, schaut der Bericht zur Probebilanz in etwa wie folgt aus:
-<img class="screenshot" alt="Probebilanz" src="/docs/assets/img/accounts/opening-4.png">
+<img class="screenshot" alt="Probebilanz" src="{{docs_base_url}}/assets/img/accounts/opening-4.png">
### Offene Rechnungen
diff --git a/erpnext/docs/user/manual/de/accounts/purchase-invoice.md b/erpnext/docs/user/manual/de/accounts/purchase-invoice.md
index 6aec9b5..b3952ef 100644
--- a/erpnext/docs/user/manual/de/accounts/purchase-invoice.md
+++ b/erpnext/docs/user/manual/de/accounts/purchase-invoice.md
@@ -9,7 +9,7 @@
oder klicken Sie in einem Lieferantenauftrag oder einem Kaufbeleg auf "Eingangsrechnung erstellen".
-<img class="screenshot" alt="Eingangsrechnung" src="/docs/assets/img/accounts/purchase-invoice.png">
+<img class="screenshot" alt="Eingangsrechnung" src="{{docs_base_url}}/assets/img/accounts/purchase-invoice.png">
Das Konzept des Veröffentlichungsdatums ist das gleiche wie bei der Ausgangsrechnung. Rechnungsnummer und Rechnungsdatum helfen Ihnen dabei nachzuvollziehen, unter welchen Daten die Rechnung bei Ihrem Lieferanten ausgewiesen ist.
diff --git a/erpnext/docs/user/manual/de/accounts/sales-invoice.md b/erpnext/docs/user/manual/de/accounts/sales-invoice.md
index 7ce30bb..7967332 100644
--- a/erpnext/docs/user/manual/de/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/de/accounts/sales-invoice.md
@@ -9,7 +9,7 @@
oder indem Sie in der rechten Ecke des Lieferscheins auf "Rechnung erstellen" klicken.
-<img class="screenshot" alt="Ausgangsrechnung" src="/docs/assets/img/accounts/sales-invoice.png">
+<img class="screenshot" alt="Ausgangsrechnung" src="{{docs_base_url}}/assets/img/accounts/sales-invoice.png">
### Auswirkung auf die Buchhaltung
diff --git a/erpnext/docs/user/manual/de/accounts/setup/account-settings.md b/erpnext/docs/user/manual/de/accounts/setup/account-settings.md
index 44aafa4..d0d9bef 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/account-settings.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/account-settings.md
@@ -1,7 +1,7 @@
# Konteneinstellungen
<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
-<img class="screenshot" alt="Konteneinstellungen" src="/docs/assets/img/accounts/account-settings.png">
+<img class="screenshot" alt="Konteneinstellungen" src="{{docs_base_url}}/assets/img/accounts/account-settings.png">
* Konten gesperrt bis: Sperren Sie Konten-Transaktionen bis zu einem bestimmten Datum. Niemand bis auf die angegebene Rolle kann dann Buchungen zu diesem Konto erstellen oder verändern.
diff --git a/erpnext/docs/user/manual/de/accounts/setup/cost-center.md b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
index a7ed877..282daee 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
@@ -22,7 +22,7 @@
>Rechnungswesen > Einstellungen > Kostenstellenplan
-<img class="screenshot" alt="Kostenstellenplan" src="/docs/assets/img/accounts/budgeting-cost-center.png">
+<img class="screenshot" alt="Kostenstellenplan" src="{{docs_base_url}}/assets/img/accounts/budgeting-cost-center.png">
Kostenstellen helfen Ihnen bei der Erstellung von Budgets für Geschäftstätigkeiten.
diff --git a/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md
index 817c557..ce4c750 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md
@@ -5,6 +5,6 @@
Ein Geschäftsjahr startet normalerweise zu Beginn eines Quartals, wie zum Beispiel am 1. April, 1. Juli oder 1. Oktober. Jedoch geht bei den meisten Firmen das Geschäftsjahr mit dem Kalenderjahr einher und startet am 1. Januar. In den meisten Fällen ist es der einfachere und leichtere Weg. Für einige Organisationen ist es vorteilhaft das Geschäftsjahr zu einem anderen Zeitpunkt zu starten. So können beispielsweise Geschäfte, die saisonal arbeiten zum 1. Juli oder 1. Oktober starten. Ein Geschäft, welches im Herbst den größten Gewinn erwirtschaftet und die größten Ausgaben im Frühling hat, könnte sich auch für den 1. Okober entscheiden. Auf diese Weise weis es wie hoch der Gewinn für das Jahr sein wird und kann seine Ausgaben so anpassen, dass das Gewinnziel erreicht wird.
-<img class="screenshot" alt="Geschäftsjahr" src="/docs/assets/img/accounts/fiscal-year.png">
+<img class="screenshot" alt="Geschäftsjahr" src="{{docs_base_url}}/assets/img/accounts/fiscal-year.png">
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
index 52fd1d7..dea8f92 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
@@ -3,7 +3,7 @@
Sie können festlegen, welche [Steuervorlage](/docs/user/manual/de/setting-up/setting-up-taxes.html) auf eine Verkaufs-/Einkaufstransaktion angewendet wird, wenn Sie die Funktion Steuerregel verwenden.
-<img class="screenshot" alt="Steuerregel" src="/docs/assets/img/accounts/tax-rule.png">
+<img class="screenshot" alt="Steuerregel" src="{{docs_base_url}}/assets/img/accounts/tax-rule.png">
Sie können Steuerregeln für Umsatz- und für Vorsteuern erstellen. Wenn Sie eine Transaktion durchführen, wählt das System Steuervorlagen basierend auf den definierten Steuerregeln aus und wendet sie an. Das System filtert Steuerregeln nach der Anzahl der maximal zutreffenden Bedingungen.
@@ -11,9 +11,9 @@
Angenommen wird haben zwei Steuerregeln wie unten abgebildet erstellt.
-<img class="screenshot" alt="Steuerregel" src="/docs/assets/img/accounts/tax-rule-1.png">
+<img class="screenshot" alt="Steuerregel" src="{{docs_base_url}}/assets/img/accounts/tax-rule-1.png">
-<img class="screenshot" alt="Steuerregel" src="/docs/assets/img/accounts/tax-rule-2.png">
+<img class="screenshot" alt="Steuerregel" src="{{docs_base_url}}/assets/img/accounts/tax-rule-2.png">
In unserem Beispiel gilt Regel 1 für Indien und Regel 2 für Großbritannien.
diff --git a/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md
index 47a0dfe..c47831d 100644
--- a/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md
+++ b/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md
@@ -33,7 +33,7 @@
#### Abbildung 2: Werkzeug zum Kontenabgleich
-<img class="screenshot" alt="Kontenabgleich" src="/docs/assets/img/accounts/bank-reconciliation.png">
+<img class="screenshot" alt="Kontenabgleich" src="{{docs_base_url}}/assets/img/accounts/bank-reconciliation.png">
**Schritt 5:** Klicken Sie auf die Schaltfläche "Abwicklungsdatum aktualisieren"
diff --git a/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md
index 22e15d4..59b73e8 100644
--- a/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md
+++ b/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md
@@ -7,7 +7,7 @@
> Rechnungswesen > Werkzeuge > Zahlungsabgleich
-<img class="screenshot" alt="Zahlungsabgleich" src="/docs/assets/img/accounts/payment-reconcile-tool.png">
+<img class="screenshot" alt="Zahlungsabgleich" src="{{docs_base_url}}/assets/img/accounts/payment-reconcile-tool.png">
**Schritt 1:** Wählen Sie das Konto aus, zu dem die Zahlungen abgeglichen werden sollen.
diff --git a/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md
index b76945c..97795aa 100644
--- a/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md
+++ b/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md
@@ -23,14 +23,14 @@
* **Hinweis**: Für den Fall, dass der Benutzer an einen Kunden zahlt oder von einem Lieferanten eine Zahlung erhält, fügen Sie manuell Anmerkungen hinzu, die sich auf zutreffende Rechnungen oder Aufträge beziehen.
-<img class="screenshot" alt="Zahlungswerkzeug" src="/docs/assets/img/accounts/payment-tool-1.png">
+<img class="screenshot" alt="Zahlungswerkzeug" src="{{docs_base_url}}/assets/img/accounts/payment-tool-1.png">
7\. Sobald die Daten angezogen wurden, klicken Sie auf die detaillierte Buchung und geben Sie den Zahlungsbetrag zur Rechnung/Bestellung/zum Beleg ein.
-<img class="screenshot" alt="Zahlungswerkzeug" src="/docs/assets/img/accounts/payment-tool-2.png">
+<img class="screenshot" alt="Zahlungswerkzeug" src="{{docs_base_url}}/assets/img/accounts/payment-tool-2.png">
8\. Klicken Sie auf "Buchungssatz erstellen" um einen neuen Buchungssatz mit den entsprechenden Einzelheiten zu erstellen.
-<img class="screenshot" alt="Zahlungswerkzeug" src="/docs/assets/img/accounts/payment-tool-3.png">
+<img class="screenshot" alt="Zahlungswerkzeug" src="{{docs_base_url}}/assets/img/accounts/payment-tool-3.png">
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md
index 0f94073..539e7f9 100644
--- a/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md
+++ b/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md
@@ -22,7 +22,7 @@
Das **abzuschließende Geschäftsjahr** ist das Jahr, für das Sie Ihre Finanzbuchhaltung abschliessen.
-<img class="screenshot" alt="Periodenabschlussbeleg" src="/docs/assets/img/accounts/period-closing-voucher.png">
+<img class="screenshot" alt="Periodenabschlussbeleg" src="{{docs_base_url}}/assets/img/accounts/period-closing-voucher.png">
Dieser Beleg überträgt den Gewinn oder Verlust (über die GuV ermittelt) in die Schlußbilanz. Sie sollten ein Konto vom Typ Verbindlichkeiten, wie Gewinnrücklagen oder Überschuss, oder vom Typ Kapital als Schlußkonto auswählen.
diff --git a/erpnext/docs/user/manual/de/buying/purchase-order.md b/erpnext/docs/user/manual/de/buying/purchase-order.md
index a161d64..7c72d1e 100644
--- a/erpnext/docs/user/manual/de/buying/purchase-order.md
+++ b/erpnext/docs/user/manual/de/buying/purchase-order.md
@@ -7,7 +7,7 @@
### Flußdiagramm der Lieferantenbestellung
-<img class="screenshot" alt="Lieferantenauftrag" src="/docs/assets/img/buying/purchase-order-f.jpg">
+<img class="screenshot" alt="Lieferantenauftrag" src="{{docs_base_url}}/assets/img/buying/purchase-order-f.jpg">
In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über:
@@ -15,7 +15,7 @@
### Einen Lieferantenauftrag erstellen
-<img class="screenshot" alt="Lieferantenauftrag" src="/docs/assets/img/buying/purchase-order.png">
+<img class="screenshot" alt="Lieferantenauftrag" src="{{docs_base_url}}/assets/img/buying/purchase-order.png">
Einen Lieferantenauftrag einzugeben ist sehr ähnlich zu einer Lieferantenanfrage. Zusätzlich müssen Sie Folgendes eingeben:
@@ -50,7 +50,7 @@
### Abbildung 3: Umrechung von Einkaufsmaßeinheit in Lagermaßeinheit
-<img class="screenshot" alt="Lieferantenauftrag - Maßeinheit" src="/docs/assets/img/buying/purchase-order-uom.png">
+<img class="screenshot" alt="Lieferantenauftrag - Maßeinheit" src="{{docs_base_url}}/assets/img/buying/purchase-order-uom.png">
**Schritt 4:** Geben Sie den Umrechnungsfaktor von einer in die andere Maßeinheit an. Beispiel: 100, wenn eine Kiste 100 Stück umfasst.
diff --git a/erpnext/docs/user/manual/de/buying/setup/buying-settings.md b/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
index e5ee4a4..28d6403 100644
--- a/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
+++ b/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
@@ -3,7 +3,7 @@
Hier können Sie Werte einstellen, die in den Transaktionen des Moduls Einkauf zugrunde gelegt werden.
-
+
Lassen Sie uns die verschiedenen Optionen durckgehen.
diff --git a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
index 172aef7..a379ec8 100644
--- a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
@@ -9,7 +9,7 @@
> Einkauf > Einstellungen > Lieferantentyp > Neuer Lieferantentyp
-<img class="screenshot" alt="Lieferantentyp" src="/docs/assets/img/buying/supplier-type.png">
+<img class="screenshot" alt="Lieferantentyp" src="{{docs_base_url}}/assets/img/buying/supplier-type.png">
Sie können Ihre Lieferanten aus einem breiten Angebot verfügbarer Typen in ERPNext klassifizieren. Wählen Sie aus einem Satz vorgegebener Optionen wie Großhändler, Elekktro, Hardware, Regional, Pharma, Rohstoffe, Dienstleistungen, etc. aus.
diff --git a/erpnext/docs/user/manual/de/buying/supplier-quotation.md b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
index 30487fc..93db6a7 100644
--- a/erpnext/docs/user/manual/de/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
@@ -7,7 +7,7 @@
### Flußdiagramm zum Lieferantenangebot
-<img class="screenshot" alt="Lieferantenangebot" src="/docs/assets/img/buying/supplier-quotation-f.jpg">
+<img class="screenshot" alt="Lieferantenangebot" src="{{docs_base_url}}/assets/img/buying/supplier-quotation-f.jpg">
Sie können ein Lieferantenangebot auch direkt erstellen über:
@@ -15,7 +15,7 @@
### Ein Lieferantenangebot erstellen
-<img class="screenshot" alt="Lieferantenangebot" src="/docs/assets/img/buying/supplier-quotation.png">
+<img class="screenshot" alt="Lieferantenangebot" src="{{docs_base_url}}/assets/img/buying/supplier-quotation.png">
Wenn Sie mehrere verschiedene Lieferanten, die Ihnen den selben Artikel liefern, haben, dann senden Sie normalerweise eine Nachricht (Lieferantenanfrage) an verschiedene Lieferanten. In vielen Fällen, besonders dann, wenn Sie den Einkauf zentralisiert haben, werden Sie alle diese Angebote aufzeichnen wollen, so dass
diff --git a/erpnext/docs/user/manual/de/buying/supplier.md b/erpnext/docs/user/manual/de/buying/supplier.md
index 37eb376..eadb4ce 100644
--- a/erpnext/docs/user/manual/de/buying/supplier.md
+++ b/erpnext/docs/user/manual/de/buying/supplier.md
@@ -7,7 +7,7 @@
> Einkauf > Dokumente > Lieferant > Neu
-<img class="screenshot" alt="Lieferant" src="/docs/assets/img/buying/supplier-master.png">
+<img class="screenshot" alt="Lieferant" src="{{docs_base_url}}/assets/img/buying/supplier-master.png">
### Kontakte und Adressen
diff --git a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
index ef40f45..c74029b 100644
--- a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
+++ b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
@@ -4,18 +4,18 @@
Das Webportal von ERPNext gibt Ihren Kunden einen schnellen Zugriff auf Ihre Aufträge, Rechnungen und Sendungen.
Kunden können den Status Ihrer Bestellungen, Rechnungen und des Versandes nachprüfen, indem sie sich auf der Webseite einloggen.
-<img class="screenshot" alt="Customer Portal Order 1" src="/docs/assets/img/website/portal-menu.png">
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
Sobald eine Bestellung aufgegeben wurde, entweder über den Einkaufswagen oder aus ERPNext heraus, kann Ihr Kunde die Bestellung ansehen und den Abrechnungs- und Versandstatus nachverfolgen. Wenn die Rechnung und die Zahlung zu einer Bestellung übertragen wurden, kann der Kunde auch hier den aktuellen Stand auf einen Blick nachvollziehen.
-<img class="screenshot" alt="Customer Portal Order 1" src="/docs/assets/img/website/website-login.png">
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
### Rechnung mit Status "gezahlt"
-<img class="screenshot" alt="Customer Portal Order 1" src="/docs/assets/img/website/invoice-unpaid.png">
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-unpaid.png">
### Rechnung mit Status "abgerechnet"
-<img class="screenshot" alt="Customer Portal Order 1" src="/docs/assets/img/website/invoice-paid.png">
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-paid.png">
{next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/issues.md b/erpnext/docs/user/manual/de/customer-portal/issues.md
index dee8eb1..8f0c7d3 100644
--- a/erpnext/docs/user/manual/de/customer-portal/issues.md
+++ b/erpnext/docs/user/manual/de/customer-portal/issues.md
@@ -5,17 +5,17 @@
### Ticketliste leeren
-<img class="screenshot" alt="Ausgabeliste" src="/docs/assets/img/website/portal-ticket-list-empty.png">
+<img class="screenshot" alt="Ausgabeliste" src="{{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png">
### Neuer Fall
-<img class="screenshot" alt="Neues Problem " src="/docs/assets/img/website/portal-new-ticket.png">
+<img class="screenshot" alt="Neues Problem " src="{{docs_base_url}}/assets/img/website/portal-new-ticket.png">
### Fall öffnen
-<img class="screenshot" alt="Ausgabe aufgehoben" src="/docs/assets/img/website/portal-ticket-1.gif">
+<img class="screenshot" alt="Ausgabe aufgehoben" src="{{docs_base_url}}/assets/img/website/portal-ticket-1.gif">
### Fall beantworten
-<img class="screenshot" alt="Frage beantworten" src="/docs/assets/img/website/portal-ticket-reply.gif">
+<img class="screenshot" alt="Frage beantworten" src="{{docs_base_url}}/assets/img/website/portal-ticket-reply.gif">
{next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/portal-login.md b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
index 5bff275..455dfac 100644
--- a/erpnext/docs/user/manual/de/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
@@ -3,6 +3,6 @@
Um sich in ein Kundenkonto einzuloggen, muss der Kunde seine Email-ID und das Passwort angeben, welche ihm von ERPNext während des Registrierungsprozesses zugesendet wurden.
-<img class="screenshot" alt="Website User Signup" src="/docs/assets/img/website/website-login.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
{next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/sign-up.md b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
index 35a660d..0a91145 100644
--- a/erpnext/docs/user/manual/de/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
@@ -6,11 +6,11 @@
### Schritt 1: Klicken Sie auf das Registrieren-Symbol
-<img class="screenshot" alt="Website User Signup" src="/docs/assets/img/website/website-login.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
### Schritt 3: Geben Sie Ihren Kundennamen und Ihre ID ein
-<img class="screenshot" alt="Website User Signup" src="/docs/assets/img/website/website-signup-details.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-signup-details.png">
Wenn der Registrierungsprozess abgeschlossen ist, wird dem Kunden eine E-Mail mit dem Passwort zugeschickt.
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
index 315e062..01bfaa7 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
@@ -17,7 +17,7 @@
4. Ist einzeln: Wenn diese Option aktiviert ist, wird dieser DocType zu einem einzeln verwendeten Formular, wie die Vertriebseinstellungen, die nicht von Benutzern reproduziert werden können.
5. Benutzerdefiniert?: Dieses Feld ist standardmäßig aktiviert, wenn ein benutzerdefinierter DocType hinzugefügt wird.
-
+
### Felder
@@ -32,7 +32,7 @@
5. Aktionen (Schaltflächen)
6. Anhänge oder Bilder
-
+
Wenn Sie Felder hinzufügen, müssen Sie den **Typ** angeben. Für eine Bereichs- oder Spaltentrennung ist die **Bezeichnung** optional. Der **Name** (Feldname) ist der Name der Spalte in der Datenbank.
@@ -42,19 +42,19 @@
In diesem Abschnitt können Sie Kriterien definieren nach denen Dokumente dieses DocTypes benannt werden. Es gibt viele verschiedene Kriterien nach denen ein Dokument benannt werden kann, wie z. B. dem Wert in diesem spezifischen Feld, oder die Benamungsserie, oder der Wert der vom Benutzer an der Eingabeaufforderung eingegeben wird, die angezeit wird, wenn ein Dokument abgespeichert wird. Im folgenden Beispiel benennen wir auf Grundlage des Wertes im Feld **book_name**.
-
+
### Berechtigung
In dieser Tabelle können Sie Rollen und Berechtigungs-Rollen für diese für die betreffenden DocTypes auswählen.
-
+
### DocTypes abspeichern
Wenn Sie einen DocType abspeichern, erscheint ein Popup-Fenster über welches Sie den Namen des DocTypes eingeben können.
-
+
### Der DocType im System
@@ -62,12 +62,12 @@
> Personalwesen > Dokumente > Buch
-
+
### Buchvorlage
Wenn Sie die Felder ausfüllen, schaut das ganze dann so aus.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
index e890f5d..beeec4b 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -16,7 +16,7 @@
In einem benutzerdefinierten Formular finden Sie für jedes Feld die Plus(+)-Option. Wenn Sie auf dieses Symbol klicken, wird eine neue Zeile oberhalb dieses Feldes eingefügt. Sie können die Einstellungen für Ihr Feld in der neu eingefügten leeren Zeile eingeben.
-<img alt="Formular anpassen - benutzerdefiniertes Feld" class="screenshot" src="/docs/assets/img/customize/custom-field-2.gif">
+<img alt="Formular anpassen - benutzerdefiniertes Feld" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-2.gif">
Im Folgenden sind die Schritte aufgeführt, wie man ein benutzerdefiniertes Feld in ein bestehendes Formular einfügt.
@@ -28,31 +28,31 @@
Wählen Sie die Transaktion oder die Vorlage, in die sie ein benutzerdefiniertes Feld einfügen wollen. Nehmen wir an, dass Sie ein benutzerdefiniertes Verknüpfungsfeld in ein Angebotsformular einfügen wollen; das Dokument soll "Angebot" heißen.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-1.gif">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-1.gif">
### Feldbezeichnung einstellen
Die Bezeichnung des benutzerdefinierten Feldes wird basierend auf seinem Namen eingestellt. Wenn Sie ein benutzerdefiniertes Feld mit einem bestimmten Namen erstellen wollen, aber mit einer sich davon unterscheidenden Bezeichnung, dann sollten Sie erst die Bezeichnung angeben, da Sie den Feldnamen noch einstellen wollen. Nach dem Speichern des benutzerdefinierten Feldes können Sie die Feldbezeichnung wieder ändern.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-2.gif">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-2.gif">
### Einstellen, nach welchem Element eingefügt werden soll ("Einfügen nach")
Diese Auswahl enthält alle bereits existierenden Felder des ausgewählten Formulars/des DocTypes. Ihr benutzerdefiniertes Feld wird nach dem Feld eingefügt, das Sie unter "Einfügen nach" auswählen.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-3.png">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-3.png">
### Feldtyp auswählen
Klicken Sie hier um weitere Informationen über Feldtypen, die Sie bei einem benutzerdefinierten Feld auswählen können, zu erhalten.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-4.png">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-4.png">
### Optionen einstellen
Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier](/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-5.png">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-5.png">
Wenn der Feldtyp als Auswahlfeld (Drop Down-Feld) angegeben ist, dann sollten alle möglichen Ergebnisse für dieses Feld im Optionen-Feld aufgelistet werden. Die möglichen Ergebnisse sollten alle in einer eigenen Zeile stehen.
@@ -69,7 +69,7 @@
5. Schreibgeschützt: Wenn diese Option aktiviert ist, kann das benutzerdefinierte Feld nicht geändert werden.
6. Beim Übertragen zulassen: Wenn diese Option ausgewählt wird, ist es erlaubt den Wert des Feldes zu ändern, wenn er in einer Transaktion übertragen wird.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-6.png">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-6.png">
### Benutzerdefiniertes Feld löschen
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
index 7c62ae5..8e2e842 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
@@ -5,7 +5,7 @@
> Einstellungen > Anpassen > Benutzerdefiniertes Skript
-<img alt="Custom Script" class="screenshot" src="/docs/assets/img/customize/custom-script-1.png">
+<img alt="Custom Script" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-script-1.png">
### Themen
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/document-title.md b/erpnext/docs/user/manual/de/customize-erpnext/document-title.md
index 5e5766b..3b13208 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/document-title.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/document-title.md
@@ -24,14 +24,14 @@
> {customer_name} for {project}
<img class="screenshot" alt = "Bezeichnung anpassen"
- src="/docs/assets/img/customize/customize-title.gif">
+ src="{{docs_base_url}}/assets/img/customize/customize-title.gif">
### Fest eingestellte und bearbeitbare Bezeichnungen
Wenn Ihre Bezeichnung als Standard-Bezeichnung generiert wurde, kann sie vom Benutzer durch klicken auf den Kopf des Dokuments bearbeitet werden.
<img class="screenshot" alt = "Bearbeitbare Bezeichnung"
- src="/docs/assets/img/customize/editable-title.gif">
+ src="{{docs_base_url}}/assets/img/customize/editable-title.gif">
Wenn Sie eine fest eingestellte Bezeichnung haben wollen, können Sie dies als Regel unter **Optionen** einstellen. Auf diese Weise wird die Bezeichnung jedesmal automatisch aktualisiert, wenn das Dokument aktualisiert wird.
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
index b23335d..f1caada 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
@@ -14,7 +14,7 @@
> Einstellungen > Druck > Druckformate
-
+
Wählen Sie den Typ des Druckformats, welches Sie bearbeiten wollen, und klicken Sie auf die Schaltfläche "Kopieren" in der rechten Spalte. Es öffnet sich ein neues Druckformat mit der Einstellung NEIN für "für "Ist Standard" und Sie kännen das Druckformat bearbeiten.
@@ -37,7 +37,7 @@
> Einstellungen > Druck und Branding > Druckeinstellungen
-
+
### Beispiel
diff --git a/erpnext/docs/user/manual/de/human-resources/appraisal.md b/erpnext/docs/user/manual/de/human-resources/appraisal.md
index 34a9217..ccec5b2 100644
--- a/erpnext/docs/user/manual/de/human-resources/appraisal.md
+++ b/erpnext/docs/user/manual/de/human-resources/appraisal.md
@@ -7,13 +7,13 @@
#### Schritt 1: Wählen Sie eine Bewertungsvorlage aus
-<img class="screenshot" alt="Beurteilung" src="/docs/assets/img/human-resources/appraisal.png">
+<img class="screenshot" alt="Beurteilung" src="{{docs_base_url}}/assets/img/human-resources/appraisal.png">
Wenn Sie eine Vorlage ausgewählt haben, erscheint der restliche Teil des Formulars.
#### Schritt 2: Geben Sie die Daten des Mitarbeiters ein
-<img class="screenshot" alt="Beurteilung" src="/docs/assets/img/human-resources/appraisal-employee.png">
+<img class="screenshot" alt="Beurteilung" src="{{docs_base_url}}/assets/img/human-resources/appraisal-employee.png">
Wenn die Bewertungsvorlage fertig ist, können Sie für jeden Zeitraum Bewertungen aufzeichnen, über die Sie die Leistung nachverfolgen können. Sie können für jeden Paramter bis zu 5 Punkte vergeben und das System berechnet die Gesamtbeurteilung des Mitarbeiters.
diff --git a/erpnext/docs/user/manual/de/human-resources/attendance.md b/erpnext/docs/user/manual/de/human-resources/attendance.md
index 9ec5f95..744077d 100644
--- a/erpnext/docs/user/manual/de/human-resources/attendance.md
+++ b/erpnext/docs/user/manual/de/human-resources/attendance.md
@@ -5,7 +5,7 @@
> Personalwesen > Dokumente > Anwesenheit > Neu
-<img class="screenshot" alt="Anwesenheit" src="/docs/assets/img/human-resources/attendence.png">
+<img class="screenshot" alt="Anwesenheit" src="{{docs_base_url}}/assets/img/human-resources/attendence.png">
Sie können einen monatlichen Report über Ihre Anwesenheiten erhalten, indem Sie zum "Monatlichen Anwesenheitsbericht" gehen.
diff --git a/erpnext/docs/user/manual/de/human-resources/employee.md b/erpnext/docs/user/manual/de/human-resources/employee.md
index e599569..7d39f6a 100644
--- a/erpnext/docs/user/manual/de/human-resources/employee.md
+++ b/erpnext/docs/user/manual/de/human-resources/employee.md
@@ -7,6 +7,6 @@
> Personalwesen > Dokumente > Mitarbeiter > Neu
-<img class="screenshot" alt="Mitarbeiter" src="/docs/assets/img/human-resources/employee.png">
+<img class="screenshot" alt="Mitarbeiter" src="{{docs_base_url}}/assets/img/human-resources/employee.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/expense-claim.md b/erpnext/docs/user/manual/de/human-resources/expense-claim.md
index 12e69bf..3fda049 100644
--- a/erpnext/docs/user/manual/de/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/de/human-resources/expense-claim.md
@@ -7,7 +7,7 @@
> Personalwesen > Dokumente > Aufwandsabrechnung > Neu
-<img class="screenshot" alt="Aufwandsabrechnung" src="/docs/assets/img/human-resources/expense_claim.png">
+<img class="screenshot" alt="Aufwandsabrechnung" src="{{docs_base_url}}/assets/img/human-resources/expense_claim.png">
Geben Sie die Mitarbeiter-ID, das Datum und die Auflistung der Ausgaben, die Sie zurückerstattet haben möchten, ein und "übertragen" Sie den Datensatz.
@@ -27,6 +27,6 @@
* Um eine Aufwandsabrechnung mit einer Aufgabe oder einem Projekt zu verknüpfen, geben Sie die Aufgabe oder das Projekt an, während Sie eine Aufwandsabrechnung erstellen.
-<img class="screenshot" alt="Aufwandsabrechnung - Verknüpfung zum Projekt" src="/docs/assets/img/project/project_expense_claim_link.png">
+<img class="screenshot" alt="Aufwandsabrechnung - Verknüpfung zum Projekt" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
index 8cef87d..bf0e195 100644
--- a/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
+++ b/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
@@ -5,30 +5,30 @@
Der Bericht zur Mitarbeiter-Urlaubsauswertung zeigt Mitarbeiter und deren Urlaubsverteilung nach den unterschiedlichen Urlaubstypen an. Der Bericht richtet sich nach der Anzahl des genehmigten Urlaubs.
-<img alt="Mitarbeier-Urlaubskonto" class="screenshot" src="/docs/assets/img/human-resources/employee-leave-balance-report.png">
+<img alt="Mitarbeier-Urlaubskonto" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-balance-report.png">
### Mitarbeiter-Geburtstag
Dieser Bericht zeigt die Geburtstage der Mitarbeiter an.
-<img alt="Mitarbeiter-Geburtstag" class="screenshot" src="/docs/assets/img/human-resources/employee-birthday-report.png">
+<img alt="Mitarbeiter-Geburtstag" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-birthday-report.png">
### Mitarbeiterinformationen
Dieser Bericht wichtige Informationen über Mitarbeiter in den Mitarbeiterdatensätzen.
-<img alt="Mitarbeiterinformation" class="screenshot" src="/docs/assets/img/human-resources/employee-information-report.png">
+<img alt="Mitarbeiterinformation" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-information-report.png">
### Übersicht monatliche Gehälter
Dieser Bericht zeigt die Nettozahlungen der Mitarbeiter und deren einzelne Bestandteile im Überblick.
-<img alt="Übersicht monatliche Gehälter" class="screenshot" src="/docs/assets/img/human-resources/monthly-salary-register-report.png">
+<img alt="Übersicht monatliche Gehälter" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/monthly-salary-register-report.png">
### Monatliche Anwesenheitsliste
Dieser Bericht zeit die monatlichen Anwesenheiten ausgewählter Mitarbeiter im Überblick.
-<img alt="Monatliche Anwesenheitsliste" class="screenshot" src="/docs/assets/img/human-resources/monthly-attendance-sheet-report.png">
+<img alt="Monatliche Anwesenheitsliste" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/monthly-attendance-sheet-report.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/job-applicant.md b/erpnext/docs/user/manual/de/human-resources/job-applicant.md
index 62de801..3bbe4c1 100644
--- a/erpnext/docs/user/manual/de/human-resources/job-applicant.md
+++ b/erpnext/docs/user/manual/de/human-resources/job-applicant.md
@@ -7,7 +7,7 @@
> Personalwesen > Dokumente > Bewerber > Neu
-<img class="screenshot" alt="Bewerber" src="/docs/assets/img/human-resources/job-applicant.png">
+<img class="screenshot" alt="Bewerber" src="{{docs_base_url}}/assets/img/human-resources/job-applicant.png">
### Verknüpfung mit einem E-Mail-Konto
@@ -20,6 +20,6 @@
* Geben Sie die E-Mail-ID und das Passwort ein und aktivieren Sie "Eingehend aktivieren".
* Unter "Anhängen an" geben Sie "Bewerber" an.
-<img class="screenshot" alt="E-Mail-Konto" src="/docs/assets/img/human-resources/email-account.png">
+<img class="screenshot" alt="E-Mail-Konto" src="{{docs_base_url}}/assets/img/human-resources/email-account.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/job-opening.md b/erpnext/docs/user/manual/de/human-resources/job-opening.md
index 0231df6..b14516e 100644
--- a/erpnext/docs/user/manual/de/human-resources/job-opening.md
+++ b/erpnext/docs/user/manual/de/human-resources/job-opening.md
@@ -7,6 +7,6 @@
> Personalwesen > Dokumente > Offene Stellen > Neu
-<img class="screenshot" alt="Offene Stellen" src="/docs/assets/img/human-resources/job-opening.png">
+<img class="screenshot" alt="Offene Stellen" src="{{docs_base_url}}/assets/img/human-resources/job-opening.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/leave-application.md b/erpnext/docs/user/manual/de/human-resources/leave-application.md
index faf5b6e..cf02a1c 100644
--- a/erpnext/docs/user/manual/de/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/de/human-resources/leave-application.md
@@ -5,14 +5,14 @@
> Personalwesen > Dokumente > Urlaubsantrag > Neu
-<img class="screenshot" alt="Urlaubsantrag" src="/docs/assets/img/human-resources/leave-application.png">
+<img class="screenshot" alt="Urlaubsantrag" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
### Urlaubsbewilliger einstellen
* Ein Urlaubsgenehmiger ist ein Benutzer der Urlaubsanträge eines Mitarbeiters bewilligen kann.
* Sie müssen eine Liste von Urlaubsbewilligern für einen Mitarbeiter in den Mitarbeiterstammdaten angeben.
-<img class="screenshot" alt="Urlaubsgenehmiger" src="/docs/assets/img/human-resources/employee-leave-approver.png">
+<img class="screenshot" alt="Urlaubsgenehmiger" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-approver.png">
> Tipp: Wenn Sie möchten, dass alle Benutzer ihre Urlaubsanträge selbst erstellen, können Sie in den Einstellungen zur Urlaubsgenehmigung Ihre Mitarbeiter-IDs als so einstellen, dass sie für die Regel zutreffend sind. Für weiterführende Informationen kesen Sie hierzu die Diskussion zum Thema [Einstellungen zu Genehmigungen](/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.html).
diff --git a/erpnext/docs/user/manual/de/human-resources/offer-letter.md b/erpnext/docs/user/manual/de/human-resources/offer-letter.md
index e545774..63cf0be 100644
--- a/erpnext/docs/user/manual/de/human-resources/offer-letter.md
+++ b/erpnext/docs/user/manual/de/human-resources/offer-letter.md
@@ -7,12 +7,12 @@
> Personalwesen > Dokumente > Angebotsschreiben > Neu
-<img class="screenshot" alt="Angebotsschreiben" src="/docs/assets/img/human-resources/offer-letter.png">
+<img class="screenshot" alt="Angebotsschreiben" src="{{docs_base_url}}/assets/img/human-resources/offer-letter.png">
> Anmerkung: Angebotsschreiben kann nur zu einem [Bewerber](/docs/user/manual/de/human-resources/job-applicant.html) erstellt werden.
Es gibt ein vordefiniertes Druckformat zum Angebotsschreiben.
-<img class="screenshot" alt="Angebotsschreiben" src="/docs/assets/img/human-resources/offer-letter-print.png">
+<img class="screenshot" alt="Angebotsschreiben" src="{{docs_base_url}}/assets/img/human-resources/offer-letter-print.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
index f47dda2..a8eb33a 100644
--- a/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
@@ -43,7 +43,7 @@
#### Abbildung 1: Gehaltsstruktur
-<img class="screenshot" alt="Gehaltsstruktur" src="/docs/assets/img/human-resources/salary-structure.png">
+<img class="screenshot" alt="Gehaltsstruktur" src="{{docs_base_url}}/assets/img/human-resources/salary-structure.png">
### In der Gehaltsstruktur
@@ -67,7 +67,7 @@
#### Abbildung 2: Gehaltsabrechnung
-<img class="screenshot" alt="Lohnzettel" src="/docs/assets/img/human-resources/salary-slip.png">
+<img class="screenshot" alt="Lohnzettel" src="{{docs_base_url}}/assets/img/human-resources/salary-slip.png">
Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über "Gehaltsabrechnung bearbeiten" anlegen.
@@ -75,7 +75,7 @@
#### Abbildung 3: Gehaltsabrechnung durchführen
-<img class="screenshot" alt="Gehaltsabrechnung durchführen" src="/docs/assets/img/human-resources/process-payroll.png">
+<img class="screenshot" alt="Gehaltsabrechnung durchführen" src="{{docs_base_url}}/assets/img/human-resources/process-payroll.png">
Beim Bearbeiten einer Gehaltsabrechnung
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/branch.md b/erpnext/docs/user/manual/de/human-resources/setup/branch.md
index 1328d73..f6913a7 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/branch.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/branch.md
@@ -3,6 +3,6 @@
Filialen Ihres Unternehmens
-<img class="screenshot" alt="Filiale" src="/docs/assets/img/human-resources/branch.png">
+<img class="screenshot" alt="Filiale" src="{{docs_base_url}}/assets/img/human-resources/branch.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md
index e50b51f..ddd3e9d 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md
@@ -7,6 +7,6 @@
> Personalwesen > Einstellungen > Abzugsart > Neu
-<img class="screenshot" alt="Abzugsart" src="/docs/assets/img/human-resources/deduction-type.png">
+<img class="screenshot" alt="Abzugsart" src="{{docs_base_url}}/assets/img/human-resources/deduction-type.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/department.md b/erpnext/docs/user/manual/de/human-resources/setup/department.md
index 532174f..c54928b 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/department.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/department.md
@@ -3,6 +3,6 @@
Abteilungen Ihres Unternehmens
-<img class="screenshot" alt="Abteilung" src="/docs/assets/img/human-resources/department.png">
+<img class="screenshot" alt="Abteilung" src="{{docs_base_url}}/assets/img/human-resources/department.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/designation.md b/erpnext/docs/user/manual/de/human-resources/setup/designation.md
index 0d01588..dee6658 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/designation.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/designation.md
@@ -3,6 +3,6 @@
Stellenbezeichnungen in Ihrem Unternehmen
-<img class="screenshot" alt="Stellenbezeichnung" src="/docs/assets/img/human-resources/designation.png">
+<img class="screenshot" alt="Stellenbezeichnung" src="{{docs_base_url}}/assets/img/human-resources/designation.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md
index 51eb375..d79e6bb 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md
@@ -7,6 +7,6 @@
> Personalwesen > Einstellungen > Einkommensart > Neu
-<img class="screenshot" alt="Einkommensart" src="/docs/assets/img/human-resources/earning-type.png">
+<img class="screenshot" alt="Einkommensart" src="{{docs_base_url}}/assets/img/human-resources/earning-type.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md
index c9d6ce2..9c334cf 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md
@@ -3,6 +3,6 @@
Verschiedene Beschäftigungsverträge, die Sie mit Ihren Mitarbeitern abgeschlossen haben.
-<img class="screenshot" alt="Art der Beschäftigung" src="/docs/assets/img/human-resources/employment-type.png">
+<img class="screenshot" alt="Art der Beschäftigung" src="{{docs_base_url}}/assets/img/human-resources/employment-type.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md b/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md
index 161a867..cec5110 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md
@@ -3,6 +3,6 @@
Sie können Urlaub für ein bestimmtes Jahr über die Urlaubsübersicht planen.
-<img class="screenshot" alt="Urlaubsübersicht" src="/docs/assets/img/human-resources/holiday-list.png">
+<img class="screenshot" alt="Urlaubsübersicht" src="{{docs_base_url}}/assets/img/human-resources/holiday-list.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md
index 8e2e5e2..c454598 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md
@@ -3,6 +3,6 @@
Globale Einstellungen zu Dokumenten des Personalwesens
-<img class="screenshot" alt="Einstellungen zum Personalwesen" src="/docs/assets/img/human-resources/hr-settings.png">
+<img class="screenshot" alt="Einstellungen zum Personalwesen" src="{{docs_base_url}}/assets/img/human-resources/hr-settings.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
index d49121b..6f53b83 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
@@ -3,7 +3,7 @@
Hilft Ihnen Urlaub bestimmten Mitarbeitern zuzuteilen
-<img class="screenshot" alt="Urlaubszuordnung" src="/docs/assets/img/human-resources/leave-allocation.png">
+<img class="screenshot" alt="Urlaubszuordnung" src="{{docs_base_url}}/assets/img/human-resources/leave-allocation.png">
Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug](/docs/user/manual/de/human-resources/tools/leave-allocation-tool.html).
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md
index 97b5af8..ece1c58 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md
@@ -3,7 +3,7 @@
Geben Sie den Urlaubstyp an, der Mitarbeitern zugeordnet werden kann.
-<img class="screenshot" alt="Urlaubstyp" src="/docs/assets/img/human-resources/leave-type.png">
+<img class="screenshot" alt="Urlaubstyp" src="{{docs_base_url}}/assets/img/human-resources/leave-type.png">
* "Maximale zulässige Urlaubstage" gibt die Maximalanzahl von Tagen dieses Urlaubstyps an, die zusammen genommen werden können.
* "Ist unbezahlter Urlaub" gibt an, dass es sich um unbezahlten Urlaub handelt.
diff --git a/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
index a4a7862..de109f4 100644
--- a/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
+++ b/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
@@ -3,6 +3,6 @@
Das Urlaubszuordnungs-Werkzeug hilft Ihnen dabei eine bestimmte Menge an Urlaub einem Mitarbeiter zuzuteilen.
-<img class="screenshot" alt="Urlaubsantrag" src="/docs/assets/img/human-resources/leave-application.png">
+<img class="screenshot" alt="Urlaubsantrag" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md
index ba351b5..3f94e83 100644
--- a/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md
+++ b/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md
@@ -7,6 +7,6 @@
> Personalwesen > Werkzeuge > Anwesenheit hochladen
-<img class="screenshot" alt="Anwesenheit hochladen" src="/docs/assets/img/human-resources/attendence-upload.png">
+<img class="screenshot" alt="Anwesenheit hochladen" src="{{docs_base_url}}/assets/img/human-resources/attendence-upload.png">
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/training.md b/erpnext/docs/user/manual/de/human-resources/training.md
index 84091d9..4e039de 100644
--- a/erpnext/docs/user/manual/de/human-resources/training.md
+++ b/erpnext/docs/user/manual/de/human-resources/training.md
@@ -3,13 +3,13 @@
Erstelle ein Schulungsprogramm und teile die Schulungstermine ein. Auf der Seite des Schulungsprogramms gibt es einen Link zur Ansicht aller Schulungstermine dieses Schulungsprogramms.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_program.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_program.png">
### Schulungstermin
Erstelle Termine für Seminare, Workshops, Konferenzen etc über den Link im Schulungsprogramm. Hier können die Teilnehmer die die Schulung benötigen eingetragen werden.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_event.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_event.png">
### Teilnehmer zum Schulungstermin einladen
@@ -17,7 +17,7 @@
Standardmäßig ist der Status des Mitarbeiters „Offen“.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_event_employee.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_event_employee.png">
Wenn der Schulungstermin gebucht wird, dann wird eine Benachrichtigung an den Mitarbeiter gesendet, dass er zum Schulungstermin eigeladen ist. Dies wird über die automatische Email „Schulungstermin“ gesendet. Der Inhalt der Email kann entsprechend angepasst werden.
@@ -25,7 +25,7 @@
Nach der Schulung können die Ergebnisse gespeichert werden basierend auf dem Feedback des Trainers.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_result.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_result.png">
Wenn das Schulungsergebnis gebucht wird, bekommen die Mitarbeiter eine Benachrichtigung, dass sie eine Schulungsbeurteilung abgeben sollen. Dies wird ebenfalls über die automatische Email verwaltet, der Inhalt kann auch hier angepasst werden.
@@ -33,5 +33,5 @@
Die Mitarbeiter können ihre Rückmeldung durch die Schulungsbeurteilung geben.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_feedback.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_feedback.png">
diff --git a/erpnext/docs/user/manual/de/introduction/key-workflows.md b/erpnext/docs/user/manual/de/introduction/key-workflows.md
index 1840479..ac5392c 100644
--- a/erpnext/docs/user/manual/de/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/de/introduction/key-workflows.md
@@ -4,7 +4,7 @@
Dieses Diagramm stellt dar, wie ERPNext die Informationen und Vorgänge in Ihrem Unternehmen über Schlüsselfunktionen nachverfolgt. Dieses Diagramm gibt nicht alle Funktionalitäten von ERPNext wieder.
-<img class="screenshot" alt="Hohe Auflösung" src="/docs/assets/img/setup/overview.png">
+<img class="screenshot" alt="Hohe Auflösung" src="{{docs_base_url}}/assets/img/setup/overview.png">
_Anmerkung: Nicht alle Schritte sind zwingend erforderlich. ERPNext erlaubt es Ihnen nach eigenem Gutdünken Schritte auszulassen, wenn Sie den Prozess vereinfachen wollen._
diff --git a/erpnext/docs/user/manual/de/introduction/the-champion.md b/erpnext/docs/user/manual/de/introduction/the-champion.md
index b04de65..912c252 100644
--- a/erpnext/docs/user/manual/de/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/de/introduction/the-champion.md
@@ -1,7 +1,7 @@
# Der Champion
<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
-<img alt="Champion" class="screenshot" src="/docs/assets/img/setup/implementation-image.png">
+<img alt="Champion" class="screenshot" src="{{docs_base_url}}/assets/img/setup/implementation-image.png">
Wir haben uns in den letzten Jahren dutzende von ERP-Umsetzungen angesehen, und wir haben erkannt, dass eine erfolgreiche Umsetzung viel mit schwer greifbaren Dingen und persönlichen Einstellungen zu tun hat.
diff --git a/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md
index 52ab420..55501e6 100644
--- a/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md
@@ -7,11 +7,11 @@
>Fertigung > Dokumente > Stückliste > Neue Stückliste
-<img class="screenshot" alt="Task" src="/docs/assets/img/manufacturing/bom.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/bom.png">
Um Arbeitsgänge hinzuzufügen, wählen Sie "Mit Arbeitsgängen". Die Übersicht der Arbeitsgänge erscheint.
-<img class="screenshot" alt="Task" src="/docs/assets/img/manufacturing/bom-operations.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/bom-operations.png">
* Wählen Sie den Artikel für den Sie eine Stückliste erstellen wollen.
* Fügen Sie die Arbeitsgänge, die Sie durchlaufen müssen, um diesen Artikel zu fertigen, in der Tabelle der Arbeitsgänge hinzu. Für jeden Arbeitsgang werden Sie nach einem Arbeitsplatz gefragt. Wenn nötig, müssen Sie neue Arbeitsplätze anlegen.
@@ -23,16 +23,16 @@
* Der Bereich Kostenkalkulation der Stückliste gibt einen ungefähren Wert der Produktionskosten eines Artikels wieder
* Fügen Sie die Liste der Artikel, die Sie für jeden Arbeitsgang benötigen, mit der entsprechenden Menge hinzu. Bei dem Artikel kann es sich um einen Zukaufartikel oder um eine Unterfertigung mit eigener Stückliste handeln. Wenn der Artikel in der Zeile ein gefertigter Artikel ist und mehrere verschiedene Stücklisten hat, wählen Sie die passende Stückliste aus. Sie können auch festlegen, ob ein Teil des Artikels zu Ausschuss wird.
-<img class="screenshot" alt="Kostenkalkulation" src="/docs/assets/img/manufacturing/bom-costing.png">
+<img class="screenshot" alt="Kostenkalkulation" src="{{docs_base_url}}/assets/img/manufacturing/bom-costing.png">
* Diese Kosten können über die Schaltfläche "Kosten aktualisieren" aktualisiert werden.
-<img class="screenshot" alt="Kosten aktualisieren" src="/docs/assets/img/manufacturing/bom-update-cost.png">
+<img class="screenshot" alt="Kosten aktualisieren" src="{{docs_base_url}}/assets/img/manufacturing/bom-update-cost.png">
### Benötigtes Material (aufgelöst)
Diese Tabelle listet alles Material auf, welches benötigt wird um den Artikel zu fertigen. Sie zieht weiterhin Unterbaugruppen mit Menge an.
-<img class="screenshot" alt="Aufgelöste Ansicht" src="/docs/assets/img/manufacturing/bom-exploded.png">
+<img class="screenshot" alt="Aufgelöste Ansicht" src="{{docs_base_url}}/assets/img/manufacturing/bom-exploded.png">
{next}
diff --git a/erpnext/docs/user/manual/de/manufacturing/operation.md b/erpnext/docs/user/manual/de/manufacturing/operation.md
index cc16375..07ca860 100644
--- a/erpnext/docs/user/manual/de/manufacturing/operation.md
+++ b/erpnext/docs/user/manual/de/manufacturing/operation.md
@@ -9,6 +9,6 @@
> Fertigung > Dokumente > Arbeitsgang > Neu
-<img class="screenshot" alt="Arbeitsgang" src="/docs/assets/img/manufacturing/operation.png">
+<img class="screenshot" alt="Arbeitsgang" src="{{docs_base_url}}/assets/img/manufacturing/operation.png">
{next}
diff --git a/erpnext/docs/user/manual/de/manufacturing/production-order.md b/erpnext/docs/user/manual/de/manufacturing/production-order.md
index d93391a..e6ddd7b 100644
--- a/erpnext/docs/user/manual/de/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/de/manufacturing/production-order.md
@@ -7,7 +7,7 @@
> Fertigung > Dokumente > Fertigungsauftrag > Neu
-<img class="screenshot" alt="Fertigungsauftrag" src="/docs/assets/img/manufacturing/production-order.png">
+<img class="screenshot" alt="Fertigungsauftrag" src="{{docs_base_url}}/assets/img/manufacturing/production-order.png">
### Einen Fertigungsauftrag erstellen
@@ -23,11 +23,11 @@
* Als Voreinstellung zieht das System Arbeitsplätze und die Dauer von Arbeitsgängen aus der gewählten Stückliste.
-<img class="screenshot" alt="Fertigungsauftrag - Arbeitsgänge" src="/docs/assets/img/manufacturing/PO-operations.png">
+<img class="screenshot" alt="Fertigungsauftrag - Arbeitsgänge" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations.png">
* Wenn Sie den Arbeitsplatz für einen bestimmten Arbeitsgang im Fertigungsauftrag neu zuordnen möchten, können Sie das tun, bevor Sie den Fertigungsauftrag übertragen.
-<img class="screenshot" alt="Fertigungsauftrag - Arbeitsgänge neu zuordnen" src="/docs/assets/img/manufacturing/PO-reassigning-operations.png">
+<img class="screenshot" alt="Fertigungsauftrag - Arbeitsgänge neu zuordnen" src="{{docs_base_url}}/assets/img/manufacturing/PO-reassigning-operations.png">
* Wählen Sie den betreffenden Arbeitsgang aus und ändern Sie seinen Arbeitsplatz.
* Sie können auch die Dauer des Arbeitsgangs ändern.
@@ -42,28 +42,28 @@
* Das erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um diesen Fertigungsauftrag abzuschliessen. Die Artikel werden an das Fertigungslager übertragen (dieser Prozess fügt basierend auf Ihren Einstellungen Unterbaugruppen mit Stückliste als EINEN Artikel hinzu oder löst die Unterpunkte auf).
* Klicken Sie auf "Material der Fertigung übergeben".
-<img class="screenshot" alt="Materialübertrag" src="/docs/assets/img/manufacturing/PO-material-transfer.png">
+<img class="screenshot" alt="Materialübertrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
* Geben Sie die Menge des Materials an, das übertragen werden soll.
-<img class="screenshot" alt="Materialübertrag - Menge" src="/docs/assets/img/manufacturing/PO-material-transfer-qty.png">
+<img class="screenshot" alt="Materialübertrag - Menge" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-qty.png">
* Übertragen Sie die Lagerbuchung.
-<img class="screenshot" alt="Lagerbuchung zum Kundenauftrag" src="/docs/assets/img/manufacturing/PO-SE-for-material-transfer.png">
+<img class="screenshot" alt="Lagerbuchung zum Kundenauftrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-SE-for-material-transfer.png">
* Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Fertigungsauftrag aktualisiert.
-<img class="screenshot" alt="Lagerbuchung zum Fertigungsauftrag" src="/docs/assets/img/manufacturing/PO-material-transfer-updated.png">
+<img class="screenshot" alt="Lagerbuchung zum Fertigungsauftrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-updated.png">
### Zeitprotokoll erstellen
-* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]<img class="screenshot" alt="Make TL against PO" src="/docs/assets/img/manufacturing/PO-operations-make-tl.png"> mitprotokolliert werden.
+* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]<img class="screenshot" alt="Make TL against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png"> mitprotokolliert werden.
* Zeitprotokolle werden zu den Arbeitsgängen des Fertigungsauftrages erstellt.
* Vorlagen für Zeitprotokolle werden für die eingeplanten Arbeitsgänge zum Zeitpunkt des Übertragens des Fertigungsauftrages erstellt.
* Um weitere Zeitprotokolle zu einem Arbeitsgang zu erstellen, wählen Sie "Zeitprotokoll erstellen" im betreffenden Arbeitsgang aus.
-<img class="screenshot" alt="Zeitprotokoll zum Fertigungsauftrag erstellen" src="/docs/assets/img/manufacturing/PO-operations-make-tl.png">
+<img class="screenshot" alt="Zeitprotokoll zum Fertigungsauftrag erstellen" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png">
### Fertige Erzeugnisse aktualisieren
@@ -71,11 +71,11 @@
* Das erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager "Fertige Erzeugnisse" gutschreibt.
* Klicken Sie auf "Fertige Erzeugnisse aktualisieren".
-<img class="screenshot" alt="Fertigerzeugnisse aktualiseren" src="/docs/assets/img/manufacturing/PO-FG-update.png">
+<img class="screenshot" alt="Fertigerzeugnisse aktualiseren" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
* Geben Sie die Menge des übertragenen Materials an.
-<img class="screenshot" alt="Menge der Fertigerzeugnisse aktualisieren" src="/docs/assets/img/manufacturing/PO-FG-update-qty.png">
+<img class="screenshot" alt="Menge der Fertigerzeugnisse aktualisieren" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update-qty.png">
>Tipp: Sie können einen Fertigungsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren.
@@ -90,7 +90,7 @@
4. Fertigerzeugnisse aktualisieren: Dieser Schritt erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager Fertige Erzeugnisse hinzufügt.
5. Um die zum Fertigungsauftrag erstellten Zeitprotokolle anzusehen, klicken Sie auf "Zeitprotokolle anzeigen".
-<img class="screenshot" alt="Fertigungsauftrag anhalten" src="/docs/assets/img/manufacturing/PO-stop.png">
+<img class="screenshot" alt="Fertigungsauftrag anhalten" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
* Sie können auch einen angehaltenen Fertigungsauftrag wieder weiter laufen lassen.
diff --git a/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
index fdf60b6..8f77716 100644
--- a/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
+++ b/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
@@ -5,7 +5,7 @@
> Fertigung > Einstellungen > Fertigungseinstellungen
-<img class="screenshot" alt="Fertigungseinstellungen" src="/docs/assets/img/manufacturing/manufacturing-settings.png">
+<img class="screenshot" alt="Fertigungseinstellungen" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-settings.png">
Überstunden zulassen: Hier können Sie angeben, ob an Arbeitsplätzen Überstunden erlaubt sind (wichtig zur Planung von Arbeitsgängen außerhalb der Betriebsstunden).
diff --git a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
index 3c0e36f..2796610 100644
--- a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
@@ -11,7 +11,7 @@
2. Erstellen Sie ein Lager für den Lieferanten, damit Sie die übergebenen Artikel nachverfolgen können (möglicherweise geben Sie ja Artikel im Wert einer Monatslieferung außer Haus).
3. Stellen Sie für den bearbeiteten Artikel und der Artikelvorlage den Punkt "Ist Fremdvergabe" auf JA ein.
-<img class="screenshot" alt="Fremdvergabe" src="/docs/assets/img/manufacturing/subcontract.png">
+<img class="screenshot" alt="Fremdvergabe" src="{{docs_base_url}}/assets/img/manufacturing/subcontract.png">
**Schritt 1:** Erstellen Sie für den bearbeiteten Artikel eine Stückliste, die den unbearbeiteten Artikel als Unterartikel enthält. Beispiel: Wenn Sie einen Stift herstellen, wird der bearbeitete Stift mit der Stückliste benannt, wbei der Tintentank, der Knopf und andere Artikel, die in die Fertigung eingehen als Unterartikel verwaltet werden.
diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
index dbe772b..922c32a 100644
--- a/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
+++ b/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
@@ -34,7 +34,7 @@
Um die Stückliste, bei der die Zentraleinheit als Rohmaterial enthalten ist, in der Stückliste des fertigen Produktes zu aktualisieren, können Sie das Stücklisten-Austauschwerkzeug verwenden.
-<img class="screenshot" alt="Stücklistenaustauschwerkzeug" src="/docs/assets/img/manufacturing/bom-replace-tool.png">
+<img class="screenshot" alt="Stücklistenaustauschwerkzeug" src="{{docs_base_url}}/assets/img/manufacturing/bom-replace-tool.png">
In diesem Werkzeug wählen Sie die aktuelle und die neue Stückliste aus. Wenn Sie auf die Schaltfläche "Austauschen" klicken, wird in der Stückliste des fertigen Produktes (Computer) die aktuelle Stückliste der Zentraleinheit durch die neue Stückliste ersetzt.
diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
index b7ef2d0..63e51f8 100644
--- a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
+++ b/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
@@ -12,30 +12,30 @@
> Fertigung > Werkzeuge > Werkzeug zur Fertigungsplanung
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="/docs/assets/img/manufacturing/ppt.png">
+<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt.png">
### Schritt 1: Auswahl und Kundenauftrag
* Wählen Sie einen Kundenauftrag für die Materialanforderung über die Filterfunktion (Zeit, Artikel und Kunde) aus.
* Klicken Sie auf "Kundenaufträge aufrufen" um eine Übersicht zu erhalten.
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="/docs/assets/img/manufacturing/ppt-get-sales-orders.png">
+<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-sales-orders.png">
### Schritt 2: Artikel aus Kundenaufträgen abrufen
Sie können Artikel hinzufügen, entfernen oder die Menge dieser Artikel verändern.
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="/docs/assets/img/manufacturing/ppt-get-item.png">
+<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-item.png">
### Schritt 3: Fertigungsaufträge erstellen
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="/docs/assets/img/manufacturing/ppt-create-production-order.png">
+<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-production-order.png">
### Schritt 4: Materialanfragen erstellen
Erstellen Sie für Artikel mit prognostiziertem Engpass Materialanfragen.
-<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="/docs/assets/img/manufacturing/ppt-create-material-request.png">
+<img class="screenshot" alt="Werkzeug zur Fertigungsplanung" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-material-request.png">
Das Werkzeug zur Fertigungsplanung wird auf zwei Ebenend verwendet:
diff --git a/erpnext/docs/user/manual/de/manufacturing/workstation.md b/erpnext/docs/user/manual/de/manufacturing/workstation.md
index 6584ebc..34e8ac6 100644
--- a/erpnext/docs/user/manual/de/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/de/manufacturing/workstation.md
@@ -9,7 +9,7 @@
> Fertigung > Dokumente > Arbeitsplatz > Neu
-<img class="screenshot" alt="Arbeitsplatz" src="/docs/assets/img/manufacturing/workstation.png">
+<img class="screenshot" alt="Arbeitsplatz" src="{{docs_base_url}}/assets/img/manufacturing/workstation.png">
Geben Sie unter "Arbeitszeit" die Betriebszeiten des Arbeitsplatzes an. Sie können die Betriebszeiten auch mit Hilfe von Schichten angeben. Wenn Sie einen Fertigungauftrag einplanen, prüft das System die Verfügbarkeit des Arbeitsplatzes basierend auf den angegebenen Betrieszeiten.
diff --git a/erpnext/docs/user/manual/de/projects/activity-cost.md b/erpnext/docs/user/manual/de/projects/activity-cost.md
index 25e6452..705846b 100644
--- a/erpnext/docs/user/manual/de/projects/activity-cost.md
+++ b/erpnext/docs/user/manual/de/projects/activity-cost.md
@@ -3,4 +3,4 @@
Die Aktivitätskosten erfassen den Stundensatz und die Kosten eines Mitarbeiters zu einer Aktivitätsart. Dieser Betrag wird beim Erstellen von Zeitprotokollen vom System angezogen. Er wird für die Aufwandsabrechnung des Projektes verwendet.
-<img class="screenshot" alt="Aktivitätskosten" src="/docs/assets/img/project/activity_cost.png">
+<img class="screenshot" alt="Aktivitätskosten" src="{{docs_base_url}}/assets/img/project/activity_cost.png">
diff --git a/erpnext/docs/user/manual/de/projects/activity-type.md b/erpnext/docs/user/manual/de/projects/activity-type.md
index 1e8c534..ff61a76 100644
--- a/erpnext/docs/user/manual/de/projects/activity-type.md
+++ b/erpnext/docs/user/manual/de/projects/activity-type.md
@@ -3,7 +3,7 @@
Unter dem Punkt "Aktivitätsart" wird eine Liste verschiedener Typen von Aktivitäten erstellt zu denen Zeitprotokolle erstellt werden können.
-<img class="screenshot" alt="Aktivitätsart" src="/docs/assets/img/project/activity_type.png">
+<img class="screenshot" alt="Aktivitätsart" src="{{docs_base_url}}/assets/img/project/activity_type.png">
Standardmäßig sind die folgenden Aktivitätsarten angelegt:
diff --git a/erpnext/docs/user/manual/de/projects/project.md b/erpnext/docs/user/manual/de/projects/project.md
index e9ce1b8..a78a91b 100644
--- a/erpnext/docs/user/manual/de/projects/project.md
+++ b/erpnext/docs/user/manual/de/projects/project.md
@@ -3,24 +3,24 @@
Das Projektmanagement in ERPNext ist aufgabengesteuert. Sie können ein Projekt erstellen und ihm mehrere unterschiedliche Aufgaben zuweisen.
-<img class="screenshot" alt="Projekt" src="/docs/assets/img/project/project.png">
+<img class="screenshot" alt="Projekt" src="{{docs_base_url}}/assets/img/project/project.png">
### Aufgaben verwalten
Ein Projekt kann in mehrere verschiedene Aufgaben aufgeteilt werden.
Eine Aufgabe kann über das Projektdokument selbst erstellt werden oder über die Schaltfläche [Aufgabe](/docs/user/manual/de/projects/tasks.html).
-<img class="screenshot" alt="Projekt" src="/docs/assets/img/project/project_task.png">
+<img class="screenshot" alt="Projekt" src="{{docs_base_url}}/assets/img/project/project_task.png">
* Um eine Aufgabe, die zu einem Projekt erstellt wurde, anzusehen, klicken Sie auf "Aufgabe",
-<img class="screenshot" alt="Projekt - Aufgabe ansehen" src="/docs/assets/img/project/project_view_task.png">
+<img class="screenshot" alt="Projekt - Aufgabe ansehen" src="{{docs_base_url}}/assets/img/project/project_view_task.png">
-<img class="screenshot" alt="Projekt - List der Aufgaben" src="/docs/assets/img/project/project_task_list.png">
+<img class="screenshot" alt="Projekt - List der Aufgaben" src="{{docs_base_url}}/assets/img/project/project_task_list.png">
* Sie können Aufgaben auch über das Projektdokument selbst ansehen.
-<img class="screenshot" alt="Projekt - Aufgabenmatrix" src="/docs/assets/img/project/project_task_grid.png">
+<img class="screenshot" alt="Projekt - Aufgabenmatrix" src="{{docs_base_url}}/assets/img/project/project_task_grid.png">
### Zeitmanagement
@@ -28,13 +28,13 @@
* Um ein Zeitprotokoll zu einem Projekt anzusehen, klicken Sie auf "Zeitprotokolle"
-<img class="screenshot" alt="Projekt - Zeitprotokoll ansehen" src="/docs/assets/img/project/project_view_time_log.png">
+<img class="screenshot" alt="Projekt - Zeitprotokoll ansehen" src="{{docs_base_url}}/assets/img/project/project_view_time_log.png">
-<img class="screenshot" alt="Projekt - Übersicht der Zeitprotokolle" src="/docs/assets/img/project/project_time_log_list.png">
+<img class="screenshot" alt="Projekt - Übersicht der Zeitprotokolle" src="{{docs_base_url}}/assets/img/project/project_time_log_list.png">
* Sie können ein Zeitprotokoll auch direkt erstellen und mit dem Projekt verknüpfen.
-<img class="screenshot" alt="Projekt - Zeitprotokoll verknüpfen" src="/docs/assets/img/project/project_time_log_link.png">
+<img class="screenshot" alt="Projekt - Zeitprotokoll verknüpfen" src="{{docs_base_url}}/assets/img/project/project_time_log_link.png">
### Aufwände verwalten
@@ -42,27 +42,27 @@
* Um die Aufwandsabrechnungen zu einem Projekt anzusehen, klicken Sie auf "Aufwandsabrechnung".
-<img class="screenshot" alt="Projekt - Aufwandsabrechnung ansehen" src="/docs/assets/img/project/project_view_expense_claim.png">
+<img class="screenshot" alt="Projekt - Aufwandsabrechnung ansehen" src="{{docs_base_url}}/assets/img/project/project_view_expense_claim.png">
* Sie könne Aufwandsabrechnungen auch direkt erstellen und mit einem Projekt verknüpfen.
-<img class="screenshot" alt="Projekt - Aufwandsabrechnung verknüpfen" src="/docs/assets/img/project/project_expense_claim_link.png">
+<img class="screenshot" alt="Projekt - Aufwandsabrechnung verknüpfen" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
* Der Gesamtbetrag der mit einem Projekt verbuchten Aufwandsabrechnungen wird unter "Gesammtsumme der Aufwandsabrechnungen" im Abschnitt "Kostenabrechnung" angezeigt.
-<img class="screenshot" alt="Projekt - Gesamtsumme Aufwandsabrechnung" src="/docs/assets/img/project/project_total_expense_claim.png">
+<img class="screenshot" alt="Projekt - Gesamtsumme Aufwandsabrechnung" src="{{docs_base_url}}/assets/img/project/project_total_expense_claim.png">
### Kostenstelle
Sie können zu einem Projekt eine [Kostenstelle](/docs/user/manual/de/accounts/setup/cost-center.html) erstellen oder Sie können eine existierende Kostenstelle verwenden um alle Aufwände die zu einem Projekt entstehen mitzuverfolgen.
-<img class="screenshot" alt="Projekt - Kostenstelle" src="/docs/assets/img/project/project_cost_center.png">
+<img class="screenshot" alt="Projekt - Kostenstelle" src="{{docs_base_url}}/assets/img/project/project_cost_center.png">
### Projektkostenabrechnung
Der Abschnitt Projektkostenabrechnung hilft Ihnen dabei, die Zeit und die AUfwände die in einem Projekt anfallen, nachzuverfolgen.
-<img class="screenshot" alt="Projekt - Kostenabrechnung" src="/docs/assets/img/project/project_costing.png">
+<img class="screenshot" alt="Projekt - Kostenabrechnung" src="{{docs_base_url}}/assets/img/project/project_costing.png">
* Der Abschnitt Kostenabrechnung wird basierend auf den Zeitprotokollen aktualisiert.
* Die Bruttospanne ist die Differenz zwischen dem Betrag der gesamten Kosten und dem Gesamtbetrag der Rechnung.
@@ -71,7 +71,7 @@
Sie können einen [Kundenauftrag](/docs/user/manual/de/selling/sales-order.html) zu einem Projekt erstellen bzw. ihn mit dem Projekt verknüpfen. Wenn er einmal verlinkt ist, können Sie das Vertriebsmodul dazu nutzen, dass Projekt mit Ihrem Kunden abzurechnen.
-<img class="screenshot" alt="Projekt - Kundenauftrag" src="/docs/assets/img/project/project_sales_order.png">
+<img class="screenshot" alt="Projekt - Kundenauftrag" src="{{docs_base_url}}/assets/img/project/project_sales_order.png">
### Gantt-Diagramm
@@ -79,8 +79,8 @@
* Um ein Gantt-Diagramm zu einem Projekt anzusehen, gehen Sie zu diesem Projekt und klicken Sie auf "Gantt-Diagramm".
-<img class="screenshot" alt="Projekt - Gantt-Diagramm ansehen" src="/docs/assets/img/project/project_view_gantt_chart.png">
+<img class="screenshot" alt="Projekt - Gantt-Diagramm ansehen" src="{{docs_base_url}}/assets/img/project/project_view_gantt_chart.png">
-<img class="screenshot" alt="Projekt - Gantt-Diagramm" src="/docs/assets/img/project/project_gantt_chart.png">
+<img class="screenshot" alt="Projekt - Gantt-Diagramm" src="{{docs_base_url}}/assets/img/project/project_gantt_chart.png">
[next]
diff --git a/erpnext/docs/user/manual/de/projects/tasks.md b/erpnext/docs/user/manual/de/projects/tasks.md
index 75fd594..f0358aa 100644
--- a/erpnext/docs/user/manual/de/projects/tasks.md
+++ b/erpnext/docs/user/manual/de/projects/tasks.md
@@ -3,13 +3,13 @@
Ein Projekt wird in Aufgaben unterteilt. In ERPNext können Sie auch Abhängigkeiten zwischen Aufgaben erstellen.
-<img class="screenshot" alt="Aufgabe" src="/docs/assets/img/project/task.png">
+<img class="screenshot" alt="Aufgabe" src="{{docs_base_url}}/assets/img/project/task.png">
### Status der Aufgabe
Ein Aufgabe kann folgende Stati haben: "Offen", "In Arbeit", "Wartet auf Überprüfung", "Geschlossen" und "Abgebrochen".
-<img class="screenshot" alt="Aufgabe - Status" src="/docs/assets/img/project/task_status.png">
+<img class="screenshot" alt="Aufgabe - Status" src="{{docs_base_url}}/assets/img/project/task_status.png">
* Standardmäßig sollte jede neu erstellte Aufgabe den Status "Offen" haben.
* Wenn ein Zeitprotokoll für eine Aufgabe erstellt wird, sollte ihr Status "In Arbeit" sein.
@@ -18,7 +18,7 @@
Sie können eine Liste von abhängigen Aufgaben im Bereich "Hängt ab von" erstellen.
-<img class="screenshot" alt="Anhängigkeiten" src="/docs/assets/img/project/task_depends_on.png">
+<img class="screenshot" alt="Anhängigkeiten" src="{{docs_base_url}}/assets/img/project/task_depends_on.png">
* Sie können eine übergeordnete Aufgabe nicht abschliessen bis alle abhängigen Aufgaben abgeschlossen sind.
* Wenn sich die abhängige Aufgabe verzögert und sich mit dem voraussichtlichen Startdatum der übergeordneten Aufgabe überlappt, überarbeitet das System die übergeordnete Aufgabe.
@@ -29,13 +29,13 @@
* Um ein zu einer Aufgabe erstelltes Zeitprotokoll anzuschauen, klicken Sie auf "Zeitprotokolle".
-<img class="screenshot" alt="Aufgabe - Zeitprotokoll ansehen" src="/docs/assets/img/project/task_view_time_log.png">
+<img class="screenshot" alt="Aufgabe - Zeitprotokoll ansehen" src="{{docs_base_url}}/assets/img/project/task_view_time_log.png">
-<img class="screenshot" alt="Aufgabe - Liste der Zeitprotokolle" src="/docs/assets/img/project/task_time_log_list.png">
+<img class="screenshot" alt="Aufgabe - Liste der Zeitprotokolle" src="{{docs_base_url}}/assets/img/project/task_time_log_list.png">
* Sie können ein Zeitprotokoll auch direkt erstellen und mit einer Aufgabe verknüpfen.
-<img class="screenshot" alt="Aufgabe - Zeitprotokoll verknüpfen" src="/docs/assets/img/project/task_time_log_link.png">
+<img class="screenshot" alt="Aufgabe - Zeitprotokoll verknüpfen" src="{{docs_base_url}}/assets/img/project/task_time_log_link.png">
### Ausgabenmanagement
@@ -43,15 +43,15 @@
* Um eine Aufwandsabrechnung, die zu einer Aufgabe erstellt wurde, anzuschauen, klicken Sie auf "Aufwandsabrechnung".
-<img class="screenshot" alt="Aufgabe - Aufwandsabrechnung ansehen" src="/docs/assets/img/project/task_view_expense_claim.png">
+<img class="screenshot" alt="Aufgabe - Aufwandsabrechnung ansehen" src="{{docs_base_url}}/assets/img/project/task_view_expense_claim.png">
* Sie können eine Aufwandsabrechnung auch direkt erstellen und sie mit einer Aufgabe verknüpfen.
-<img class="screenshot" alt="Aufgabe - Aufwandsabrechnung verknüpfen" src="/docs/assets/img/project/task_expense_claim_link.png">
+<img class="screenshot" alt="Aufgabe - Aufwandsabrechnung verknüpfen" src="{{docs_base_url}}/assets/img/project/task_expense_claim_link.png">
* Der Gesamtbetrag der Aufwandsabrechnungen zu einer Aufgabe wird unter "Gesamtbetrag der Aufwandsabrechnungen" im Abschnitt Kostenabrechnung angezeigt.
-<img class="screenshot" alt="Aufgabe - Gesamtsumme Aufwandsabrechnung" src="/docs/assets/img/project/task_total_expense_claim.png">
+<img class="screenshot" alt="Aufgabe - Gesamtsumme Aufwandsabrechnung" src="{{docs_base_url}}/assets/img/project/task_total_expense_claim.png">
{next}
diff --git a/erpnext/docs/user/manual/de/projects/time-log-batch.md b/erpnext/docs/user/manual/de/projects/time-log-batch.md
index 4383e1c..6aa85cb 100644
--- a/erpnext/docs/user/manual/de/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/de/projects/time-log-batch.md
@@ -9,17 +9,17 @@
Öffnen Sie einfach Ihre Übersicht der Zeitprotokolle und kreuzen Sie die Artikel an, die Sie dem Zeitprotokollstapel hinzufügen möchten. Klicken Sie dann auf die Schaltfläche "Zeitprotokollstapel erstellen" und diese Zeitprotokolle werden ausgewählt.
-<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="/docs/assets/img/project/time_sheet.gif">
+<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_sheet.gif">
### Ausgangsrechnungen erstellen
* Sobald Sie einen Zeitprotokollstapel übertragen haben, sollte die Schaltfläche "Rechnung erstellen" erscheinen.
-<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="/docs/assets/img/project/time_sheet_make_invoice.png">
+<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_sheet_make_invoice.png">
* Klicken Sie auf diese Schaltfläche und erstellen Sie eine Ausgangsrechnung zu einem Zeitprotokollstapel.
-<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="/docs/assets/img/project/time_sheet_sales_invoice.png">
+<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_sheet_sales_invoice.png">
* Wenn Sie die Ausgangsrechnung "übertragen", wird die Nummer der Ausgangsrechnung in den Zeitprotokollen und im Zeitprotokollstapel aktualisiert und ihr Status wird auf "abgerechnet" geändert.
diff --git a/erpnext/docs/user/manual/de/projects/time-log.md b/erpnext/docs/user/manual/de/projects/time-log.md
index 072837e..fcfccc6 100644
--- a/erpnext/docs/user/manual/de/projects/time-log.md
+++ b/erpnext/docs/user/manual/de/projects/time-log.md
@@ -9,7 +9,7 @@
* Projekte
* Interne Referenzen
-<img class="screenshot" alt="Zeitprotokoll" src="/docs/assets/img/project/time_log.png">
+<img class="screenshot" alt="Zeitprotokoll" src="{{docs_base_url}}/assets/img/project/time_log.png">
### Zeitprotokolle erstellen
@@ -21,15 +21,15 @@
Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll" und wählen Sie "Kalender" aus.
-<img class="screenshot" alt="Zeitprotokoll - Kalender ansehen" src="/docs/assets/img/project/time_log_view_calendar.png">
+<img class="screenshot" alt="Zeitprotokoll - Kalender ansehen" src="{{docs_base_url}}/assets/img/project/time_log_view_calendar.png">
* Um ein Zeitprotokoll für mehrere Tage zu erstellen, klicken Sie und ziehen Sie den Mauszeiger über die Tage.
-<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="/docs/assets/img/project/time_log_calendar_day.gif">
+<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_log_calendar_day.gif">
* Sie können Zeitprotokolle auch aus der Wochen- oder Tagesansicht des Kalender heraus erstellen.
-<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="/docs/assets/img/project/time_log_calendar_week.gif">
+<img class="screenshot" alt="Zeitprotokoll - Kalender aufziehen" src="{{docs_base_url}}/assets/img/project/time_log_calendar_week.gif">
* Zeitprotokolle für Fertigungsprozesse müssen aus dem Fertigungsauftrag heraus erstellt werden.
* Um mehrere Zeitprotokolle zu Arbeitsgängen zu erstellen wählen Sie den entsprechenden Arbeitsgang und klicken Sie auf "Zeitprotokoll erstellen".
@@ -41,7 +41,7 @@
* Das System kalkuliert dann den Rechnungsbetrag basierend auf den im Zeitprotokoll angegebenen Stunden.
* Wenn "Abrechenbar" nicht markiert wurde, zeigt das System beim "Rechnungsbetrag" 0 an.
-<img class="screenshot" alt="Zeitprotokoll - Abrechnung" src="/docs/assets/img/project/time_log_costing.png">
+<img class="screenshot" alt="Zeitprotokoll - Abrechnung" src="{{docs_base_url}}/assets/img/project/time_log_costing.png">
* Nach dem Übertragen des Zeitprotokolls müssen Sie einen [Zeitprotokollstapel](/docs/user/manual/de/projects/time-log-batch.html) erstellen um mit der Abrechnung fortfahren zu können.
diff --git a/erpnext/docs/user/manual/de/selling/quotation.md b/erpnext/docs/user/manual/de/selling/quotation.md
index 94ff78b..6097abd 100644
--- a/erpnext/docs/user/manual/de/selling/quotation.md
+++ b/erpnext/docs/user/manual/de/selling/quotation.md
@@ -11,11 +11,11 @@
Sie können auch ein Angebot aus einer Opportunity heraus erstellen.
-<img class="screenshot" alt="Angebot aus Opportunity erstellen" src="/docs/assets/img/selling/make-quote-from-opp.png">
+<img class="screenshot" alt="Angebot aus Opportunity erstellen" src="{{docs_base_url}}/assets/img/selling/make-quote-from-opp.png">
Oder Sie erstellen ein neues Angebot und übernehmen Details aus der Opportunity.
-<img class="screenshot" alt="Angebot aus Opportunity erstellen" src="/docs/assets/img/selling/make-quotation.gif">
+<img class="screenshot" alt="Angebot aus Opportunity erstellen" src="{{docs_base_url}}/assets/img/selling/make-quotation.gif">
Ein Angebot enthält Informationen über:
diff --git a/erpnext/docs/user/manual/de/selling/sales-order.md b/erpnext/docs/user/manual/de/selling/sales-order.md
index d980518..187aeab 100644
--- a/erpnext/docs/user/manual/de/selling/sales-order.md
+++ b/erpnext/docs/user/manual/de/selling/sales-order.md
@@ -9,7 +9,7 @@
### Flußdiagramm des Kundenauftrags
-<img class="screenshot" alt="Kundenauftrag aus Angebot erstellen" src="/docs/assets/img/selling/sales-order-f.jpg">
+<img class="screenshot" alt="Kundenauftrag aus Angebot erstellen" src="{{docs_base_url}}/assets/img/selling/sales-order-f.jpg">
Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag
@@ -17,11 +17,11 @@
Sie können einen Kundenauftrag auch aus einem übertragenen Angebot heraus erstellen.
-<img class="screenshot" alt="Kundenauftrag aus Angebot erstellen" src="/docs/assets/img/selling/make-SO-from-quote.png">
+<img class="screenshot" alt="Kundenauftrag aus Angebot erstellen" src="{{docs_base_url}}/assets/img/selling/make-SO-from-quote.png">
Oder Sie erstellen einen neuen Kundenauftrag und entnehmen die Details aus dem Angebot.
-<img class="screenshot" alt="Kundenauftrag aus Angebot erstellen" src="/docs/assets/img/selling/make-so.gif">
+<img class="screenshot" alt="Kundenauftrag aus Angebot erstellen" src="{{docs_base_url}}/assets/img/selling/make-so.gif">
Die meisten Informationen im Kundenauftrag sind dieselben wie im Angebot. Einige Dinge möchte der Kundenauftrag aber aktualisiert haben.
@@ -60,7 +60,7 @@
ERPNext erstellt automatisch eine neue Bestellung und versendet eine E-Mail-Mitteilung an die E-Mail-Konten, die Sie im Feld "Benachrichtigungs-E-Mail-Adresse" eingestellt haben.
-<img class="screenshot" alt="Wiederkehrende Kundenaufträge" src="/docs/assets/img/selling/recurring-sales-order.png">
+<img class="screenshot" alt="Wiederkehrende Kundenaufträge" src="{{docs_base_url}}/assets/img/selling/recurring-sales-order.png">
### Die nächsten Schritte
diff --git a/erpnext/docs/user/manual/de/selling/setup/product-bundle.md b/erpnext/docs/user/manual/de/selling/setup/product-bundle.md
index d97b31d..30475eb 100644
--- a/erpnext/docs/user/manual/de/selling/setup/product-bundle.md
+++ b/erpnext/docs/user/manual/de/selling/setup/product-bundle.md
@@ -11,7 +11,7 @@
> Vertrieb > Einstellungen > Produkt-Bundle > Neu
-<img class="screenshot" alt="Produkt-Bundle" src="/docs/assets/img/selling/product-bundle.png">
+<img class="screenshot" alt="Produkt-Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.png">
### Hauptartikel auswählen
@@ -27,7 +27,7 @@
Wenn Vertriebstransaktionen erstellt werden, wie z. B. Ausgangsrechnung, Kundenauftrag und Lieferschein, dann wird der übergeordnete Artikel aus der Hauptartikelliste ausgewählt.
-<img class="screenshot" alt="Produkt-Bundle" src="/docs/assets/img/selling/product-bundle.gif">
+<img class="screenshot" alt="Produkt-Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.gif">
Beim Auswählen des übergeordneten Artikels aus der Hauptartikelliste werden die Unterartikel aus der Tabelle "Packliste" der Transaktion angezogen. Wenn der Unterartikel ein serialisierter Artikel ist, können Sie seine Seriennummer direkt in der Packlistentabelle angeben. Wenn die Transaktion versendet wird, reduziert das System den Lagerbestand der Unterartikel auf dem Lager der in der Packlistentabelle angegeben ist.
diff --git a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
index c4d096e..66a95a0 100644
--- a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
@@ -13,7 +13,7 @@
Vertriebspartner werden mit einem vom Benutzer vergebenen Namen abgespeichert.
-<img class="screenshot" alt="Vertriebspartner" src="/docs/assets/img/selling/sales-partner.png">
+<img class="screenshot" alt="Vertriebspartner" src="{{docs_base_url}}/assets/img/selling/sales-partner.png">
Sie können die Adressen und Kontaktdaten von Vertriebsmitarbeitern erfassen und sie basierend auf Menge und Betrag jeder Artikelgruppe zuweisen.
@@ -21,13 +21,13 @@
Um die Namen Ihrer Partner auf Ihrer Webseite anzuzeigen, aktivieren Sie "Auf der Webseite anzeigen". Wenn Sie diese Option anklicken, erscheint ein Feld, über das Sie das Logo Ihres Partners und eine kurze Beschreibung eingeben können.
-<img class="screenshot" alt="Vertriebspartner" src="/docs/assets/img/selling/sales-partner-website.png">
+<img class="screenshot" alt="Vertriebspartner" src="{{docs_base_url}}/assets/img/selling/sales-partner-website.png">
Um eine Übersicht Ihrer Partner zu erhalten, gehen Sie zu:
https://example.erpnext.com/Partners
-<img class="screenshot" alt="Auflistung der Vertriebspartner" src="/docs/assets/img/crm/sales-partner-listing.png">
+<img class="screenshot" alt="Auflistung der Vertriebspartner" src="{{docs_base_url}}/assets/img/crm/sales-partner-listing.png">
{next}
diff --git a/erpnext/docs/user/manual/de/selling/setup/selling-settings.md b/erpnext/docs/user/manual/de/selling/setup/selling-settings.md
index 08492a6..0e71d41 100644
--- a/erpnext/docs/user/manual/de/selling/setup/selling-settings.md
+++ b/erpnext/docs/user/manual/de/selling/setup/selling-settings.md
@@ -3,7 +3,7 @@
In den Vertriebseinstellungen können Sie Eigenheiten angeben, die bei Ihren Vertriebstransaktionen mit berücksichtigt werden. Im Folgenden sprechen wir jeden einzelnen Punkt an.
-<img class="screenshot" alt="Vertriebseinstellungen" src="/docs/assets/img/selling/selling-settings.png">
+<img class="screenshot" alt="Vertriebseinstellungen" src="{{docs_base_url}}/assets/img/selling/selling-settings.png">
### 1\. Benennung der Kunden nach
diff --git a/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md
index 8bf609d..fc59f02 100644
--- a/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md
+++ b/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md
@@ -3,6 +3,6 @@
Wenn Sie eine Versandregel verwenden, können Sie die Kosten der Lieferung des Produktes an einen Kunden festlegen. Sie können für den gleichen Artikel für verschiedene Regionen verschiedene Versandregeln definieren.
-<img class="screenshot" alt="Versandregel" src="/docs/assets/img/selling/shipping-rule.png">
+<img class="screenshot" alt="Versandregel" src="{{docs_base_url}}/assets/img/selling/shipping-rule.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/authorization-rule.md b/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
index bcc5674..7b202f1 100644
--- a/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
+++ b/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
@@ -37,7 +37,7 @@
Geben Sie "Autorisierter Wert" ein. Im Beispiel stellen wir das auf 10.000 Euro ein.
-<img class="screenshot" alt="Autorisierungsregel" src="/docs/assets/img/setup/auth-rule.png">
+<img class="screenshot" alt="Autorisierungsregel" src="{{docs_base_url}}/assets/img/setup/auth-rule.png">
Wenn ein Benutzer aus dem Vertrieb versucht eine Kundenbestellung mit einem Wert über 10.000 Euro zu übertragen, dann bekommt er eine Fehlermeldung.
diff --git a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
index 851424a..c793463 100644
--- a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
@@ -13,4 +13,4 @@
Um mehrere Datensätze umzubenennen, laden Sie eine CSV-Datei mit den alten Namen in der ersten Spalte und den neuen Namen in der zweiten Spalte hoch indem Sie auf "Hochladen" klicken.
-<img class="screenshot" alt="Bulk Rename" src="/docs/assets/img/setup/data/rename.png">
\ No newline at end of file
+<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
index 1ea4e48..a3fccc5 100644
--- a/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
@@ -5,7 +5,7 @@
Um das Werkzeug zum Datenimport zu öffnen, gehen Sie entweder zu den Einstellungen oder zur Transaktion, für die Sie importieren wollen. Wenn der Datenimport erlaubt ist, sehen Sie eine Importschaltfläche:
-<img alt="Importvorgang starten" class="screenshot" src="/docs/assets/img/setup/data-import/data-import-1.png">
+<img alt="Importvorgang starten" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-1.png">
Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und einen zweiten um Daten hoch zu laden.
@@ -15,7 +15,7 @@
Daten werden in ERPNext in Tabellen gespeichert, sehr ähnlich einer Tabellenkalkulation mit Spalten und Zeilen voller Daten. Jede Instanz in ERPNext kann mehrere verschiedene mit Ihr verbundene Untertabellen haben. Die Untertabellen sind mit Ihren übergeordneten Tabellen verknüpft und werden dort eingesetzt, wo es für eine Eigenschaft mehrere verschiedene Werte gibt. So kann z. B. ein Artikel mehrere verschiedene Preise haben, eine Rechnung hat mehrere verschiedene Artikel usw.
-<img alt="Vorlage herunterladen" class="screenshot" src="/docs/assets/img/setup/data-import/data-import-2.png">
+<img alt="Vorlage herunterladen" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-2.png">
* Klicken Sie auf die Tabelle, die Sie herunter laden wollen, oder auf "Alle Tabellen".
* Für Massenbearbeitung klicken Sie auf "Mit Daten herunterladen".
@@ -34,7 +34,7 @@
Fügen Sie abschliessend die CSV-Datei im Abschnitt Import hinzu. Klicken Sie auf die Schaltfläche "Hochladen und Importieren".
-<img alt="Upload" class="screenshot" src="/docs/assets/img/setup/data-import/data-import-3.png">
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-3.png">
#### Anmerkungen
diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-account.md b/erpnext/docs/user/manual/de/setting-up/email/email-account.md
index 1a315d2..e2923f6 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/email-account.md
@@ -11,7 +11,7 @@
Es gibt zwei Arten von E-Mail-Konten, ausgehend und eingehend. E-Mail-Konten für ausgehende E-Mails verwenden einen SMTP-Service, eingehende E-Mails verwenden einen POP-Service. Die meisten E-Mail-Anbieter wie GMail, Outlook oder Yahoo bieten diese Seriveleistungen an.
-<img class="screenshot" alt="Kriterien definieren" src="/docs/assets/img/setup/email/email-account-list.png">
+<img class="screenshot" alt="Kriterien definieren" src="{{docs_base_url}}/assets/img/setup/email/email-account-list.png">
### Konten zu ausgehenden E-Mails
@@ -19,13 +19,13 @@
Um ein Konto für ausgehende E-Mails einzurichten, markieren Sie die Option **Ausgehend aktivieren** und geben Sie die Einstellungen zum SMTP-Server an. Wenn Sie einen bekannten E-Mail-Service nutzen, wird das vom System für Sie voreingestellt.
-<img class="screenshot" alt="Ausgehende E-Mails" src="/docs/assets/img/setup/email/email-account-sending.png">
+<img class="screenshot" alt="Ausgehende E-Mails" src="{{docs_base_url}}/assets/img/setup/email/email-account-sending.png">
### Konten zu eingehenden E-Mails
Um ein Konto für eingehende E-Mails einzurichten, markieren Sie die Option **Eingehend aktivieren** und geben Sie die Einstellungen zum POP3-Server an. Wenn Sie einen bekannten E-Mail-Service nutzen, wird das vom System für Sie voreingestellt.
-<img class="screenshot" alt="Eingehende E-Mails" src="/docs/assets/img/setup/email/email-account-incoming.png">
+<img class="screenshot" alt="Eingehende E-Mails" src="{{docs_base_url}}/assets/img/setup/email/email-account-incoming.png">
### Wie ERPNext Antworten handhabt
@@ -35,6 +35,6 @@
Wenn Sie möchten, dass ERPNext Sie benachrichtigt, wenn eine E-Mail für eine bestimmte Zeit unbeantwortet bleibt, dann können Sie die Option **Benachrichtigen, wenn unbeantwortet** markieren. Hier können Sie die Anzahl der Minuten einstellen, die das System warten soll, bevor eine Benachrichtigung gesendet wird, und den Empfänger.
-<img class="screenshot" alt="Eingehende Email" src="/docs/assets/img/setup/email/email-account-unreplied.png">
+<img class="screenshot" alt="Eingehende Email" src="{{docs_base_url}}/assets/img/setup/email/email-account-unreplied.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
index c965c9b..58f6fe3 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
@@ -32,7 +32,7 @@
---
#### Beispiel
-1. [Kriterien definieren](<img class="screenshot" src="/docs/assets/img/setup/email/email-alert-1.png">)
-2. [Empfänger und Nachrichtentext eingeben](<img class="screenshot" src="/docs/assets/img/setup/email/email-alert-2.png">)
+1. [Kriterien definieren](<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/email/email-alert-1.png">)
+2. [Empfänger und Nachrichtentext eingeben](<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/email/email-alert-2.png">)
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-digest.md b/erpnext/docs/user/manual/de/setting-up/email/email-digest.md
index 9199ee2..18117a3 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/email-digest.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/email-digest.md
@@ -13,6 +13,6 @@
Stellen Sie ein, wie oft Sie eine Benachrichtigung erhalten wollen, markieren Sie alle Artikel, über die Sie in Ihrer wöchentlichen Aktualisierung benachrichtig werden wollen und wählen Sie die Benutzer-IDs aus, an die die Zusammenfassung gesendet werden soll.
-<img class="screenshot" alt="E-Mail-Bericht" src="/docs/assets/img/setup/email/email-digest.png">
+<img class="screenshot" alt="E-Mail-Bericht" src="{{docs_base_url}}/assets/img/setup/email/email-digest.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/email/sending-email.md b/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
index e1f23b9..970d257 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
@@ -3,7 +3,7 @@
In ERPNext können sie jedes beliebige Dokument per E-Mail versenden (als PDF-Anhang) indem Sie in einem beliebigen geöffneten Dokument auf `Menü > E-Mail` gehen.
-<img class="screenshot" alt="Emails versenden" src="/docs/assets/img/setup/email/send-email.gif">
+<img class="screenshot" alt="Emails versenden" src="{{docs_base_url}}/assets/img/setup/email/send-email.gif">
**Anmerkung:** Es müssen Konten zum [E-Mail-Versand](/docs/user/manual/de/setting-up/email/email-account.html) eingerichtet sein.
diff --git a/erpnext/docs/user/manual/de/setting-up/pos-setting.md b/erpnext/docs/user/manual/de/setting-up/pos-setting.md
index b75f96c..1849911 100644
--- a/erpnext/docs/user/manual/de/setting-up/pos-setting.md
+++ b/erpnext/docs/user/manual/de/setting-up/pos-setting.md
@@ -9,7 +9,7 @@
Setzen Sie die Standardeinstellungen wie definiert.
-<img class="screenshot" alt="POS-Einstellungen" src="/docs/assets/img/pos-setting/pos-setting.png">
+<img class="screenshot" alt="POS-Einstellungen" src="{{docs_base_url}}/assets/img/pos-setting/pos-setting.png">
> Wichtig: Wenn Sie einen bestimmten Benutzer angeben, werden die POS-Einstellungen nur auf diesen Benutzer angewendet. Wenn diese Optin leer bleibt, werden die Einstellungen auf alle Benutzer angewendet. Um mehr über POS zu erfahren, gehen Sie zu POS.
diff --git a/erpnext/docs/user/manual/de/setting-up/price-lists.md b/erpnext/docs/user/manual/de/setting-up/price-lists.md
index 6fc5f08..b58e191 100644
--- a/erpnext/docs/user/manual/de/setting-up/price-lists.md
+++ b/erpnext/docs/user/manual/de/setting-up/price-lists.md
@@ -11,7 +11,7 @@
> Vertrieb/Einkauf/Lagerbestand > Einstellungen > Preisliste > Neu
-<img class="screenshot" alt="Preisliste" src="/docs/assets/img/price-list/price-list.png">
+<img class="screenshot" alt="Preisliste" src="{{docs_base_url}}/assets/img/price-list/price-list.png">
* Diese Preislisten werden verwendet, wenn der Datensatz zum Artikelpreis erstellt wird, um den Verkaufs- oder Einkaufspreis eines Artikels nachvollziehen zu können. Klicken Sie hier, wenn Sie mehr über Artikelpreise erfahren wollen.
* Um eine bestimmte Preisliste zu deaktivieren, deaktivieren Sie das Feld "Aktiviert" im der Preisliste. Die deaktivierte Preisliste ist dann in der Auswahl nicht mehr in Verkaufs- oder Einkaufstransaktionen verfügbar.
diff --git a/erpnext/docs/user/manual/de/setting-up/print/address-template.md b/erpnext/docs/user/manual/de/setting-up/print/address-template.md
index 0622e0c..b3f37f7 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/address-template.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/address-template.md
@@ -28,6 +28,6 @@
### Beispiel
-<img class="screenshot" alt="Adressvorlage" src="/docs/assets/img/setup/print/address-format.png">
+<img class="screenshot" alt="Adressvorlage" src="{{docs_base_url}}/assets/img/setup/print/address-format.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/print/letter-head.md b/erpnext/docs/user/manual/de/setting-up/print/letter-head.md
index e08da28..cc05b85 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/letter-head.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/letter-head.md
@@ -15,10 +15,10 @@
#### Beispiel
-<img class="screenshot" alt="Briefkopf" src="/docs/assets/img/setup/print/letter-head.png">
+<img class="screenshot" alt="Briefkopf" src="{{docs_base_url}}/assets/img/setup/print/letter-head.png">
So sieht der Briefkopf eines Ausdruckes aus:
-<img class="screenshot" alt="Briefkopf" src="/docs/assets/img/setup/print/letter-head-1.png">
+<img class="screenshot" alt="Briefkopf" src="{{docs_base_url}}/assets/img/setup/print/letter-head-1.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md
index 14ba200..e4236ae 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md
@@ -11,19 +11,19 @@
### Schritt 1: Erstellen Sie ein neues Format
-<img class="screenshot" alt="E-Mail senden" src="/docs/assets/img/setup/print/print-format-builder-1.gif">
+<img class="screenshot" alt="E-Mail senden" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-1.gif">
### Schritt 2: Ein neues Feld hinzufügen
Um ein Feld hinzuzufügen, nehmen Sie es auf der linken Seitenleiste mit der Maus auf und fügen Sie es Ihrem Layout hinzu. Sie können das Layout bearbeiten, indem Sie auf das Symbol für Einstellungen klicken.
-<img class="screenshot" alt="E-Mail senden" src="/docs/assets/img/setup/print/print-format-builder-2.gif">
+<img class="screenshot" alt="E-Mail senden" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-2.gif">
### Schritt 3: Ein Feld entfernen
Um ein Feld zu entfernen, legen Sie es einfach zurück in die Seitenleiste.
-<img class="screenshot" alt="E-Mail senden" src="/docs/assets/img/setup/print/print-format-builder-3.gif">
+<img class="screenshot" alt="E-Mail senden" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-3.gif">
### Schritt 4
@@ -31,7 +31,7 @@
Klicken Sie dann auf **HTML bearbeiten** um den Inhalt zu bearbeiten.
-<img class="screenshot" alt="E-Mail senden" src="/docs/assets/img/setup/print/print-format-builder-4.gif">
+<img class="screenshot" alt="E-Mail senden" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-4.gif">
Um Ihr Format abzuspeichern klicken Sie einfach auf die Schaltfläche **Speichern**.
diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-headings.md b/erpnext/docs/user/manual/de/setting-up/print/print-headings.md
index b695a3c..cf6b48a 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/print-headings.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/print-headings.md
@@ -9,10 +9,10 @@
#### Abbildung 1: Druckköpfe abspeichern
-<img class="screenshot" alt="Druckköpfe" src="/docs/assets/img/setup/print/print-heading.png">
+<img class="screenshot" alt="Druckköpfe" src="{{docs_base_url}}/assets/img/setup/print/print-heading.png">
Hier ist ein Beispiel abgebildet, wie man einen Druckkopf auswechselt:
-<img class="screenshot" alt="Druckköpfe" src="/docs/assets/img/setup/print/print-heading-1.png">
+<img class="screenshot" alt="Druckköpfe" src="{{docs_base_url}}/assets/img/setup/print/print-heading-1.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-settings.md b/erpnext/docs/user/manual/de/setting-up/print/print-settings.md
index 995edd6..7dc8067 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/print-settings.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/print-settings.md
@@ -7,6 +7,6 @@
> Einstellungen > Druck > Druckeinstellungen
-<img class="screenshot" alt="Druckeinstellungen" src="/docs/assets/img/setup/print/print-settings.png">
+<img class="screenshot" alt="Druckeinstellungen" src="{{docs_base_url}}/assets/img/setup/print/print-settings.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md
index 071d757..718fcc2 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md
@@ -9,13 +9,13 @@
> Vertrieb > Einstellungen > Vorlage für Allgemeine Geschäftsbedingungen > Neu
-<img class="screenshot" alt="Geschäftsbedingungen" src="/docs/assets/img/setup/print/terms-1.png">
+<img class="screenshot" alt="Geschäftsbedingungen" src="{{docs_base_url}}/assets/img/setup/print/terms-1.png">
### 2\. Bearbeitung in HTML
Der Inhalt der Allgemeinen Geschäftsbedingungen kann nach Ihren Vorstellungen formatiert werden und es können bei Bedarf auch Bilder eingefügt werden. Für diejenigen, die sich in HTML auskennen, findet Sich auch eine Möglichkeit den Inhalt der Allgemeinen Geschäftsbedingungen in HTML zu formatieren.
-<img class="screenshot" alt="Geschäfsbedingungen - HTML bearbeiten" src="/docs/assets/img/setup/print/terms-2.png">
+<img class="screenshot" alt="Geschäfsbedingungen - HTML bearbeiten" src="{{docs_base_url}}/assets/img/setup/print/terms-2.png">
Dies erlaubt es Ihnen auch die Vorlage für die Allgemeinen Geschäftsbedingungen als Fußzeile zu verwenden, was sonst in ERPNext nicht als dedizierte Funktionalität zur Verfügung steht. Da die Inhalte der Allgemeinen Geschäftsbedingungen im Druckformat immer zuletzt erscheinen, sollten die Einzelheiten zur Fußzeile am Ende des Inhaltes eingefügt werden.
@@ -23,6 +23,6 @@
In Transaktionen finden Sie den Abschnitt Allgemeine Geschäftsbedingungen, wo Sie nach einer Vorlage für die Allgemeinen Geschäftsbedingungen suchen und diese auswählen können.
-<img class="screenshot" alt="Geschäfsbedingungen - Im Dokument auswählen" src="/docs/assets/img/setup/print/terms-3.png">
+<img class="screenshot" alt="Geschäfsbedingungen - Im Dokument auswählen" src="{{docs_base_url}}/assets/img/setup/print/terms-3.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md
index 4f45dfc..612cf9a 100644
--- a/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md
@@ -13,11 +13,11 @@
Die Tabelle zu den Artikelsteuern ist ein Abschnitt in den Artikelstammdaten.
-<img class="screenshot" alt="Artikelsteuer" src="/docs/assets/img/taxes/item-tax.png">
+<img class="screenshot" alt="Artikelsteuer" src="{{docs_base_url}}/assets/img/taxes/item-tax.png">
* **Inklusive oder Exklusive Steuer:** ERPNext erlaubt es Ihnen Artikelpreise inklusive Steuer einzugeben.
-<img class="screenshot" alt="Steuer inklusive" src="/docs/assets/img/taxes/inclusive-tax.png">
+<img class="screenshot" alt="Steuer inklusive" src="{{docs_base_url}}/assets/img/taxes/inclusive-tax.png">
* **Ausnahme von der Regel:** Die Einstellungen zur Artikelsteuer werden nur dann benötigt, wenn sich der Steuersatz eines bestimmten Artikels von demjenigen, den Sie im Standard-Steuerkonto definiert haben, unterscheidet.
* **Die Artikelsteuer kann überschrieben werden:** Sie können den Artikelsteuersatz überschreiben oder ändern, wenn Sie in der Artikelsteuertabelle zu den Artikelstammdaten gehen.
@@ -34,7 +34,7 @@
> Einstellungen > Rechnungswesen > Vorlage für Verkaufssteuern und -abgaben
-<img class="screenshot" alt="Vorlage für Verkaufssteuern" src="/docs/assets/img/taxes/sales-tax-master.png">
+<img class="screenshot" alt="Vorlage für Verkaufssteuern" src="{{docs_base_url}}/assets/img/taxes/sales-tax-master.png">
Wenn Sie eine neue Vorlage erstellen, müssen Sie für jeden Steuertyp eine neue Zeile einfügen.
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md
index ef9bc22..44ec38e 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md
@@ -7,6 +7,6 @@
Immer dann, wenn ein neues Dokument erstellt wird, werden diese Werte als Standardeinstellungen verwendet.
-<img class="screenshot" alt="Globale Voreinstellungen" src="/docs/assets/img/setup/settings/global-defaults.png">
+<img class="screenshot" alt="Globale Voreinstellungen" src="{{docs_base_url}}/assets/img/setup/settings/global-defaults.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md
index 8aaf923..996f3dc 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md
@@ -11,6 +11,6 @@
Markieren oder demarkieren Sie die Elemente die angezeigt / ausgeblendet werden sollen.
-<img class="screenshot" alt="Moduleinstellungen" src="/docs/assets/img/setup/settings/show-hide-modules.png">
+<img class="screenshot" alt="Moduleinstellungen" src="{{docs_base_url}}/assets/img/setup/settings/show-hide-modules.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
index 0c66c5e..1a6f336 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
@@ -33,6 +33,6 @@
Sehen Sie hier, wie der Nummernkreis eingestellt wird.
-<img class="screenshot" alt="Nummernkreise" src="/docs/assets/img/setup/settings/naming-series.gif">
+<img class="screenshot" alt="Nummernkreise" src="{{docs_base_url}}/assets/img/setup/settings/naming-series.gif">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md
index d804901..856d016 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md
@@ -7,6 +7,6 @@
> Einstellungen > Einstellungen > Systemeinstellungen
-<img class="screenshot" alt="Systemeinstellungen" src="/docs/assets/img/setup/settings/system-settings.png">
+<img class="screenshot" alt="Systemeinstellungen" src="{{docs_base_url}}/assets/img/setup/settings/system-settings.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
index eb37836..0fc2a1f 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
@@ -3,7 +3,7 @@
Wählen Sie Ihre Sprache. ERPNext gibt es in mehr als 20 Sprachen.
-<img alt="Sprache" class="screenshot" src="/docs/assets/img/setup-wizard/step-1.png">
+<img alt="Sprache" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-1.png">
---
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
index 6116247..3b6d1ac 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
@@ -4,7 +4,7 @@
In diesem letzten Schritt geben Sie bitte die Bezeichnungen der Artikel ein, die Sie kaufen oder verkaufen.
<img alt="Artikel hinzufügen" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-10.png">
+src="{{docs_base_url}}/assets/img/setup-wizard/step-10.png">
Bitte stellen Sie auch die Artikelart (Produkt oder Dienstleistung) und die Standardmaßeinheit ein. Machen Sie sich keine Sorgen, Sie können das alles später noch bearbeiten.
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md
index 5387b0a..be327ae 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md
@@ -3,7 +3,7 @@
Stellen Sie den Namen Ihres Landes, die Währung und die Zeitzone ein.
-<img alt="Währung" class="screenshot" src="/docs/assets/img/setup-wizard/step-2.png">
+<img alt="Währung" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-2.png">
---
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
index 97b246d..2d1789d 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
@@ -4,7 +4,7 @@
Geben Sie Details zum Benutzerprofil, wie Name, Benutzer-ID und das bevorzugte Passwort ein.
<img alt="Benutzer" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-3.png">
+src="{{docs_base_url}}/assets/img/setup-wizard/step-3.png">
---
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md
index aca7823..4c131b5 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md
@@ -4,7 +4,7 @@
Geben Sie Details zum Unternehmen wie Name, Kürzel und Geschäftsjahr ein.
<img alt="Unternehmensdetails" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-4.png">
+src="{{docs_base_url}}/assets/img/setup-wizard/step-4.png">
---
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md
index d8a5c0d..f74af9f 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md
@@ -4,7 +4,7 @@
Fügen Sie einen Firmenbriefkopf und ein Firmenlogo hinzu.
<img alt="Firmenlogo und Briefkopf" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-5.png">
+src="{{docs_base_url}}/assets/img/setup-wizard/step-5.png">
---
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md
index 07832e1..692bb20 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md
@@ -4,6 +4,6 @@
Fügen Sie weitere Benutzer hinzu und teilen Sie ihnen gemäß Ihren Verantwortungsbereichen am Arbeitsplatz Rollen zu.
<img alt="Benutzer" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-6.png">
+src="{{docs_base_url}}/assets/img/setup-wizard/step-6.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md
index edf6476..5bd354f 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md
@@ -4,7 +4,7 @@
Geben Sie bis zu drei Steuerarten an, die Sie regelmäßig in Bezug auf Ihr Gehalt zahlen. Dieser Assistent erstellt eine Steuervorlage, die die Steuren für jede Steuerart berechnet.
<img alt="Steuerdetails" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-7.png">
+src="{{docs_base_url}}/assets/img/setup-wizard/step-7.png">
Geben Sie einfach den Namen der Steuerart und den Steuersatz ein.
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md
index 4525c34..50e56fe 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md
@@ -4,7 +4,7 @@
Geben Sie die Namen Ihrer Kunden und die Kontaktpersonen ein.
<img alt="Customers" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-8.png">
+src="{{docs_base_url}}/assets/img/setup-wizard/step-8.png">
---
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md
index 2769879..a56c3b2 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md
@@ -4,7 +4,7 @@
Geben Sie ein paar Namen Ihrer Lieferanten ein.
<img alt="Lieferanten" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-9.png">
+src="{{docs_base_url}}/assets/img/setup-wizard/step-9.png">
---
diff --git a/erpnext/docs/user/manual/de/setting-up/sms-setting.md b/erpnext/docs/user/manual/de/setting-up/sms-setting.md
index 0a1e73b..1bcc058 100644
--- a/erpnext/docs/user/manual/de/setting-up/sms-setting.md
+++ b/erpnext/docs/user/manual/de/setting-up/sms-setting.md
@@ -10,7 +10,7 @@
http://instant.smses.com/web2sms.php?username=<USERNAME>&password;=<PASSWORD>&to;=<MOBILENUMBER>&sender;=<SENDERID>&message;=<MESSAGE>
-<img class="screenshot" alt="SMS-Einstellungen" src="/docs/assets/img/setup/sms-settings2.jpg">
+<img class="screenshot" alt="SMS-Einstellungen" src="{{docs_base_url}}/assets/img/setup/sms-settings2.jpg">
> Anmerkung: Die Zeichenfolge bis zum "?" ist die URL des SMS-Gateways.
@@ -23,7 +23,7 @@
Beachten Sie, dass einige Parameter in der URL statisch sind. Sie bekommen von Ihrem SMS-Anbieter statische Werte wie Benutzername, Passwort usw. Diese statischen Werte sollten in die Tabelle der statischen Parameter eingetragen werden.
-<img class="screenshot" alt="SMS-Einstellungen" src="/docs/assets/img/setup/sms-settings1.png">
+<img class="screenshot" alt="SMS-Einstellungen" src="{{docs_base_url}}/assets/img/setup/sms-settings1.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
index a1c8dbb..01f2281 100644
--- a/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
+++ b/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -23,18 +23,18 @@
Sie sollten sich an eine spezielle Vorlage eines Tabellenblattes halten um den Bestand und den Wert eines Artikels zu importieren. Öffnen Sie ein neues Formular zum Bestandsabgleich um die Optionen für den Download zu sehen.
-<img class="screenshot" alt="Bestandsabgleich" src="/docs/assets/img/setup/stock-recon-1.png">
+<img class="screenshot" alt="Bestandsabgleich" src="{{docs_base_url}}/assets/img/setup/stock-recon-1.png">
#### Schritt 2: Geben Sie Daten in die CSV-Datei ein.
-<img class="screenshot" alt="Bestandsabgleich" src="/docs/assets/img/setup/stock-reco-data.png">
+<img class="screenshot" alt="Bestandsabgleich" src="{{docs_base_url}}/assets/img/setup/stock-reco-data.png">
Das CSV-Format beachtet Groß- und Kleinschreibung. Verändern Sie nicht die Kopfbezeichnungen, die in der Vorlage vordefiniert wurden. In den Spalten "Artikelnummer" und "Lager" geben Sie bitte die richtige Artikelnummer und das Lager ein, so wie es in ERPNext bezeichnet wird. Für die Menge geben Sie den Lagerbestand, den Sie für diesen Artikel erfassen wollen, in einem bestimmten Lager ein. Wenn Sie die Menge oder den wertmäßigen Betrag eines Artikels nicht ändern wollen, dann lassen Sie den Eintrag leer.
Anmerkung: Geben Sie keine "0" ein, wenn sie die Menge oder den wertmäßigen Betrag nicht ändern wollen. Sonst kalkuliert das System eine Menge von "0". Lassen Sie also das Feld leer!
#### Schritt 3: Laden Sie die Datei hoch und geben Sie in das Formular "Bestandsableich" Werte ein.
-<img class="screenshot" alt="Bestandsabgleich" src="/docs/assets/img/setup/stock-recon-2.png">
+<img class="screenshot" alt="Bestandsabgleich" src="{{docs_base_url}}/assets/img/setup/stock-recon-2.png">
##### Buchungsdatum
@@ -52,11 +52,11 @@
#### Schritt 4: Überprüfen Sie die Daten zum Bestandsabgleich
-<img class="screenshot" alt="Bestandsabgleich Überprüfung" src="/docs/assets/img/setup/stock-reco-upload.gif">
+<img class="screenshot" alt="Bestandsabgleich Überprüfung" src="{{docs_base_url}}/assets/img/setup/stock-reco-upload.gif">
### Bericht zum Lagerbuch
-<img class="screenshot" alt="Bestandsabgleich" src="/docs/assets/img/setup/stock-reco-ledger.png">
+<img class="screenshot" alt="Bestandsabgleich" src="{{docs_base_url}}/assets/img/setup/stock-reco-ledger.png">
##### So arbeitet der Bestandsabgleich
diff --git a/erpnext/docs/user/manual/de/setting-up/territory.md b/erpnext/docs/user/manual/de/setting-up/territory.md
index 24ce34c..22743d0 100644
--- a/erpnext/docs/user/manual/de/setting-up/territory.md
+++ b/erpnext/docs/user/manual/de/setting-up/territory.md
@@ -3,6 +3,6 @@
Wenn sich Ihre Geschäftstätigkeit in verschiedenen Regionen abspielt (das können z. B. Länder, Bundesländer oder Städte sein), ist es normalerweise eine großartige Idee, diese Struktur auch im System abzubilden. Wenn Sie Ihre Kunden erst einmal nach Regionen eingeteilt haben, können für jede Artikelgruppe Ziele aufstellen und bekommen Berichte, die Ihnen Ihre aktuelle Leistung in einem Gebiet zeigen und auch das, was Sie geplant haben. Sie können zudem auch eine unterschiedliche Preispolitik für ein und dasselbe Produkt in unterschiedlichen Regionen einstellen.
-<img class="screenshot" alt="Baumstruktur Regionen" src="/docs/assets/img/crm/territory-tree.png">
+<img class="screenshot" alt="Baumstruktur Regionen" src="{{docs_base_url}}/assets/img/crm/territory-tree.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
index ac4093b..8c4c914 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
@@ -11,7 +11,7 @@
### 1. Übersicht der Benutzer
-<img class="screenshot" src="/docs/assets/img/setup/users/user-1.png" alt="Benutzerliste">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-1.png" alt="Benutzerliste">
Um einen neuen Benutzer hinzuzufügen, klicken Sie auf "Neu".
@@ -28,18 +28,18 @@
Nach dem Speichern sehen Sie eine Liste der Rollen und daneben jeweils eine Schaltfläche zum Anklicken. Markieren Sie alle Rollen, von denen Sie möchten, dass sie der Benutzer bekommt, und speichern Sie das Dokument ab. Um zu sehen, welche Berechtigungen die einzelnen Rollen haben, klicken Sie auf den Rollennamen.
-<img class="screenshot" src="/docs/assets/img/setup/users/user-2.png" alt="Benutzerrollen">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-2.png" alt="Benutzerrollen">
### 4. Zugriff auf Module einstellen
Benutzer haben Zugriff auf alle Module, für die sie aufgrund Ihrer Rollen Berechtigungen haben. Wenn Sie bestimmte Module für den Zugriff sperren möchten, entfernen Sie die Markierung in der Liste.
-<img class="screenshot" src="/docs/assets/img/setup/users/user-3.png" alt="Geblockte Module für Benutzer">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-3.png" alt="Geblockte Module für Benutzer">
### 5. Sicherheitseinstellungen
Wenn Sie dem Benutzer nur zu bestimmten Bürozeiten oder an Wochenenden Zugriff auf das System gewähren möchten, stellen Sie das unter den Sicherheitseinstellungen ein.
-<img class="screenshot" src="/docs/assets/img/setup/users/user-4.png" alt="Sicherheitseinstellungen für Benutzer">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-4.png" alt="Sicherheitseinstellungen für Benutzer">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
index 1d121c8..0e9911e 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
@@ -7,7 +7,7 @@
> Einstellungen > Berechtigungen > Rollenberechtigungen-Manager
-<img alt="Berechtigungen für Lesen, Schreiben, Erstellen, Übertragen und Abändern mit Hilfe des Rollenberechtigungen-Managers einstellen" class="screenshot" src="/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application.png">
+<img alt="Berechtigungen für Lesen, Schreiben, Erstellen, Übertragen und Abändern mit Hilfe des Rollenberechtigungen-Managers einstellen" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-application.png">
Berechtigungen werden angewandt auf einer Kombination von:
@@ -43,23 +43,23 @@
Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechtigungssystems abdeckt.
-<img class="screenshot" alt="Der Urlaubsantrag sollte von einem Mitarbeiter erstellt werden, und von einem Urlaubsgenehmiger oder Mitarbeiter des Personalwesens genehmigt werden." src="/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png">
+<img class="screenshot" alt="Der Urlaubsantrag sollte von einem Mitarbeiter erstellt werden, und von einem Urlaubsgenehmiger oder Mitarbeiter des Personalwesens genehmigt werden." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png">
1\. **Er sollte von einem "Mitarbeiter" erstellt werden.** Aus diesem Grund sollte die Rolle "Mitarbeiter" Berechtigungen zum Lesen, Schreiben und Erstellen haben.
-<img class="screenshot" alt="Einem Mitarbeiter Lese-, Schreib- und Erstellrechte für einen Urlaubsantrag geben." src="/docs/assets/img/users-and-permissions/setting-up-permissions-employee-role.png">
+<img class="screenshot" alt="Einem Mitarbeiter Lese-, Schreib- und Erstellrechte für einen Urlaubsantrag geben." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-employee-role.png">
2\. **Ein Mitarbeiter sollte nur auf seine/Ihre eigenen Urlaubsanträge zugreifen können.** Daher sollte der Punkt "Benutzerberechtigungen anwenden" für die Rolle "Mitarbeiter" aktiviert sein und es sollte ein Datensatz "Benutzerberechtigung" für jede Kombination von Benutzer und Mitarbeiter erstellt werden. (Dieser Aufwand reduziert sich für den Dokumententyp, indem über das Programm Datensätze für Benutzerberechtigungen erstellt werden.)
-<img class="screenshot" alt="Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken." src="/docs/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png">
+<img class="screenshot" alt="Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png">
3\. **Der Personalmanager sollte alle Urlaubsanträge sehen können.** Erstellen Sie für den Personalmanager eine Berechtigungsregel auf der Ebene 0 mit Lese-Rechten. Die Option "Benutzerberechtigungen anwenden" sollte deaktiviert sein.
-<img class="screenshot" alt="Einem Personalmanager Rechte für Übertragen und Stornieren für Urlaubsanträge geben. 'Benutzerberechtigungen anwenden' ist demarkiert um vollen Zugriff zu ermöglichen." src="/docs/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png">
+<img class="screenshot" alt="Einem Personalmanager Rechte für Übertragen und Stornieren für Urlaubsanträge geben. 'Benutzerberechtigungen anwenden' ist demarkiert um vollen Zugriff zu ermöglichen." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png">
4\. **Der Urlaubsgenehmiger sollte die ihn betreffenden Urlaubsanträge lesen und aktualisieren können.** Der Urlaubsgenehmiger erhält Lese- und Schreibzugriff auf Ebene 0, und die Option "Benutzerberechtigungen anwenden" wird aktiviert. Zutreffende Mitarbeiter-Dokumente sollten in den Benutzerberechtigungen des Urlaubsgenehmigers aufgelistet sein. (Dieser Aufwand reduziert sich für Urlaubsgenehmiger, die in Mitarbeiterdokumenten aufgeführt werden, indem über das Programm Datensätze für Benutzerberechtigungen erstellt werden.)
-<img class="screenshot" alt="Rechte für Schreiben, Lesen und Übertragen an einen Urlaubsgenehmiger zum Genehmigen von Urlauben geben. 'Benutzerberechtigungen anwenden' ist markiert, um den Zugriff basierend auf dem Mitarbeitertyp einzuschränken." src="/docs/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png">
+<img class="screenshot" alt="Rechte für Schreiben, Lesen und Übertragen an einen Urlaubsgenehmiger zum Genehmigen von Urlauben geben. 'Benutzerberechtigungen anwenden' ist markiert, um den Zugriff basierend auf dem Mitarbeitertyp einzuschränken." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png">
5\. **Ein Urlaubsantrag sollte nur von einem Mitarbeiter der Personalverwaltung oder einem Urlaubsgenehmiger bestätigt oder abgelehnt werden können.** Das Statusfeld des Urlaubsantrags wird auf Ebene 1 gesetzt. Mitarbeiter der Personalverwaltung und Urlaubsgenehmiger bekommen Lese- und Schreibrechte für Ebene 1, während allen anderen Leserechte für Ebene 1 gegeben werden.
@@ -67,6 +67,6 @@
6\. **Der Mitarbeiter der Personalverwaltung sollte die Möglichkeit haben Urlaubsanträge an seine Untergebenen zu delegieren.** Er erhält die Erlaubis Benutzerberechtigungen einzustellen. Ein Nutzer mit der Rolle "Benutzer Personalverwaltung" wäre dann also in der Lage Benutzer-Berechtigungen und Urlaubsanträge für andere Benutzer zu definieren.
-<img class="screenshot" alt="Es dem Benutzer der Personalverwaltung ermöglichen, den Zugriff auf Urlaubsanträge zu delegieren, indem er 'Benutzerberechtigungen einstellen' markiert. Dies erlaubt es dem Benutzer der Personalverwaltung auf den Benutzerberechtigungen-Manager für 'Urlaubsanträge' zuzugreifen" src="/docs/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png">
+<img class="screenshot" alt="Es dem Benutzer der Personalverwaltung ermöglichen, den Zugriff auf Urlaubsanträge zu delegieren, indem er 'Benutzerberechtigungen einstellen' markiert. Dies erlaubt es dem Benutzer der Personalverwaltung auf den Benutzerberechtigungen-Manager für 'Urlaubsanträge' zuzugreifen" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
index aea4770..2436439 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
@@ -5,6 +5,6 @@
Um ein Dokument zu teilen, öffnen Sie das Dokument, klicken Sie auf das "+"-Symbol im Abschnitt "Freigegeben für" und wählen Sie den Benutzer aus.
-<img class="screenshot" src="/docs/assets/img/setup/users/share.gif">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/share.gif">
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/workflows.md b/erpnext/docs/user/manual/de/setting-up/workflows.md
index c53a264..7879a0a 100644
--- a/erpnext/docs/user/manual/de/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/de/setting-up/workflows.md
@@ -7,7 +7,7 @@
Wenn ein Benutzer einen Urlaub beantragt, dann wird seine Anfrage an die Personalabteilung weiter geleitet. Die Personalabteilung, repräsentiert durch einen Mitarbeiter der Personalabteilung, wird diese Anfrage dann entweder genehmigen oder ablehnen. Wenn dieser Prozess abgeschlossen ist, dann bekommt der Vorgesetzte des Benutzers (der Urlaubsgenehmiger) eine Mitteilung, dass die Personalabteilung den Antrag genehmigt oder abgelehnt hat. Der Vorgesetzte, der die genehmigende Instanz ist, wird dann den Antrag entweder genehmigen oder ablehnen. Dementsprechend bekommt der Benutzer dann eine Genehmigung oder eine Ablehnung.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-leave-fl.jpg">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-leave-fl.jpg">
Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu:
@@ -15,11 +15,11 @@
#### Schritt 1: Geben Sie die unterschiedlichen Zustände des Prozesses Urlaubsantrag ein.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-1.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-1.png">
#### Schritt 2: Geben Sie die Übergangsregeln ein.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-2.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-2.png">
Hinweise:
@@ -37,14 +37,14 @@
Wenn ein Urlaubsantrag übertragen wird, steht der Status in der Ecke der rechten Seite auf "Beantragt".
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-3.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-3.png">
Wenn sich ein Mitarbeiter der Personalabteilung anmeldet, dann kann er den Antrag genehmigen oder ablehnen. Wenn eine Genehmigung erfolgt, wechselt der Status in der rechten Ecke zu "Genehmigt". Es wird jedoch ein blaues Informationssymbol angezeigt, welches aussagt, dass der Urlaubsantrag noch anhängig ist.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-4.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-4.png">
Wenn der Urlaubsgenehmiger die Seite mit den Urlaubsanträgen öffnet, kann er den Status von "Genehmigt" auf "Abgelehnt" ändern.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-5.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-5.png">
{next}
diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
index 639e140..f0e1f7a 100644
--- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -133,11 +133,11 @@
<p><strong>Lagerbuch</strong>
</p>
-<img class="screenshot" alt="Lagerbuch" src="/docs/assets/img/accounts/perpetual-receipt-sl-1.png">
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-sl-1.png">
**Hauptbuch:**
-<img class="screenshot" alt="Hauptbuch" src="/docs/assets/img/accounts/perpetual-receipt-gl-2.png">
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-gl-2.png">
Um ein System der doppelten Buchhaltung zu erhalten, werden dadurch, dass sich der Kontensaldo durch den Kaufbeleg erhöht, die Konten "In Verkaufsstellen" und "Anlagevermögen im Lager" belastet und das temporäre Konto "Lagerware erhalten aber noch nicht abgerechnet" entlastet. Zum selben Zeitpunkt wird eine negative Aufwendung auf das Konto "In der Bewertung enthaltene Kosten" verbucht, um die Bewertung hinzuzufügen und um eine doppelte Aufwandsverbuchung zu vermeiden.
@@ -149,7 +149,7 @@
#### Hauptbuch
-<img class="screenshot" alt="Hauptbuch" src="/docs/assets/img/accounts/perpetual-pinv-gl-3.png">
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-pinv-gl-3.png">
Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und hebt den Effekt des Kaufbeleges auf.
@@ -206,11 +206,11 @@
**Lagerbuch**
-<img class="screenshot" alt="Lagerbuch" src="/docs/assets/img/accounts/perpetual-dn-sl-4.png">
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-sl-4.png">
**Hauptbuch**
-<img class="screenshot" alt="Hauptbuch" src="/docs/assets/img/accounts/perpetual-dn-gl-5.png">
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-gl-5.png">
Da der Artikel aus dem Lager "In Verkaufsstellen" geliefert wird, wird das Konto "In Verkaufsstellen" entlastet und ein Betrag in gleicher Höhe dem Aufwandskonto "Selbstkosten" belastet. Der belastete/entlastete Betrag ist gleich dem Gesamtwert (Einkaufskosten) des Verkaufsartikels. Und der Wert wird gemäß der bevorzugten Bewertungsmethode (FIFO/Gleitender Durchschnitt) oder den tatsächlichen Kosten eines serialisierten Artikels kalkuliert.
@@ -231,11 +231,11 @@
**Lagerbuch**
-<img class="screenshot" alt="Lagerbuch" src="/docs/assets/img/accounts/perpetual-inv-sl-6.png">
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-sl-6.png">
**Hauptbuch**
-<img class="screenshot" alt="Hauptbuch" src="/docs/assets/img/accounts/perpetual-inv-gl-7.png">
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-gl-7.png">
Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten "In Verkaufsstellen" und "Selbstkosten" basierend auf der Bewertung beeinflusst.
@@ -268,11 +268,11 @@
**Lagerbuch**
-<img class="screenshot" alt="Lagerbuch" src="/docs/assets/img/accounts/perpetual-st-receipt-sl.png">
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-sl.png">
**Hauptbuch**
-<img class="screenshot" alt="Hauptbuch" src="/docs/assets/img/accounts/perpetual-st-receipt-gl.png">
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-gl.png">
* * *
@@ -303,11 +303,11 @@
**Lagerbuch**
-<img class="screenshot" alt="Lagerbuch" src="/docs/assets/img/accounts/perpetual-st-issue-sl.png">
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-sl.png">
**Hauptbuch**
-<img class="screenshot" alt="Hauptbuch" src="/docs/assets/img/accounts/perpetual-st-issue-gl.png">
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-gl.png">
* * *
@@ -340,8 +340,8 @@
**Lagerbuch**
-<img class="screenshot" alt="Lagerbuch" src="/docs/assets/img/accounts/perpetual-st-transfer-sl.png">
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-sl.png">
**Hauptbuch**
-<img class="screenshot" alt="Hauptbuch" src="/docs/assets/img/accounts/perpetual-st-transfer-gl.png">
\ No newline at end of file
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-gl.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/stock/batch.md b/erpnext/docs/user/manual/de/stock/batch.md
index 69171e1..783e7e3 100644
--- a/erpnext/docs/user/manual/de/stock/batch.md
+++ b/erpnext/docs/user/manual/de/stock/batch.md
@@ -13,7 +13,7 @@
Die Chargenstammdaten werden vor der Ausfertigung des Kaufbelegs erstellt. Somit erstellen Sie immer dann, wenn für einen Chargenartikel ein Kaufbeleg oder ein Produktionsauftrag ausgegeben werden, zuerst die Chargennummer des Artikels und wählen diese dann im Kaufbeleg oder im Produktionsauftrag aus.
-<img class="screenshot" alt="Charge" src="/docs/assets/img/stock/batch.png">
+<img class="screenshot" alt="Charge" src="{{docs_base_url}}/assets/img/stock/batch.png">
> Anmerkung: Bei Lagertransaktionen werden die Chargen-IDs basierend auf dem Code, dem Lager, dem Verfallsdatum der Charge (verglichen mit dem Veröffentlichungsdatum der Transaktion) und der aktuellen Menge im Lager gefiltert.
diff --git a/erpnext/docs/user/manual/de/stock/delivery-note.md b/erpnext/docs/user/manual/de/stock/delivery-note.md
index 5ee2567..c9c2682 100644
--- a/erpnext/docs/user/manual/de/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/de/stock/delivery-note.md
@@ -11,7 +11,7 @@
oder aber über eine "übertragene" Kundenbestellung (die noch nicht versandt wurde) indem Sie auf "Lieferschein erstellen" klicken.
-<img class="screenshot" alt="Lieferschein" src="/docs/assets/img/stock/delivery-note.png">
+<img class="screenshot" alt="Lieferschein" src="{{docs_base_url}}/assets/img/stock/delivery-note.png">
Sie können die Details auch aus einer noch nicht gelieferten Kundenbestellung "herausziehen".
diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md
index 2a59ecb..5f77fac 100644
--- a/erpnext/docs/user/manual/de/stock/material-request.md
+++ b/erpnext/docs/user/manual/de/stock/material-request.md
@@ -3,7 +3,7 @@
Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst.
-<img class="screenshot" alt="Materialanfrage" src="(/docs/assets/img/buying/material-request-workflow.jpg">
+<img class="screenshot" alt="Materialanfrage" src="({{docs_base_url}}/assets/img/buying/material-request-workflow.jpg">
Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu:
@@ -11,7 +11,7 @@
### Materialanfrage erstellen
-<img class="screenshot" alt="Materialanfrage" src="/docs/assets/img/buying/material-request.png">
+<img class="screenshot" alt="Materialanfrage" src="{{docs_base_url}}/assets/img/buying/material-request.png">
Eine Materialanfrage kann auf folgende Arten erstellt werden:
diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md
index 2f6e001..2b3d9e7 100644
--- a/erpnext/docs/user/manual/de/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/de/stock/projected-quantity.md
@@ -7,7 +7,7 @@
Eine strikte Kontrolle des projizierten Lagerbestandes ist entscheidend um Engpässe vorherzusagen und die richtige Bestellmenge kalkulieren zu können.
-<img class="screenshot" alt="Bericht zur projizierten Menge" src="/docs/assets/img/stock/projected-quantity-stock-report.png">
+<img class="screenshot" alt="Bericht zur projizierten Menge" src="{{docs_base_url}}/assets/img/stock/projected-quantity-stock-report.png">
> Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge
diff --git a/erpnext/docs/user/manual/de/stock/purchase-receipt.md b/erpnext/docs/user/manual/de/stock/purchase-receipt.md
index 5303895..f78600d 100644
--- a/erpnext/docs/user/manual/de/stock/purchase-receipt.md
+++ b/erpnext/docs/user/manual/de/stock/purchase-receipt.md
@@ -11,7 +11,7 @@
oder aus einer "übertragenen" Einkaufsbestellung heraus, in dem Sie auf die Schaltfläche "Kaufbeleg erstellen" klicken.
-<img class="screenshot" alt="Kaufbeleg" src="/docs/assets/img/stock/purchase-receipt.png">
+<img class="screenshot" alt="Kaufbeleg" src="{{docs_base_url}}/assets/img/stock/purchase-receipt.png">
### Ausschuss
diff --git a/erpnext/docs/user/manual/de/stock/purchase-return.md b/erpnext/docs/user/manual/de/stock/purchase-return.md
index 0805d75..1da0bc4 100644
--- a/erpnext/docs/user/manual/de/stock/purchase-return.md
+++ b/erpnext/docs/user/manual/de/stock/purchase-return.md
@@ -7,18 +7,18 @@
Öffnen Sie hierzu zuerst die ursprüngliche Eingangsrechnung zu der der Lieferant die Artikel geliefert hat.
-<img class="screenshot" alt="Original-Eingangsrechnung" src="/docs/assets/img/stock/purchase-return-original-purchase-receipt.png">
+<img class="screenshot" alt="Original-Eingangsrechnung" src="{{docs_base_url}}/assets/img/stock/purchase-return-original-purchase-receipt.png">
Klicken Sie dann auf "Lieferantenreklamation erstellen", dies öffnet einen neuen Kaufbeleg bei dem "Ist Reklamation" markiert ist, und bei dem die Artikel mit negativer Menge aufgeführt sind.
-<img class="screenshot" alt="Reklamation zum Lieferschein" src="/docs/assets/img/stock/purchase-return-against-purchase-receipt.png">
+<img class="screenshot" alt="Reklamation zum Lieferschein" src="{{docs_base_url}}/assets/img/stock/purchase-return-against-purchase-receipt.png">
Bei der Ausgabe eines Reklamations-Kaufbelegs vermindert das System die Menge des Artikels auf dem entsprechenden Lager. Um einen korrekten Lagerwert zu erhalten, verändert sich der Lagersaldo entsprechend dem Einkaufspreis des zurückgesendeten Artikels.
-<img class="screenshot" alt="Reklamation und Lagerbuch" src="/docs/assets/img/stock/purchase-return-stock-ledger.png">
+<img class="screenshot" alt="Reklamation und Lagerbuch" src="{{docs_base_url}}/assets/img/stock/purchase-return-stock-ledger.png">
Wenn die Ständige Inventur aktiviert wurde, verbucht das System weiterhin Buchungssätze zum Lagerkonto um den Lagersaldo mit dem Lagerbestand des Lagerbuchs zu synchronisieren.
-<img class="screenshot" alt="Reklamation und Lagerbuch" src="/docs/assets/img/stock/purchase-return-general-ledger.png">
+<img class="screenshot" alt="Reklamation und Lagerbuch" src="{{docs_base_url}}/assets/img/stock/purchase-return-general-ledger.png">
{next}
diff --git a/erpnext/docs/user/manual/de/stock/sales-return.md b/erpnext/docs/user/manual/de/stock/sales-return.md
index 0daef5c..2b4fbb4 100644
--- a/erpnext/docs/user/manual/de/stock/sales-return.md
+++ b/erpnext/docs/user/manual/de/stock/sales-return.md
@@ -7,22 +7,22 @@
Öffnen Sie dazu zuerst den Lieferschein/die Ausgangsrechnung zu dem/der der Kunde einen Artikel zurück sendet.
-<img class="screenshot" alt="Original-Lieferschein" src="/docs/assets/img/stock/sales-return-original-delivery-note.png">
+<img class="screenshot" alt="Original-Lieferschein" src="{{docs_base_url}}/assets/img/stock/sales-return-original-delivery-note.png">
Klicken Sie dann auf "Kundenreklamation erstellen", das öffnet einen neuen Lieferschein, bei dem "Ist Reklamation" aktiviert ist, und die Artikel und Steuern mit negativem Betrag angezeigt werden.
Sie können die Reklamation auch über die Originalausgangsrechnung erstellen. Um Material mit einer Gutschrift zurück zu geben, markieren Sie die Option "Lager aktualisieren" in der Reklamationsrechnung.
-<img class="screenshot" alt="Kundenreklamation zum Lieferschein" src="/docs/assets/img/stock/sales-return-against-delivery-note.png">
+<img class="screenshot" alt="Kundenreklamation zum Lieferschein" src="{{docs_base_url}}/assets/img/stock/sales-return-against-delivery-note.png">
Bei der Ausgabe eines Rücksendelieferscheins / einer Reklamationsrechnung erhöht das System den Lagerbestand im entsprechenden Lager. Um den richtigen Lagerwert zu erhalten erhöht sich der Lagerbestand um den Wert des ursprünglichen Einkaufspreises des zurückgeschickten Artikels.
-<img class="screenshot" alt="Kundenreklamation zur Eingangsrechnung" src="/docs/assets/img/stock/sales-return-against-sales-invoice.png">
+<img class="screenshot" alt="Kundenreklamation zur Eingangsrechnung" src="{{docs_base_url}}/assets/img/stock/sales-return-against-sales-invoice.png">
Für den Fall einer Reklamationsrechnung erhält das Kundenkonto eine Gutschrift und die damit verknüpften Konten für Erträge und Steuern werden belastet.
Wenn die ständige Inventur aktiviert ist, erstellt das System auch Buchungen für das Lagerkonto um den Kontostand des Lagers mit dem Lagerbuch zu synchronisieren.
-<img class="screenshot" alt="Lagerbuch und Reklamation" src="/docs/assets/img/stock/sales-return-stock-ledger.png">
+<img class="screenshot" alt="Lagerbuch und Reklamation" src="{{docs_base_url}}/assets/img/stock/sales-return-stock-ledger.png">
-<img class="screenshot" alt="Lagerbuch und Reklamation" src="/docs/assets/img/stock/sales-return-general-ledger.png">
+<img class="screenshot" alt="Lagerbuch und Reklamation" src="{{docs_base_url}}/assets/img/stock/sales-return-general-ledger.png">
{next}
diff --git a/erpnext/docs/user/manual/de/stock/serial-no.md b/erpnext/docs/user/manual/de/stock/serial-no.md
index 883a45e..1fb8bd8 100644
--- a/erpnext/docs/user/manual/de/stock/serial-no.md
+++ b/erpnext/docs/user/manual/de/stock/serial-no.md
@@ -13,7 +13,7 @@
Der Lagerbestand eines Artikels kann nur dann beeinflusst werden, wenn die Seriennummer mit Hilfe einer Lagertransaktion (Lagerbuchung, Kaufbeleg, Lieferschein, Ausgangsrechnung) übertragen wird. Wenn eine neue Seriennummer direkt erstellt wird, kann der Lagerort nicht eingestellt werden.
-<img class="screenshot" alt="Seriennummer" src="/docs/assets/img/stock/serial-no.png">
+<img class="screenshot" alt="Seriennummer" src="{{docs_base_url}}/assets/img/stock/serial-no.png">
* Der Status wird aufgrund der Lagerbuchung eingestellt.
* Nur Seriennummern mit dem Status "Verfügbar" können geliefert werden.
diff --git a/erpnext/docs/user/manual/de/stock/setup/item-attribute.md b/erpnext/docs/user/manual/de/stock/setup/item-attribute.md
index d61c6fc..6deabb3 100644
--- a/erpnext/docs/user/manual/de/stock/setup/item-attribute.md
+++ b/erpnext/docs/user/manual/de/stock/setup/item-attribute.md
@@ -3,18 +3,18 @@
Sie können Attribute und Attributwerte für Ihre Artikelvarianten hier auswählen.
-<img class="screenshot" alt="Attributvorlage" src="/docs/assets/img/stock/item-attribute.png">
+<img class="screenshot" alt="Attributvorlage" src="{{docs_base_url}}/assets/img/stock/item-attribute.png">
### Nicht-numerische Attribute
* Für nicht-numerische Attribute definieren Sie Attributwerte und deren Abkürzungen in der Tabelle Attributwerte.
-<img class="screenshot" alt="Attributvorlage" src="/docs/assets/img/stock/item-attribute-non-numeric.png">
+<img class="screenshot" alt="Attributvorlage" src="{{docs_base_url}}/assets/img/stock/item-attribute-non-numeric.png">
### Numerische Attribute
* Wenn Ihr Attribut numerisch ist, wählen Sie numerische Werte.
* Geben Sie den Bereich an und die Schrittweite.
-<img class="screenshot" alt="Attributvorlage" src="/docs/assets/img/stock/item-attribute-numeric.png">
+<img class="screenshot" alt="Attributvorlage" src="{{docs_base_url}}/assets/img/stock/item-attribute-numeric.png">
diff --git a/erpnext/docs/user/manual/de/stock/setup/item-group.md b/erpnext/docs/user/manual/de/stock/setup/item-group.md
index c911c6c..8be1a60 100644
--- a/erpnext/docs/user/manual/de/stock/setup/item-group.md
+++ b/erpnext/docs/user/manual/de/stock/setup/item-group.md
@@ -3,19 +3,19 @@
Die Artikelgruppe ist die Klassifikationskategorie. Ordnen Sie ein Produkt abhängig von seiner Art in einen entsprechenden Bereich ein. Wenn das Produkt dienstleistungsorientiert ist, ordnen Sie es unter dem Hauptpunkt Dienstleistung ein. Wenn das Produkt als Rohmaterial verwendet wird, müssen Sie es in der Kategorie Rohmaterial einordnen. Für den Fall, dass es sich bei dem Produkt um reine Handelsware handelt, können Sie es im Bereich Handelsware einordnen.
-<img class="screenshot" alt="Baumstruktur Artikelgruppe" src="/docs/assets/img/stock/item-group-tree.png">
+<img class="screenshot" alt="Baumstruktur Artikelgruppe" src="{{docs_base_url}}/assets/img/stock/item-group-tree.png">
### Eine Artikelgruppe erstellen
* Wählen Sie eine Artikelgruppe aus unter der Sie eine Artikelgruppe erstellen wollen.
* Klicken Sie auf "Unterpunkt hinzufügen".
-<img class="screenshot" alt="Artikelgruppe hinzufügen" src="/docs/assets/img/stock/item-group-new.gif">
+<img class="screenshot" alt="Artikelgruppe hinzufügen" src="{{docs_base_url}}/assets/img/stock/item-group-new.gif">
### Eine Artikelgruppe löschen
* Wählen Sie die zu löschende Artikelgruppe aus.
* Klicken Sie auf "Löschen"
-<img class="screenshot" alt="Artikelgruppe hinzufügen" src="/docs/assets/img/stock/item-group-del.gif">
+<img class="screenshot" alt="Artikelgruppe hinzufügen" src="{{docs_base_url}}/assets/img/stock/item-group-del.gif">
{next}
diff --git a/erpnext/docs/user/manual/de/stock/setup/stock-settings.md b/erpnext/docs/user/manual/de/stock/setup/stock-settings.md
index 2eb84eb..c7237b0 100644
--- a/erpnext/docs/user/manual/de/stock/setup/stock-settings.md
+++ b/erpnext/docs/user/manual/de/stock/setup/stock-settings.md
@@ -3,6 +3,6 @@
Sie können Standardeinstellungen für Ihre mit dem Lager verbundenen Transaktionen hier voreinstellen.
-<img class="screenshot" alt="Lagereinstellungen" src="/docs/assets/img/stock/stock-settings.png">
+<img class="screenshot" alt="Lagereinstellungen" src="{{docs_base_url}}/assets/img/stock/stock-settings.png">
{next}
diff --git a/erpnext/docs/user/manual/de/stock/stock-entry.md b/erpnext/docs/user/manual/de/stock/stock-entry.md
index 442c42d..4b9fe08 100644
--- a/erpnext/docs/user/manual/de/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/de/stock/stock-entry.md
@@ -7,7 +7,7 @@
> Lagerbestand > Dokumente > Lagerbuchung > Neu
-<img class="screenshot" alt="Lagerbuchung" src="/docs/assets/img/stock/stock-entry.png">
+<img class="screenshot" alt="Lagerbuchung" src="{{docs_base_url}}/assets/img/stock/stock-entry.png">
Lagerbuchungen können aus folgenden Gründen erstellt werden:
@@ -27,15 +27,15 @@
Um Zusatzkosten hinzuzufügen, geben Sie die Beschreibung und den Betrag der Kosten in die Tabelle Zusatzkosten ein.
-<img class="screenshot" alt="Lagerbuchung Zusatzlkosten" src="/docs/assets/img/stock/additional-costs-table.png">
+<img class="screenshot" alt="Lagerbuchung Zusatzlkosten" src="{{docs_base_url}}/assets/img/stock/additional-costs-table.png">
Die hinzugefügten Zusatzkosten werden basierend auf dem Grundwert der Artikel proportional auf die erhaltenen Artikel verteilt. Dann werden die verteilten Zusatzkosten zum Grundpreis hinzugerechnet, um den Wert neu zu berechnen.
-<img class="screenshot" alt="Lagerbuchung Preis für Artikelvarianten" src="/docs/assets/img/stock/stock-entry-item-valuation-rate.png">
+<img class="screenshot" alt="Lagerbuchung Preis für Artikelvarianten" src="{{docs_base_url}}/assets/img/stock/stock-entry-item-valuation-rate.png">
Wenn die laufende Inventur aktiviert ist, werden Zusatzkosten auf das Konto "Aufwendungen im Wert beinhaltet" gebucht.
-<img class="screenshot" alt="Zusatzkosten Hauptbuch" src="/docs/assets/img/stock/additional-costs-general-ledger.png">
+<img class="screenshot" alt="Zusatzkosten Hauptbuch" src="{{docs_base_url}}/assets/img/stock/additional-costs-general-ledger.png">
> Hinweis: Um den Lagerbestand über eine Tabellenkalkulation zu aktualisieren, bitte unter Lagerabgleich nachlesen.
{next}
diff --git a/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
index 0cb6ea1..340e104 100644
--- a/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
+++ b/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
@@ -23,7 +23,7 @@
Im Dokument können Sie verschiedene Kaufbelege auswählen und alle Artikel daraus abrufen. Dann sollten Sie zutreffende Abgaben aus der Tabelle "Steuern und Abgaben" hinzufügen. Die hinzugefügten Abgaben werden proportional auf die Artikel aufgeteilt, basierend auf ihrem Wert.
-<img class="screenshot" alt="Einstandskostenbeleg" src="/docs/assets/img/stock/landed-cost.png">
+<img class="screenshot" alt="Einstandskostenbeleg" src="{{docs_base_url}}/assets/img/stock/landed-cost.png">
### Was passiert bei der Ausgabe?
diff --git a/erpnext/docs/user/manual/de/stock/tools/packing-slip.md b/erpnext/docs/user/manual/de/stock/tools/packing-slip.md
index 474f2d5..93752be 100644
--- a/erpnext/docs/user/manual/de/stock/tools/packing-slip.md
+++ b/erpnext/docs/user/manual/de/stock/tools/packing-slip.md
@@ -3,6 +3,6 @@
Ein Packzettel ist ein Dokument, welches die Artikel einer Sendung auflistet. Normalerweise wird er den gelieferten Waren beigelegt. Beim Versand eines Produktes wird ein Entwurf für einen Lieferschein erstellt. Sie können aus diesem Lieferschein (Entwurf) einen Packzettel erstellen.
-<img class="screenshot" alt="Packzettel" src="/docs/assets/img/stock/packing-slip.png">
+<img class="screenshot" alt="Packzettel" src="{{docs_base_url}}/assets/img/stock/packing-slip.png">
{next}
diff --git a/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md
index 76ef650..9c375df 100644
--- a/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md
+++ b/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md
@@ -5,6 +5,6 @@
> Lagerbestand > Werkzeuge > Qualitätsprüfung > Neu
-<img class="screenshot" alt="Qualitätsprüfung" src="/docs/assets/img/stock/quality-inspection.png">
+<img class="screenshot" alt="Qualitätsprüfung" src="{{docs_base_url}}/assets/img/stock/quality-inspection.png">
{next}
diff --git a/erpnext/docs/user/manual/de/stock/warehouse.md b/erpnext/docs/user/manual/de/stock/warehouse.md
index 56c5913..a2e6c43 100644
--- a/erpnext/docs/user/manual/de/stock/warehouse.md
+++ b/erpnext/docs/user/manual/de/stock/warehouse.md
@@ -7,7 +7,7 @@
> Lagerbestand > Einstellungen > Lager > Neu
-<img class="screenshot" alt="Lager" src="/docs/assets/img/stock/warehouse.png">
+<img class="screenshot" alt="Lager" src="{{docs_base_url}}/assets/img/stock/warehouse.png">
In ERPNext muss jedes Lager einer festen Firma zugeordnet sein, um einen unternehmensbezogenen Lagerbestand zu erhalten. Die Lager werden mit den ihnen zugeordneten Firmenkürzeln abgespeichert. Dies erleichtert es auf einen Blick herauszufinden, welches Lager zu welcher Firma gehört.
diff --git a/erpnext/docs/user/manual/de/support/issue.md b/erpnext/docs/user/manual/de/support/issue.md
index 7b8e911..57c3c8f 100644
--- a/erpnext/docs/user/manual/de/support/issue.md
+++ b/erpnext/docs/user/manual/de/support/issue.md
@@ -7,7 +7,7 @@
> Support > Dokumente > Anfrage > Neu
-<img class="screenshot" alt="Fall" src="/docs/assets/img/support/issue.png">
+<img class="screenshot" alt="Fall" src="{{docs_base_url}}/assets/img/support/issue.png">
### Gesprächsaufzeichnung
diff --git a/erpnext/docs/user/manual/de/support/maintenance-schedule.md b/erpnext/docs/user/manual/de/support/maintenance-schedule.md
index df08375..dcc88ae 100644
--- a/erpnext/docs/user/manual/de/support/maintenance-schedule.md
+++ b/erpnext/docs/user/manual/de/support/maintenance-schedule.md
@@ -9,7 +9,7 @@
> Support > Dokumente > Wartungsplan > Neu
-<img class="screenshot" alt="Wartungsplan" src="/docs/assets/img/support/maintenance-schedule.png">
+<img class="screenshot" alt="Wartungsplan" src="{{docs_base_url}}/assets/img/support/maintenance-schedule.png">
Im Wartungsplan gibt es zwei Abschnitte:
diff --git a/erpnext/docs/user/manual/de/support/maintenance-visit.md b/erpnext/docs/user/manual/de/support/maintenance-visit.md
index 86ed897..d215c73 100644
--- a/erpnext/docs/user/manual/de/support/maintenance-visit.md
+++ b/erpnext/docs/user/manual/de/support/maintenance-visit.md
@@ -5,7 +5,7 @@
> Support > Dokumente > Wartungsbesuch > Neu
-<img class="screenshot" alt="Wartungsbesuch" src="/docs/assets/img/support/maintenance-visit.png">
+<img class="screenshot" alt="Wartungsbesuch" src="{{docs_base_url}}/assets/img/support/maintenance-visit.png">
Der Wartungsbesuch inhält Informationen über:
diff --git a/erpnext/docs/user/manual/de/support/warranty-claim.md b/erpnext/docs/user/manual/de/support/warranty-claim.md
index a54aac8..42ae52d 100644
--- a/erpnext/docs/user/manual/de/support/warranty-claim.md
+++ b/erpnext/docs/user/manual/de/support/warranty-claim.md
@@ -11,7 +11,7 @@
> Support > Dokukumente > Garantieantrag > Neu
-
+
Wenn für die Lösung des Problems ein Besuch beim Kunden notwendig ist, können Sie einen neuen Wartungsbesuch erstellen.
diff --git a/erpnext/docs/user/manual/de/using-erpnext/calendar.md b/erpnext/docs/user/manual/de/using-erpnext/calendar.md
index 8be1609..42d884b 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/calendar.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/calendar.md
@@ -5,7 +5,7 @@
Sie können die Kalenderansicht umschalten zwischen Monatsansicht, Wochenansicht und Tagesansicht.
-<img class="screenshot" alt="Calendar" src="/docs/assets/img/collaboration-tools/calendar-1.png">
+<img class="screenshot" alt="Calendar" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-1.png">
### Ereignisse im Kalender erstellen
@@ -15,7 +15,7 @@
Diese Ansicht zeigt die 24 Stunden des Tages aufgeteilt in verschiedene Zeitfenster an. Klicken Sie für den Startzeitpunkt auf ein Zeitfenster und ziehen Sie den Rahmen auf bis Sie den Endzeitpunkt erreichen.
-<img class="screenshot" alt="Calendar" src="/docs/assets/img/collaboration-tools/calendar-2.gif">
+<img class="screenshot" alt="Calendar" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-2.gif">
Auf Grundlage der Auswahl des Zeitfensters werden Start- und Endzeitpunkt in die Ereignisvorlage übernommen. Sie können dann noch die Bezeichnung des Ereignisses angeben und speichern.
@@ -23,7 +23,7 @@
Im Leadformular finden Sie die Felder "Nächster Kontakt durch" und "Nächstes Kontaktdatum". Wenn Sie in diesen Feldern einen Termin und eine Kontaktperson eintragen, wird automatisch ein Ereignis erstellt.
-<img class="screenshot" alt="Lead Event" src="/docs/assets/img/collaboration-tools/calendar-3.png">
+<img class="screenshot" alt="Lead Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-3.png">
#### Geburtstag
@@ -33,7 +33,7 @@
Sie können Ereignisse als wiederkehrend in bestimmten Intervallen markieren, indem Sie "Dieses Ereignis wiederholen" aktivieren.
-<img class="screenshot" alt="Calendar Recurring Event" src="/docs/assets/img/collaboration-tools/calendar-4.png">
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-4.png">
### Erinnerungen an Ereignisse
@@ -43,7 +43,7 @@
Wenn Sie in der Ereignisvorlage den Punkt "E-Mail-Erinnerung am Morgen senden" anklicken, erhalten alle Teilnehmer an diesem Ereignis eine Benachrichtungs-E-Mail.
-<img class="screenshot" alt="Calendar Recurring Event" src="/docs/assets/img/collaboration-tools/calendar-6.png">
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-6.png">
#### Einen täglichen E-Mail-Bericht erstellen
@@ -53,6 +53,6 @@
> Einstellungen > E-Mail > Täglicher E-Mail-Bericht
-<img class="screenshot" alt="Calendar Recurring Event" src="/docs/assets/img/collaboration-tools/calender-email-digest.png">
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calender-email-digest.png">
{next}
diff --git a/erpnext/docs/user/manual/de/website/blog-post.md b/erpnext/docs/user/manual/de/website/blog-post.md
index c316577..1641ea9 100644
--- a/erpnext/docs/user/manual/de/website/blog-post.md
+++ b/erpnext/docs/user/manual/de/website/blog-post.md
@@ -9,12 +9,12 @@
> Webseite > Blog-Eintrag > Neu
-<img class="screenshot" alt="Blogeintrag" src="/docs/assets/img/website/blog-post.png">
+<img class="screenshot" alt="Blogeintrag" src="{{docs_base_url}}/assets/img/website/blog-post.png">
Sie können einen Blog mit Hilfe des Markdown-Formats formatieren. Sie können auf Ihren Blog auch zugreifen, indem Sie zur Seite "blog.html" gehen.
#### Ein Beispiel für einen Blog.
-<img class="screenshot" alt="Beispiel für ein Blog" src="/docs/assets/img/website/blog-sample.png">
+<img class="screenshot" alt="Beispiel für ein Blog" src="{{docs_base_url}}/assets/img/website/blog-sample.png">
{next}
diff --git a/erpnext/docs/user/manual/de/website/blogger.md b/erpnext/docs/user/manual/de/website/blogger.md
index 6332fb6..8d81b39 100644
--- a/erpnext/docs/user/manual/de/website/blogger.md
+++ b/erpnext/docs/user/manual/de/website/blogger.md
@@ -3,6 +3,6 @@
Ein Blogger ist ein Benutzer, der Blog-Einträge erstellen kann. Sie können eine Kurzbiografie des Bloggers angeben und dazu einen Avatar.
-<img class="screenshot" alt="Blogger" src="/docs/assets/img/website/blogger.png">
+<img class="screenshot" alt="Blogger" src="{{docs_base_url}}/assets/img/website/blogger.png">
{next}
diff --git a/erpnext/docs/user/manual/de/website/setup/website-settings.md b/erpnext/docs/user/manual/de/website/setup/website-settings.md
index 2082455..a79d091 100644
--- a/erpnext/docs/user/manual/de/website/setup/website-settings.md
+++ b/erpnext/docs/user/manual/de/website/setup/website-settings.md
@@ -3,7 +3,7 @@
Die meisten der Einstellungen, die Ihre Webseite betreffen, können hier eingestellt werden.
-<img class="screenshot" alt="Webseiten-Einstellungen" src="/docs/assets/img/website/website-settings.png">
+<img class="screenshot" alt="Webseiten-Einstellungen" src="{{docs_base_url}}/assets/img/website/website-settings.png">
### Zielseite
@@ -15,7 +15,7 @@
Wählen Sie das Thema für Ihre Webseite aus. Sie können auch neue Themen für Ihre Webseite erstellen.
-<img class="screenshot" alt="Webseiten-Themen" src="/docs/assets/img/website/website-theme.png">
+<img class="screenshot" alt="Webseiten-Themen" src="{{docs_base_url}}/assets/img/website/website-theme.png">
* Wählen "Neues Webseiten-Thema erstellen" wenn Sie das Standars-Thema der Webseite anpassen wollen.
@@ -23,13 +23,13 @@
Hier können Sie ein Banner/Logo auf Ihrer Webseite hinzufügen. Hängen Sie das Bild an und klicken Sie auf "Banner aus Bild einrichten". Das System erstellt einen HTML-Kode unter Banner HTML.
-<img class="screenshot" alt="Banner" src="/docs/assets/img/website/banner.png">
+<img class="screenshot" alt="Banner" src="{{docs_base_url}}/assets/img/website/banner.png">
### Kopfleiste
Hier können Sie die Menüeinträge in der Kopfleiste einstellen.
-<img class="screenshot" alt="Kopfleiste" src="/docs/assets/img/website/top-bar.png">
+<img class="screenshot" alt="Kopfleiste" src="{{docs_base_url}}/assets/img/website/top-bar.png">
* In ähnlicher Art und Weise können Sie auch die Verknüpfungen auf der Seitenleiste und in der Fußzeile einstellen.
@@ -37,7 +37,7 @@
Sie können Google Analytics und soziale Netzwerke in Ihre Webseite mit einbinden und Einträge auf der Webseite teilen.
-<img class="screenshot" alt="Einbindungen" src="/docs/assets/img/website/integrations.png">
+<img class="screenshot" alt="Einbindungen" src="{{docs_base_url}}/assets/img/website/integrations.png">
* Sie können ein öffentliches Anmelden auf Ihr ERPNext-Konto unterbinden indem Sie auf "Anmelden deaktivieren" klicken.
diff --git a/erpnext/docs/user/manual/de/website/web-form.md b/erpnext/docs/user/manual/de/website/web-form.md
index e8c9850..473f2c7 100644
--- a/erpnext/docs/user/manual/de/website/web-form.md
+++ b/erpnext/docs/user/manual/de/website/web-form.md
@@ -18,7 +18,7 @@
3. Geben Sie an, ob sich der Benutzer einloggen muss, Daten ändern muss, mehrere verschiedene Datensätze verwalten soll, etc.
4. Fügen Sie die Felder, die Sie in den Datensätzen haben wollen, hinzu.
-<img class="screenshot" alt="Webformular" src="/docs/assets/img/website/web-form.png">
+<img class="screenshot" alt="Webformular" src="{{docs_base_url}}/assets/img/website/web-form.png">
* * *
@@ -26,7 +26,7 @@
Wenn Sie das Web-Formular erstellt haben, können Sie es unter der URL ansehen und ausprobieren!
-<img class="screenshot" alt="Webformular" src="/docs/assets/img/website/web-form-view.png">
+<img class="screenshot" alt="Webformular" src="{{docs_base_url}}/assets/img/website/web-form-view.png">
* * *
diff --git a/erpnext/docs/user/manual/de/website/web-page.md b/erpnext/docs/user/manual/de/website/web-page.md
index 96f917f..91bd7d5 100644
--- a/erpnext/docs/user/manual/de/website/web-page.md
+++ b/erpnext/docs/user/manual/de/website/web-page.md
@@ -7,7 +7,7 @@
> Webseite > Webseite > Neu
-<img class="screenshot" alt="Webseit" src="/docs/assets/img/website/web-page.png">
+<img class="screenshot" alt="Webseit" src="{{docs_base_url}}/assets/img/website/web-page.png">
### Bezeichnung
diff --git a/erpnext/docs/user/manual/en/CRM/contact.md b/erpnext/docs/user/manual/en/CRM/contact.md
index dcc8e17..f87f82c 100644
--- a/erpnext/docs/user/manual/en/CRM/contact.md
+++ b/erpnext/docs/user/manual/en/CRM/contact.md
@@ -18,12 +18,12 @@
> CRM > Contact > New
-<img class="screenshot" alt="Contact" src="/docs/assets/img/crm/contact.png">
+<img class="screenshot" alt="Contact" src="{{docs_base_url}}/assets/img/crm/contact.png">
Or you can add a Contact or Address directly from the Customer record, click on “New
Contact” or “New Address”.
-<img class="screenshot" alt="Contact" src="/docs/assets/img/crm/contact-from-cust.png">
+<img class="screenshot" alt="Contact" src="{{docs_base_url}}/assets/img/crm/contact-from-cust.png">
> Tip: When you select a Customer in any transaction, one Contact and Address
gets pre-selected. This is the “Default Contact or Address”.
diff --git a/erpnext/docs/user/manual/en/CRM/crm_reports.md b/erpnext/docs/user/manual/en/CRM/crm_reports.md
index 4ac90bb..3680bad 100644
--- a/erpnext/docs/user/manual/en/CRM/crm_reports.md
+++ b/erpnext/docs/user/manual/en/CRM/crm_reports.md
@@ -5,7 +5,7 @@
###Lead Details
It has data about the leads and their contact and address details.
<img alt="Lead Details" class="screenshot"
- src="/docs/assets/img/crm/report/lead.png">
+ src="{{docs_base_url}}/assets/img/crm/report/lead.png">
###Sales Funnel
By using the sales funnel report, and by quantifying the number of prospects at each stage of the process, you can get an idea of your potential customers.
@@ -15,28 +15,28 @@
For example, if you notice that very few communications with the prospects has taken place in a month which might indicate a decrease in the sales. From the next month, organization should make sure that more communications has to take place with the prospects.
<img alt="Lead Details" class="screenshot"
- src="/docs/assets/img/crm/report/sales_funnel.png">
+ src="{{docs_base_url}}/assets/img/crm/report/sales_funnel.png">
###Prospects Engaged But Not Converted
Using this report, user gets the information about the leads who has shown interest in the business with you but due to some reason they were not converted into the customers.
<img alt="Lead Details" class="screenshot"
- src="/docs/assets/img/crm/report/prospects_engaged_but_not_converted.png">
+ src="{{docs_base_url}}/assets/img/crm/report/prospects_engaged_but_not_converted.png">
###Minutes to First Response for Opportunity
Immediacy is so important – and so valued
In this internet area, we all expect a quicker response time to any of our query. This report gives you the information about the first response time given to an opportunities or issues. Using this report, the organization can improve their first response time to the prospects which can help to the better sales in the future.
<img alt="Lead Details" class="screenshot"
- src="/docs/assets/img/crm/report/minutes_to_first_response.png">
+ src="{{docs_base_url}}/assets/img/crm/report/minutes_to_first_response.png">
###Customer Addresses And Contacts
It has data about the customers and their contact and address details.
<img alt="Lead Details" class="screenshot"
- src="/docs/assets/img/crm/report/customer_address_and_contact.png">
+ src="{{docs_base_url}}/assets/img/crm/report/customer_address_and_contact.png">
###Inactive Customers
This report shows the list of customers who has not purchased since long time.
<img alt="Lead Details" class="screenshot"
- src="/docs/assets/img/crm/report/inactive_customers.png">
+ src="{{docs_base_url}}/assets/img/crm/report/inactive_customers.png">
diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
index 5924665..780881b 100644
--- a/erpnext/docs/user/manual/en/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -11,13 +11,13 @@
> Selling > Customer
-<img class="screenshot" alt="Create Customer" src="/docs/assets/img/crm/create-customer.gif">
+<img class="screenshot" alt="Create Customer" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
or upload it via the [Data Import Tool](/docs/user/manual/en/setting-up/data/data-import-tool.html).
A Customer can avail the features (operations) in the selling process. The general flow can be summarised as:
-<img class="screenshot" alt="Customer" src="/docs/assets/img/crm/customer-to selling-flowchart.jpeg">
+<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer-to selling-flowchart.jpeg">
> Note: Customers are separate from Contacts and Addresses. A Customer can
have multiple Contacts and Addresses.
diff --git a/erpnext/docs/user/manual/en/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md
index 2a48166..dbd8dc7 100644
--- a/erpnext/docs/user/manual/en/CRM/lead.md
+++ b/erpnext/docs/user/manual/en/CRM/lead.md
@@ -26,7 +26,7 @@
> CRM > Lead > New Lead
-<img class="screenshot" alt="Lead" src="/docs/assets/img/crm/lead.png">
+<img class="screenshot" alt="Lead" src="{{docs_base_url}}/assets/img/crm/lead.png">
ERPNext gives you a lot of options you may want to store about your Leads. For
example what is the source, how likely are they to give you business etc. If
@@ -51,7 +51,7 @@
further Opportunities from the same source can be created against this
Customer.
-<img class="screenshot" alt="Create Customer" src="/docs/assets/img/crm/lead-to-customer.gif">
+<img class="screenshot" alt="Create Customer" src="{{docs_base_url}}/assets/img/crm/lead-to-customer.gif">
---
diff --git a/erpnext/docs/user/manual/en/CRM/newsletter.md b/erpnext/docs/user/manual/en/CRM/newsletter.md
index 2aac1b2..e41ba1f 100644
--- a/erpnext/docs/user/manual/en/CRM/newsletter.md
+++ b/erpnext/docs/user/manual/en/CRM/newsletter.md
@@ -14,8 +14,8 @@
document before testing. A test email will be sent to your Email Address. You can
send the email to all the intended receipients by clicking on the send button.
-<img class="screenshot" alt="Newsletter - New" src="/docs/assets/img/crm/newsletter-new.png">
+<img class="screenshot" alt="Newsletter - New" src="{{docs_base_url}}/assets/img/crm/newsletter-new.png">
-<img class="screenshot" alt="Newsletter - Test" src="/docs/assets/img/crm/newsletter-test.png">
+<img class="screenshot" alt="Newsletter - Test" src="{{docs_base_url}}/assets/img/crm/newsletter-test.png">
{next}
diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
index 94338f9..e1ffdbf 100644
--- a/erpnext/docs/user/manual/en/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -9,17 +9,17 @@
#### Figure 1: Create Opportunity
-<img class="screenshot" alt="Opportunity" src="/docs/assets/img/crm/new-opportunity.gif">
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/new-opportunity.gif">
You can also go to an “Open” Lead and select “Opportunity” from the **Make** dropdown.
#### Figure 2: Create Opportunity from an open Lead
-<img class="screenshot" alt="Opportunity" src="/docs/assets/img/crm/lead-to-opportunity.png">
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/lead-to-opportunity.png">
#### Figure 3: Create Opportunity for Customer to Collect their Requirement
-<img class="screenshot" alt="Opportunity" src="/docs/assets/img/crm/requirement-gathering.png">
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/requirement-gathering.png">
An Opportunity can also come from an existing Customer. You can create
multiple Opportunities against the same Lead. In Opportunity, apart from the
@@ -29,7 +29,7 @@
#### Make Supplier Quotation
In some businesses, users collect the rates from their supplier against the customer requirement and based on the supplier rates they prepare the quotation for the customer. With ERPNext, you can make a supplier quotation from the opportunity itself.
-<img class="screenshot" alt="Opportunity" src="/docs/assets/img/crm/make-sq-from-opportunity.png">
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/make-sq-from-opportunity.png">
> Best Practice: Leads and Opportunities are often referred as your “Sales
Pipeline” this is what you need to track if you want to be able to predict how
diff --git a/erpnext/docs/user/manual/en/CRM/setup/campaign.md b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
index 17b06f1..2c30d1c 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/campaign.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
@@ -4,7 +4,7 @@
product or a service. This is done in a market segment of a particular
geographical area, to achieve specified objectives.
-<img class="screenshot" alt="Campaign" src="/docs/assets/img/crm/campaign.png">
+<img class="screenshot" alt="Campaign" src="{{docs_base_url}}/assets/img/crm/campaign.png">
You can track [Lead](/docs/user/manual/en/CRM/lead.html), [Opportunity](/docs/user/manual/en/CRM/opportunity.html), [Quotation](/docs/user/manual/en/selling/quotation.html) against a campaign.
@@ -12,11 +12,11 @@
* To track a 'Lead' against a campaign select 'View Leads'.
-<img class="screenshot" alt="Campaign - View Leads" src="/docs/assets/img/crm/campaign-view-leads.png">
+<img class="screenshot" alt="Campaign - View Leads" src="{{docs_base_url}}/assets/img/crm/campaign-view-leads.png">
* You shall get a filtered list of all leads made against that campaign.
* You can also create new leads by clicking 'New'
-<img class="screenshot" alt="Campaign - New Lead" src="/docs/assets/img/crm/campaign-new-lead.png">
+<img class="screenshot" alt="Campaign - New Lead" src="{{docs_base_url}}/assets/img/crm/campaign-new-lead.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
index 628057a..8709ca2 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
@@ -5,12 +5,12 @@
group. Typically Customers are grouped by market segment (that is usually
based on your domain).
-<img class="screenshot" alt="Customer Group Tree" src="/docs/assets/img/crm/customer-group-tree.png">
+<img class="screenshot" alt="Customer Group Tree" src="{{docs_base_url}}/assets/img/crm/customer-group-tree.png">
> Tip: If you think all this is too much effort, you can leave it at “Default
Customer Group”. But all this effort, will pay off when you start getting
reports. An example of a sample report is given below:
-<img class="screenshot" alt="Customer Group report" src="/docs/assets/img/crm/sales-analytics-customer.gif">
+<img class="screenshot" alt="Customer Group report" src="{{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
index b96020e..6e319f1 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
@@ -5,7 +5,7 @@
individually. Again as in Territory, the target has to be set against Item
Group.
-<img class="screenshot" alt="Sales Person Tree" src="/docs/assets/img/crm/sales-person-tree.png">
+<img class="screenshot" alt="Sales Person Tree" src="{{docs_base_url}}/assets/img/crm/sales-person-tree.png">
####Sales Person in Transactions
diff --git a/erpnext/docs/user/manual/en/accounts/accounting-reports.md b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
index 99d7029..a71a26c 100644
--- a/erpnext/docs/user/manual/en/accounts/accounting-reports.md
+++ b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
@@ -9,7 +9,7 @@
done in that period for that Account.
<img alt="General Ledger" class="screenshot"
- src="/docs/assets/img/accounts/general-ledger.png">
+ src="{{docs_base_url}}/assets/img/accounts/general-ledger.png">
### Trial Balance
@@ -22,7 +22,7 @@
* Credits
* Closing
-<img alt="Trial Balance" class="screenshot" src="/docs/assets/img/accounts/trial-balance.png">
+<img alt="Trial Balance" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/trial-balance.png">
The sum of all closing balances in a Trial Balance must be zero.
@@ -32,7 +32,7 @@
Suppliers. In this report, you will get your outstanding amounts period wise.
i.e. between 0-30 days, 30-60 days and so on.
-<img alt="Accounts Receivable" class="screenshot" src="/docs/assets/img/accounts/accounts-receivable.png">
+<img alt="Accounts Receivable" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
### Sales and Purchase Register
@@ -40,6 +40,6 @@
invoice Item, you will get the amount of individual tax that has been paid,
based on the Taxes and Charges table.
-<img alt="Sales Register" class="screenshot" src="/docs/assets/img/accounts/sales-register.png">
+<img alt="Sales Register" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/sales-register.png">
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
index 9627ff2..4ae0a5c 100644
--- a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
@@ -24,7 +24,7 @@
#### Figure 1 : Journal Entry -Advance Entry
-<img class="screenshot" alt="Advace Payment" src="/docs/assets/img/accounts/advance-payment-1.png">
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-1.png">
### Double Entry Accounting
@@ -41,7 +41,7 @@
#### Figure 2: Transaction and Difference Entry
-<img class="screenshot" alt="Advace Payment" src="/docs/assets/img/accounts/advance-payment-2.png">
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-2.png">
Save and submit the Journal Entry. If this document is not saved it will not be pulled in
other accounting documents.
@@ -55,7 +55,7 @@
#### Figure 3: Receive Advance
-<img class="screenshot" alt="Advace Payment" src="/docs/assets/img/accounts/advance-payment-3.png">
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-3.png">
Save and submit the Sales Invoice.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md b/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
index b66c063..d469b28 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
@@ -22,7 +22,7 @@
Enter Payment Amount as 19,600.
-<img alt="Sales Invoice Payment Amount" class="screenshot" src="/docs/assets/img/articles/withhold-1.png">
+<img alt="Sales Invoice Payment Amount" class="screenshot" src="{{docs_base_url}}/assets/img/articles/withhold-1.png">
#####Step 2.2: Allocate Against Sales Invoice
@@ -32,6 +32,6 @@
You can notice that there is a difference of 400 in the Payment Amount and the Amount Allocated against Sales Invoice. You can book this difference account under Withhold Account.
-<img alt="Deduction/Loss Account" class="screenshot" src="/docs/assets/img/articles/withhold-2.gif">
+<img alt="Deduction/Loss Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/withhold-2.gif">
Following same steps, you can also manage difference availed due to Currency Exchange Gain/Loss.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
index 3ae76a8..e4a33e0 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
@@ -14,22 +14,22 @@
####2. Edit Account
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/change-parent-1.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-1.png">
####3. Change Parent Account
Search and select preferred Parent Account and save.
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/change-parent-2.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-2.png">
Refresh system from Help menu to experience the change.
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/change-parent-3.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-3.png">
<div class="well"> Note: Parent cannot be customized for the Root Accounts, like Asset, Liability, Income, Expense, Equity.</div>
#### Quick Help
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/change-parent-account-1.gif">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-account-1.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md b/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md
index 6f92232..5609171 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/common-receivable-account.md
@@ -2,7 +2,7 @@
As per the party model, a common receivable account called **Debtor** is auto-created. This is a default Receivable Account for all the Customers.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/common-receivable.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/common-receivable.png">
If needed, you can also create a new receivable account and update in the Customer master.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md
index 6a041df..acac407 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md
@@ -2,13 +2,13 @@
As per accounting standards, debit in a accounting entry must be equal to credit. If not, system does allow submission of accounting transaction, thereby stops ledger posting. In ERPNext, on saving accounting entry, system validates if debit and credit is tallying.
-<img alt="Debit Credit Not Equal" class="screenshot" src="/docs/assets/img/articles/difference-entry-1.png">
+<img alt="Debit Credit Not Equal" class="screenshot" src="{{docs_base_url}}/assets/img/articles/difference-entry-1.png">
To have entry balanced, you should one more row, select another account, and update different amount in it. Or you can add difference amount in one of the Account's row itself.
On clicking 'Make Difference Entry' button, new Row will be added under Journal Entry Accounts table, with difference amount. You can edit that row to select appropriate Account.
-<img alt="Debit Credit Not Equal" class="screenshot" src="/docs/assets/img/articles/difference-entry-2.gif">
+<img alt="Debit Credit Not Equal" class="screenshot" src="{{docs_base_url}}/assets/img/articles/difference-entry-2.gif">
On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entri correctly.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
index 4a1b54b..ddd3679 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
@@ -18,13 +18,13 @@
After Fiscal Year is saved, you will find option to set that Fiscal year as Default.
-<img alt="Debit Credit Not Equal" class="screenshot" src="/docs/assets/img/articles/fiscal-year-error-1.png">
+<img alt="Debit Credit Not Equal" class="screenshot" src="{{docs_base_url}}/assets/img/articles/fiscal-year-error-1.png">
Default Fiscal Year will be updated in the Global Default setting as well. You can manually update Default Fiscal Year from:
`Setup > Settings > Global Default`
-<img alt="Debit Credit Not Equal" class="screenshot" src="/docs/assets/img/articles/fiscal-year-error-2.png">
+<img alt="Debit Credit Not Equal" class="screenshot" src="{{docs_base_url}}/assets/img/articles/fiscal-year-error-2.png">
Save Global Default, and Reload your ERPNext account. Then, default Fiscal Year will be auto-updated in your transactions.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/freeze-account.md b/erpnext/docs/user/manual/en/accounts/articles/freeze-account.md
index 3582c28..135214a 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/freeze-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/freeze-account.md
@@ -6,8 +6,8 @@
To freeze an Account, go to Chart of Accounts, and edit an Account.
-<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/freeze-account-1.png">
+<img class="screenshot" alt="Download Backup" src="{{docs_base_url}}/assets/img/articles/freeze-account-1.png">
If User has Role define in the Account Setting assigned, then he/she will be able to set an Account as Frozen.
-<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/freeze-account-2.png">
\ No newline at end of file
+<img class="screenshot" alt="Download Backup" src="{{docs_base_url}}/assets/img/articles/freeze-account-2.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
index 3ed6b86..9d5f614 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
@@ -10,12 +10,12 @@
Set date in the **Accounts Frozen Upto** field.
-<img alt="Accounts Frozen Date" class="screenshot" src="/docs/assets/img/articles/frozen-date-1.png">
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-1.png">
Now, the system will not allow to make any accounting entries before set date. If at all someone tries creating entries, system will show error message as below.
-<img alt="Frozen Date Error" class="screenshot" src="/docs/assets/img/articles/frozen-date-2.png">
+<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-2.png">
You can still allow user with certain role to create/edit entries within accounts frozen date. You can set that Role in the Account Settings itself.
-<img alt="Frozen Date Error" class="screenshot" src="/docs/assets/img/articles/frozen-date-3.png">
+<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-3.png">
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
index 6b643a9..80aed6d 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
@@ -12,7 +12,7 @@
`Explore > Accounts > Chart of Accounts`
-<img class="screenshot" alt="Freeze Account" src="/docs/assets/img/articles/freeze-account-1.png">
+<img class="screenshot" alt="Freeze Account" src="{{docs_base_url}}/assets/img/articles/freeze-account-1.png">
Click on Account in which Frozen Date is to be updated.
@@ -20,7 +20,7 @@
In the Account form, you will find a field called **Frozen**. Set value in this field as 'Yes'
-<img class="screenshot" alt="Freeze Account" src="/docs/assets/img/articles/freeze-account-2.png">
+<img class="screenshot" alt="Freeze Account" src="{{docs_base_url}}/assets/img/articles/freeze-account-2.png">
####Step 3: Save
diff --git a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
index 643636b..a9a9fef 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
@@ -6,7 +6,7 @@
To mange currency difference, create Account **Foreign Exchange Gain/Loss**. This account is generally created on the Expense side of P&L statement. However, you can place it under another group as per your accounting requirement.
-<img alt="Accounts Frozen Date" class="screenshot" src="/docs/assets/img/articles/exchange-rate-difference-1.png">
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/exchange-rate-difference-1.png">
#### Book Payment Entry
@@ -16,7 +16,7 @@
One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenerio.
-<img alt="Accounts Frozen Date" class="screenshot" src="/docs/assets/img/articles/exchange-rate-difference-2.gif">
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/exchange-rate-difference-2.gif">
In case you incur loss due to change foriegn exchnage rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
index 0b919a8..d89c199 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
@@ -16,7 +16,7 @@
Currency Exchange between base currency and customer currency will auto-fetch.
-<img alt="Accounts Frozen Date" class="screenshot" src="/docs/assets/img/articles/multiple-currency-1.gif">
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/multiple-currency-1.gif">
#### Step 4: Update Details
@@ -26,7 +26,7 @@
Save Sales Invoice and then check Print Format. For all the Currency field (rate, amount, totals) Customer's Currency symbol will be updated as well.
-<img alt="Accounts Frozen Date" class="screenshot" src="/docs/assets/img/articles/multiple-currency-2.png">
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/multiple-currency-2.png">
#### Currency Exchange Masters
diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
index 9dca4e2..cd50cc9 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
@@ -14,7 +14,7 @@
Assuming your Cheque Date is 31st December, 2016 (or any future date). As a result, this posting in your bank ledger will appear on Posting Date updated.
-<img alt="JE Posting Date" class="screenshot" src="/docs/assets/img/articles/post-dated-1.png">
+<img alt="JE Posting Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/post-dated-1.png">
Note: Payment Entry Reference Date should equal to or less than Posting Date.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md b/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
index e7a0772..19b0104 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
@@ -2,7 +2,7 @@
**Question:** On saving the Purchase Invoice, I am getting a validation message that Credit To Account must be a Balance Sheet account.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/purchase-invoice-account-type.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/purchase-invoice-account-type.png">
**Answer: **On submission of a Purchase Invoice, payable is updated towards the Supplier. As per the accounting standards, Payable Account is aligned under Current Liability (credit side of Balance Sheet).
diff --git a/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
index 8a5fc35..3f1d6eb 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
@@ -15,7 +15,7 @@
`Projects > Project > New`
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/project-cost-center-4.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-4.png">
#### 1.2 Create Cost Center
@@ -31,7 +31,7 @@
Update Cost Center in the Project master.
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/project-cost-center-1.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-1.png">
In the sales and purchase transactions, if Project is selected, then Cost Center will fetched from the Project master.
@@ -43,7 +43,7 @@
In the sales transactions (which are Sales Order, Delivery Note and Sales Invoice), Project will be selected in the More Info section. On selection of a Project, respective Cost Center will be updated for all the items in that transaction. Cost Center will be updated on in the transactions which has Cost Center field.
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/project-cost-center-2.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-2.png">
#### 2.2 Project in the Purchase Transactions
@@ -51,7 +51,7 @@
As per perpetual inventory valuation system, expense for the purchased item will be booked when raw-materials are consumed. On consumption of goods, if you are creating Material Issue (stock) entry, then Expense Cost (says Cost of Goods Sold) and Project's Cost Center should be updated in that entry.
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/project-cost-center-3.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-3.png">
### 3. Accounting Report for a Project
@@ -61,11 +61,11 @@
**Monthly Project Analysis**
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/project-cost-center-5.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-5.png">
**Overall Profitability**
-<img alt="Project Default Cost Center" class="screenshot" src="/docs/assets/img/articles/project-cost-center-6.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/project-cost-center-6.png">
#### 3.2 Projectwise Budgeting
diff --git a/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md b/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md
index d8618be..11d4b3d 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/types-in-tax-template.md
@@ -2,7 +2,7 @@
In the Sales Taxes and Purchase Taxes master, you will find a column called Type. Following a brief on a meaning of each Type and how you can use it.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/types-in-tax-masters.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/types-in-tax-masters.png">
**Actual:** This allows you to enter expense amount directly. For example, Rs. 500 incurred for Shipping.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
index 12ebd01..4c6c659 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
@@ -2,7 +2,7 @@
If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invoice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse.
-<img alt="Update Stock" class="screenshot" src="/docs/assets/img/articles/update-stock.png">
+<img alt="Update Stock" class="screenshot" src="{{docs_base_url}}/assets/img/articles/update-stock.png">
On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
index 2bfe687..904a679 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
@@ -6,7 +6,7 @@
- Valuation
- Total and Valuation
-<img alt="Purchase Tax and Charges Categories" class="screenshot" src="/docs/assets/img/articles/purchase-other-charges-1.png">
+<img alt="Purchase Tax and Charges Categories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/purchase-other-charges-1.png">
Let's consider an example to understand an effect of each charge type. We purchase ten units of item, at the rate of 800. total purchase amount is 800. Purchased item has 4% VAT applied on it, and INR 100 was incurred in transportation.
diff --git a/erpnext/docs/user/manual/en/accounts/bank-guarantee.md b/erpnext/docs/user/manual/en/accounts/bank-guarantee.md
index c0c6d7a..9e0e766 100644
--- a/erpnext/docs/user/manual/en/accounts/bank-guarantee.md
+++ b/erpnext/docs/user/manual/en/accounts/bank-guarantee.md
@@ -6,6 +6,6 @@
This document allows you to track Bank Guarantees given to clients. You can set Email Alerts as the Bank Guarantee expiry date approaches to remind yourself to get the Bank Guarantee back from your client.
-<img class="screenshot" alt="Bank Guarantee" src="/docs/assets/img/accounts/bank-guarantee.png">
+<img class="screenshot" alt="Bank Guarantee" src="{{docs_base_url}}/assets/img/accounts/bank-guarantee.png">
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/budgeting.md b/erpnext/docs/user/manual/en/accounts/budgeting.md
index 3e7db19..6602110 100644
--- a/erpnext/docs/user/manual/en/accounts/budgeting.md
+++ b/erpnext/docs/user/manual/en/accounts/budgeting.md
@@ -12,7 +12,7 @@
> Accounts > Budget and Cost Center > Chart of Cost Center > Add New Cost Center
-<img class="screenshot" alt="Budget" src="/docs/assets/img/accounts/budgeting-cost-center.png">
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budgeting-cost-center.png">
###Budgeting
@@ -30,20 +30,20 @@
In the Budgets table, select Income / Expense account for which Budget is to be defined.
-<img class="screenshot" alt="Budget" src="/docs/assets/img/accounts/budget-account.png">
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budget-account.png">
####Step 4: Monthly Distribution
If you have seasonal business, you can also define a Monthly Distribution record, to distribute the budget between months. If you don't set the monthly distribution, ERPNext will calculate the budget on yearly
basis or in equal proportion for every month.
-<img class="screenshot" alt="Monthly Distribution" src="/docs/assets/img/accounts/monthly-budget-distribution.png">
+<img class="screenshot" alt="Monthly Distribution" src="{{docs_base_url}}/assets/img/accounts/monthly-budget-distribution.png">
####Step 5: Alert on Budget
While setting budget, you can also define the actions when expenses will exceed the allocated budget for a period. You can set separate action for monthly and annual budgets. There are 3 types of actions: Stop, Warn and Ignore. If Stop, system will not allow to book expenses more than allocated budget. In Case of Warn, it will just warn the user that expenses has been exceeded from the allocated budget. And Ignore will do nothing.
-<img class="screenshot" alt="Monthly Distribution" src="/docs/assets/img/accounts/budget-warning.png">
+<img class="screenshot" alt="Monthly Distribution" src="{{docs_base_url}}/assets/img/accounts/budget-warning.png">
####Budget Variance Report
@@ -53,6 +53,6 @@
Accounts > Budget and Cost Center > Budget Variance Report
-<img class="screenshot" alt="Budget Variance Report" src="/docs/assets/img/accounts/budget-variance-report.png">
+<img class="screenshot" alt="Budget Variance Report" src="{{docs_base_url}}/assets/img/accounts/budget-variance-report.png">
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
index 44a940a..79bc1c1 100644
--- a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
@@ -27,13 +27,13 @@
An Example of various financial statement are given below:
#### Cash Flow Report
-<img class="screenshot" alt="Cash Flow Report" src="/docs/assets/img/accounts/cash_flow_report.png">
+<img class="screenshot" alt="Cash Flow Report" src="{{docs_base_url}}/assets/img/accounts/cash_flow_report.png">
#### Profit and Loss Report
-<img class="screenshot" alt="Profit and Loss Report" src="/docs/assets/img/accounts/profit_n_loss_report.png">
+<img class="screenshot" alt="Profit and Loss Report" src="{{docs_base_url}}/assets/img/accounts/profit_n_loss_report.png">
#### Balance Sheet Report
-<img class="screenshot" alt="Balance Sheet Report" src="/docs/assets/img/accounts/balance_sheet_report.png">
+<img class="screenshot" alt="Balance Sheet Report" src="{{docs_base_url}}/assets/img/accounts/balance_sheet_report.png">
To edit your Chart of Accounts in ERPNext go to:
@@ -48,7 +48,7 @@
Let us understand the main groups of the Chart of Accounts.
-<img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-1.png">
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-1.png">
### Balance Sheet Accounts
@@ -86,7 +86,7 @@
In ERPNext it is easy to create a Profit and Loss analysis chart. An example
of a Profit and Loss analysis chart is given below:
-<img class="screenshot" alt="Financial Analytics Profit and Loss Statement" src="/docs/assets/img/accounts/financial-analytics-pl.png">
+<img class="screenshot" alt="Financial Analytics Profit and Loss Statement" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-pl.png">
(On the first day of the year you have not made any profit or loss, but you
still have assets, hence balance sheet accounts never become zero at the
@@ -106,7 +106,7 @@
> Note: An Account “Ledger” is also sometimes called as Account “Head”.
-<img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-2.png">
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-2.png">
### Account Number
A standard chart of accounts is organized according to a numerical system. Each major category will begin with a certain number, and then the sub-categories within that major category will all begin with the same number. For example, if assets are classified by numbers starting with the digit 1000, then cash accounts might be labeled 1100, bank accounts might be labeled 1200, accounts receivable might be labeled 1300, and so on. A gap between account numbers is generally maintained for adding accounts in the future.
@@ -139,7 +139,7 @@
group under which you want to create the new Account. On the right side, you
will see an option to “Open” or “Add Child” a new Account.
-<img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-3.png">
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-3.png">
Option to create will only appear if you click on a Group (folder) type
Account. There you need to enter account name, account number and some more
diff --git a/erpnext/docs/user/manual/en/accounts/credit-limit.md b/erpnext/docs/user/manual/en/accounts/credit-limit.md
index b48ae56..476a374 100644
--- a/erpnext/docs/user/manual/en/accounts/credit-limit.md
+++ b/erpnext/docs/user/manual/en/accounts/credit-limit.md
@@ -14,7 +14,7 @@
#### Figure 1: Credit Limit
-<img class="screenshot" alt="Credit Limit" src="/docs/assets/img/accounts/credit-limit-1.png">
+<img class="screenshot" alt="Credit Limit" src="{{docs_base_url}}/assets/img/accounts/credit-limit-1.png">
Go to the 'CREDIT LIMIT' section and enter the amount in the field Credit Limit.
@@ -50,7 +50,7 @@
#### Figure 2: Credit Controller
-<img class="screenshot" alt="Credit Limit" src="/docs/assets/img/accounts/credit-limit-2.png">
+<img class="screenshot" alt="Credit Limit" src="{{docs_base_url}}/assets/img/accounts/credit-limit-2.png">
Save the changes.
diff --git a/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md b/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md
index a2aefc3..85df285 100644
--- a/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md
+++ b/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md
@@ -12,17 +12,17 @@
Here is the example of Item on which 12% GST is applied only.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/item-wise-tax.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/item-wise-tax.png">
For the item which is exempted from GST totally, mention 0% as tax rate in the Item master.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/exempted-item.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/exempted-item.png">
####Step 2: Setup Taxes and Other Charges
In Sales Taxes and Other Charges master, select GST 16% account and mention Tax Rate as 16. This tax rate will be applied on all the Items selected in the Sales Order, unless specific Tax Rate is defined in the Item master.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/tax-master.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/tax-master.png">
<div class="well">If you want to have tax rate always applied from the Item master, then you should update Rate for the tax account as zero in the Taxes and Charges master.</div>
@@ -30,7 +30,7 @@
In the Sales Order, we have selected many Items. For the items mentioned in blue, tax rate is applied based on tax rate mentioned in the taxes table. For the items highlited in red, tax rate has fetched for them from the respective item master.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/tax-calulation.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/tax-calulation.png">
Please note that item's tax rate will be pulled from the item master only if you have update same tax account (GST 16% in this case) in both Item master and tax master.
diff --git a/erpnext/docs/user/manual/en/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md
index ebfc9f5..c967b34 100644
--- a/erpnext/docs/user/manual/en/accounts/journal-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md
@@ -7,9 +7,9 @@
To create a Journal Entry go to:
-> Accounts > Documents > Journal Entry > New
+> Accounts > Company and Accounts > Journal Entry > New
-<img class="screenshot" alt="Journal Entry" src="/docs/assets/img/accounts/journal-entry.png">
+<img class="screenshot" alt="Journal Entry" src="{{docs_base_url}}/assets/img/accounts/journal-entry.png">
In a Journal Entry, you must select.
diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
index 060cd17..118f059 100644
--- a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -6,15 +6,15 @@
To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account.
-<img class="screenshot" alt="Set Currency from Chart of Accounts" src="/docs/assets/img/accounts/multi-currency/chart-of-accounts.png">
+<img class="screenshot" alt="Set Currency from Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/multi-currency/chart-of-accounts.png">
You can also assign / modify the currency by opening specific Account record for existing Accounts.
-<img class="screenshot" alt="Modify Account Currency" src="/docs/assets/img/accounts/multi-currency/account.png">
+<img class="screenshot" alt="Modify Account Currency" src="{{docs_base_url}}/assets/img/accounts/multi-currency/account.png">
For Customer / Supplier (Party), you can also define it's billing currency in the Party record. If the Party's accounting currency is different from Company Currency, you should mention Default Receivable / Payable Account in that currency.
-<img class="screenshot" alt="Customer Accounting Currency" src="/docs/assets/img/accounts/multi-currency/customer.png">
+<img class="screenshot" alt="Customer Accounting Currency" src="{{docs_base_url}}/assets/img/accounts/multi-currency/customer.png">
Once you defined Currency in the Account and selected relevant accounts in the Party record , you are ready to make transactions against them. If Party account currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If account currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party Account Currency.
@@ -42,7 +42,7 @@
Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency.
-<img class="screenshot" alt="Sales Invoice Outstanding" src="/docs/assets/img/accounts/multi-currency/sales-invoice.png">
+<img class="screenshot" alt="Sales Invoice Outstanding" src="{{docs_base_url}}/assets/img/accounts/multi-currency/sales-invoice.png">
### Purchase Invoice
@@ -52,12 +52,12 @@
In Journal Entry, you can make transactions in different currencies. There is a checkbox "Multi Currency", to enable multi-currency entries. If "Multi Currency" option selected, you will be able to select accounts with different currencies.
-<img class="screenshot" alt="Journal Entry Exchange Rate" src="/docs/assets/img/accounts/multi-currency/journal-entry-multi-currency.png">
+<img class="screenshot" alt="Journal Entry Exchange Rate" src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-multi-currency.png">
In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically.
-<img class="screenshot" alt="Journal Entry in multi currency" src="/docs/assets/img/accounts/multi-currency/journal-entry-row.png">
+<img class="screenshot" alt="Journal Entry in multi currency" src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-row.png">
## Reports
@@ -65,12 +65,12 @@
In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency.
-<img class="screenshot" alt="General Ledger Report" src="/docs/assets/img/accounts/multi-currency/general-ledger.png">
+<img class="screenshot" alt="General Ledger Report" src="{{docs_base_url}}/assets/img/accounts/multi-currency/general-ledger.png">
### Accounts Receivable / Payable
In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency.
-<img class="screenshot" alt="Accounts Receivable Report" src="/docs/assets/img/accounts/multi-currency/accounts-receivable.png">
+<img class="screenshot" alt="Accounts Receivable Report" src="{{docs_base_url}}/assets/img/accounts/multi-currency/accounts-receivable.png">
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
index 958c20b..3261ccfd 100644
--- a/erpnext/docs/user/manual/en/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
@@ -28,7 +28,7 @@
If Entry Type is selected as Opening Entry, all the Balance Sheet Accounts will be auto-fetched in the Journal Entry.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-account-1.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-account-1.png">
#### Step 3: Posting Date
@@ -38,13 +38,13 @@
For each Account, enter opening value in the Debit or Credit column. As per the double entry valuation system, Total Debit value in a entry must be equal to Total Credit value.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-6.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-6.png">
####Step 5: Is Opening
Set field `Is Opening` as `Yes`.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-3.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-3.png">
####Step 6: Save and Submit
@@ -56,13 +56,13 @@
If you are updating account opening balance in few accounts at a time, you can use **Temporary Opening** account for balancing purpose. In the standard chart of accounts, a Temporary Opening Account is auto-created under Assets.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-7.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-7.png">
In the Journal Entry, manually select an Account for which opening balance is to be updated. For each Account, enter opening balance value in the Debit or Credit column, based on it's Account Type (Asset or Liability).
For example, if you want to update balance in bank accounts, create Journal Entry as following.
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-2.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-2.png">
Once all your invoices are entered, your **Temporary Opening** account will have a balance of zero!
@@ -70,7 +70,7 @@
After completing the accounting entries, the trial balance report will look like the one given below:
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-4.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-4.png">
###Stock Opening
@@ -78,7 +78,7 @@
`Chart of Accounts > Assets > Current Asset > StocK Assets > (Warehouse Account)`
-<img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-5.png">
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-5.png">
To update stock opening balance, create [Stock Reconciliation entry](/docs/user/manual/en/stock/opening-stock.html). Based on the valuation of items's update in the Warehouse, balance will be updated in the Warehouse account.
@@ -102,6 +102,6 @@
Here, select the company and type of invoice (sales or purchase) and add a line item for each invoice you want to create.
-<img class="screenshot" alt="Opening Invoice Creation Tool" src="/docs/assets/img/accounts/opening-invoice-creation-tool.png">
+<img class="screenshot" alt="Opening Invoice Creation Tool" src="{{docs_base_url}}/assets/img/accounts/opening-invoice-creation-tool.png">
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/payment-entry.md b/erpnext/docs/user/manual/en/accounts/payment-entry.md
index ae82eb2..c361099 100644
--- a/erpnext/docs/user/manual/en/accounts/payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/payment-entry.md
@@ -12,25 +12,25 @@
On submitting a document against which Payment Entry can be made, you will find Make Payment button.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-1.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-1.png">
####Step 2: Mode of Payment
In the Payment Entry, select Mode of Payment (eg: Bank, Cash, Wire Transfer). In the Mode of Payment master, default Account can be set. This default payment Account will fetch into Payment Entry.
-<img class="screenshot" alt="Making Paymentt" src="/docs/assets/img/accounts/payment-entry-2.gif">
+<img class="screenshot" alt="Making Paymentt" src="{{docs_base_url}}/assets/img/accounts/payment-entry-2.gif">
####Step 3: Payment Amount
Enter actual payment amount received from the Customer or paid to the Supplier or Employee.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-3.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-3.png">
####Step 4: Allocate Amount
If creating Payment Entry for the Customer, Payment Amount will be allocated against Sales Invoice.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-4.gif">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-4.gif">
On the same lines, when creating Payment Entry for a Supplier, Payment Amount will be allocated against Purchase Invoice.
@@ -40,13 +40,13 @@
When making payment entry, there could be some difference in the actual payment amount and the invoice outstanding. This difference could be due to rounding error, or change in the currency exchange rate. You can set an Account here where this difference amount will be booked.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-5.gif">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-5.gif">
####Step 6: Submit
Save and Submit Payment Entry. On submission, outstanding will be updated in the Invoices.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-8.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-8.png">
If payment entry was created against Sales Order or Purchase Order, field Advance Paid will be updated in them. when creating Payment invoice against those transactions, Payment Entry will auto-update in that Invoice, so that you can allocate invoice amount against advance payment entry.
@@ -64,11 +64,11 @@
ERPNext allows you maintain accounts and invoicing in the [multiple currency](/docs/user/manual/en/accounts/multi-currency-accounting.html). If invoice is made in the party currency, Currency Exchange Rate between companies base currency and party currency is also entered in the invoice. When creating Payment Entry against that invoice, you will again have to mention the Currency Exchange Rate at the time of payment.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-6.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-6.png">
Since Currency Exchange Rate is fluctuating all the time, it can lead to difference in the payment amount against invoice total. This difference amount can be booked in the Currency Exchange Gain/Loss Amount.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-7.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-7.png">
Payments can also be made independent of invoices by creating a new Payment Entry.
@@ -81,7 +81,7 @@
3. Cash - Cash
4. Bank - Bank
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-9.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-9.png">
###Difference between Payment Entry and Journal Entry?
diff --git a/erpnext/docs/user/manual/en/accounts/payment-request.md b/erpnext/docs/user/manual/en/accounts/payment-request.md
index 7ee397e..a654611 100644
--- a/erpnext/docs/user/manual/en/accounts/payment-request.md
+++ b/erpnext/docs/user/manual/en/accounts/payment-request.md
@@ -3,10 +3,10 @@
Payment Request is sent via Email and will contain a link to a Payment Gateway if setup. You can create payment request via Sales Order or Sales Invoice.
- Create Payment Request via Sales Order
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/accounts/pr-from-so.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-from-so.png">
- Create payment Request via Sales Invoice
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/accounts/pr-from-si.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-from-si.png">
---
@@ -15,16 +15,16 @@
Note: Invoice/Order currency and Payment Gateway Account currency should be same.
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/accounts/pr-details-1.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-details-1.png">
---
##### Notify Customer
You can notify customer from Payment Request with print format. If customer contact email is mentioned, it will automatically fetch email. If not so you can set Email Address on Payment Request.
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/accounts/pr-details-2.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-details-2.png">
##### Request Mail
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/accounts/pr-email.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-email.png">
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/payments.md b/erpnext/docs/user/manual/en/accounts/payments.md
index e2d8ade..e29ac9d 100644
--- a/erpnext/docs/user/manual/en/accounts/payments.md
+++ b/erpnext/docs/user/manual/en/accounts/payments.md
@@ -18,11 +18,11 @@
On submitting a document against which Payment Entry can be made, you will find Make Payment button.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-1.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-1.png">
####Step 2: Payment Entry
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-9.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-9.png">
For more details about payment entry [check here.](/docs/user/manual/en/accounts/payment-entry)
@@ -34,18 +34,18 @@
Goto Accounts Settings > checked Make Payment via Journal Entry
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/account-settings.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/account-settings.png">
####Step 2: Make Payment
On submitting a document against which Journal Entry can be made, you will find Make Payment button.
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/payment-entry-1.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-1.png">
####Step 3: Journal Entry
Save and submit the journal entry to record the payament against the invoice
-<img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/journal-entry.png">
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/journal-entry.png">
For more details about journal entry [check here.](/docs/user/manual/en/accounts/journal-entry)
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index 7458f0d..166f2c5 100644
--- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -29,7 +29,7 @@
In POS, user can select the existing customer during making an order or create the new customer. This features works in the offline mode also. User can also add the customer details like contact number, address details etc on the form. The customer which has been created from the POS will be synced when the internet connection is active.
-<img class="screenshot" alt="POS Customer" src="/docs/assets/img/accounts/pos-customer.png">
+<img class="screenshot" alt="POS Customer" src="{{docs_base_url}}/assets/img/accounts/pos-customer.png">
### Adding an Item
@@ -39,7 +39,7 @@
**Barcode / Serial No** \- A Barcode / Serial No is an optical machine-readable representation of data relating to the object to which it is attached. Enter Barcode / Serial No in the box as shown in the image below and pause for a second, the item will be automatically added to the cart.
-<img class="screenshot" alt="POS Item" src="/docs/assets/img/accounts/pos-item.png">
+<img class="screenshot" alt="POS Item" src="{{docs_base_url}}/assets/img/accounts/pos-item.png">
> Tip: To change the quantity of an Item, enter your desired quantity in the
quantity box. These are mostly used if the same Item is purchased in bulk.
@@ -51,7 +51,7 @@
1. Select row in the cart and clik on delete button in the numeric keypad
-<img class="screenshot" alt="POS Item" src="/docs/assets/img/accounts/pos_deleted_item.gif">
+<img class="screenshot" alt="POS Item" src="{{docs_base_url}}/assets/img/accounts/pos_deleted_item.gif">
2. Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item.
@@ -69,7 +69,7 @@
2. Select your “Mode of Payment”.
3. Click on “Pay” button to Save the document.
-<img class="screenshot" alt="POS Payment" src="/docs/assets/img/accounts/pos-payment.png">
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/pos-payment.png">
Submit the document to finalise the record. After the document is submitted,
you can either print or email it directly to the customer.
@@ -78,7 +78,7 @@
Outstanding amount can be write off from the POS, user has to enter the amount under write off field on the payment screen.
-<img class="screenshot" alt="POS Payment" src="/docs/assets/img/accounts/write-off.png">
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/write-off.png">
System books the write off amount into the ledger which has selected on the POS Profile.
@@ -86,12 +86,12 @@
POS calculate the extra amount paid by the customer, which user can return from the cash account. User has to set the account for the change amount on the POS profile.
-<img class="screenshot" alt="POS Payment" src="/docs/assets/img/accounts/change-amount.png">
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/change-amount.png">
### Offline Records
All the records from the POS stores into the browser's local storegae and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records
-<img class="screenshot" alt="POS Payment" src="/docs/assets/img/accounts/offline-records.png">
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/offline-records.png">
#### Accounting entries (GL Entry) for a Point of Sale:
@@ -112,7 +112,7 @@
### Email
User can send email from the POS, after submission of an order, user has to click on menu > email
-<img class="screenshot" alt="POS Payment" src="/docs/assets/img/accounts/pos-email.png">
+<img class="screenshot" alt="POS Payment" src="{{docs_base_url}}/assets/img/accounts/pos-email.png">
After sync of an order, email sent to the customer with the print of the bill in the attachment
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
index dfb27bd..6048fea 100644
--- a/erpnext/docs/user/manual/en/accounts/pricing-rule.md
+++ b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
@@ -25,7 +25,7 @@
####1.1 Applicable On:
-<img alt="Applicable On" class="screenshot" src="/docs/assets/img/articles/pricing-rule-on.png">
+<img alt="Applicable On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-on.png">
If you want Pricing Rule to be applied on all the items, select based on Item Group. For value, select **All Item Group** (parent Item Group).
@@ -33,31 +33,31 @@
Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
-<img alt="Applicable for" class="screenshot" src="/docs/assets/img/articles/pricing-rule-for.png">
+<img alt="Applicable for" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-for.png">
####1.3 Quantity:
Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
-<img alt="Applicable Qty" class="screenshot" src="/docs/assets/img/articles/pricing-rule-qty.png">
+<img alt="Applicable Qty" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-qty.png">
###2. Application:
Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
-<img alt="Applicable" class="screenshot" src="/docs/assets/img/articles/pricing-rule-application.png">
+<img alt="Applicable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-application.png">
####2.1 Price
Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
-<img alt="Applicable Price" class="screenshot" src="/docs/assets/img/articles/pricing-rule-price.png">
+<img alt="Applicable Price" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-price.png">
#### 2.2 Discount Percentage
Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
-<img alt="Discount" class="screenshot" src="/docs/assets/img/articles/pricing-rule-discount.png">
+<img alt="Discount" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-discount.png">
If %Discount is to be applied on all Price Lists, then leave Price List field blank.
@@ -65,19 +65,19 @@
Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
-<img alt="Validity" class="screenshot" src="/docs/assets/img/articles/pricing-rule-validity.png">
+<img alt="Validity" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-validity.png">
#### Priority
If two or more Pricing Rules are found based on same conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.
-<img alt="Priority" class="screenshot" src="/docs/assets/img/articles/pricing-rule-priority.png">
+<img alt="Priority" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-priority.png">
#### Disable
Check to Disable Pricing Rule.
-<img alt="Disable" class="screenshot" src="/docs/assets/img/articles/pricing-rule-disable.png">
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-disable.png">
### Add Margin
@@ -89,20 +89,20 @@
Create price list for supllier and create item price against the price list.
-<img alt="Disable" class="screenshot" src="/docs/assets/img/articles/price-list.png">
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/price-list.png">
####2. Make Pricing Rule
Create pricing rule for the item against which supplier rate has created
-<img alt="Disable" class="screenshot" src="/docs/assets/img/articles/pricing-rule-margin.png">
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-margin.png">
####2. Make Invoice
System apply the margin rate on the item price on selection of an item.
-<img alt="Disable" class="screenshot" src="/docs/assets/img/articles/pricing-rule-invoice.png">
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-invoice.png">
For more details about pricing rule [Click Here](/docs/user/manual/en/selling/articles/adding-margin.html)
diff --git a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
index c6b2050..8076bd8 100644
--- a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
@@ -14,7 +14,7 @@
You can also create a Purchase Invoice from:
> Accounts > Billing > Purchase Invoice > New Purchase Invoice
-<img class="screenshot" alt="Purchase Invoice" src="/docs/assets/img/accounts/purchase-invoice.png">
+<img class="screenshot" alt="Purchase Invoice" src="{{docs_base_url}}/assets/img/accounts/purchase-invoice.png">
The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and
“Bill Date” helps to track the bill number as set by your Supplier for
diff --git a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
index 7923d8f..713fb60 100644
--- a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
+++ b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
@@ -10,7 +10,7 @@
Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check **Is Recurring** to set document as recurring.
-<img alt="Recurring Invoice" class="screenshot" src="/docs/assets/img/accounts/recurring.gif">
+<img alt="Recurring Invoice" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/recurring.gif">
**From Date and To Date:** This defines contract period with the customer.
diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
index 3ea13f0..5067975 100644
--- a/erpnext/docs/user/manual/en/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -8,7 +8,7 @@
or you can Make a new Sales Invoice after you submit the Delivery Note.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/accounts/sales-invoice.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/accounts/sales-invoice.png">
#### Accounting Impact
@@ -64,7 +64,7 @@
(FEFO) basis. This is a variant of First In First Out (FIFO) that gives
highest priority to the soonest to expire Items.
-<img class="screenshot" alt="POS Invoice" src="/docs/assets/img/accounts/sales-invoice-fetch-batch.png">
+<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/sales-invoice-fetch-batch.png">
Note that if the first batch in the queue cannot satisfy the order on the invoice,
the next batch in the queue that can satisfy the order will be selected. If there is
@@ -79,7 +79,7 @@
Also, if you check the **Update Stock** the stock will also update automatically,
without the need of a Delivery Note.
-<img class="screenshot" alt="POS Invoice" src="/docs/assets/img/accounts/pos-sales-invoice.png">
+<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/pos-sales-invoice.png">
#### Billing Timesheet with Project
@@ -88,7 +88,7 @@
Sales Invoice, select the Project for which the billing is to be made, and the
corresponding Timesheet entries for that Project will be fetched.
-<img class="screenshot" alt="POS Invoice" src="/docs/assets/img/accounts/billing-timesheet-sales-invoice.png">
+<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/billing-timesheet-sales-invoice.png">
* * *
diff --git a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
index f47f6e6..9bb7ec3 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
@@ -1,7 +1,7 @@
# Accounts Settings
-<img class="screenshot" alt="Account Settings" src="/docs/assets/img/accounts/account-settings.png">
+<img class="screenshot" alt="Account Settings" src="{{docs_base_url}}/assets/img/accounts/account-settings.png">
* Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role.
diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
index 0eabce7..dfe4231 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -34,6 +34,6 @@
> Accounts > Setup > Chart of Cost Centers
-<img class="screenshot" alt="Cost Center" src="/docs/assets/img/chart-of-cost-center.png">
+<img class="screenshot" alt="Cost Center" src="{{docs_base_url}}/assets/img/chart-of-cost-center.png">
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
index a211ee3..e4c55ed 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
@@ -25,6 +25,6 @@
In case you have multiple companies sharing the same Fiscal Year, you can add
it into the grid as shown below.
-<img class="screenshot" alt="Fiscal Year" src="/docs/assets/img/accounts/fiscal-year.png">
+<img class="screenshot" alt="Fiscal Year" src="{{docs_base_url}}/assets/img/accounts/fiscal-year.png">
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
index a7dee08..2d375cd 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
@@ -2,7 +2,7 @@
You can define which [Tax Template](/docs/user/manual/en/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule.
-<img class="screenshot" alt="Tax Rule" src="/docs/assets/img/accounts/tax-rule.png">
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule.png">
You can define Tax Rules for Sales or Purchase Taxes.
While making a Transaction the system will select and apply tax template based on the tax rule defined.
@@ -12,9 +12,9 @@
Suppose we define 2 Tax Rules as below.
-<img class="screenshot" alt="Tax Rule" src="/docs/assets/img/accounts/tax-rule-1.png">
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule-1.png">
-<img class="screenshot" alt="Tax Rule" src="/docs/assets/img/accounts/tax-rule-2.png">
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule-2.png">
Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country as United Kingdom
diff --git a/erpnext/docs/user/manual/en/accounts/share/share_balance.md b/erpnext/docs/user/manual/en/accounts/share/share_balance.md
new file mode 100644
index 0000000..2e66036
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/share/share_balance.md
@@ -0,0 +1,9 @@
+# Share Balance
+
+This is a report view which gives the list of all the shares held by a given Shareholder and its value
+
+> Accounts > Share Balance
+
+<img class="screenshot" alt="Create Shareholder" src="/docs/assets/img/accounts/shareholder/sharebalance_1.png">
+
+<img class="screenshot" alt="Create Shareholder" src="/docs/assets/img/accounts/shareholder/sharebalance_2.png">
diff --git a/erpnext/docs/user/manual/en/accounts/share/share_ledger.md b/erpnext/docs/user/manual/en/accounts/share/share_ledger.md
new file mode 100644
index 0000000..05b85b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/share/share_ledger.md
@@ -0,0 +1,9 @@
+# Share Ledger
+
+This is a report view which gives the list of all the transactions made by a given Shareholder
+
+> Accounts > Share Ledger
+
+<img class="screenshot" alt="Create Shareholder" src="/docs/assets/img/accounts/shareholder/shareledger_1.png">
+
+<img class="screenshot" alt="Create Shareholder" src="/docs/assets/img/accounts/shareholder/shareledger_2.png">
diff --git a/erpnext/docs/user/manual/en/accounts/share/share_transfer.md b/erpnext/docs/user/manual/en/accounts/share/share_transfer.md
new file mode 100644
index 0000000..fc1207b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/share/share_transfer.md
@@ -0,0 +1,9 @@
+# Shareholder Transfer
+
+There may be times when you want to change the share structure of your company; either by adding a new shareholder or by changing the existing proportion of shares between shareholders. A share transfer is the process of transferring existing shares from one person to another; either by sale or gift.
+
+You can directly create your Shareholders via
+
+> Accounts > Share Transfer
+
+<img class="screenshot" alt="Create Shareholder" src="/docs/assets/img/accounts/shareholder/sharetransfer_issue_tonystark.png">
diff --git a/erpnext/docs/user/manual/en/accounts/share/shareholder.md b/erpnext/docs/user/manual/en/accounts/share/shareholder.md
new file mode 100644
index 0000000..dfa065d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/share/shareholder.md
@@ -0,0 +1,21 @@
+# Shareholder
+
+A shareholder is any person, company or other institution that owns at least one share of a company’s stock. Because shareholders are a company's owners, they reap the benefits of the company's successes in the form of increased stock valuation. If the company does poorly, however, shareholders can lose money if the price of its stock declines.
+
+A shareholder is uniquely identified by the Shareholder ID. Normally this ID is a naming series, starting with `SH-`. Also as soon as the Shareholder makes even a single transaction, a Folio number is allocated to him. This also is a unique to the Shareholder.
+
+You can directly create your Shareholders via
+
+> Accounts > Shareholder
+
+<img class="screenshot" alt="Create Shareholder" src="/docs/assets/img/accounts/shareholder/shareholder_tonystark.png">
+
+A Shareholder can avail the features (operations) in the [Share Transfer](/docs/user/manual/en/accounts/share/share_transfer.html) process.
+
+> Note: Shareholders are separate from Contacts and Addresses. A Shareholder can
+have multiple Contacts and Addresses.
+
+### Contacts and Addresses
+
+[Contacts and Addresses](/docs/user/manual/en/CRM/contact.html) in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Shareholders, Customers and Suppliers
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/subscription.md b/erpnext/docs/user/manual/en/accounts/subscription.md
index 9afab58..aa67b59 100644
--- a/erpnext/docs/user/manual/en/accounts/subscription.md
+++ b/erpnext/docs/user/manual/en/accounts/subscription.md
@@ -2,7 +2,7 @@
If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing.
-<img class="screenshot" alt="Subscription" src="/docs/assets/img/accounts/subscription.png">
+<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.png">
#### Scenario
@@ -11,7 +11,7 @@
To set the subscription for the sales invoice
Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
-<img class="screenshot" alt="Subscription" src="/docs/assets/img/accounts/subscription.gif">
+<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.gif">
**From Date and To Date**: This defines contract period with the customer.
diff --git a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
index 77d27ef..2f0ebaa 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
@@ -8,7 +8,7 @@
####Bank Reconciliation Statement
-<img class="screenshot" alt="Bank Reconciliation statement" src="/docs/assets/img/accounts/bank-reconciliation-2.png">
+<img class="screenshot" alt="Bank Reconciliation statement" src="{{docs_base_url}}/assets/img/accounts/bank-reconciliation-2.png">
In the report, check whether the field 'Balance as per bank' matches the Bank Account Statement. If it is matching, it means that Clearance Date is correctly updated for all the bank entries. If there is a mismatch, Its because of bank entries for which Cleanrane Date is not yet updated.
@@ -36,7 +36,7 @@
__Step 4:__ Click on the JV from the table and update clearance date.
-<img class="screenshot" alt="Bank Reconciliation" src="/docs/assets/img/accounts/bank-reconciliation.png">
+<img class="screenshot" alt="Bank Reconciliation" src="{{docs_base_url}}/assets/img/accounts/bank-reconciliation.png">
__Step 5:__ Click on the button 'Update Clearance Date'.
diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
index 329d789..e7c888f 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
@@ -10,7 +10,7 @@
To cancel off some payments and invoices, select the Invoices and Journal Vouchers and click on “Reconcile”.
-<img class="screenshot" alt="Payment Reconciliation" src="/docs/assets/img/accounts/payment-reconcile-tool.png">
+<img class="screenshot" alt="Payment Reconciliation" src="{{docs_base_url}}/assets/img/accounts/payment-reconcile-tool.png">
__Step 1:__ Select the Account against whom the payments need to be reconciled.
diff --git a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
index e48055d..6bc0f5a 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
@@ -21,7 +21,7 @@
**Closing Fiscal Year** will be an year for which you are closing your financial statement.
-<img class="screenshot" alt="Period Closing Voucher" src="/docs/assets/img/accounts/period-closing-voucher.png">
+<img class="screenshot" alt="Period Closing Voucher" src="{{docs_base_url}}/assets/img/accounts/period-closing-voucher.png">
This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account.
diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md
index ecdc4f9..3ee1590 100644
--- a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md
+++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop.md
@@ -45,6 +45,6 @@
You form should now look something like this
-<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/crop.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/agriculture/crops_and_land/crop.png">
Repeat step 2 for as many crops as you need. You can save some time by duplicating existing crops and modifying only the necessary items
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md
index 7a9c3eb..07f8bcf 100644
--- a/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md
+++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md
@@ -19,7 +19,7 @@
It should now look something like this
-<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/crop_cycle.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/agriculture/crops_and_land/crop_cycle.png">
Repeat these for every Crop Cycle you need
@@ -27,4 +27,4 @@
> Projects > Project
-<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/projects.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/agriculture/crops_and_land/projects.png">
diff --git a/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md b/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md
index 9b3fb23..5ca643e 100644
--- a/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md
+++ b/erpnext/docs/user/manual/en/agriculture/crops_and_land/land_unit.md
@@ -17,7 +17,7 @@
It should look something like this
-<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/land_unit.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/agriculture/crops_and_land/land_unit.png">
With the farm created, we can now create our first Carrot Field! Click on New
diff --git a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md
index e7f68ad..7c6bcb5 100644
--- a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md
+++ b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md
@@ -19,6 +19,6 @@
Now it should look something like this
-<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/agriculture/diseases_and_fertilizer/disease.png">
These Tasks will be imported into the Crop Cycle Project if you choose to add this Disease to the list of Detected Diesase in Crop Cycle
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md
index 8e1ccf2..3fbde5c 100644
--- a/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md
+++ b/erpnext/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md
@@ -2,4 +2,4 @@
This is used to keep track of available fertilizers, and their chemical composition, which is linked to the Item master
-<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png">
\ No newline at end of file
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/agriculture/index.md b/erpnext/docs/user/manual/en/agriculture/index.md
index b186998..c49d1f2 100644
--- a/erpnext/docs/user/manual/en/agriculture/index.md
+++ b/erpnext/docs/user/manual/en/agriculture/index.md
@@ -4,7 +4,7 @@
A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing, etc.), recording environmental and crop data for analysis, and reports to help make effective decisions.
-<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/agri_desk.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/agriculture/agri_desk.png">
The Agriculture module in ERPNext helps you keep track of your farming operations. It allows you keep records for each field where you farm, such as geospatial and soil texture characteristics. It allows you to:
@@ -15,7 +15,7 @@
* Record sale of the harvest or transfer to warehouse for further processing
* View reports
-<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/agri_doctypes.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/agriculture/agri_doctypes.png">
### Topics
diff --git a/erpnext/docs/user/manual/en/asset/asset-maintenance.md b/erpnext/docs/user/manual/en/asset/asset-maintenance.md
index 7ad13a6..93f6781 100644
--- a/erpnext/docs/user/manual/en/asset/asset-maintenance.md
+++ b/erpnext/docs/user/manual/en/asset/asset-maintenance.md
@@ -11,21 +11,21 @@
### Enable Asset Maintenance
Check Maintain Required in Asset to enable Asset Maintenance
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/maintenance_required.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/maintenance_required.png">
### Asset Maintenance Team
Create Asset Maintenance Team, select team members and their role.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance_team.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset_maintenance_team.png">
### Asset Maintenance
For each asset create a Asset Maintenance record listing all the associated maintenance tasks, maintenance type (Preventive Maintenance or Calibration), periodicity, assign to and start and end date of maintenance. Based on start date and periodicity the next due date is auto-calculated and a ToDo is created for the Assignee.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset_maintenance.png">
### Asset Maintenance Log
For each task in Asset Maintenance, Asset Maintenance Log is auto created to keep track of the upcoming Maintenances. It will have status, completion date and actions performed. Based on completion date here, next due date is calculated automatically and new Asset Maintenance Log is created.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance_log.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset_maintenance_log.png">
### Asset Repair
You can also maintain the records of Repair/Failures of your asset which are not listed in Asset Maintenance.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_repair.png">
\ No newline at end of file
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset_repair.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/asset/assets.md b/erpnext/docs/user/manual/en/asset/assets.md
index 6932c59..a5a84b6 100644
--- a/erpnext/docs/user/manual/en/asset/assets.md
+++ b/erpnext/docs/user/manual/en/asset/assets.md
@@ -6,7 +6,7 @@
Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
-<img class="screenshot" alt="Asset Category" src="/docs/assets/img/asset/asset-category.png">
+<img class="screenshot" alt="Asset Category" src="{{docs_base_url}}/assets/img/asset/asset-category.png">
> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master.
@@ -14,13 +14,13 @@
Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset.png">
Explanation of the fields:
1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked.
- <img class="screenshot" alt="Asset Item" src="/docs/assets/img/asset/asset-item.png">
+ <img class="screenshot" alt="Asset Item" src="{{docs_base_url}}/assets/img/asset/asset-item.png">
2. Asset Category: The category of assets it belongs to.
3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
@@ -42,24 +42,31 @@
The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/depreciation-schedule.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/depreciation-schedule.png">
On the scheduled date, system creates depreciation entry by creating a Journal Entry and the same Journal Entry is updated in the depreciation table for reference. Next Depreciation Date and Current Value are also updated on submission of depreciation entry.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/depreciation-entry.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/depreciation-entry.png">
In the depreciation entry, the "Accumulated Depreciation Account" is credited and "Depreciation Expense Account" is debited. The related accounts can be set in the Asset Category or Company.
+If you are required to calculate the depreciation based on your Fiscal Year and prorated by the number of days left, select the corresponding option in "Account Settings".
+
+The system will automatically set the fiscal year end date as the next depreciation date and calculate the depreciation amount prorata temporis based on the Available-for-use Date (IFRS16)
+
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-prorated-depreciation.png">
+
+
For better visibility, net value of the asset on different depreciation dates are shown in a line graph.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-graph.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset-graph.png">
## Purchase an Asset
For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-purchase-invoice.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset-purchase-invoice.png">
On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
@@ -73,23 +80,23 @@
- "Accumulated Depreciation Account" will be debited by the total depreciated amount till now.
- "Gain/Loss Account on Asset Disposal" will be credited/debited based on gain/loss amount. The Gain/Loss account can be set in Company record.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-sales.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset-sales.png">
## Scrap an Asset
You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/scrap-journal-entry.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/scrap-journal-entry.png">
## Asset Movement
The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-movement.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset-movement.png">
There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement.
-<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-movement-using-button.png">
+<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset-movement-using-button.png">
{next}
diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
index b632bb3..acc8fa7 100644
--- a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
+++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
@@ -6,7 +6,7 @@
In the Item master, under Supplier Details section, enter Item Code as given by the Supplier to this item.
-<img alt="Supplier Item Code" class="screenshot" src="/docs/assets/img/articles/supplier-item-code.png">
+<img alt="Supplier Item Code" class="screenshot" src="{{docs_base_url}}/assets/img/articles/supplier-item-code.png">
#### 2. Supplier's Item Code in Transactions
@@ -14,7 +14,7 @@
Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master.
-<img alt="Supplier Item Code in transaction" class="screenshot" src="/docs/assets/img/articles/supplier-item-code-in-purchase-order.png">
+<img alt="Supplier Item Code in transaction" class="screenshot" src="{{docs_base_url}}/assets/img/articles/supplier-item-code-in-purchase-order.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
index a01f023..80f5283 100644
--- a/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
+++ b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
@@ -12,7 +12,7 @@
Update Default Supplier in the Item master.
-<img alt="Item Purchase UoM" class="screenshot" src="/docs/assets/img/articles/for-supplier-2.png">
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-2.png">
####Step 2: New Purchase Order
@@ -22,13 +22,13 @@
From the options available to pull data in the Purchase Order, click on `For Supplier`.
-<img alt="Item Purchase UoM" class="screenshot" src="/docs/assets/img/articles/for-supplier-1.gif">
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-1.gif">
####Step 4: Get Items
Select Supplier name and click on `Get`.
-<img alt="Item Purchase UoM" class="screenshot" src="/docs/assets/img/articles/for-supplier-3.png">
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/for-supplier-3.png">
####Step 5: Edit Items
diff --git a/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
index ad5ebd7..81b1aab 100644
--- a/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
+++ b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
@@ -15,28 +15,28 @@
In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Purchase UoM (Box in this case). Updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM.
-<img alt="Item Purchase UoM" class="screenshot" src="/docs/assets/img/articles/editing-uom-in-po.gif">
+<img alt="Item Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/editing-uom-in-po.gif">
#### Step 2: Update UoM Conversion Factors
In one Box, if you get 20 Nos. of Pen, UoM Conversion Factor would be 20.
-<img alt="Item Conversion Factor" class="screenshot" src="/docs/assets/img/articles/po-conversion-factor.png">
+<img alt="Item Conversion Factor" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-conversion-factor.png">
Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one Box, then Qty in the stock UoM will be set as 20.
-<img alt="Purchase Qty in Default UoM" class="screenshot" src="/docs/assets/img/articles/po-qty-in-stock-uom.png">
+<img alt="Purchase Qty in Default UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-qty-in-stock-uom.png">
### Stock Ledger Posting
Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM.
-<img alt="Print Format in Purchase UoM" class="screenshot" src="/docs/assets/img/articles/po-stock-uom-ledger.png">
+<img alt="Print Format in Purchase UoM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-stock-uom-ledger.png">
### Set Conversion Factor in Item
In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor.
-<img alt="Purchase UoM master" class="screenshot" src="/docs/assets/img/articles/item-purchase-uom-conversion.png">
+<img alt="Purchase UoM master" class="screenshot" src="{{docs_base_url}}/assets/img/articles/item-purchase-uom-conversion.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/purchase-order.md b/erpnext/docs/user/manual/en/buying/purchase-order.md
index cdfd0f9..070b3a0 100644
--- a/erpnext/docs/user/manual/en/buying/purchase-order.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-order.md
@@ -9,7 +9,7 @@
#### Purchase Order Flow Chart
-
+
In ERPNext, you can also make a Purchase Order directly by going to:
@@ -17,7 +17,7 @@
#### Create Purchase Order
-<img class="screenshot" alt="Purchase Order" src="/docs/assets/img/buying/purchase-order.png">
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/purchase-order.png">
Entering a Purchase Order is very similar to a Purchase Request, additionally
you will have to set:
@@ -42,10 +42,10 @@
and what you pay to your Supplier. This is called Value Added Tax (VAT).
#### Add Taxes in Purchase Order
-<img class="screenshot" alt="Purchase Order" src="/docs/assets/img/buying/add_taxes_to_doc.png">
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/add_taxes_to_doc.png">
#### Show Tax break-up
-<img class="screenshot" alt="Purchase Order" src="/docs/assets/img/buying/show_tax_breakup.png">
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/show_tax_breakup.png">
For example you buy Items worth X and sell them for 1.3X. So your Customer
pays 1.3 times the tax you pay your Supplier. Since you have already paid tax
@@ -81,7 +81,7 @@
#### Figure 3: Conversion of Purchase UOM to stock UOM
-<img class="screenshot" alt="Purchase Order - UOM" src="/docs/assets/img/buying/purchase-order-uom.png">
+<img class="screenshot" alt="Purchase Order - UOM" src="{{docs_base_url}}/assets/img/buying/purchase-order-uom.png">
__Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has
100 pieces.
diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
index b04949f..448532f 100644
--- a/erpnext/docs/user/manual/en/buying/purchase-taxes.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
@@ -10,7 +10,7 @@
> Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
Master
-<img class="screenshot" alt="Purchase taxes" src="/docs/assets/img/buying/purchase-taxes.png">
+<img class="screenshot" alt="Purchase taxes" src="{{docs_base_url}}/assets/img/buying/purchase-taxes.png">
You can specify if the tax / charge is only for valuation (not a part of
diff --git a/erpnext/docs/user/manual/en/buying/request-for-quotation.md b/erpnext/docs/user/manual/en/buying/request-for-quotation.md
index a48c297..2241ed6 100644
--- a/erpnext/docs/user/manual/en/buying/request-for-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/request-for-quotation.md
@@ -13,35 +13,35 @@
__Step 1:__ Open Request for Quotation and click on make Supplier Quotation.
-
+
__Step 2:__ Select supplier and click on make Supplier Quotation.
-
+
__Step 3:__ System will open the Supplier Quotation, user has to enter the rate and submit it.
-
+
#### For Supplier
__Step 1:__ User has to create contact or enter Email Address against the supplier on Request for Quotation.
-
+
__Step 2:__ User has to click on send supplier emails button.
* If supplier's user not available: system will create supplier's user and send details to the supplier, supplier will need to click on the link(Password Update) present in the email. After password update supplier can access his portal with the Request for Quotation form.
-
+
* If supplier's user available: system will send Request for Quotation link to supplier, supplier has to login using his credentials to view Request for Quotation form on portal.
-
+
__Step 3:__ Supplier has to enter amount and notes(payment terms) on the form and click on submit
-
+
__Step 4:__ On submission, system will create Supplier Quotation (draft mode) against the supplier. The user has to review the Supplier Quotation
and submit it. When all items from the Request for Quotation have been quoted by a supplier, the status is updated in the Supplier
@@ -51,4 +51,4 @@
If a supplier indicates that they will not provide a quotation for the item, this can be indicated in the RFQ document by checking the 'No Quote' box after the Request for Quotation has been submitted.
-
+
diff --git a/erpnext/docs/user/manual/en/buying/setup/buying-settings.md b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
index 197a18e..05f3e5a 100644
--- a/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
+++ b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
@@ -2,7 +2,7 @@
Buying Settings is where you can define properties which will be applied in the Buying module's transactions.
-
+
Let us look at the various options that can be configured:
diff --git a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
index 16d5445..5d80c1a 100644
--- a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
@@ -16,7 +16,7 @@
> Buying > Setup > Supplier Type > New Supplier Type
-<img class="screenshot" alt="Supplier Type" src="/docs/assets/img/buying/supplier-type.png">
+<img class="screenshot" alt="Supplier Type" src="{{docs_base_url}}/assets/img/buying/supplier-type.png">
You can classify your suppliers from a range of choice available in ERPNext.
Choose from a set of given options like Distributor, Electrical,Hardware,
diff --git a/erpnext/docs/user/manual/en/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
index 5935477..4dabeba 100644
--- a/erpnext/docs/user/manual/en/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
@@ -10,7 +10,7 @@
#### Supplier Quotation Flow-Chart
-
+
You can also make a Supplier Quotation directly from:
@@ -18,7 +18,7 @@
#### Create Supplier Quotation
-<img class="screenshot" alt="Supplier Quotation" src="/docs/assets/img/buying/supplier-quotation.png">
+<img class="screenshot" alt="Supplier Quotation" src="{{docs_base_url}}/assets/img/buying/supplier-quotation.png">
If you have multiple Suppliers who supply you with the same Item, you
usually send out a message (Request for Quote) to various Suppliers. In
@@ -37,10 +37,10 @@
You can select relevant tax by going to "Taxes and Charges" section and adding an entry to the table as shown below,
-<img class="screenshot" alt="Supplier Quotation" src="/docs/assets/img/buying/add_taxes_to_doc.png">
+<img class="screenshot" alt="Supplier Quotation" src="{{docs_base_url}}/assets/img/buying/add_taxes_to_doc.png">
Besides, in case of multiple items you can keep track of taxes on each by clicking "Show tax break-up"
-<img class="screenshot" alt="Supplier Quotation" src="/docs/assets/img/buying/show_tax_breakup.png">
+<img class="screenshot" alt="Supplier Quotation" src="{{docs_base_url}}/assets/img/buying/show_tax_breakup.png">
{next}
diff --git a/erpnext/docs/user/manual/en/buying/supplier-scorecard.md b/erpnext/docs/user/manual/en/buying/supplier-scorecard.md
index eb33030..ad4ce49 100644
--- a/erpnext/docs/user/manual/en/buying/supplier-scorecard.md
+++ b/erpnext/docs/user/manual/en/buying/supplier-scorecard.md
@@ -14,24 +14,24 @@
### Create Supplier Scorecard
A supplier scorecard is created for each supplier individually. Only one supplier scorecard can be created for each
supplier.
-<img class="screenshot" alt="Purchase Order" src="/docs/assets/img/buying/supplier-scorecard.png">
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/supplier-scorecard.png">
#### Final Score and Standings
The supplier scorecard consists of a set evaluation periods, during which the performance of a supplier is
evaluated. This period can be daily, monthly or yearly. The current score is calculated from the score of each evaluation
period based on the weighting function. The default formula is linearly weight over the previous 12 scoring periods.
-<img class="screenshot" alt="Purchase Order" src="/docs/assets/img/buying/supplier-scorecard-weighing.png">
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/supplier-scorecard-weighing.png">
This formula is customizable.
The supplier standing is used to quickly sort suppliers based on their performance. These are customizable for each supplier.
The scorecard standing of a supplier can also be used to restrict suppliers from being included in Request for Quotations or
being issued Purchase Orders.
-<img class="screenshot" alt="Purchase Order" src="/docs/assets/img/buying/supplier-scorecard-standing.png">
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/supplier-scorecard-standing.png">
#### Evaluation Criteria and Variables
A supplier can be evaluated on several individual evaluation criteria, including (but not limited to) quotation response time,
delivered item quality, and delivery timeliness. These criteria are weighed to determine the final period score.
-<img class="screenshot" alt="Purchase Order" src="/docs/assets/img/buying/supplier-scorecard-criteria.png">
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/supplier-scorecard-criteria.png">
The method for calculating each criteria is determined through the criteria formula field, which can use a number of pre-established variables.
The value of each of these variables is calculated over the scoring period for each supplier. Examples of such variables include:
- The total number of items received from the supplier
diff --git a/erpnext/docs/user/manual/en/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md
index 217d8b7..7ff645f 100644
--- a/erpnext/docs/user/manual/en/buying/supplier.md
+++ b/erpnext/docs/user/manual/en/buying/supplier.md
@@ -6,13 +6,13 @@
`Explore > Supplier > New Supplier`
-<img class="screenshot" alt="Supplier Master" src="/docs/assets/img/buying/supplier-master.png">
+<img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-master.png">
### Contacts and Addresses
Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Suppliers. Once Supplier is saved, you will find option to create Contact and Address for that Supplier.
-<img class="screenshot" alt="Supplier Master" src="/docs/assets/img/buying/supplier-new-address-contact.png">
+<img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-new-address-contact.png">
> Tip: When you select a Supplier in any transaction, Contact for which "Is Primary" field id checked, it will auto-fetch with the Supplier details.
@@ -22,7 +22,7 @@
If you want to customize payable account for the Supplier, you should first add a payable Account in the Chart of Account, and then select that Payable Account in the Supplier master.
-<img class="screenshot" alt="Supplier Master" src="/docs/assets/img/buying/supplier-payable-account.png">
+<img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-payable-account.png">
If you don't want to customize payable account, and proceed with default payable account "Creditor", then do not update any value in the Default Supplier Account's table.
diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index 6facabf..7fc9862 100644
--- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -2,18 +2,18 @@
ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web.
-<img class="screenshot" alt="Customer Portal" src="/docs/assets/img/website/portal-menu.png">
+<img class="screenshot" alt="Customer Portal" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance.
-<img class="screenshot" alt="Customer Portal" src="/docs/assets/img/website/website-login.png">
+<img class="screenshot" alt="Customer Portal" src="{{docs_base_url}}/assets/img/website/website-login.png">
#### Outstanding Sales Invoice
-<img class="screenshot" alt="Customer Portal" src="/docs/assets/img/website/invoice-unpaid.png">
+<img class="screenshot" alt="Customer Portal" src="{{docs_base_url}}/assets/img/website/invoice-unpaid.png">
#### Paid Sales Invoice
-<img class="screenshot" alt="Customer Portal" src="/docs/assets/img/website/invoice-paid.png">
+<img class="screenshot" alt="Customer Portal" src="{{docs_base_url}}/assets/img/website/invoice-paid.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
index 17b74e4..dc83ff6 100644
--- a/erpnext/docs/user/manual/en/customer-portal/issues.md
+++ b/erpnext/docs/user/manual/en/customer-portal/issues.md
@@ -7,18 +7,18 @@
#### Empty Issue List
-<img class="screenshot" alt="Issue List" src="/docs/assets/img/website/portal-ticket-list-empty.png">
+<img class="screenshot" alt="Issue List" src="{{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png">
#### New Issue
-<img class="screenshot" alt="New Issue " src="/docs/assets/img/website/portal-new-ticket.png">
+<img class="screenshot" alt="New Issue " src="{{docs_base_url}}/assets/img/website/portal-new-ticket.png">
#### Open Issue
-<img class="screenshot" alt="Issue Raised" src="/docs/assets/img/website/portal-ticket-1.gif">
+<img class="screenshot" alt="Issue Raised" src="{{docs_base_url}}/assets/img/website/portal-ticket-1.gif">
#### Reply on Issue
-<img class="screenshot" alt="Issue reply" src="/docs/assets/img/website/portal-ticket-reply.gif">
+<img class="screenshot" alt="Issue reply" src="{{docs_base_url}}/assets/img/website/portal-ticket-reply.gif">
{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/portal-login.md b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
index efa70a2..9065968 100644
--- a/erpnext/docs/user/manual/en/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
@@ -3,6 +3,6 @@
To login into the customer account, the customer has to use his Email Address and
the password sent by ERPNext; generated through the sign-up process.
-<img class="screenshot" alt="Website User Signup" src="/docs/assets/img/website/website-login.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
index 36e1b2c..aed8057 100644
--- a/erpnext/docs/user/manual/en/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -6,11 +6,11 @@
On the Login Page, you will find option to Signup.
-<img class="screenshot" alt="Website User Signup" src="/docs/assets/img/website/website-login.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
#### Step 2: Enter Customer Name and ID
-<img class="screenshot" alt="Website User Signup" src="/docs/assets/img/website/website-signup-details.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-signup-details.png">
After the sign up process, an email will be sent to the customers Email Address with the password details.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
index 686f748..902ada8 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
@@ -12,17 +12,17 @@
In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.)
-<img alt="select docytpe" class="screenshot" src="/docs/assets/img/articles/allow-on-submit-1.png">
+<img alt="select docytpe" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-1.png">
#### Step 3: Edit Field Property
In the fields section, click on the Custom field and check the **Allow On Submit**.
-<img alt="Check Allow on Submit" class="screenshot" src="/docs/assets/img/articles/allow-on-submit-2.png">
+<img alt="Check Allow on Submit" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-2.png">
#### Step 3: Update Customize Form
-<img alt="Update" class="screenshot" src="/docs/assets/img/articles/allow-on-submit-3.png">
+<img alt="Update" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-3.png">
After updating Customize Form, you should reload your ERPNext account. Then check form, and field to confirm its editable in submitted form as well.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md
index bc31cf2..65f7566 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/child-table-.md
@@ -6,28 +6,28 @@
This is how Quotation Item table renders value when Editable Grid is enabled. It will maximum list four columns in the table.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/child-1.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/child-1.png">
As per the default setting, only four columns are listed in the child table. Following is how you can add more columns in the editable itself.
For the field to be added as a column in the table, enter a value in the Column field. Also, ensure that "Is List View" property is checked for that field.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/child-2.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/child-2.png">
Based on the value in the Column field, columns will be added in the child table. Ensure that sum total of value added in the Column field doesn't exceed 10. Based on the Column value, width for that column will be set.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/child-3.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/child-3.png">
**Switch to Un-editable Grid**
To have more values shown in the preview of Quotation Item table, you can disable Editable Grid for the Quotation Item Doctype. Steps below.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/child-4.gif">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/child-4.gif">
Once Editable Grid is disabled for the Quotation Item, the following is how values will be rendered in a preview of the Quotation Item table.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/child-5.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/child-5.png">
To have specific field's value shown in the preview, ensure that for that field, in the Customize Form tool, "In List View" property is checked.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/child-6.png">
\ No newline at end of file
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/child-6.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
index 9a480bd..b6e6ddc 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
@@ -13,7 +13,7 @@
In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.). Once fields are updated in the accompanying table below, open a field above the one you wish to insert your Custom Field. Then click on "Insert Above" to insert the new Custom Field.
-<img alt="Select Docytpe" class="screenshot" src="/docs/assets/img/articles/link-field-1.gif">
+<img alt="Select Docytpe" class="screenshot" src="{{docs_base_url}}/assets/img/articles/link-field-1.gif">
####Step 4: Custom Field Values
@@ -24,6 +24,6 @@
1. Name: Desired name for the field
1. Options: Enter the name of the Doctype to which the field is linked
-<img alt="Enter Values" class="screenshot" src="/docs/assets/img/articles/link-field-2.png">
+<img alt="Enter Values" class="screenshot" src="{{docs_base_url}}/assets/img/articles/link-field-2.png">
<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
index 0319fd6..d8e5319 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
@@ -12,13 +12,13 @@
Select document type for which Sort Order is to be customized.
-<img alt="Sort Order field" class="screenshot" src="/docs/assets/img/articles/sort-order-2.png">
+<img alt="Sort Order field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/sort-order-2.png">
####Step 3: Update Sort Details
In the Customize Form, you will find these fields.
-<img alt="Sort Order field" class="screenshot" src="/docs/assets/img/articles/sort-order-1.png">
+<img alt="Sort Order field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/sort-order-1.png">
1. Sort Field: Select field based on which sorting will be done. It will be "Item_Code" field in scenario.
2. Sort Order: Sort Order will be two possible options, **Asc** for ascending, and **Desc** for descending.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
index 6a88fb7..b938552 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
@@ -8,16 +8,16 @@
In the Awesome Bar, type and select "Report List" for an option.
-<img alt="Report Search" class="screenshot" src="/docs/assets/img/articles/delete-report-1.png">
+<img alt="Report Search" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-1.png">
####Selecting and Deleting Report
The Report List will have all the standard and custom reports of your account. You can select Custom Report to be deleted from the list itself, and click on Delete icon.
-<img alt="Report List" class="screenshot" src="/docs/assets/img/articles/delete-report-2.png">
+<img alt="Report List" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-2.png">
Or you can open that report, and delete it from File menu option.
-<img alt="Report Delete" class="screenshot" src="/docs/assets/img/articles/delete-report-3.png">
+<img alt="Report Delete" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-3.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
index c4009c0..e47692f 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
@@ -2,7 +2,7 @@
All the sales transactions like Sales Order, Sales Invoice has Rounded Total in it. It calculated based on the value of Grand Total. Also Rounded Total is also visible in the Standard Print Formats.
-<img alt="Print Preview" class="screenshot" src="/docs/assets/img/articles/hide-rounded-total-1.png">
+<img alt="Print Preview" class="screenshot" src="{{docs_base_url}}/assets/img/articles/hide-rounded-total-1.png">
Follow steps given below to hide rounded total from Standard Print Formats, for all the sales transactions.
@@ -14,7 +14,7 @@
Check Disable Rounded Total, and Save Global Defaults.
-<img alt="Print Preview" class="screenshot" src="/docs/assets/img/articles/hide-rounded-total-2.png">
+<img alt="Print Preview" class="screenshot" src="{{docs_base_url}}/assets/img/articles/hide-rounded-total-2.png">
For system to take effect of this setting, you should clear cache and refresh your ERPNext account. Then your print formats shall not render value for the Rounded Total in the print formats.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
index 04b20ac..4c35e21 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
@@ -8,12 +8,12 @@
Sales Order (standard fields)
-<img class="screenshot" alt="Standard fields in Sales Order" src="/docs/assets/img/articles/fetching-1.png">
+<img class="screenshot" alt="Standard fields in Sales Order" src="{{docs_base_url}}/assets/img/articles/fetching-1.png">
Sales Invoice (custom fields)
-<img class="screenshot" alt="Custom Field in Sales Invoice" src="/docs/assets/img/articles/fetching-2.png">
+<img class="screenshot" alt="Custom Field in Sales Invoice" src="{{docs_base_url}}/assets/img/articles/fetching-2.png">
Since names for the Customer's PO related fields are same in the Sales Order and Sales Invoice, when creating Sales Invoice from the Sales Order, values in these fields are auto-fetched.
-<img class="screenshot" alt="Values fetching from Sales Order to Sales Invoice" src="/docs/assets/img/articles/fetching-3.gif">
\ No newline at end of file
+<img class="screenshot" alt="Values fetching from Sales Order to Sales Invoice" src="{{docs_base_url}}/assets/img/articles/fetching-3.gif">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md
index ea0dd93..2b7459c 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md
@@ -10,13 +10,13 @@
#### Step 2: Select Document Type
-<img alt="Select Doctype" class="screenshot" src="/docs/assets/img/articles/max-attachment-1.png">
+<img alt="Select Doctype" class="screenshot" src="{{docs_base_url}}/assets/img/articles/max-attachment-1.png">
#### Step 3: Set Limit
Set Maximum Attachments as five.
-<img alt="Set Max Attachment" class="screenshot" src="/docs/assets/img/articles/max-attachment-2.png">
+<img alt="Set Max Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/max-attachment-2.png">
After update Max Attachments, Update Customization Form. Reload your ERPNext account and then check specific Quotation to confirm if Max Attachment limit is applied.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
index b967a35..62cc3f9 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
@@ -14,13 +14,13 @@
As per our scenario, Sales Order will be selected as Document Type.
field-visible-2.gif
-<img alt="Document Type" class="screenshot" src="/docs/assets/img/articles/print-visible-1.png">
+<img alt="Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/articles/print-visible-1.png">
#### Step 3: Uncheck Print Hide
click to open field to be made visible in the Standard Print Format. Uncheck **Print Hide** field.
-<img alt="Uncheck Print Hide " class="screenshot" src="/docs/assets/img/articles/print-visible-2.gif">
+<img alt="Uncheck Print Hide " class="screenshot" src="{{docs_base_url}}/assets/img/articles/print-visible-2.gif">
#### Step 4: Update
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
index 40cad73..c72004d 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
@@ -12,7 +12,7 @@
Firstly we will create a link field which will be linked to the Doctype.
-<img alt="Custom Link Field" class="screenshot" src="/docs/assets/img/articles/dynamic-field-1.gif">
+<img alt="Custom Link Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/dynamic-field-1.gif">
By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just like Quotation is one Doctype, which has multiple Quotation under it. Same way, Doctype is also a Doctype which has Sales Order, Purchase Order and other doctypes created as Doctype records.
@@ -27,17 +27,17 @@
So linking this field with parent Doctype will list all the Doctype records.
-<img alt="journal Voucher Link Field" class="screenshot" src="/docs/assets/img/articles/dynamic-field-2.png">
+<img alt="journal Voucher Link Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/dynamic-field-2.png">
#### Step 2: Insert Dynamic Link Field
This custom field's type will be "Dynamic Link". In the Option field, name of Doctype link field will be mentioned.
-<img alt="Custom Dynamic Field" class="screenshot" src="/docs/assets/img/articles/dynamic-field-3.gif">
+<img alt="Custom Dynamic Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/dynamic-field-3.gif">
This field will allow selecting document id, based on value selected in the Doctype link field. For example, if we select Sales Order in the prior field, Dynamic Link field will list all the Sales Orders ids.
-<img alt="Custom Dynamic Field" class="screenshot" src="/docs/assets/img/articles/dynamic-field-4.gif">
+<img alt="Custom Dynamic Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/dynamic-field-4.gif">
<div class="well">
**Customizing options in the Doctype Link field**
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
index c3f97c4..191ce8a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
@@ -6,7 +6,7 @@
If module is hidden in-spite of assignment of required Role, then you should check if Website is not disabled from All Application.
-<img alt="All Applications" class="screenshot" src="/docs/assets/img/articles/module-visibility-1.gif">
+<img alt="All Applications" class="screenshot" src="{{docs_base_url}}/assets/img/articles/module-visibility-1.gif">
If Website is checked in All Application, but still not visible for the User, check if is hidden by System Manager. In the Setup module, feature called Show/Hide Modules allows System Manager to hide specific module from all the Users.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
index 369a712..3dd6c68 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
@@ -16,12 +16,12 @@
Update Warehouse field name in the Search By field.
-<img alt="Search By in Customize Form" class="screenshot" src="/docs/assets/img/articles/search-by-1.png">
+<img alt="Search By in Customize Form" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-by-1.png">
#### Searching in Another Record.
While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier.
-<img alt="Search By in Customize Form" class="screenshot" src="/docs/assets/img/articles/search-by-2.png">
+<img alt="Search By in Customize Form" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-by-2.png">
<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
index d098e5e..ede54f2 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
@@ -8,13 +8,13 @@
#### 1.1 Go to My Setting
-<img alt="My Setting" class="screenshot" src="/docs/assets/img/articles/change-language-1.png">
+<img alt="My Setting" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-1.png">
#### 1.2 Select Language
-<img alt="Select Language" class="screenshot" src="/docs/assets/img/articles/change-language-2.png">
+<img alt="Select Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-2.png">
-<img alt="Select Language" class="screenshot" src="/docs/assets/img/articles/set-language-1.gif">
+<img alt="Select Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/set-language-1.gif">
#### 1.3 Save User
@@ -30,13 +30,13 @@
#### Set Language
-<img alt="Global Language" class="screenshot" src="/docs/assets/img/articles/change-language-3.png">
+<img alt="Global Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-language-3.png">
#### Save
Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference.
-<img alt="Select Language" class="screenshot" src="/docs/assets/img/articles/set-language-2.gif">
+<img alt="Select Language" class="screenshot" src="{{docs_base_url}}/assets/img/articles/set-language-2.gif">
Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://translate.erpnext.com).
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md
index 45c1f79..4ed070f 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md
@@ -8,11 +8,11 @@
`Setup > Settings > System Settings`.
-<img alt="Global Precision" class="screenshot" src="/docs/assets/img/articles/precision-1.png">
+<img alt="Global Precision" class="screenshot" src="{{docs_base_url}}/assets/img/articles/precision-1.png">
You can also set field specific precision. To do that go to `Setup > Customize > Customize Form` and select the DocType there. Then go to the specific field row and change precision. Precision field is only visible if field-type is one of the Float, Currency and Percent.
-<img alt="Field-wise Precision" class="screenshot" src="/docs/assets/img/articles/precision-2.png">
+<img alt="Field-wise Precision" class="screenshot" src="{{docs_base_url}}/assets/img/articles/precision-2.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
index 29eef88..5868141 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
@@ -10,10 +10,10 @@
Select Document Type for which you want to set user permission. After permissions are loaded for selected document, scroll to role for which you want to set restriction.
-<img alt="Sales Order" class="screenshot" src="/docs/assets/img/articles/owner-restriction-1.png">
+<img alt="Sales Order" class="screenshot" src="{{docs_base_url}}/assets/img/articles/owner-restriction-1.png">
#### Step 3: Apply User Permission
For Role to be restricted (Sales User in this case), check "If Owner".
-<img alt="S" class="screenshot" src="/docs/assets/img/articles/owner-restriction-2.png">
+<img alt="S" class="screenshot" src="{{docs_base_url}}/assets/img/articles/owner-restriction-2.png">
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
index 93abb3e..d6d1e3f 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
@@ -21,7 +21,7 @@
not be able to re-produce.
1. Custom?: This field will be checked by default when adding Custom Doctype.
-<img alt="Doctype Basic" class="screenshot" src="/docs/assets/img/setup/customize/doctype-basics.png">
+<img alt="Doctype Basic" class="screenshot" src="{{docs_base_url}}/assets/img/setup/customize/doctype-basics.png">
#### Fields
@@ -36,7 +36,7 @@
1. Actions (button)
1. Attachments or Images
-<img alt="Doc fields" class="screenshot" src="/docs/assets/img/setup/customize/Doctype-all-fields.png">
+<img alt="Doc fields" class="screenshot" src="{{docs_base_url}}/assets/img/setup/customize/Doctype-all-fields.png">
When you add fields, you need to enter the **Type**. **Label** is optional for Section Break and Column Break. **Name** (`fieldname`) is the name of the database table column.
@@ -46,19 +46,19 @@
In this section, you can define criteria based on which document for this doctype will be named. There are multiple criterion based on which document can be named, like naming based on the value in the specific field, or based on Naming Series, or based on value provided by the user in the prompt, which will be shown when saving document. In the following example, we are doing naming based on the value in the field **book_name**.
-<img alt="Doctype Naming" class="screenshot" src="/docs/assets/img/setup/customize/doctype-field-naming.png">
+<img alt="Doctype Naming" class="screenshot" src="{{docs_base_url}}/assets/img/setup/customize/doctype-field-naming.png">
#### Permission
In this table, you should select roles and define permission roles for them for this Doctype.
-<img alt="Doctype Permissions" class="screenshot" src="/docs/assets/img/setup/customize/Doctype-permissions.png">
+<img alt="Doctype Permissions" class="screenshot" src="{{docs_base_url}}/assets/img/setup/customize/Doctype-permissions.png">
#### Save DocType
On saving doctype, you will get pop-up to provide name for this Doctype.
-<img alt="Doctype Save" class="screenshot" src="/docs/assets/img/setup/customize/Doctype-save.png">
+<img alt="Doctype Save" class="screenshot" src="{{docs_base_url}}/assets/img/setup/customize/Doctype-save.png">
#### DocType in System
@@ -67,12 +67,12 @@
`Human Resource > Document > Book`
-<img alt="Doctype List" class="screenshot" src="/docs/assets/img/setup/customize/Doctype-list-view.png">
+<img alt="Doctype List" class="screenshot" src="{{docs_base_url}}/assets/img/setup/customize/Doctype-list-view.png">
#### Book master
Using the fields entered, following is the master one book.
-<img alt="Doctype Form" class="screenshot" src="/docs/assets/img/setup/customize/Doctype-book-added.png">
+<img alt="Doctype Form" class="screenshot" src="{{docs_base_url}}/assets/img/setup/customize/Doctype-book-added.png">
{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
index 2c11e0d..ec6c222 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
@@ -14,25 +14,25 @@
In the Customize Form, select Document Type in which you want to insert Custom Field. Let's assume we are inserting Custom Field in the Employee master.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-1.gif">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-1.gif">
#### Insert Row for the Custom Field
In Customize Form, open the field above which you want to insert a Custom Field. Click on Insert Above.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-2.gif">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-2.gif">
####Set Field Label
Custom Field's name will be set based on its Label. If you want to create Custom Field with specific name, but with different label, then you should first set Label as you want Field Name to be set. After Custom Field is saved, you can edit the Field Label again.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-3.png">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-3.png">
####Select Field Type
There are various types of Field like Data, Date, Link, Select, Text and so on. Select Field Type for the Custom Field.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-4.png">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-4.png">
Click [here](/docs/user/manual/en/customize-erpnext/articles/field-types.html) to learn more about types of field you can set for your Custom Field.
@@ -44,7 +44,7 @@
If field type is set as Select (drop down field), then all he possible result for this field should be listed in the Options field. Each possible result should be separate by row.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-5.png">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-5.png">
For Data field, Option can be set to "Email" or "Phone" and the field will be validated accordingly.
@@ -65,7 +65,7 @@
After inserting required details for the Custom Field, Update Customize Form. On update, Custom Field will be inserting in the form, Employee master in this case. Before checking Employee form, reload your ERPNext account. After reload, check Employee form to see Custom Field in a form.
-<img alt="Select Document Type" class="screenshot" src="/docs/assets/img/customize/custom-field-6.png">
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-6.png">
####Deleting Custom Field
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
index f5519c2..1e21e4a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
@@ -6,7 +6,7 @@
`Setup > Customization > Custom Script`
-<img alt="Custom Script" class="screenshot" src="/docs/assets/img/customize/custom-script-1.png">
+<img alt="Custom Script" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-script-1.png">
### Topics
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
index 5f590bb..7eb02ab 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
@@ -13,7 +13,7 @@
You can also reach the Customize Form tool from the List Views.
-<img alt="Customize Form List" class="screenshot" src="/docs/assets/img/customize/customize-form-from-list-view.gif">
+<img alt="Customize Form List" class="screenshot" src="{{docs_base_url}}/assets/img/customize/customize-form-from-list-view.gif">
####Step 2: Select Document Type
@@ -21,7 +21,7 @@
If you reach customize form from the Setup module, or from awesome bar, then you will have to manually select Document Type in which customization needs to be made.
-<img alt="Customize Form select doctype" class="screenshot" src="/docs/assets/img/customize/customize-form-select-doctype.png">
+<img alt="Customize Form select doctype" class="screenshot" src="{{docs_base_url}}/assets/img/customize/customize-form-select-doctype.png">
####Step 3: Edit Property
@@ -29,7 +29,7 @@
To customized Project field, click on the respective row, and check "Mandatory". With this, Project field will become mandatory in the Sales Order.
-<img alt="Customize Form select doctype" class="screenshot" src="/docs/assets/img/customize/customize-form-edit-property.gif">
+<img alt="Customize Form select doctype" class="screenshot" src="{{docs_base_url}}/assets/img/customize/customize-form-edit-property.gif">
Like setting setting field Mandatory, following are the other customization options in the Customize Form tool.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/document-title.md b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md
index 64dad31..a05158d 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/document-title.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md
@@ -23,14 +23,14 @@
{customer_name} for {project}
<img class="screenshot" alt = "Customize Title"
- src="/docs/assets/img/customize/customize-title.gif">
+ src="{{docs_base_url}}/assets/img/customize/customize-title.gif">
#### Fixed or Editable Titles
If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document.
<img class="screenshot" alt = "Editable Title"
- src="/docs/assets/img/customize/editable-title.gif">
+ src="{{docs_base_url}}/assets/img/customize/editable-title.gif">
If you want a fixed title, you can set the rule in the **Options** property. In this way, the title will be automatically updated everytime the document is updated.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
index ad4b00e..ab47a45 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
@@ -4,7 +4,7 @@
`Setup > Permissions > Show / Hide Modules`
-<img alt="Hide Features" class="screenshot" src="/docs/assets/img/customize/show-hide-modules.png">
+<img alt="Hide Features" class="screenshot" src="{{docs_base_url}}/assets/img/customize/show-hide-modules.png">
Click [here](/docs/user/manual/en/customize-erpnext/articles/module-visibility.html) to learn about other features from where icons from the desktop can be hidden.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
index 7c1234f..ccfa63a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
@@ -8,35 +8,35 @@
To create a Kanban board in ERPNext click the Kanban dropdown on the sidebar, and select New Kanban Board.
-<img class="screenshot" alt="Add New Kanban Board" src="/docs/assets/img/customize/kanban-board-1.png">
+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-1.png">
###Add new Card/Document
To add Cards on Kanban Board click Add Tasks. You can Edit a card details by click on the card and it will take you to the Task Doctype where you can further add and edit card details.
-<img class="screenshot" alt="Add card in Kanban Board" src="/docs/assets/img/customize/kanban-board-2.png">
+<img class="screenshot" alt="Add card in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-2.png">
###Update Cards/Document Status
Based on the Task status you can drag and drop the Cards in the respective column. For example if the task is work in progress you can move the card for the task from the status Open to Working.
-<img class="screenshot" alt="Move Cards on Kanban Board" src="/docs/assets/img/customize/kanban-board-3.gif">
+<img class="screenshot" alt="Move Cards on Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-3.gif">
###Manage Columns
To add more columns in the Kanban board click Add columns.
-<img class="screenshot" alt="Add New column in Kanban Board" src="/docs/assets/img/customize/kanban-board-4.gif">
+<img class="screenshot" alt="Add New column in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-4.gif">
To move columns based on the priority drag and drop the columns as per requirement.
-<img class="screenshot" alt="Move columns in Kanban Board" src="/docs/assets/img/customize/kanban-board-5.gif">
+<img class="screenshot" alt="Move columns in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-5.gif">
To set Colors to a Card click drop down menu on the card and assign color to it.
-<img class="screenshot" alt="Add color to cards in Kanban Board" src="/docs/assets/img/customize/kanban-board-6.gif">
+<img class="screenshot" alt="Add color to cards in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-6.gif">
You can also Archive and Restore the columns added in a Kanban board. To do so click Archive in drop down menu on the card. Once archived you can restore the column from the list of the archived columns in the Kanban board.
-<img class="screenshot" alt="Archive and Restore in Kanban Board" src="/docs/assets/img/customize/kanban-board-7.gif">
+<img class="screenshot" alt="Archive and Restore in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-7.gif">
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
index 993f92a..e626e9b 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
@@ -18,7 +18,7 @@
`Setup > Printing > Print Formats`
-<img alt="Print Format" class="screenshot" src="/docs/assets/img/customize/print-format.png">
+<img alt="Print Format" class="screenshot" src="{{docs_base_url}}/assets/img/customize/print-format.png">
Select the type of Print Format you want to edit and click on the “Copy”
button on the right column. A new Print Format will open up with “Is Standard”
@@ -45,7 +45,7 @@
`Setup > Printing and Branding > Print Settings`
-<img alt="Print Format" class="screenshot" src="/docs/assets/img/customize/print-settings.png">
+<img alt="Print Format" class="screenshot" src="{{docs_base_url}}/assets/img/customize/print-settings.png">
#### Example
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
index b97cfb1..8b35e8d 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria.md
@@ -2,12 +2,25 @@
Assessment Criteria is the parameter based on which you assess the Student.
-<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/education/assessment/assessment-criteria.png">
+<img class="screenshot" alt="Assessment Criteria" src="{{docs_base_url}}/assets/img/education/assessment/assessment-criteria.png">
After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
+<img class="screenshot" alt="Assessment Plan Criteria" src="{{docs_base_url}}/assets/img/education/assessment/assessment-plan-criteria.png">
+
+#### Video Tutorial on Assessment Criteria
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/t8ZDDq4qtIk?end=52' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+<div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md
deleted file mode 100644
index 4287ca8..0000000
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_criteria_group.md
+++ /dev/null
@@ -1 +0,0 @@
-#
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
index ed02a53..b1ad745 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_group.md
@@ -4,10 +4,23 @@
For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-term.png">
+<img class="screenshot" alt="Assessment Group Term" src="{{docs_base_url}}/assets/img/education/assessment/assessment-group-term.png">
On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-details.png">
+<img class="screenshot" alt="Assessment Group Term" src="{{docs_base_url}}/assets/img/education/assessment/assessment-group-details.png">
+
+#### Video Tutorial on Assessment Group
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/I1T7Z2JbcP4' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+<div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
index 7272279..0bb7e6b 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_plan.md
@@ -10,10 +10,23 @@
4. Examiner and Supervisor
-<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/education/assessment/assessment-plan-details.png">
+<img class="screenshot" alt="Assessment Plan Details" src="{{docs_base_url}}/assets/img/education/assessment/assessment-plan-details.png">
5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
+<img class="screenshot" alt="Assessment Plan Criteria" src="{{docs_base_url}}/assets/img/education/assessment/assessment-plan-criteria.png">
+
+#### Video Tutorial on Assessment Plan
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/Q9CzzoYb_Js' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
index ed3e5fb..4ca91a7 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result.md
@@ -2,6 +2,18 @@
Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/education/assessment/assessment_result_tool.html).
-<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/education/assessment/assessment-result.png">
+<img class="screenshot" alt="Assessment Result" src="{{docs_base_url}}/assets/img/education/assessment/assessment-result.png">
+
+#### Video Tutorial on Assessment Result
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/U8ZRB8CM-UM?end=89' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
index 88b7a7a..f57fc18 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/assessment_result_tool.md
@@ -2,8 +2,21 @@
Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student.
-<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/education/assessment/assessment-result-tool.png">
+<img class="screenshot" alt="Assessment Result Tool" src="{{docs_base_url}}/assets/img/education/assessment/assessment-result-tool.png">
As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
+#### Video Tutorial on Assessment Result Tool
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/U8ZRB8CM-UM?start=80' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
{next}
diff --git a/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
index 0ad610b..3d8f2e9 100644
--- a/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
+++ b/erpnext/docs/user/manual/en/education/Assessment/grading_scale.md
@@ -2,6 +2,19 @@
In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned.
-<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/education/assessment/grading-scale.png">
+<img class="screenshot" alt="Grading Scale" src="{{docs_base_url}}/assets/img/education/assessment/grading-scale.png">
+
+#### Video Tutorial on Grading Scale
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/t8ZDDq4qtIk?start=52' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Attendance/index.txt b/erpnext/docs/user/manual/en/education/Attendance/index.txt
index 8cd0262..14ecda3 100644
--- a/erpnext/docs/user/manual/en/education/Attendance/index.txt
+++ b/erpnext/docs/user/manual/en/education/Attendance/index.txt
@@ -1,3 +1,3 @@
student-attendance
-student-leave-application
-student-attendance-tool
\ No newline at end of file
+student-attendance-tool
+student-leave-application
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
index fac9d6e..cc526b5 100644
--- a/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance-tool.md
@@ -10,6 +10,19 @@
Student detials will be autofetched and you can mark the attendance of the given date.
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/setup/student-attendance-tool.gif">
+<img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/setup/student-attendance-tool.gif">
+
+#### Tutorial Video for Student Attendance Tool
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//j9pgkPuyiaI?start=63' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+<div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
index 4be2831..0ebb65c 100644
--- a/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-attendance.md
@@ -8,8 +8,21 @@
Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save.
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-attendance.gif">
+<img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/schedule/student-attendance.gif">
**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
+#### Tutorial Video on Student Attendance
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//j9pgkPuyiaI' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
index e22c6e9..406c20d 100644
--- a/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
+++ b/erpnext/docs/user/manual/en/education/Attendance/student-leave-application.md
@@ -4,10 +4,23 @@
To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-leave-application.gif">
+<img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/schedule/student-leave-application.gif">
Incase the student is not attending the institute in order to participate or represent institute in any event, he/she can be mark as present from the Leave Application itself.
Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave.
+#### Tutorial Video for Student Leave Application
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/NwwH5t-NKBE' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
index 97a26c7..fa2e09a 100644
--- a/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
+++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment-tool.md
@@ -8,14 +8,26 @@
1. **Student Applicants**: List of Student Applicants will be fetched for the selected **Program**, **Academic year** and **Academic Term** (if provided).
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment-tool.gif">
+<img class="screenshot" alt="Student Applicant Enrollment" src="{{docs_base_url}}/assets/img/education/admission/program-enrollment-tool.gif">
2. **Program Enrollment**: List of students already enrolled in selected **Program** for the given **Academic Year**, **Academic Term** (if provided) and **Student Batch** will be fetched and can be used to enroll students from one academic year/term to another in the same **Program** or a new **Program**.
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment-tool01.gif">
+<img class="screenshot" alt="Student Applicant Enrollment" src="{{docs_base_url}}/assets/img/education/admission/program-enrollment-tool01.gif">
**New Student Batch**: This can be selected for the entire students fetched in the table. Priority will be given to the Batch selected in the table (for individual students).
For promoting the students, the new academic year, academic term and program can also be selected for the enrollment of the fetched students list.
+#### Video Tutorial for Program Enrollment Tool
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//5nxWYBRHY_o?start=82' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/admission/program-enrollment.md b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md
index 6fe9692..54bf98b 100644
--- a/erpnext/docs/user/manual/en/education/admission/program-enrollment.md
+++ b/erpnext/docs/user/manual/en/education/admission/program-enrollment.md
@@ -7,7 +7,7 @@
Else, to create the new Program Enrollment manually, go to:
> Education > Program Enrollment > New
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment.gif">
+<img class="screenshot" alt="Student Applicant Enrollment" src="{{docs_base_url}}/assets/img/education/admission/program-enrollment.gif">
If any institution has skipped the online admission process then Program Enrollment can also be considered as the confirmation of the admission in a particular Program.
@@ -17,5 +17,15 @@
Student Category: For the Institutions having multiple Fees Structure, this field can be used to differentiate the student enrollment in a given fee category.
+#### Video Tutorial For Program Enrollment
-{next}
\ No newline at end of file
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }</style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//5nxWYBRHY_o?start=0&end=88' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
+{next}
diff --git a/erpnext/docs/user/manual/en/education/admission/student-applicant.md b/erpnext/docs/user/manual/en/education/admission/student-applicant.md
index 121844c..2f72542 100644
--- a/erpnext/docs/user/manual/en/education/admission/student-applicant.md
+++ b/erpnext/docs/user/manual/en/education/admission/student-applicant.md
@@ -3,7 +3,7 @@
A Student Applicant record needs to be created when a student applies for a program at your institute.
You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master.
-<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-applicant.png">
+<img class="screenshot" alt="Student Applicant" src="{{docs_base_url}}/assets/img/education/admission/student-applicant.png">
### Application Status
@@ -20,11 +20,23 @@
### Student Enrollment
Once the form is submitted you can either approve or reject the application form.
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-application-actions.png">
+<img class="screenshot" alt="Student Applicant Enrollment" src="{{docs_base_url}}/assets/img/education/admission/student-application-actions.png">
Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/education/student/program-enrollment.html).
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-applicant-enroll.png">
+<img class="screenshot" alt="Student Applicant Enrollment" src="{{docs_base_url}}/assets/img/education/admission/student-applicant-enroll.png">
+
+#### Video Tutorial for Student Application
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }</style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/l8PUACusN3E' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
{next}
diff --git a/erpnext/docs/user/manual/en/education/admission/student_admission.md b/erpnext/docs/user/manual/en/education/admission/student_admission.md
index f2b8ef6..ff98a92 100644
--- a/erpnext/docs/user/manual/en/education/admission/student_admission.md
+++ b/erpnext/docs/user/manual/en/education/admission/student_admission.md
@@ -7,7 +7,7 @@
**education** >> **Admissions** >> **Student Admission** >>
-<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-admission.gif">
+<img class="screenshot" alt="Student Applicant" src="{{docs_base_url}}/assets/img/education/admission/student-admission.gif">
Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant.
diff --git a/erpnext/docs/user/manual/en/education/fees/fee-category.md b/erpnext/docs/user/manual/en/education/fees/fee-category.md
index 8a4822f..b724681 100644
--- a/erpnext/docs/user/manual/en/education/fees/fee-category.md
+++ b/erpnext/docs/user/manual/en/education/fees/fee-category.md
@@ -2,6 +2,6 @@
List of all different type of fees collected.
-<img class="screenshot" alt="Fees Category" src="/docs/assets/img/education/fees/fee-category.png">
+<img class="screenshot" alt="Fees Category" src="{{docs_base_url}}/assets/img/education/fees/fee-category.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/fees/fee-structure.md b/erpnext/docs/user/manual/en/education/fees/fee-structure.md
index 2131c4a..f502b93 100644
--- a/erpnext/docs/user/manual/en/education/fees/fee-structure.md
+++ b/erpnext/docs/user/manual/en/education/fees/fee-structure.md
@@ -8,7 +8,7 @@
or you can create the Fee Structure from Program also.
-<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/education/fees/fee-structure.png">
+<img class="screenshot" alt="Fees Structure" src="{{docs_base_url}}/assets/img/education/fees/fee-structure.png">
#### Academic Year Impact
@@ -20,4 +20,16 @@
If you are going to use this in the Fee Schedule, you must select the Accounts carefully as Fee Schedule updates the respected Accounts in bulk.
+#### Video Tutorial for Fee Structure
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//_ZkvyVnWgYk' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/fees/fees.md b/erpnext/docs/user/manual/en/education/fees/fees.md
index 5e0c126..e5cdcb3 100644
--- a/erpnext/docs/user/manual/en/education/fees/fees.md
+++ b/erpnext/docs/user/manual/en/education/fees/fees.md
@@ -3,6 +3,6 @@
Maintain a record of fees collected from students.
The [Fee Structure](/docs/user/manual/en/education/fees/fee-structure.html) is fetched based on the selected Program and Academic Term.
-<img class="screenshot" alt="Fees" src="/docs/assets/img/education/fees/fees.png">
+<img class="screenshot" alt="Fees" src="{{docs_base_url}}/assets/img/education/fees/fees.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/fees/index.md b/erpnext/docs/user/manual/en/education/fees/index.md
index d0ccb94..c432db2 100644
--- a/erpnext/docs/user/manual/en/education/fees/index.md
+++ b/erpnext/docs/user/manual/en/education/fees/index.md
@@ -2,7 +2,7 @@
This section contains 'Fee' related documents.
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/fees/fees-section.png">
+<img class="screenshot" alt="Fees Section" src="{{docs_base_url}}/assets/img/education/fees/fees-section.png">
### Topics
diff --git a/erpnext/docs/user/manual/en/education/index.md b/erpnext/docs/user/manual/en/education/index.md
index 36c6bbd..49dfd64 100644
--- a/erpnext/docs/user/manual/en/education/index.md
+++ b/erpnext/docs/user/manual/en/education/index.md
@@ -3,6 +3,6 @@
The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination.
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/module.png">
+<img class="screenshot" alt="Fees Section" src="{{docs_base_url}}/assets/img/education/module.png">
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/schedule/course-schedule.md b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md
index f5134d5..eeccae4 100644
--- a/erpnext/docs/user/manual/en/education/schedule/course-schedule.md
+++ b/erpnext/docs/user/manual/en/education/schedule/course-schedule.md
@@ -3,13 +3,25 @@
Course Schedule is the schedule of a session conducted by an Instructor for a particular Course.
You can see the overall course schedule in the Calendar view.
-<img class="screenshot" alt="Course Schedule" src="/docs/assets/img/education/schedule/course-schedule.png">
+<img class="screenshot" alt="Course Schedule" src="{{docs_base_url}}/assets/img/education/schedule/course-schedule.png">
+
+#### Video Tutorial on Course Scheduling
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/iy-DBV9jI-A?start=0&end=114' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
### Marking Attendance
You can mark attendance for a Student Group against a Course Schedule.
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att.png">
+<img class="screenshot" alt="Course Schedule Attendance" src="{{docs_base_url}}/assets/img/education/schedule/course-schedule-att.png">
- To make attendance, expand the attendance section.
- Check the students who were present for that session.
@@ -20,6 +32,6 @@
Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden.
A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule.
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att-1.png">
+<img class="screenshot" alt="Course Schedule Attendance" src="{{docs_base_url}}/assets/img/education/schedule/course-schedule-att-1.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/schedule/examination.md b/erpnext/docs/user/manual/en/education/schedule/examination.md
index d21d204..10f59f8 100644
--- a/erpnext/docs/user/manual/en/education/schedule/examination.md
+++ b/erpnext/docs/user/manual/en/education/schedule/examination.md
@@ -2,7 +2,7 @@
The Examination record can be used to track the exam schedule and the results of that exam.
-<img class="screenshot" alt="Examination" src="/docs/assets/img/education/schedule/examination.png">
+<img class="screenshot" alt="Examination" src="{{docs_base_url}}/assets/img/education/schedule/examination.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/schedule/index.md b/erpnext/docs/user/manual/en/education/schedule/index.md
index 247b0b8..5e1b43a 100644
--- a/erpnext/docs/user/manual/en/education/schedule/index.md
+++ b/erpnext/docs/user/manual/en/education/schedule/index.md
@@ -1,6 +1,6 @@
# Schedule
-<img class="screenshot" alt="Schedule Section" src="/docs/assets/img/education/schedule/schedule-section.png">
+<img class="screenshot" alt="Schedule Section" src="{{docs_base_url}}/assets/img/education/schedule/schedule-section.png">
### Topics
diff --git a/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md
index 08a7fa9..65dd95b 100644
--- a/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md
+++ b/erpnext/docs/user/manual/en/education/schedule/scheduling-tool.md
@@ -2,7 +2,7 @@
This tool can be used to create 'Course Schedules'.
-<img class="screenshot" alt="Scheduling Tool" src="/docs/assets/img/education/schedule/scheduling-tool.png">
+<img class="screenshot" alt="Scheduling Tool" src="{{docs_base_url}}/assets/img/education/schedule/scheduling-tool.png">
### Creating Course Schedules
@@ -20,4 +20,14 @@
- Check the 'Reschedule' checkbox and then click 'Schedule Course' button.
- System will delete existing Course Schedules for specified Course within the mentioned Course Start Date and Course End Date and crate new Course Schedules.
+#### Video Tutorial on Scheduling Tool
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }</style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/iy-DBV9jI-A?start=114' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
{next}
diff --git a/erpnext/docs/user/manual/en/education/setup/academic-term.md b/erpnext/docs/user/manual/en/education/setup/academic-term.md
index d264dca..2dd1d69 100644
--- a/erpnext/docs/user/manual/en/education/setup/academic-term.md
+++ b/erpnext/docs/user/manual/en/education/setup/academic-term.md
@@ -4,7 +4,7 @@
The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year.
-<img class="screenshot" alt="Academic Term" src="/docs/assets/img/education/setup/academic-term.png">
+<img class="screenshot" alt="Academic Term" src="{{docs_base_url}}/assets/img/education/setup/academic-term.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/academic-year.md b/erpnext/docs/user/manual/en/education/setup/academic-year.md
index c9ea521..ec66c97 100644
--- a/erpnext/docs/user/manual/en/education/setup/academic-year.md
+++ b/erpnext/docs/user/manual/en/education/setup/academic-year.md
@@ -4,7 +4,7 @@
The **Academic year** form have the Start and End date for the Academic year.
-<img class="screenshot" alt="Academic Year" src="/docs/assets/img/education/setup/academic-year.png">
+<img class="screenshot" alt="Academic Year" src="{{docs_base_url}}/assets/img/education/setup/academic-year.png">
**Student group** link is given to view or add the respective groups to the Academic year.
diff --git a/erpnext/docs/user/manual/en/education/setup/course.md b/erpnext/docs/user/manual/en/education/setup/course.md
index 0d6e5ac..609cac4 100644
--- a/erpnext/docs/user/manual/en/education/setup/course.md
+++ b/erpnext/docs/user/manual/en/education/setup/course.md
@@ -4,12 +4,24 @@
To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted.
-<img class="screenshot" alt="Course" src="/docs/assets/img/education/setup/course.png">
+<img class="screenshot" alt="Course" src="{{docs_base_url}}/assets/img/education/setup/course.png">
Once a **Course** is created, a course schedule can defined for the same.
-<img class="screenshot" alt="Course" src="/docs/assets/img/education/setup/Course.gif">
-
The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
+#### Video Tutorial for Course
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//1ueE4seFTp8?start=66' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/school-settings.md b/erpnext/docs/user/manual/en/education/setup/education-settings.md
similarity index 61%
rename from erpnext/docs/user/manual/en/education/setup/school-settings.md
rename to erpnext/docs/user/manual/en/education/setup/education-settings.md
index 44f9c44..ccff8f2 100644
--- a/erpnext/docs/user/manual/en/education/setup/school-settings.md
+++ b/erpnext/docs/user/manual/en/education/setup/education-settings.md
@@ -2,14 +2,15 @@
The Education Settings page allow you to setup basic settings like **Academic Year and Term** for the educational setup.
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/education.png">
+
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/setup/education-settings.png">
The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group**
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-batch-validation.gif">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/setup/student-batch-validation.gif">
You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-course-validation.gif">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/setup/student-course-validation.gif">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/index.md b/erpnext/docs/user/manual/en/education/setup/index.md
index 1062c3a..63ebfae 100644
--- a/erpnext/docs/user/manual/en/education/setup/index.md
+++ b/erpnext/docs/user/manual/en/education/setup/index.md
@@ -1,8 +1,8 @@
# Setup
-The Setup section of education module provides facility to make some basic configuration. Below are doctypes for basic configuration.
+The Setup section of education module provides facility to make some basic master records and configuration. Below are doctypes for those masters and configuration.
-<img class="screenshot" alt="Setup Section" src="/docs/assets/img/education/setup/setup-section.png">
+<img class="screenshot" alt="Setup Section" src="{{docs_base_url}}/assets/img/education/setup/setup.png">
### Topics
diff --git a/erpnext/docs/user/manual/en/education/setup/instructor.md b/erpnext/docs/user/manual/en/education/setup/instructor.md
index 219413d..9f4dbdc 100644
--- a/erpnext/docs/user/manual/en/education/setup/instructor.md
+++ b/erpnext/docs/user/manual/en/education/setup/instructor.md
@@ -6,7 +6,7 @@
> Education > Instructor > New
-<img class="screenshot" alt="Instructor" src="/docs/assets/img/education/setup/instructor.png">
+<img class="screenshot" alt="Instructor" src="{{docs_base_url}}/assets/img/education/setup/instructor.png">
An **Instructor** can also be linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**.
@@ -16,5 +16,16 @@
Further, the log for the Instructor can be entered in the Instructor Log table which can be used for keeping the records of subjects taught by that Instructor.
+#### Video Tutorial for Instructor
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//rVqQYS1_02k' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/program.md b/erpnext/docs/user/manual/en/education/setup/program.md
index 25e390e..e9fb091 100644
--- a/erpnext/docs/user/manual/en/education/setup/program.md
+++ b/erpnext/docs/user/manual/en/education/setup/program.md
@@ -4,16 +4,28 @@
To create a Program go to :
-###education >> Setup >> Program >> New Program
+> Education > Setup > Program > New Program
Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted.
-<img class="screenshot" alt="Program" src="/docs/assets/img/education/setup/program.png">
+<img class="screenshot" alt="Program" src="{{docs_base_url}}/assets/img/education/setup/program.png">
Add the relevant Course and the Fee details for a program.
-<img class="screenshot" alt="Program" src="/docs/assets/img/education/setup/course-fee-program.png">
+<img class="screenshot" alt="Program" src="{{docs_base_url}}/assets/img/education/setup/course-fee-program.png">
The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program.
+#### Video Tutorial on Program and Courses
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//1ueE4seFTp8?end=70' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/room.md b/erpnext/docs/user/manual/en/education/setup/room.md
index 6a1f32e..02e604c 100644
--- a/erpnext/docs/user/manual/en/education/setup/room.md
+++ b/erpnext/docs/user/manual/en/education/setup/room.md
@@ -4,14 +4,14 @@
The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom.
-<img class="screenshot" alt="Room" src="/docs/assets/img/education/setup/room.png">
+<img class="screenshot" alt="Room" src="{{docs_base_url}}/assets/img/education/setup/room.png">
The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot.
-<img class="screenshot" alt="Room" src="/docs/assets/img/education/setup/Course-schedule-error.png">
+<img class="screenshot" alt="Room" src="{{docs_base_url}}/assets/img/education/setup/Course-schedule-error.png">
The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time.
-<img class="screenshot" alt="Room" src="/docs/assets/img/education/setup/Room-Assesment-plan.png">
+<img class="screenshot" alt="Room" src="{{docs_base_url}}/assets/img/education/setup/Room-Assesment-plan.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/setup/student-batch-name.md b/erpnext/docs/user/manual/en/education/setup/student-batch-name.md
index 3b5ad41..3c6a405 100644
--- a/erpnext/docs/user/manual/en/education/setup/student-batch-name.md
+++ b/erpnext/docs/user/manual/en/education/setup/student-batch-name.md
@@ -2,7 +2,7 @@
Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-batch.gif">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/student-batch.gif">
You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
diff --git a/erpnext/docs/user/manual/en/education/setup/student-category.md b/erpnext/docs/user/manual/en/education/setup/student-category.md
index cb5cbea..b02b5b2 100644
--- a/erpnext/docs/user/manual/en/education/setup/student-category.md
+++ b/erpnext/docs/user/manual/en/education/setup/student-category.md
@@ -2,11 +2,15 @@
Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc.
-To create Student category go to Setup >> Student Category >> New.
+To create Student category go to:
+
+> Setup > Student Category > New
We can create new student category by adding a name and save it
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-category.gif">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/setup/student-category.png">
+
+You can select the Student Category while making the Fee Structure and accordingly the student from the selected groups can be filtered out while making the Fee Schedule.
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/student/guardian.md b/erpnext/docs/user/manual/en/education/student/guardian.md
index ca34e8b..5df444e 100644
--- a/erpnext/docs/user/manual/en/education/student/guardian.md
+++ b/erpnext/docs/user/manual/en/education/student/guardian.md
@@ -2,7 +2,7 @@
The Guardian doctype allows you to record the guardian details for a **Student**.
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/guardian.png">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/guardian.png">
The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
diff --git a/erpnext/docs/user/manual/en/education/student/student-batch.md b/erpnext/docs/user/manual/en/education/student/student-batch.md
index 3b5ad41..3c6a405 100644
--- a/erpnext/docs/user/manual/en/education/student/student-batch.md
+++ b/erpnext/docs/user/manual/en/education/student/student-batch.md
@@ -2,7 +2,7 @@
Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-batch.gif">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/student-batch.gif">
You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
diff --git a/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md b/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md
index aeedd97..631e6b6 100644
--- a/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md
+++ b/erpnext/docs/user/manual/en/education/student/student-group-creation-tool.md
@@ -4,14 +4,26 @@
To create Student group using this tool go to
-##education >>Student >> Student Group creation tool
+> Education > Student > Student Group creation tool
Select the **Academic Term** and the **Program** for which a student group is to be created.
-<img class="screenshot" alt="Student Group Creation Tool" src="/docs/assets/img/education/student/student-group-creation-tool.gif">
+<img class="screenshot" alt="Student Group Creation Tool" src="{{docs_base_url}}/assets/img/education/student/student-group-creation-tool.gif">
By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course.
You can leave it unchecked if you don't want to consider batch while making course based groups.
+#### Tutorial Video on Student Group Creation Tool
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/5K_smeeE1Q4?start=108' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/student/student-group.md b/erpnext/docs/user/manual/en/education/student/student-group.md
index 467fb3e..58821bd 100644
--- a/erpnext/docs/user/manual/en/education/student/student-group.md
+++ b/erpnext/docs/user/manual/en/education/student/student-group.md
@@ -6,17 +6,32 @@
To create a Student Group go to:
-education >> Student >> New Student Group
+> Education > Student > New Student Group
-<img class="screenshot" alt="Student Group" src="/docs/assets/img/education/student/Student-group.gif">
+
+<img class="screenshot" alt="Student Group" src="{{docs_base_url}}/assets/img/education/student/Student-group.gif">
+
To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute.
Once a student group is created you can mark attendance for the group.
-<img class="screenshot" alt="Student Group" src="/docs/assets/img/education/student/student-group-attendance.gif">
+<img class="screenshot" alt="Student Group" src="{{docs_base_url}}/assets/img/education/student/student-group-attendance.gif">
You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group.
+#### Tutorial Video on Student Groups
+
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed/QILiHiTD3uc'
+ frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/education/student/student-log.md b/erpnext/docs/user/manual/en/education/student/student-log.md
index 5c113e4..37a8c1b 100644
--- a/erpnext/docs/user/manual/en/education/student/student-log.md
+++ b/erpnext/docs/user/manual/en/education/student/student-log.md
@@ -4,6 +4,6 @@
You can make a note of student activities using Student log.
Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-log.png">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/student-log.png">
{next}
diff --git a/erpnext/docs/user/manual/en/education/student/student.md b/erpnext/docs/user/manual/en/education/student/student.md
index fce5d7b..3dbb42c 100644
--- a/erpnext/docs/user/manual/en/education/student/student.md
+++ b/erpnext/docs/user/manual/en/education/student/student.md
@@ -3,10 +3,23 @@
A Student is a person who has enrolled at your institute and you have accepted their application.
The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details.
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student.png">
+
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/student.png">
+
The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted.
You can view every doctype created for a particular student. Eg : Fees, Student Group, etc
+#### Video Tutorial on Student Management
+
+
+<div>
+ <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+ </style>
+ <div class='embed-container'>
+ <iframe src='https://www.youtube.com/embed//nIUsbl0rEE0' frameborder='0' allowfullscreen>
+ </iframe>
+ </div>
+</div>
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/fleet_management/index.md b/erpnext/docs/user/manual/en/fleet_management/index.md
index 564cb28..5e32271 100644
--- a/erpnext/docs/user/manual/en/fleet_management/index.md
+++ b/erpnext/docs/user/manual/en/fleet_management/index.md
@@ -19,15 +19,15 @@
* Enter License Plate,Make,Model,Odometer Value,Fuel Type and Fuel UOM for a quick entry.
- <img class="screenshot" alt="Vehicle" src="/docs/assets/img/human-resources/vehicle-1.1.png">
+ <img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.1.png">
* Enter details like Insurance,Chassis,Vehicle Value,Location and Employee.
- <img class="screenshot" alt="Vehicle" src="/docs/assets/img/human-resources/vehicle-1.2.png">
+ <img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.2.png">
* Enter Vehicle attributes like color,wheels,doors and last carbon check
- <img class="screenshot" alt="Vehicle" src="/docs/assets/img/human-resources/vehicle-1.3.png">
+ <img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.3.png">
### Vehicle Log
@@ -39,17 +39,17 @@
* Enter License Plate,Employee,Date,Odometer reading for a quick entry.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/vehicle-log-2.1.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-log-2.1.png">
* Enter Refuelling details,Service details if applicable.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/vehicle-log-2.2.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-log-2.2.png">
### Make Expense Claim
* Click on Make Expense Claim button .This button appears only in case of Submitted Vehicle Logs.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/expense-claim-3.1.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/expense-claim-3.1.png">
When you click on 'Make Expense Claim',
@@ -57,10 +57,10 @@
2. The sum of Fuel Expenses and Service Expenses is copied over to Expense Claim Amount.
3. Employee can submit the Expense Claim for further processing.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/expense-claim-3.2.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/expense-claim-3.2.png">
### Vehicle Expenses Report
* To track and monitor Vehicle Expenses you can use the Vehicle Expenses report.This report gives a one stop view of all your vehicle expenses month wise.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/vehicle-expenses.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-expenses.png">
diff --git a/erpnext/docs/user/manual/en/healthcare/appointment.md b/erpnext/docs/user/manual/en/healthcare/appointment.md
index a5cea36..0abcc88 100755
--- a/erpnext/docs/user/manual/en/healthcare/appointment.md
+++ b/erpnext/docs/user/manual/en/healthcare/appointment.md
@@ -6,15 +6,15 @@
You can book appointments for a registered Patient by searching and selecting the Patient field. You can search the Patient by Patient ID, Name, Email or Mobile number. You can also register a new Patient from the Appointment screen by selecting "Create a new patient" in the Patient field.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/appointment_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/appointment_1.png">
If you have a front desk executive to manage your appointments, you can configure a user role to have access to Patient Appointment so that she can do the bookings by selecting the Physician whom the Patient wish to consult and the date for booking. "Check Availability" button will pop up all the available time slots with status indicators for the date. She can select a time slot and "Book" the Appointment for the Patient.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/appointment_2.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/appointment_2.png">
After Booking, the scheduled time of the Appointment and duration will be updated and seved in the document.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/appointment_3.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/appointment_3.png">
You can configure ERPNext to send an SMS alert to the Patient about the booking confirmation or a reminder on the day of Appointment by doing necessary configurations in -
diff --git a/erpnext/docs/user/manual/en/healthcare/consultation.md b/erpnext/docs/user/manual/en/healthcare/consultation.md
index a98713b..8418644 100755
--- a/erpnext/docs/user/manual/en/healthcare/consultation.md
+++ b/erpnext/docs/user/manual/en/healthcare/consultation.md
@@ -4,13 +4,13 @@
If you are creating the Consultation document from an Appointment, Patient and other related data will automatically be populated else you can search the Patient by name, email phone number etc. The Patient Details section will list the latest Vital Signs record of the patient and other information captured in the Patient screen.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/consultation_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/consultation_1.png">
### Assessment
Encounter Impression section allows you to select (or create new) Complaints and your assessment based on the presented complaints. You can opt to include the captured data in Consultation print by selecting the "In Print" flag
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/consultation_2.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/consultation_2.png">
### Prescriptions
@@ -18,11 +18,11 @@
Prescribing a laboratory investigation is similar and if you have Lab Tests configured, you can select from the list. Or key in the Lab Test name to be printed as part of the Prescription.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/consultation_3.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/consultation_3.png">
### Medical Coding
You can also attach one or more Medical Codes to designate the Diagnosis in the Medical Coding Section. You will have to select the Medical Code Standard you wish to encode the diagnosis and then select the Code by searching the Code itself or the Code Description.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/consultation_4.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/consultation_4.png">
{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/index.md b/erpnext/docs/user/manual/en/healthcare/index.md
index 85e3b6f..f13205f 100755
--- a/erpnext/docs/user/manual/en/healthcare/index.md
+++ b/erpnext/docs/user/manual/en/healthcare/index.md
@@ -2,7 +2,7 @@
ERPNext Healthcare helps you manage your Clinic or Practice efficiently by scheduling **Appointments** and recording **Patient Encounters** (Consultations). You can easily pull out a **Patient's Health Record** anytime to review all the history of treatments assisting you in providing effective, high quality care.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/module.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/module.png">
Patients can view various documents relevant to them and book Appointments via the **ERPNext Portal**. The healthcare module is integrated with **Accounts** and **Human Resources** modules, helping you in **Billing**, **Payroll Management** etc. and benefit from other rich features of ERPNext. You can configure the **Selling** and **Stock** modules manage your Pharmacy.
diff --git a/erpnext/docs/user/manual/en/healthcare/lab_test.md b/erpnext/docs/user/manual/en/healthcare/lab_test.md
index bdf0cfc..7592188 100755
--- a/erpnext/docs/user/manual/en/healthcare/lab_test.md
+++ b/erpnext/docs/user/manual/en/healthcare/lab_test.md
@@ -6,11 +6,11 @@
Once you have all necessary Lab Test Templates configured, you can start creating Lab Tests by selecting a Test Template every time you create a Test. To create a new Lab Test
>Healthcare > Laboratory > Lab Test > New Lab Test
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/lab_test_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/lab_test_1.png">
You can record the test results in the Lab Test document as the results gets ready.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/lab_test_2.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/lab_test_2.png">
> Note: To create Sample Collection documents for every Lab Test, check "Manage Sample Collection" flag in Healthcare Settings and select Sample in the Lab Test Template
diff --git a/erpnext/docs/user/manual/en/healthcare/medical_codes.md b/erpnext/docs/user/manual/en/healthcare/medical_codes.md
index c0997b1..16fba05 100755
--- a/erpnext/docs/user/manual/en/healthcare/medical_codes.md
+++ b/erpnext/docs/user/manual/en/healthcare/medical_codes.md
@@ -4,6 +4,6 @@
Medical Code Standard document is used to name the Code Standard and act as a container for all the medical codes which are standardized under it. Medical Codes and descriptions can then be imported to the Medical Code document, after ensuring that you set the Medical Code Standard field to the appropriate Standard name.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/medical_code_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/medical_code_1.png">
{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/medical_record.md b/erpnext/docs/user/manual/en/healthcare/medical_record.md
index 9d2697d..f9f7fdc 100755
--- a/erpnext/docs/user/manual/en/healthcare/medical_record.md
+++ b/erpnext/docs/user/manual/en/healthcare/medical_record.md
@@ -3,11 +3,11 @@
Medical Record automatically keeps track of all Consultations, recorded Vital Signs, Lab Investigations etc. Complaints, Diagnosis etc. captured as part of consultation are easily viewable but to look at the details of other documents, links are provided.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/medical_record_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/medical_record_1.png">
##### Adding notes manually to Medical Record
In the Patient screen Create > Medical Record will allow you to record notes to the Medical Record manually. You can also attach files when doing this, and the Medical Record will display links to the attached file along side the notes. Create > Medical Record button is also made available in the Consultation screen
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/medical_record_2.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/medical_record_2.png">
{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/patient.md b/erpnext/docs/user/manual/en/healthcare/patient.md
index ed6810e..b476568 100755
--- a/erpnext/docs/user/manual/en/healthcare/patient.md
+++ b/erpnext/docs/user/manual/en/healthcare/patient.md
@@ -3,11 +3,11 @@
In ERPNext Healthcare, the Patient document corresponds any individual who is the recipient of healthcare services you provide. For every ERPNext Healthcare document, it is important to have a Patient associated with it. You can create a new Patient from
> Healthcare > Masters > Patient > New Patient
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/patient_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/patient_1.png">
The Patient document holds most details that are required to identify and qualify a patient. You can enter as much information available while creating the Patient. All information in the patient document is presented on the Consultation screen for easy lookup and you can always update this information. Other data like observations, vital signs etc. are not part of the Patient document. These could be recorded during patient encounters and will be available as part of the Patient Medical Record.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/patient_2.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/patient_2.png">
### Patient as a Customer
@@ -16,7 +16,7 @@
In many cases, you may want to associate multiple Patients to a single Customer against whom you want to book the transactions. For instance, a Veterinarian would require the care services provided to different pets of an individual invoiced against a single Customer.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/patient_3.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/patient_3.png">
The Patient Relation section of the Patient allows you to select how a Patient is related to another Patient in the system. This is optional, but will be quite handy if you want to use ERPNext in a fertility clinic, for example.
diff --git a/erpnext/docs/user/manual/en/healthcare/physician.md b/erpnext/docs/user/manual/en/healthcare/physician.md
index 7b7995b..da65df7 100755
--- a/erpnext/docs/user/manual/en/healthcare/physician.md
+++ b/erpnext/docs/user/manual/en/healthcare/physician.md
@@ -5,12 +5,12 @@
Linking a User to the Physician makes the system populate the Physician field in all documents to the Physician associated with the logged in User.
>Note: You should also relate the User to an Employee to utilize the various features of Human Resources module.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/physician_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/physician_1.png">
### Scheduling and Availability
Each Physician can have a "Physician Schedule" and a "Time per Appointment" on the basis of which, the scheduler will book Appointments. Also, you can select appropriate Income Accounts for a Physician to book all Consultation charges into separate accounts.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/physician_2.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/physician_2.png">
### Referring Physicians
You may also want to manage a list of Doctors who refers Patients to your facility. You can manage such data in the Physician document itself by leaving out the User link.
diff --git a/erpnext/docs/user/manual/en/healthcare/physician_schedule.md b/erpnext/docs/user/manual/en/healthcare/physician_schedule.md
index 0da7896..4952cd1 100755
--- a/erpnext/docs/user/manual/en/healthcare/physician_schedule.md
+++ b/erpnext/docs/user/manual/en/healthcare/physician_schedule.md
@@ -4,10 +4,10 @@
You can create Physician Schedule from -
> Healthcare > Masters > Physician Schedule
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/physician_schedule_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/physician_schedule_1.png">
After naming the schedule you can use the "Add Time Slots" button to create time slots for each day of the week. These time slots will then be displayed while checking the availability of a Physician when booking an Appointment.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/physician_schedule_2.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/physician_schedule_2.png">
{next}
diff --git a/erpnext/docs/user/manual/en/healthcare/sample_collection.md b/erpnext/docs/user/manual/en/healthcare/sample_collection.md
index 3473daf..ea960ea 100755
--- a/erpnext/docs/user/manual/en/healthcare/sample_collection.md
+++ b/erpnext/docs/user/manual/en/healthcare/sample_collection.md
@@ -2,7 +2,7 @@
It's critical for a Laboratory to manage collected samples and you may want to ID the sample, print stickers etc. ERPNext Healthcare "Sample Collection" document helps you to easily manage the sample collection process by creating a sample collection document for every Lab Test automatically. You will have to turn on the flag in Healthcare Settings to enable this feature.
> Healthcare Settings > Laboratory Settings > Manage Sample Collection
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/sample_collection_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/sample_collection_1.png">
> Note: You will have to select a Sample in the Lab Test Template for the system to automatically create a Sample Collection document
diff --git a/erpnext/docs/user/manual/en/healthcare/vital_signs.md b/erpnext/docs/user/manual/en/healthcare/vital_signs.md
index 21b25d9..8196d25 100755
--- a/erpnext/docs/user/manual/en/healthcare/vital_signs.md
+++ b/erpnext/docs/user/manual/en/healthcare/vital_signs.md
@@ -2,11 +2,11 @@
ERPNext Healthcare allows you to record Vital Signs of Patients and manage this information as part of the Patient's health record. You can create a new document and record Vital Signs of a Patient from most of the Healthcare documents or directly by
> Healthcare > Consultation > Vital Signs > New Vital Signs
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/vitals_1.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/vitals_1.png">
You can select the Patient for whom you are recording the vitals and start by entering each of the fields. Normal values or ranges are provided for ease of assessment. Also present is an auto BMI calculator.
-<img class="screenshot" alt="ERPNext Healthcare" src="/docs/assets/img/healthcare/vitals_2.png">
+<img class="screenshot" alt="ERPNext Healthcare" src="{{docs_base_url}}/assets/img/healthcare/vitals_2.png">
All recorded Vital Signs are made available in the Patient Medical Record and the last recorded Vital Sign is displayed on the left hand side pane for easy review.
diff --git a/erpnext/docs/user/manual/en/hospitality/hotel-room.md b/erpnext/docs/user/manual/en/hospitality/hotel-room.md
new file mode 100644
index 0000000..b788d1b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/hospitality/hotel-room.md
@@ -0,0 +1,5 @@
+# Hotel Room
+
+Hotel Room is a master to create hotel rooms for reservation
+
+<img class="screenshot" alt="Hotel Room" src="/docs/assets/img/hotels/hotel-room.png">
diff --git a/erpnext/docs/user/manual/en/hospitality/index.md b/erpnext/docs/user/manual/en/hospitality/index.md
index efd7377..dc6c743 100644
--- a/erpnext/docs/user/manual/en/hospitality/index.md
+++ b/erpnext/docs/user/manual/en/hospitality/index.md
@@ -6,4 +6,8 @@
The Restaurant module in ERPNext will help you manage a chain of restaurants. You can create Restaurants, Menus, Tables, Reservations and a manage Order Entry and Billing.
+### Manage Hotels
+
+The Hotels module in ERPNext will help you manage creating Hotel Rooms, create Hotel Room Reservation. It will also help in creating Invoice from hotel room reservation
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/hospitality/index.txt b/erpnext/docs/user/manual/en/hospitality/index.txt
index cbe6da0..0c909d8 100644
--- a/erpnext/docs/user/manual/en/hospitality/index.txt
+++ b/erpnext/docs/user/manual/en/hospitality/index.txt
@@ -1,4 +1,5 @@
restaurant
restaurant-menu
reservations
-order-entry
\ No newline at end of file
+order-entry
+hotel-room
diff --git a/erpnext/docs/user/manual/en/hospitality/order-entry.md b/erpnext/docs/user/manual/en/hospitality/order-entry.md
index 929cfd8..ff6dea1 100644
--- a/erpnext/docs/user/manual/en/hospitality/order-entry.md
+++ b/erpnext/docs/user/manual/en/hospitality/order-entry.md
@@ -8,7 +8,7 @@
To place an order you can select an item and click the enter key so that the item will be updated in the items table.
-<img class="screenshot" alt="Order Entry" src="/docs/assets/img/restaurant/order-entry.png">
+<img class="screenshot" alt="Order Entry" src="{{docs_base_url}}/assets/img/restaurant/order-entry.png">
You can also choose items with the POS style item selector.
@@ -16,11 +16,11 @@
When it is time for billing, you just choose the bill and you can select the customer and mode of payment. On saving, a Sales Invoice is generated and the order section becomes empty.
-<img class="screenshot" alt="Order Entry" src="/docs/assets/img/restaurant/order-entry-bill.png">
+<img class="screenshot" alt="Order Entry" src="{{docs_base_url}}/assets/img/restaurant/order-entry-bill.png">
### Sales Invoice
To print the invoice, you can click on the Invoice Link and print the invoice
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/restaurant/restaurant-invoice.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/restaurant/restaurant-invoice.png">
diff --git a/erpnext/docs/user/manual/en/hospitality/reservations.md b/erpnext/docs/user/manual/en/hospitality/reservations.md
index 0d4a8ab..f81f74f 100644
--- a/erpnext/docs/user/manual/en/hospitality/reservations.md
+++ b/erpnext/docs/user/manual/en/hospitality/reservations.md
@@ -4,10 +4,10 @@
To take a reservation, just make a new Restaurant Reservation from the Restaurant Page and set the time, number of people and name of the guest.
-<img class="screenshot" alt="Reservation" src="/docs/assets/img/restaurant/reservation.png">
+<img class="screenshot" alt="Reservation" src="{{docs_base_url}}/assets/img/restaurant/reservation.png">
### Kanban
As your guests walk in, You can also manage the reservations by making a simple Kanban board for the same.
-<img class="screenshot" alt="Reservation Kanban Board" src="/docs/assets/img/restaurant/reservation-kanban.png">
+<img class="screenshot" alt="Reservation Kanban Board" src="{{docs_base_url}}/assets/img/restaurant/reservation-kanban.png">
diff --git a/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md b/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md
index dfbf4ce..52585e0 100644
--- a/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md
+++ b/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md
@@ -4,4 +4,4 @@
When you save the Restaurant Menu, a Price List is created for that Menu and all pricing is linked to that price list. This way you can easily control the items on offer and pricing from the menu.
-<img class="screenshot" alt="Restaurant Menu" src="/docs/assets/img/restaurant/restaurant-menu.png">
+<img class="screenshot" alt="Restaurant Menu" src="{{docs_base_url}}/assets/img/restaurant/restaurant-menu.png">
diff --git a/erpnext/docs/user/manual/en/hospitality/restaurant.md b/erpnext/docs/user/manual/en/hospitality/restaurant.md
index 7b72318..b6c7045 100644
--- a/erpnext/docs/user/manual/en/hospitality/restaurant.md
+++ b/erpnext/docs/user/manual/en/hospitality/restaurant.md
@@ -6,7 +6,7 @@
If you have a default Sales Taxes and Charges Template, you can add it so that the same charge + tax will be applicable for all invoices in the restaurant.
-<img class="screenshot" alt="Restaurant" src="/docs/assets/img/restaurant/restaurant.png">
+<img class="screenshot" alt="Restaurant" src="{{docs_base_url}}/assets/img/restaurant/restaurant.png">
After your restaurant is created, you can add Tables and Menus for that restaurant
@@ -14,6 +14,6 @@
You can add a Restaurant Table by creating a new Restaurant Table from the dashboard.
-<img class="screenshot" alt="Restaurant Table" src="/docs/assets/img/restaurant/restaurant-table.png">
+<img class="screenshot" alt="Restaurant Table" src="{{docs_base_url}}/assets/img/restaurant/restaurant-table.png">
diff --git a/erpnext/docs/user/manual/en/human-resources/appraisal.md b/erpnext/docs/user/manual/en/human-resources/appraisal.md
index 6ecb898..ce534e5 100644
--- a/erpnext/docs/user/manual/en/human-resources/appraisal.md
+++ b/erpnext/docs/user/manual/en/human-resources/appraisal.md
@@ -8,13 +8,13 @@
#### Step 1: Select an Appraisal Template
-<img class="screenshot" alt="Appraisal" src="/docs/assets/img/human-resources/appraisal.png">
+<img class="screenshot" alt="Appraisal" src="{{docs_base_url}}/assets/img/human-resources/appraisal.png">
After you select the template, the remaining form appears.
#### Step 2: Enter Employee Details
-<img class="screenshot" alt="Appraisal" src="/docs/assets/img/human-resources/appraisal-employee.png">
+<img class="screenshot" alt="Appraisal" src="{{docs_base_url}}/assets/img/human-resources/appraisal-employee.png">
Once the Appraisal Template is completed, you can create Appraisal records for
each period where you track performance. You can give points out of 5 for each
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
index a24ca93..dae54ba 100644
--- a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
@@ -12,13 +12,13 @@
Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters)
-
+
#### 1.2 Salaries Account
Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it.
-
+
#### 1.3 Interest Account
@@ -28,7 +28,7 @@
Once loan amount is finalized, make journal voucher to book loan payment entry. You should Credit Loan amount to Bank/Cash account and Debit Loan amount employee loan account.
-
+
### 3. Book Loan Recovery and Interest
@@ -36,13 +36,13 @@
If your employee pays separately for his/her loan installment and loan interest, then create journal voucher.
-
+
#### 3.2 Loan Adjustment in Salary
And if you deduct loan installment and interest from employees salary, then book journal entry for the same.
-
+
In the Salary Slip of an employee, then create two Deduction Types in Salary Structure. One as 'Loan Installment' and other one as 'Loan Interest'. So that you can update those values under this deduction heads.
@@ -50,6 +50,6 @@
After recovering loan and loan interest, General Ledger report will show the loan account details as follows.
-
+
<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
index 7fb045c..7153708 100644
--- a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
+++ b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
@@ -27,7 +27,7 @@
<li>Create Holiday List (if any), and link it with Employee master.</li>
</ol>
<p>When creating Salary Slip for an Employee, following is what you will see:</p>
-<img src="/docs/assets/img/articles/SGrab_282.png">
+<img src="{{docs_base_url}}/assets/img/articles/SGrab_282.png">
<br>
<br><b>Working Days:</b> Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
<br>
@@ -46,7 +46,7 @@
<br>As indicated above, if you have LWP checked for components in the earning and deducted table, you will notice a reduction in Amount based on no. of LWP of an Employee for that month.
<br>
<br>
-<img src="/docs/assets/img/articles/SGrab_283.png" width="760"><br>
+<img src="{{docs_base_url}}/assets/img/articles/SGrab_283.png" width="760"><br>
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md
index 289a24a..8812700 100644
--- a/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md
+++ b/erpnext/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md
@@ -6,6 +6,6 @@
If you want to include holidays in the count of Total Working days, then ensure that in the HR Settings, field **Include holidays in Total no. of Working Days** is checked and vice versa.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/hr-working-days.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/hr-working-days.png">
To learn how to define holidays for your company, check [Holiday List](/user/manual/en/human-resources/holiday-list) feature in the HR module.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/attendance.md b/erpnext/docs/user/manual/en/human-resources/attendance.md
index 1cd5ad3..1b1a6d9 100644
--- a/erpnext/docs/user/manual/en/human-resources/attendance.md
+++ b/erpnext/docs/user/manual/en/human-resources/attendance.md
@@ -5,7 +5,7 @@
> Human Resources > Documents > Attendance > New Attendance
-<img class="screenshot" alt="Attendence" src="/docs/assets/img/human-resources/attendence.png">
+<img class="screenshot" alt="Attendence" src="{{docs_base_url}}/assets/img/human-resources/attendence.png">
You can get a monthly report of your Attendance data by going to the “Monthly
Attendance Details” report.
diff --git a/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
index 6ae15e0..d3ba22a 100644
--- a/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
+++ b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
@@ -12,4 +12,4 @@
You can also choose to Customize the Message you send to your employees:
-<img class="screenshot" alt="Department" src="/docs/assets/img/human-resources/department.png">
+<img class="screenshot" alt="Department" src="{{docs_base_url}}/assets/img/human-resources/department.png">
diff --git a/erpnext/docs/user/manual/en/human-resources/employee-advance.md b/erpnext/docs/user/manual/en/human-resources/employee-advance.md
index 4e07611..49f22e8 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee-advance.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee-advance.md
@@ -6,7 +6,7 @@
> HR > Employee Advance > New Employee Advance
-<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/employee_advance.png">
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/employee_advance.png">
Set the Employee ID, date, purpose and requested amount and “Save” the record.
@@ -14,19 +14,19 @@
Employee Advance record can be created by any employee but they cannot submit the record.
-After saving Employee Advance, Employee should [Assign document to Approver](/docs/user/manual/en/using-eprnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert](/docs/user/manual/en/setting-up/email/email-alerts.html).
+After saving Employee Advance, Employee should [Assign document to Approver](/docs/user/manual/en/using-erpnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert](/docs/user/manual/en/setting-up/email/email-alerts.html).
After verification, approver can submit the Employee Advance form or reject the request.
### Make Payment Entry
After submission of Employee Advance record, accounts user will be able to create payment entry via Journal Entry or Payment Entry form.
The payment entry will look like following:
-<img class="screenshot" alt="Employee Advance Payment via Journal Entry" src="/docs/assets/img/human-resources/employee_advance_journal_entry.png">
+<img class="screenshot" alt="Employee Advance Payment via Journal Entry" src="{{docs_base_url}}/assets/img/human-resources/employee_advance_journal_entry.png">
-<img class="screenshot" alt="Employee Advance Payment via Payment Entry" src="/docs/assets/img/human-resources/employee_advance_payment_entry.png">
+<img class="screenshot" alt="Employee Advance Payment via Payment Entry" src="{{docs_base_url}}/assets/img/human-resources/employee_advance_payment_entry.png">
On submission of payment entry, the paid amount and status will be updated in Employee Advance record.
### Adjust advances on Expense Claim
Later when employee claims the expense and advance record can be fetched in Expense Claim and linked to the claim record.
-<img class="screenshot" alt="Employee Advance Payment via Payment Entry" src="/docs/assets/img/human-resources/expense_claim_advances.png">
\ No newline at end of file
+<img class="screenshot" alt="Employee Advance Payment via Payment Entry" src="{{docs_base_url}}/assets/img/human-resources/expense_claim_advances.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
index 28d28b5..b76a226 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
@@ -10,7 +10,7 @@
Configure Loan limit and Rate of interest.
-<img class="screenshot" alt="Loan Type" src="/docs/assets/img/human-resources/loan-type.png">
+<img class="screenshot" alt="Loan Type" src="{{docs_base_url}}/assets/img/human-resources/loan-type.png">
### Employee Loan Application
@@ -18,7 +18,7 @@
> Human Resources > Employee Loan Management > Employee Loan Application > New Employee Loan Application
-<img class="screenshot" alt="Employee Loan Application" src="/docs/assets/img/human-resources/employee-loan-application.png">
+<img class="screenshot" alt="Employee Loan Application" src="{{docs_base_url}}/assets/img/human-resources/employee-loan-application.png">
#### In the Employee Loan Application,
@@ -27,7 +27,7 @@
On save, Employee can see Repayment Information and make changes if required before submitting.
-<img class="screenshot" alt="Employee Loan Application" src="/docs/assets/img/human-resources/repayment-info.png">
+<img class="screenshot" alt="Employee Loan Application" src="{{docs_base_url}}/assets/img/human-resources/repayment-info.png">
### Employee Loan
@@ -35,7 +35,7 @@
> Human Resources > Employee Loan Management > Employee Loan > New Employee Loan
-<img class="screenshot" alt="Employee Loan Application" src="/docs/assets/img/human-resources/employee-loan.png">
+<img class="screenshot" alt="Employee Loan Application" src="{{docs_base_url}}/assets/img/human-resources/employee-loan.png">
#### In the Employee Loan,
@@ -44,13 +44,13 @@
* Enter Disbursement Date and Account Info
* As soon as you hit save, the repayment schedule is generated.
-<img class="screenshot" alt="repayment Schedule" src="/docs/assets/img/human-resources/repayment-schedule.png">
+<img class="screenshot" alt="repayment Schedule" src="{{docs_base_url}}/assets/img/human-resources/repayment-schedule.png">
#### Loan repayment deduction from Salary
To auto deduct the Loan repayment from Salary, check "Repay from Salary" in Employee Loan. It will appear as Loan repayment in Salary Slip.
-<img class="screenshot" alt="Salary Slip" src="/docs/assets/img/human-resources/loan-repayment-salary-slip.png">
+<img class="screenshot" alt="Salary Slip" src="{{docs_base_url}}/assets/img/human-resources/loan-repayment-salary-slip.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
index 99cc687..32e332a 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md
@@ -6,6 +6,6 @@
> Human Resources > Employee > New
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/employee.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/employee.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
index 2d7432f..655935b 100644
--- a/erpnext/docs/user/manual/en/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
@@ -6,14 +6,14 @@
> HR > Expense Claim > New Expense Claim
-<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/expense_claim.png">
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/expense_claim.png">
Set the Employee ID, date and the list of expenses that are to be claimed and
“Submit” the record.
### Set Account for Employee
Set employee's expense account on the employee form, system books an expense amount of an employee under this account.
-<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/employee_account.png">
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/employee_account.png">
### Approving Expenses
@@ -27,16 +27,16 @@
### Booking the Expense
On submission of Expense Claim, system books an expense against the expense account and the employee account
-<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/expense_claim_book.png">
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/expense_claim_book.png">
User can view unpaid expense claim using report "Unclaimed Expense Claims"
-<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/unclaimed_expense_claims.png">
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/unclaimed_expense_claims.png">
### Payment for Expense Claim
To make payment against the expense claim, user has to click on Make > Bank Entry
#### Expense Claim
-<img class="screenshot" alt="Expense Claim" src="/docs/assets/img/human-resources/payment.png">
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/payment.png">
#### Payment Entry
<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/payment_entry.png">
@@ -55,6 +55,6 @@
* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
-<img class="screenshot" alt="Expense Claim - Project Link" src="/docs/assets/img/project/project_expense_claim_link.png">
+<img class="screenshot" alt="Expense Claim - Project Link" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/fleet-management.md b/erpnext/docs/user/manual/en/human-resources/fleet-management.md
index d7c4564..9e79d04 100644
--- a/erpnext/docs/user/manual/en/human-resources/fleet-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/fleet-management.md
@@ -19,15 +19,15 @@
* Enter License Plate, Make, Model, Odometer Value, Fuel Type and Fuel UOM for a quick entry.
- <img class="screenshot" alt="Vehicle" src="/docs/assets/img/human-resources/vehicle-1.1.png">
+ <img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.1.png">
* Enter details like Insurance, Chassis, Vehicle Value, Location and Employee.
- <img class="screenshot" alt="Vehicle" src="/docs/assets/img/human-resources/vehicle-1.2.png">
+ <img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.2.png">
* Enter Vehicle attributes like color, wheels, doors and last carbon check
- <img class="screenshot" alt="Vehicle" src="/docs/assets/img/human-resources/vehicle-1.3.png">
+ <img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.3.png">
### Vehicle Log
@@ -39,17 +39,17 @@
* Enter License Plate, Employee, Date, Odometer reading for a quick entry.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/vehicle-log-2.1.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-log-2.1.png">
* Enter Refueling details, Service details if applicable.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/vehicle-log-2.2.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-log-2.2.png">
### Make Expense Claim
* Click on Make Expense Claim button. This button appears only in case of Submitted Vehicle Logs.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/expense-claim-3.1.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/expense-claim-3.1.png">
When you click on 'Make Expense Claim',
@@ -57,10 +57,10 @@
2. The sum of Fuel Expenses and Service Expenses is copied over to Expense Claim Amount.
3. Employee can submit the Expense Claim for further processing.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/expense-claim-3.2.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/expense-claim-3.2.png">
### Vehicle Expenses Report
* To track and monitor Vehicle Expenses you can use the Vehicle Expenses report.This report gives a one stop view of all your vehicle expenses month wise.
- <img class="screenshot" alt="Vehicle Log" src="/docs/assets/img/human-resources/vehicle-expenses.png">
+ <img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-expenses.png">
diff --git a/erpnext/docs/user/manual/en/human-resources/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
index a015ebc..c1e76f1 100644
--- a/erpnext/docs/user/manual/en/human-resources/holiday-list.md
+++ b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
@@ -14,22 +14,22 @@
Give a name to Holiday List. It can be based in Fiscal Year or location or department as application. Also select From and To Date for the Holiday List.
-<img class="screenshot" alt="Holiday List" src="/docs/assets/img/human-resources/holiday-list-1.png">
+<img class="screenshot" alt="Holiday List" src="{{docs_base_url}}/assets/img/human-resources/holiday-list-1.png">
You can quickly add Weekly Off in the Holiday List as following.
-<img class="screenshot" alt="Holiday List" src="/docs/assets/img/human-resources/holiday-list-2.gif">
+<img class="screenshot" alt="Holiday List" src="{{docs_base_url}}/assets/img/human-resources/holiday-list-2.gif">
After that, you can also add specific days (like festival holidays) manually.
-<img class="screenshot" alt="Holiday List" src="/docs/assets/img/human-resources/holiday-list-3.png">
+<img class="screenshot" alt="Holiday List" src="{{docs_base_url}}/assets/img/human-resources/holiday-list-3.png">
### Holiday List in Employee
If you have created multiple Holiday List, then select specific Holiday List for an Employee in the respective master.
-<img class="screenshot" alt="Holiday List" src="/docs/assets/img/human-resources/holiday-list-4.png">
+<img class="screenshot" alt="Holiday List" src="{{docs_base_url}}/assets/img/human-resources/holiday-list-4.png">
When an Employee applies for the Leave, then days mentioned in the Holiday List will not be counted, as they are holiday already. For more configuration option in Holiday List, check `HR > HR Settings`.
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
index 406dbda..248a49a 100644
--- a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
+++ b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
@@ -4,37 +4,37 @@
Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves.
-<img alt="Employee Leave Balance" class="screenshot" src="/docs/assets/img/human-resources/employee-leave-balance-report.png">
+<img alt="Employee Leave Balance" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-balance-report.png">
### Employee Birthday
Employee Birthday Report shows Birthdays of your employees.
-<img alt="Employee Birthday" class="screenshot" src="/docs/assets/img/human-resources/employee-birthday-report.png">
+<img alt="Employee Birthday" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-birthday-report.png">
### Employee Information
Employee Information Report shows Report View of important information recorded in Employee master.
-<img alt="Employee Information" class="screenshot" src="/docs/assets/img/human-resources/employee-information-report.png">
+<img alt="Employee Information" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-information-report.png">
### Employee Holiday Attendance
Employee Holiday Attendance shows the list of Employees who attended on Holidays.
-<img alt="Employee Information" class="screenshot" src="/docs/assets/img/human-resources/employee-holiday-report.png">
+<img alt="Employee Information" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-holiday-report.png">
### Monthly Salary Register
Monthly Salary Register shows net pay and its components of employee(s) at a glance.
-<img alt="Monthly Salary Register" class="screenshot" src="/docs/assets/img/human-resources/monthly-salary-register-report.png">
+<img alt="Monthly Salary Register" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/monthly-salary-register-report.png">
### Monthly Attendance Sheet
Monthly Attendance Sheet shows monthly attendance of selected employee at a glance.
-<img alt="Monthly Attendance Sheet" class="screenshot" src="/docs/assets/img/human-resources/monthly-attendance-sheet-report.png">
+<img alt="Monthly Attendance Sheet" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/monthly-attendance-sheet-report.png">
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/index.md b/erpnext/docs/user/manual/en/human-resources/index.md
index 5191505..120b64c 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.md
+++ b/erpnext/docs/user/manual/en/human-resources/index.md
@@ -2,7 +2,7 @@
The Human Resources (HR) Module covers the processes linked to managing a team
of co-workers. Most important feature here is processing the payroll by using
-Process Payroll to generate Salary Slips. Most countries have complex tax
+Payroll Entry to generate Salary Slips. Most countries have complex tax
rules stating which expenses the company can make on behalf of the Employees.
There are a set of rules for the company to deduct taxes and social security
from employee payroll. ERPNext allows to accomodate all types of taxes and
diff --git a/erpnext/docs/user/manual/en/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
index 04abb85..327d05f 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -4,6 +4,7 @@
expense-claim
attendance
salary-and-payroll
+payroll-entry
appraisal
job-applicant
job-opening
diff --git a/erpnext/docs/user/manual/en/human-resources/job-applicant.md b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
index d13cf19..105bfdd 100644
--- a/erpnext/docs/user/manual/en/human-resources/job-applicant.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
@@ -6,7 +6,7 @@
> Human Resource > Job Applicant > New
-<img class="screenshot" alt="Job Applicant" src="/docs/assets/img/human-resources/job-applicant.png">
+<img class="screenshot" alt="Job Applicant" src="{{docs_base_url}}/assets/img/human-resources/job-applicant.png">
### Linking with an Email Account
@@ -22,6 +22,6 @@
* In 'Append To' select 'Job Applicant'
-<img class="screenshot" alt="Email Account" src="/docs/assets/img/human-resources/email-account.png">
+<img class="screenshot" alt="Email Account" src="{{docs_base_url}}/assets/img/human-resources/email-account.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/job-opening.md b/erpnext/docs/user/manual/en/human-resources/job-opening.md
index e198caf..cb58858 100644
--- a/erpnext/docs/user/manual/en/human-resources/job-opening.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-opening.md
@@ -6,7 +6,7 @@
> Human Resource > Job Opening > New
-<img class="screenshot" alt="Job Opening" src="/docs/assets/img/human-resources/job-opening.png">
+<img class="screenshot" alt="Job Opening" src="{{docs_base_url}}/assets/img/human-resources/job-opening.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
index 438dbba..b9855ab 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -7,7 +7,7 @@
> Human Resources > Leave Application > New Leave Application
-<img class="screenshot" alt="Leave Application" src="/docs/assets/img/human-resources/leave-application.png">
+<img class="screenshot" alt="Leave Application" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
###Setting Leave Approver
@@ -15,7 +15,7 @@
* You need to mention a list of Leave Approvers against an Employee in the Employee Master.
-<img class="screenshot" alt="Leave Approver" src="/docs/assets/img/human-resources/employee-leave-approver.png">
+<img class="screenshot" alt="Leave Approver" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-approver.png">
> Tip : If you want all users to create their own Leave Applications, you can set
their “Employee ID” as a match rule in the Leave Application Permission
diff --git a/erpnext/docs/user/manual/en/human-resources/leave.md b/erpnext/docs/user/manual/en/human-resources/leave.md
index 4fa3a57..5b32a2b 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave.md
@@ -12,7 +12,7 @@
requirement.
<img class="screenshot" alt="New Leave Type"
- src="/docs/assets/img/human-resources/new-leave-type.png">
+ src="{{docs_base_url}}/assets/img/human-resources/new-leave-type.png">
**Max Days Leave Allowed:** It refers to maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days under a particular Leave Type, his/her extended leave may be considered as ‘Leave Without Pay’ and this may affect his/her salary calculation.
@@ -45,7 +45,7 @@
To allocate leaves to an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period.
<img class="screenshot" alt="Manual Leave Allocation"
- src="/docs/assets/img/human-resources/manual-leave-allocation.png">
+ src="{{docs_base_url}}/assets/img/human-resources/manual-leave-allocation.png">
###Via Leave Allocation Tool
> Human Resources > Tools > Leave Allocation Tool
@@ -53,7 +53,7 @@
This tool enables you to allocate leaves for a category of employees, instead of individual ones. You can allocate leaves based on Employee Type, Branch, Department and Designation. Leave Allocation Tool is also known as Leave Control Panel.
<img class="screenshot" alt="Leave Allocation Tool"
- src="/docs/assets/img/human-resources/leave-allocation-tool.png">
+ src="{{docs_base_url}}/assets/img/human-resources/leave-allocation-tool.png">
---
@@ -71,7 +71,7 @@
- Employee gets notification on the status of his/her Leave Application
<img class="screenshot" alt="Leave Allocation Tool"
- src="/docs/assets/img/human-resources/new-leave-application.png">
+ src="{{docs_base_url}}/assets/img/human-resources/new-leave-application.png">
**Notes:**
@@ -89,4 +89,4 @@
Leave Block List is a list of dates in a year, on which employees can not apply for leave. You can define a list of users who can approve Leave Application on blocked days, in case of urgency. You can also define whether the list will applied on entire company or any specific departments.
<img class="screenshot" alt="Leave Allocation Tool"
- src="/docs/assets/img/human-resources/leave-block-list.png">
\ No newline at end of file
+ src="{{docs_base_url}}/assets/img/human-resources/leave-block-list.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/offer-letter.md b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
index 1df1a38..734f193 100644
--- a/erpnext/docs/user/manual/en/human-resources/offer-letter.md
+++ b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
@@ -7,12 +7,12 @@
> Human Resource > Offer Letter > New
-<img class="screenshot" alt="Offer Letter" src="/docs/assets/img/human-resources/offer-letter.png">
+<img class="screenshot" alt="Offer Letter" src="{{docs_base_url}}/assets/img/human-resources/offer-letter.png">
> Note: An offer letter can be made only against a [Job Applicant](/docs/user/manual/en/human-resources/job-applicant.html)
There is a pre-designed print format to print you offer letter.
-<img class="screenshot" alt="Offer Letter" src="/docs/assets/img/human-resources/offer-letter-print.png">
+<img class="screenshot" alt="Offer Letter" src="{{docs_base_url}}/assets/img/human-resources/offer-letter-print.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/payroll-entry.md b/erpnext/docs/user/manual/en/human-resources/payroll-entry.md
new file mode 100644
index 0000000..4414bc2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/payroll-entry.md
@@ -0,0 +1,49 @@
+# Payroll Entry
+
+You can also create salary slip for multiple employees using Payroll Entry:
+
+> Human Resources > Payroll Entry
+
+<img class="screenshot" alt="Payroll Entry" src="/docs/assets/img/human-resources/payroll-entry.png">
+
+In Payroll Entry,
+
+ 1. Select the Company for which you want to create the Salary Slips. You can also select the other fields like Branch, Department, Designation or Project to be more specific.
+ 2. Check "Salary Slip based on Timesheet" if you want to process timesheet based Salary Slips.
+ 3. Select the Start Date and End Date or Fiscal year and month for which you want to create the Salary Slips.
+ 4. Click on "Get Employee Details" to get a list of Employees for which the Salary Slips will be created based on the selected criteria.
+ 5. Select the Cost Center and Payment Account.
+ 6. Save the form and Submit it to create Salary Slip records for each active Employee for the time period selected. If the Salary Slips are already created, the system will not create any more Salary Slips. You can also just save the form as Draft and create the Salary Slips later.
+
+<img class="screenshot" alt="Payroll Entry" src="/docs/assets/img/human-resources/created-payroll.png">
+
+Once all Salary Slips are created, you can check by clicking on "View Salary Slips", if they are created correctly or edit it if you want to deduct Leave Without Pay (LWP).
+
+After checking, you can "Submit" them all together by clicking on "Submit Salary Slip".
+
+### Booking Salaries in Accounts
+
+The final step is to book the Salaries in your Accounts.
+
+Salaries in businesses are usually dealt with extreme privacy. In most cases,
+the companies issues a single payment to the bank combining all salaries and
+the bank distributes the salaries to each employee’s salary account. This way
+there is only one payment entry in the company’s books of accounts and anyone
+with access to the company’s accounts will not have access to the individual
+salaries.
+
+The salary payment entry is a Journal Entry that debits the total of the
+earning type salary component and credits the total of deduction type salary
+component of all Employees to the default account set at Salary Component level
+for each component.
+
+To generate your salary payment voucher from Payroll Entry, click on,
+> Make > Bank Entry
+
+<img class="screenshot" alt="Payroll Entry" src="/docs/assets/img/human-resources/payroll-make-bank-entry.png">
+
+It will ask to enter the Bank Transaction Reference Number and date. All other details will be auto-filled according to your Payroll Entry form. Click on Save and create it.
+
+<img class="screenshot" alt="Payroll Entry" src="/docs/assets/img/human-resources/payroll-journal-entry.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
index e902617..eff40ef 100644
--- a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -7,7 +7,7 @@
To process Payroll in ERPNext,
1. Create Salary Structures for all Employees.
- 2. Generate Salary Slips via Process Payroll.
+ 2. Generate Salary Slips via [Payroll Entry](/docs/user/manual/en/human-resources/payroll-entry.html).
3. Book the Salary in your Accounts.
### Salary Structure
@@ -46,7 +46,7 @@
#### Figure 1.1:Salary Structure
-<img class="screenshot" alt="Salary Structure" src="/docs/assets/img/human-resources/salary-structure.png">
+<img class="screenshot" alt="Salary Structure" src="{{docs_base_url}}/assets/img/human-resources/salary-structure.png">
### In the Salary Structure,
@@ -55,7 +55,7 @@
#### Figure 1.2:Salary Structure for Salary Slip based on Timesheet
-<img class="screenshot" alt="Salary Structure" src="/docs/assets/img/human-resources/salary-timesheet.png">
+<img class="screenshot" alt="Salary Structure" src="{{docs_base_url}}/assets/img/human-resources/salary-timesheet.png">
### Salary Slip Based on Timesheet
@@ -72,20 +72,20 @@
#### Figure 1.3:Condition and Formula
-<img class="screenshot" alt="Salary Structure" src="/docs/assets/img/human-resources/condition-formula.png">
+<img class="screenshot" alt="Salary Structure" src="{{docs_base_url}}/assets/img/human-resources/condition-formula.png">
* Condition and Amount
#### Figure 1.4:Condition and Amount
-<img class="screenshot" alt="Salary Structure" src="/docs/assets/img/human-resources/condition-amount.png">
+<img class="screenshot" alt="Salary Structure" src="{{docs_base_url}}/assets/img/human-resources/condition-amount.png">
* Only Formula
* Only Amount
#### Figure 1.5:Account Details
-<img class="screenshot" alt="Salary Structure" src="/docs/assets/img/human-resources/salary-structure-account.png">
+<img class="screenshot" alt="Salary Structure" src="{{docs_base_url}}/assets/img/human-resources/salary-structure-account.png">
* Select Mode of Payment and Payment Account for the Salary Slips which will be generated using this Salary Structure
@@ -115,7 +115,7 @@
### Creating Salary Slips
Once the Salary Structure is created, you can make a salary slip from the same
-form or you can process your payroll for the month using Process Payroll.
+form or you can process your payroll for the month using Payroll Entry.
To create a new Salary Slip go to:
@@ -123,7 +123,8 @@
#### Figure 2: Salary Slip
-<img class="screenshot" alt="Salary Slip" src="/docs/assets/img/human-resources/salary-slip.png">
+<img class="screenshot" alt="Salary Slip" src="{{docs_base_url}}/assets/img/human-resources/salary-slip.png">
+
You can also create salary slip for multiple employees using Process Payroll:
@@ -131,7 +132,7 @@
#### Figure 3: Process Payroll
-<img class="screenshot" alt="Process Payroll" src="/docs/assets/img/human-resources/process-payroll.png">
+<img class="screenshot" alt="Process Payroll" src="{{docs_base_url}}/assets/img/human-resources/process-payroll.png">
In Process Payroll,
@@ -166,7 +167,8 @@
#### Figure 3.1: Make Bank Entry
-<img class="screenshot" alt="Process Payroll" src="/docs/assets/img/human-resources/bank-entry.png">
+<img class="screenshot" alt="Process Payroll" src="{{docs_base_url}}/assets/img/human-resources/bank-entry.png">
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/branch.md b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
index 75c0c43..33135e8 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/branch.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
@@ -2,6 +2,6 @@
Branches of your organization
-<img class="screenshot" alt="Branch" src="/docs/assets/img/human-resources/branch.png">
+<img class="screenshot" alt="Branch" src="{{docs_base_url}}/assets/img/human-resources/branch.png">
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
index 39e7e2a..032d249 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
@@ -6,7 +6,7 @@
> Human Resource > Setup > Deduction Type > New
-<img class="screenshot" alt="Deduction Type" src="/docs/assets/img/human-resources/deduction-type.png">
+<img class="screenshot" alt="Deduction Type" src="{{docs_base_url}}/assets/img/human-resources/deduction-type.png">
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/department.md b/erpnext/docs/user/manual/en/human-resources/setup/department.md
index 9eb4245..78567dc 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/department.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/department.md
@@ -2,6 +2,6 @@
Departments in your organization
-<img class="screenshot" alt="Department" src="/docs/assets/img/human-resources/department.png">
+<img class="screenshot" alt="Department" src="{{docs_base_url}}/assets/img/human-resources/department.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/designation.md b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
index 5ac771f..c88e085 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/designation.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
@@ -2,6 +2,6 @@
Designations in your organization
-<img class="screenshot" alt="Designation" src="/docs/assets/img/human-resources/designation.png">
+<img class="screenshot" alt="Designation" src="{{docs_base_url}}/assets/img/human-resources/designation.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
index 1758663..4e9f685 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
@@ -6,7 +6,7 @@
> Human Resource > Setup > Earning Type > New
-<img class="screenshot" alt="Earning Type" src="/docs/assets/img/human-resources/earning-type.png">
+<img class="screenshot" alt="Earning Type" src="{{docs_base_url}}/assets/img/human-resources/earning-type.png">
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
index de07ac9..c3843b9 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
@@ -2,6 +2,6 @@
Various employment contracts you have with your employees.
-<img class="screenshot" alt="Employment Type" src="/docs/assets/img/human-resources/employment-type.png">
+<img class="screenshot" alt="Employment Type" src="{{docs_base_url}}/assets/img/human-resources/employment-type.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
index a12bcdb..1741df4 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
@@ -2,6 +2,6 @@
GLobal settings for HR related documents
-<img class="screenshot" alt="HR Settings" src="/docs/assets/img/human-resources/hr-settings.png">
+<img class="screenshot" alt="HR Settings" src="{{docs_base_url}}/assets/img/human-resources/hr-settings.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md
index dfc350e..e17dddd 100644
--- a/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md
+++ b/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md
@@ -6,6 +6,6 @@
This tool allows you to add attendance records for multiple employees quickly.
-<img class="screenshot" alt="Attendence upload" src="/docs/assets/img/human-resources/employee-attendance-tool.png">
+<img class="screenshot" alt="Attendence upload" src="{{docs_base_url}}/assets/img/human-resources/employee-attendance-tool.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
index 7a45002..4b67c11 100644
--- a/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
+++ b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
@@ -6,6 +6,6 @@
> Human Resources > Upload Attendance
-<img class="screenshot" alt="Attendence upload" src="/docs/assets/img/human-resources/attendence-upload.png">
+<img class="screenshot" alt="Attendence upload" src="{{docs_base_url}}/assets/img/human-resources/attendence-upload.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/training.md b/erpnext/docs/user/manual/en/human-resources/training.md
index 4d39bf1..0c193c7 100644
--- a/erpnext/docs/user/manual/en/human-resources/training.md
+++ b/erpnext/docs/user/manual/en/human-resources/training.md
@@ -3,13 +3,13 @@
Create Training Program and schedule Training Events under it. It has a dashboard linked to Training Event to view which event is under the Training Program.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_program.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_program.png">
### Training Event
Schedule seminars, workshops, conferences etc using Training Event linked to a Training Program. You can also invite your employees to attend the event using this feature.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_event.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_event.png">
### Inviting Employees for Event
@@ -17,7 +17,7 @@
By default the status of the employee will be 'Open'.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_event_employee.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_event_employee.png">
When you submit the Training Event, a notification will be sent to the employee notifying that the Training has been scheduled. This is sent via Email Alert "Training Scheduled". You can modify this Email Alert to customize the message.
@@ -25,7 +25,7 @@
After completion of the training Employee-wise training results can be stored based on the Feedback received from the Trainer.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_result.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_result.png">
When the Training Result is submitted, all the employees will receive an email notifying them that they must share their feedback via "Training Feedback". This is also managed via an Email Alert, so you can customize this alert too.
@@ -33,4 +33,4 @@
Employees can then share their feedback via Training Feedback.
-<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_feedback.png">
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_feedback.png">
diff --git a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
index c53bef9..dc3db10 100644
--- a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
@@ -302,11 +302,11 @@
> Human Resource > Leave and Attendance > Leave Type
-#### Process Payroll
+#### Payroll Entry
A tool that helps in creation of multiple Salary Slips for Employees.
-> Human Resource > Salary and Payroll > Process Payroll
+> Human Resource > Payroll Entry
#### Salary Slip
diff --git a/erpnext/docs/user/manual/en/introduction/key-workflows.md b/erpnext/docs/user/manual/en/introduction/key-workflows.md
index 9196014..85a1a15 100644
--- a/erpnext/docs/user/manual/en/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/en/introduction/key-workflows.md
@@ -6,7 +6,7 @@
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/overview.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/overview.png">
_Note: Not all of the steps are mandatory. ERPNext allows you to freely skip
steps if you want to simplify the process._
diff --git a/erpnext/docs/user/manual/en/introduction/the-champion.md b/erpnext/docs/user/manual/en/introduction/the-champion.md
index fca349e..589c338 100644
--- a/erpnext/docs/user/manual/en/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/en/introduction/the-champion.md
@@ -1,6 +1,6 @@
# The Champion
-<img alt="Champion" class="screenshot" src="/docs/assets/img/setup/implementation-image.png">
+<img alt="Champion" class="screenshot" src="{{docs_base_url}}/assets/img/setup/implementation-image.png">
We have seen dozens of ERP implementations over the past few years and we
realize that successful implementation is a lot about intangibles and
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md b/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md
index 4dd10b3..e1c1c42 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md
@@ -2,7 +2,7 @@
Capacity Planning functionality helps you in tracking production jobs allocated on each Workstation.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/capacity-1.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/capacity-1.png">
Follow are the steps to use Capacity Planning Feature in your ERPNext account.
@@ -32,7 +32,7 @@
**Question:** On Submission of Production Order, we are getting following error message.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/capacity-2.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/capacity-2.png">
**Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Production Order.
@@ -45,7 +45,7 @@
If you want to ignore above validation and allow scheduling of production job beyond the working hours of the Workstation, enable
Overtime in the Manufacturing Settings.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/capacity-3.png">
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/capacity-3.png">
If you want to complete disable Capacity Planning feature, in the Manufacturing Settings, check field "Disable Capacity Planning and Time Tracking".
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
index 453528e..3f507af 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
@@ -8,7 +8,7 @@
BOM of PC will have all the raw-material items selected in it. Hard Disk and DVD Drive (sub-assemblies) will also be selected as raw-material items. For the sib-assembly items, respective BOM no. will be fetched as well.
-<img alt="Nested BOM" class="screenshot" src="/docs/assets/img/articles/nested-bom-1.png">
+<img alt="Nested BOM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/nested-bom-1.png">
Following is how the structure of nested BOM will look:
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
index 5b5ac00..c09a727 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
@@ -4,7 +4,7 @@
**Answer:** There are 3 available options in the <i>Valuation Based On</i> field:
-<img alt="Nested BOM" class="screenshot" src="/docs/assets/img/articles/valuation-based-on-1.png">
+<img alt="Nested BOM" class="screenshot" src="{{docs_base_url}}/assets/img/articles/valuation-based-on-1.png">
**Valuation Rate:** Item valuation rate is defined based on it's purchase or manufacture value.
diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
index 112efab..11a7cac 100644
--- a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -10,11 +10,11 @@
> Manufacturing > Bill of Materials > New BOM
-<img class="screenshot" alt="Task" src="/docs/assets/img/manufacturing/bom.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/bom.png">
* To add Operations select 'With Operation'. The Operations table shall appear.
-<img class="screenshot" alt="Task" src="/docs/assets/img/manufacturing/bom-operations.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/bom-operations.png">
* Select the Item for which you want to make the BOM.
* Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary.
@@ -27,22 +27,22 @@
* Add the list of Items you require for each operation, with its quantity. This Item could be a purchased Item or a sub-assembly with its own BOM. If the row Item is a manufactured Item and has multiple BOMs, select the appropriate BOM. You can also define if a part of the Item goes into scrap.
-<img class="screenshot" alt="Costing" src="/docs/assets/img/manufacturing/bom-costing.png">
+<img class="screenshot" alt="Costing" src="{{docs_base_url}}/assets/img/manufacturing/bom-costing.png">
* This cost can be updated on by using the 'Update Cost' button.
-<img class="screenshot" alt="Update Cost" src="/docs/assets/img/manufacturing/bom-update-cost.png">
+<img class="screenshot" alt="Update Cost" src="{{docs_base_url}}/assets/img/manufacturing/bom-update-cost.png">
* User can select the currency in the BOM
* System calculates the costing based on the price list currency
-<img class="screenshot" alt="Update Cost" src="/docs/assets/img/manufacturing/price-list-based-currency-bom.png">
+<img class="screenshot" alt="Update Cost" src="{{docs_base_url}}/assets/img/manufacturing/price-list-based-currency-bom.png">
### Materials Required(exploded)
This table lists down all the Material required for the Item to be Manufactured.
It also fetches sub-assemblies along with the quantity.
-<img class="screenshot" alt="Exploded Section" src="/docs/assets/img/manufacturing/bom-exploded.png">
+<img class="screenshot" alt="Exploded Section" src="{{docs_base_url}}/assets/img/manufacturing/bom-exploded.png">
{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/introduction.md b/erpnext/docs/user/manual/en/manufacturing/introduction.md
index b7f0a99..2a947b2 100644
--- a/erpnext/docs/user/manual/en/manufacturing/introduction.md
+++ b/erpnext/docs/user/manual/en/manufacturing/introduction.md
@@ -1,6 +1,6 @@
# Introduction
-<img class="screenshot" alt="Task" src="/docs/assets/img/manufacturing/manufacturing.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing.png">
### Types of Production Planning
diff --git a/erpnext/docs/user/manual/en/manufacturing/operation.md b/erpnext/docs/user/manual/en/manufacturing/operation.md
index 8d495f1..75066aa 100644
--- a/erpnext/docs/user/manual/en/manufacturing/operation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/operation.md
@@ -8,6 +8,6 @@
> Manufacturing > Documents > Operation > New
-<img class="screenshot" alt="Operation" src="/docs/assets/img/manufacturing/operation.png">
+<img class="screenshot" alt="Operation" src="{{docs_base_url}}/assets/img/manufacturing/operation.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
index 430ef8a..4ceb4fc 100644
--- a/erpnext/docs/user/manual/en/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -1,6 +1,6 @@
# Production Order
-<img class="screenshot" alt="Production Order" src="/docs/assets/img/manufacturing/manufacturing-flow.png">
+<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-flow.png">
A Production Order (also known as a Work Order) is a document that is given to
the manufacturing shop floor by the Production Planner as a signal to produce
a certain quantity of a certain Item. The Production Order also helps to generate
@@ -13,7 +13,7 @@
> Manufacturing > Documents > Production Order > New
-<img class="screenshot" alt="Production Order" src="/docs/assets/img/manufacturing/production-order.png">
+<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/production-order.png">
### Creating Production Orders
@@ -35,11 +35,11 @@
* By default the system fetchs workstation and duration for Production Order Operations from the selected BOM.
-<img class="screenshot" alt="PO Opeartions" src="/docs/assets/img/manufacturing/PO-operations.png">
+<img class="screenshot" alt="PO Opeartions" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations.png">
* If you wish to reassign the workstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order.
-<img class="screenshot" alt="PO reassigning Operations" src="/docs/assets/img/manufacturing/PO-reassigning-operations.png">
+<img class="screenshot" alt="PO reassigning Operations" src="{{docs_base_url}}/assets/img/manufacturing/PO-reassigning-operations.png">
* Select the respective operation, and change its workstation.
* You can also change the Operating Time for that operation
@@ -56,19 +56,19 @@
* Click on 'Start'.
-<img class="screenshot" alt="Transfer Materials" src="/docs/assets/img/manufacturing/PO-material-transfer.png">
+<img class="screenshot" alt="Transfer Materials" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
* Mention the quantity of materials to be transfered.
-<img class="screenshot" alt="Material Transfer Qty" src="/docs/assets/img/manufacturing/PO-material-transfer-qty.png">
+<img class="screenshot" alt="Material Transfer Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-qty.png">
* Submit the Stock Entry
-<img class="screenshot" alt="Stock Entry for PO" src="/docs/assets/img/manufacturing/PO-SE-for-material-transfer.png">
+<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-SE-for-material-transfer.png">
* Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry.
-<img class="screenshot" alt="Stock Entry for PO" src="/docs/assets/img/manufacturing/PO-material-transfer-updated.png">
+<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-updated.png">
#### Material Transfer through Stock Entry
Use cases for this option are:
@@ -84,7 +84,7 @@
* Drafts of Timesheet are created based on the scheduled operations when an Production Order is Submitted.
* To create more Timesheets against an operation click 'Make Timesheet' button.
-<img class="screenshot" alt="Make timesheet against PO" src="/docs/assets/img/manufacturing/PO-operations-make-ts.png">
+<img class="screenshot" alt="Make timesheet against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-ts.png">
###Updating Finished Goods
@@ -92,11 +92,11 @@
* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
* Click on 'Finish'.
-<img class="screenshot" alt="Update Finished Goods" src="/docs/assets/img/manufacturing/PO-FG-update.png">
+<img class="screenshot" alt="Update Finished Goods" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
* Mention the quantity of materials to be transfered.
-<img class="screenshot" alt="Update Finished Goods Qty" src="/docs/assets/img/manufacturing/PO-FG-update-qty.png">
+<img class="screenshot" alt="Update Finished Goods Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update-qty.png">
> Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry.
@@ -111,7 +111,7 @@
4. Update Finished Goods: This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
5. To check all Time Logs made against the Production Order click on 'Show Time Logs'
-<img class="screenshot" alt="PO - stop" src="/docs/assets/img/manufacturing/PO-stop.png">
+<img class="screenshot" alt="PO - stop" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
* You can also re-start a stopped Production Order.
diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
index 7e65ba2..0908c37 100644
--- a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
@@ -4,7 +4,7 @@
`Manufacturing > Setup > Manufacturing Settings`
-<img class="screenshot" alt="Manufacturing Settings" src="/docs/assets/img/manufacturing/manufacturing-settings-1.png">
+<img class="screenshot" alt="Manufacturing Settings" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-settings-1.png">
####Disable Capacity Planning and Time Tracking
@@ -16,7 +16,7 @@
In the Workstation master, actual working hours are defined (say 101m to 6pm). As per the Capacity Planning, Time Logs are created against Workstation, for tracking actual operations hour. It also considers working hours of a Workstation when scheduling job (via Time Log).
-<img class="screenshot" alt="Manufacturing Settings" src="/docs/assets/img/articles/manufacturing-settings-2.png">
+<img class="screenshot" alt="Manufacturing Settings" src="{{docs_base_url}}/assets/img/articles/manufacturing-settings-2.png">
As per the standard validation, if Operation cannot be completed within working hours of Workstation, then user is asked to divide an Operation into multiple and smaller Operations. However, if `Allow Overtime` field is checked, while creating Time Logs for Operation, working hours of Workstation will not be validated. In this case, Time Logs for Operation will be created beyond working hours of Workstation as well.
@@ -24,7 +24,7 @@
Holiday of a company can be recorded in the [Holiday List](/docs/user/manual/en/human-resources/) master. While scheduling production job on workstation, system doesn't consider a day listed in the Holiday list. If you want production job to be scheduled on holidays as well, `Allow Production on Holidays` field should be checked.
-<img class="screenshot" alt="Manufacturing Settings" src="/docs/assets/img/articles/manufacturing-settings-3.png">
+<img class="screenshot" alt="Manufacturing Settings" src="{{docs_base_url}}/assets/img/articles/manufacturing-settings-3.png">
####Over Production Allowance Percentage
@@ -34,7 +34,7 @@
When creating Manufacture Entry, raw-material items are back-flush based on BOM of production item. If you want raw-material items to be back-flushed based on Material Transfer entry made against that Production Order instead, then you should set Back-flush Raw Materials Based On "Material Transferred for Manufacture".
-<img class="screenshot" alt="Manufacturing Settings" src="/docs/assets/img/articles/manufacturing-settings-4.png">
+<img class="screenshot" alt="Manufacturing Settings" src="{{docs_base_url}}/assets/img/articles/manufacturing-settings-4.png">
####Capacity Planning For (Days)
diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
index 5abf0c6..cfef2a5 100644
--- a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
@@ -17,7 +17,7 @@
2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go).
3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”.
-<img class="screenshot" alt="Sub-Contracting" src="/docs/assets/img/manufacturing/subcontract.png">
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract.png">
__Step 1:__ Make a Bill of Materials for the processed Item, with the unprocessed
@@ -25,24 +25,24 @@
pen will be named under Bill of Materials(BOM), whereas, the refill, knob, and
other items which go into the making of pen, will be categorized as sub-items.
-<img class="screenshot" alt="Sub-Contracting" src="/docs/assets/img/manufacturing/subcontract2.png">
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract2.png">
__Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials. You can also select the warehouse from which the material would be reserved for sub contracting.
-<img class="screenshot" alt="Sub-Contracting" src="/docs/assets/img/manufacturing/subcontract3.png">
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract3.png">
Once the PO is submitted, you can view the reserved quantity of the item from the item dashboard as well.
-<img class="screenshot" alt="Sub-Contracting" src="/docs/assets/img/manufacturing/subcontract3-reserved-material.png">
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract3-reserved-material.png">
__Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier.
-<img class="screenshot" alt="Sub-Contracting" src="/docs/assets/img/manufacturing/subcontract4.png">
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract4.png">
__Step 4:__ Receive the Items from your Supplier via Purchase Receipt. Make sure to check the “Consumed Quantity” in the “Raw Materials” table so that the
correct stock is maintained at the Supplier’s end.
-<img class="screenshot" alt="Sub-Contracting" src="/docs/assets/img/manufacturing/subcontract5.png">
+<img class="screenshot" alt="Sub-Contracting" src="{{docs_base_url}}/assets/img/manufacturing/subcontract5.png">
> Note 1: Make sure that the “Rate” of processed Item is the processing rate
(excluding the raw material rate).
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
index e9ba2a5..9f253d6 100644
--- a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
@@ -13,7 +13,7 @@
> Manufacturing > Tools > Production Planning Tool
-<img class="screenshot" alt="Production Planing Tool" src="/docs/assets/img/manufacturing/ppt.png">
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt.png">
#### Step 1: Specify source to get Production Items
@@ -27,7 +27,7 @@
* Use filters to get the Sales Order / Material Request
* Click on Get Sales Order / Get Material Requests to generate a list.
-<img class="screenshot" alt="Production Planing Tool" src="/docs/assets/img/manufacturing/ppt-get-sales-orders.png">
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-sales-orders.png">
@@ -36,11 +36,11 @@
* Get the items for the Sales Order / Material request list
* You can add/remove or change quantity of these Items.
-<img class="screenshot" alt="Production Planing Tool" src="/docs/assets/img/manufacturing/ppt-get-item.png">
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-item.png">
#### Step 4: Create Production Orders
-<img class="screenshot" alt="Production Planing Tool" src="/docs/assets/img/manufacturing/ppt-create-production-order.png">
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-production-order.png">
@@ -48,7 +48,7 @@
Create Material Request for Items with projected shortfall.
-<img class="screenshot" alt="Production Planing Tool" src="/docs/assets/img/manufacturing/ppt-create-material-request.png">
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-material-request.png">
diff --git a/erpnext/docs/user/manual/en/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md
index 5670893..80654f4 100644
--- a/erpnext/docs/user/manual/en/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md
@@ -10,7 +10,7 @@
> Manufacturing > Documents > Workstation > New
-<img class="screenshot" alt="Workstation" src="/docs/assets/img/manufacturing/workstation.png">
+<img class="screenshot" alt="Workstation" src="{{docs_base_url}}/assets/img/manufacturing/workstation.png">
In workstation specify the workstation working hours under the 'working hour' section.
You can also specify the working hours based on shifts.
diff --git a/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md b/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md
index 0078f6c..6587ca2 100644
--- a/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md
+++ b/erpnext/docs/user/manual/en/non_profit/Chapter/chapter.md
@@ -8,7 +8,7 @@
> Non Profit > Chapter > New
-<img class="screenshot" alt="Chapter" src="/docs/assets/img/non_profit/chapter/chapter.png">
+<img class="screenshot" alt="Chapter" src="{{docs_base_url}}/assets/img/non_profit/chapter/chapter.png">
System User or Chapter Head can add chapter Member directly from the desk or
User can join directly by visiting chapter page on website
@@ -17,9 +17,9 @@
> My Account on website > Chapter from sidebar > Select Available chapter and click on join chapter button
-<img class="screenshot" alt="online Chapter" src="/docs/assets/img/non_profit/chapter/online_chapter.png">
+<img class="screenshot" alt="online Chapter" src="{{docs_base_url}}/assets/img/non_profit/chapter/online_chapter.png">
-<img class="screenshot" alt="online Chapter" src="/docs/assets/img/non_profit/chapter/online_chapter_join.png">
+<img class="screenshot" alt="online Chapter" src="{{docs_base_url}}/assets/img/non_profit/chapter/online_chapter_join.png">
To leave chapter click on leave chapter button
diff --git a/erpnext/docs/user/manual/en/non_profit/Donor/donor.md b/erpnext/docs/user/manual/en/non_profit/Donor/donor.md
index 7958755..7da4839 100644
--- a/erpnext/docs/user/manual/en/non_profit/Donor/donor.md
+++ b/erpnext/docs/user/manual/en/non_profit/Donor/donor.md
@@ -8,7 +8,7 @@
> Non Profit > Donor > New
-<img class="screenshot" alt="Student" src="/docs/assets/img/non_profit/donor/donor.png">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/non_profit/donor/donor.png">
**Email:** Email field is the id of Member doctype.
diff --git a/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md b/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md
index ba74c17..4c643b4 100644
--- a/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md
+++ b/erpnext/docs/user/manual/en/non_profit/Donor/donor_type.md
@@ -10,7 +10,7 @@
> Non Profit > Donor Type > New
-<img class="screenshot" alt="donor type" src="/docs/assets/img/non_profit/donor/donor_type.png">
+<img class="screenshot" alt="donor type" src="{{docs_base_url}}/assets/img/non_profit/donor/donor_type.png">
**Donor Type:** The Donor Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a donor type name that is appropriate to both audiences. It can be changed at a later date
diff --git a/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md b/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md
index 3b07d35..268f26a 100644
--- a/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md
+++ b/erpnext/docs/user/manual/en/non_profit/Grant Application/grant_application.md
@@ -7,11 +7,11 @@
> My Account on website > Grant Application from sidebar > Apply for new Grant Application.
-<img class="screenshot" alt="Online Grant Application row" src="/docs/assets/img/non_profit/grant_application/grant_application_row.png">
+<img class="screenshot" alt="Online Grant Application row" src="{{docs_base_url}}/assets/img/non_profit/grant_application/grant_application_row.png">
-<img class="screenshot" alt="Online Grant Application" src="/docs/assets/img/non_profit/grant_application/online_grant_application_1.png">
+<img class="screenshot" alt="Online Grant Application" src="{{docs_base_url}}/assets/img/non_profit/grant_application/online_grant_application_1.png">
-<img class="screenshot" alt="Online Grant Application" src="/docs/assets/img/non_profit/grant_application/grant_portal.png">
+<img class="screenshot" alt="Online Grant Application" src="{{docs_base_url}}/assets/img/non_profit/grant_application/grant_portal.png">
To Generate Grant Application go to:
@@ -19,7 +19,7 @@
> Non Profit > Grant Application > New.
-<img class="screenshot" alt="Grant Application" src="/docs/assets/img/non_profit/grant_application/grant_application.png">
+<img class="screenshot" alt="Grant Application" src="{{docs_base_url}}/assets/img/non_profit/grant_application/grant_application.png">
**Email:** Email is a mandatory field.
diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/member.md b/erpnext/docs/user/manual/en/non_profit/Membership/member.md
index c9dc9c6..2467f14 100644
--- a/erpnext/docs/user/manual/en/non_profit/Membership/member.md
+++ b/erpnext/docs/user/manual/en/non_profit/Membership/member.md
@@ -8,7 +8,7 @@
> Non Profit > Member > New
-<img class="screenshot" alt="Student" src="/docs/assets/img/non_profit/membership/member.png">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/non_profit/membership/member.png">
**Email:** Email field is the id of Member doctype.
diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/membership.md b/erpnext/docs/user/manual/en/non_profit/Membership/membership.md
index f101b86..d871cc5 100644
--- a/erpnext/docs/user/manual/en/non_profit/Membership/membership.md
+++ b/erpnext/docs/user/manual/en/non_profit/Membership/membership.md
@@ -9,7 +9,7 @@
> Non Profit > Membership > New
-<img class="screenshot" alt="Membership" src="/docs/assets/img/non_profit/membership/membership.png">
+<img class="screenshot" alt="Membership" src="{{docs_base_url}}/assets/img/non_profit/membership/membership.png">
**Member:** Member is a link field fetch member details from Member doctype.
diff --git a/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md b/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md
index eb7a09e..0e03bb4 100644
--- a/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md
+++ b/erpnext/docs/user/manual/en/non_profit/Membership/membership_type.md
@@ -9,7 +9,7 @@
> Non Profit > Membership Type > New
-<img class="screenshot" alt="Student" src="/docs/assets/img/non_profit/membership/membership_type.png">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/non_profit/membership/membership_type.png">
**Membership Type:** The Membership Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date
diff --git a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md
index 6b875ee..01b2b51 100644
--- a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md
+++ b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer.md
@@ -8,7 +8,7 @@
> Non Profit > Volunteer > New
-<img class="screenshot" alt="Volunteer" src="/docs/assets/img/non_profit/volunteer/volunteer.png">
+<img class="screenshot" alt="Volunteer" src="{{docs_base_url}}/assets/img/non_profit/volunteer/volunteer.png">
**Email:** Email field is the id of Member doctype.
diff --git a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md
index 95b4c81..dcf2608 100644
--- a/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md
+++ b/erpnext/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md
@@ -8,7 +8,7 @@
> Non Profit > Volunteer Type > New
-<img class="screenshot" alt="Volunteer" src="/docs/assets/img/non_profit/volunteer/volunteer_type.png">
+<img class="screenshot" alt="Volunteer" src="{{docs_base_url}}/assets/img/non_profit/volunteer/volunteer_type.png">
**Volunteer Type:** The Volunteer Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date
diff --git a/erpnext/docs/user/manual/en/non_profit/index.md b/erpnext/docs/user/manual/en/non_profit/index.md
index 546581f..7d56f4d 100644
--- a/erpnext/docs/user/manual/en/non_profit/index.md
+++ b/erpnext/docs/user/manual/en/non_profit/index.md
@@ -13,11 +13,11 @@
<div class="section" style="padding-top: 0px; margin-top: -30px;">
<div class="fake-browser-frame">
<img class="img-responsive browser-image feature-image" alt="Non Profit Domain"
- src="/docs/assets/img/non_profit/non_profit_domain.png">
+ src="{{docs_base_url}}/assets/img/non_profit/non_profit_domain.png">
</div>
</div>
### Non Profit Domain
-<img class="screenshot" alt="Non Profit" src="/docs/assets/img/non_profit/module.png">
+<img class="screenshot" alt="Non Profit" src="{{docs_base_url}}/assets/img/non_profit/module.png">
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/activity-cost.md b/erpnext/docs/user/manual/en/projects/activity-cost.md
index 88d4f0a..565686f 100644
--- a/erpnext/docs/user/manual/en/projects/activity-cost.md
+++ b/erpnext/docs/user/manual/en/projects/activity-cost.md
@@ -3,4 +3,4 @@
Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type.
This rate is pulled by the system while making Time Logs. It is used for Project Costing.
-<img class="screenshot" alt="Activity Cost" src="/docs/assets/img/project/activity_cost.png">
+<img class="screenshot" alt="Activity Cost" src="{{docs_base_url}}/assets/img/project/activity_cost.png">
diff --git a/erpnext/docs/user/manual/en/projects/activity-type.md b/erpnext/docs/user/manual/en/projects/activity-type.md
index 4e968a6..54b455e 100644
--- a/erpnext/docs/user/manual/en/projects/activity-type.md
+++ b/erpnext/docs/user/manual/en/projects/activity-type.md
@@ -2,7 +2,7 @@
Activity Type makes a list of the different types of activities against which a Time Log can be made.
-<img class="screenshot" alt="Activity Type" src="/docs/assets/img/project/activity_type.png">
+<img class="screenshot" alt="Activity Type" src="{{docs_base_url}}/assets/img/project/activity_type.png">
By default the following Activity Types are created.
diff --git a/erpnext/docs/user/manual/en/projects/articles/project-costing.md b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
index 2943ea6..f83608a 100644
--- a/erpnext/docs/user/manual/en/projects/articles/project-costing.md
+++ b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
@@ -12,17 +12,17 @@
Activity Cost is a master where you can track billing and costing rate for each Employee, and for each Activity Type.
-<img alt="Activity Cost" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png">
+<img alt="Activity Cost" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png">
#### Time Log
Based on Actual Time spent on the Project-Task, Employee will create a time log.
-<img alt="Time Log" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png">
+<img alt="Time Log" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png">
On selection of Activity Type in the Time Log, Billing and Costing Rate will fetched for that Employee from respective Activity Cost master.
-<img alt="[Time Log Costing" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png">
+<img alt="[Time Log Costing" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png">
Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log.
@@ -30,10 +30,10 @@
Based on total Time Logs created for a specific Task, its costing will be updated in the respective Task master.
-<img alt="Costing in Task" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png">
+<img alt="Costing in Task" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png">
Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project.
-<img alt="Costing in Project" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png">
+<img alt="Costing in Project" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
index e1e936b..25f28d5 100644
--- a/erpnext/docs/user/manual/en/projects/project.md
+++ b/erpnext/docs/user/manual/en/projects/project.md
@@ -2,7 +2,7 @@
Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/project.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project.png">
You can also track % Completion of a Project using different methods.
@@ -10,34 +10,34 @@
2. Task Progress
3. Task Weight
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/project-percent-complete.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project-percent-complete.png">
Some examples of how the % Completion is calculated based on Tasks.
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/percent-complete-calc.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/percent-complete-calc.png">
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/percent-complete-formula.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/percent-complete-formula.png">
### Managing tasks
Project can be divided into multiple Tasks.
Task can be created via Project document itself or can be created via [Task](/docs/user/manual/en/projects/tasks.html)
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/project_task.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project_task.png">
* To view Task made against a Project click on 'Tasks'
-<img class="screenshot" alt="Project - View Task" src="/docs/assets/img/project/project_view_task.png">
+<img class="screenshot" alt="Project - View Task" src="{{docs_base_url}}/assets/img/project/project_view_task.png">
-<img class="screenshot" alt="Project - Task List" src="/docs/assets/img/project/project_task_list.png">
+<img class="screenshot" alt="Project - Task List" src="{{docs_base_url}}/assets/img/project/project_task_list.png">
* You can also view the Tasks from the Project document itself
-<img class="screenshot" alt="Project - Task Grid" src="/docs/assets/img/project/project_task_grid.png">
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/project_task_grid.png">
* To add Weights to Tasks you can follow the below steps
-<img class="screenshot" alt="Project - Task Grid" src="/docs/assets/img/project/tasks.png">
-<img class="screenshot" alt="Project - Task Grid" src="/docs/assets/img/project/task-weights.png">
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/tasks.png">
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/task-weights.png">
### Managing time
@@ -48,13 +48,13 @@
* To view Time Log made against a Project click on 'Time Logs'
-<img class="screenshot" alt="Project - View Time Log" src="/docs/assets/img/project/project_view_time_log.png">
+<img class="screenshot" alt="Project - View Time Log" src="{{docs_base_url}}/assets/img/project/project_view_time_log.png">
-<img class="screenshot" alt="Project - Time Log List" src="/docs/assets/img/project/project_time_log_list.png">
+<img class="screenshot" alt="Project - Time Log List" src="{{docs_base_url}}/assets/img/project/project_time_log_list.png">
* You can also create a Time Log directlly and link it to the Project.
-<img class="screenshot" alt="Project - Link Time Log" src="/docs/assets/img/project/project_time_log_link.png">
+<img class="screenshot" alt="Project - Link Time Log" src="{{docs_base_url}}/assets/img/project/project_time_log_link.png">
### Managing expenses
@@ -63,27 +63,27 @@
* To view Expense Claims made against a Project click on 'Expense Claims'
-<img class="screenshot" alt="Project - View Expense Claim" src="/docs/assets/img/project/project_view_expense_claim.png">
+<img class="screenshot" alt="Project - View Expense Claim" src="{{docs_base_url}}/assets/img/project/project_view_expense_claim.png">
* You can also create a Expense Claims directlly and link it to the Project.
-<img class="screenshot" alt="Project - Link Expense Claim" src="/docs/assets/img/project/project_expense_claim_link.png">
+<img class="screenshot" alt="Project - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
-<img class="screenshot" alt="Project - Total Expense Claim" src="/docs/assets/img/project/project_total_expense_claim.png">
+<img class="screenshot" alt="Project - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/project_total_expense_claim.png">
### Cost Center
You can make a [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
-<img class="screenshot" alt="Project - Cost Center" src="/docs/assets/img/project/project_cost_center.png">
+<img class="screenshot" alt="Project - Cost Center" src="{{docs_base_url}}/assets/img/project/project_cost_center.png">
###Project Costing
The Project Costing section helps you track the time, expenses and purchases incurred against the project.
-<img class="screenshot" alt="Project - Costing" src="/docs/assets/img/project/project_costing.png">
+<img class="screenshot" alt="Project - Costing" src="{{docs_base_url}}/assets/img/project/project_costing.png">
* The Total Cost is composed of the costing amount from timesheets, the total cost from expense claims and the total cost from purchase invoices created against this project.
@@ -93,7 +93,7 @@
You can make/link a [Sales Order](/docs/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project.
-<img class="screenshot" alt="Project - Sales Order" src="/docs/assets/img/project/project_sales_order.png">
+<img class="screenshot" alt="Project - Sales Order" src="{{docs_base_url}}/assets/img/project/project_sales_order.png">
###Gantt Chart
@@ -102,8 +102,8 @@
* To view gantt chart against a project, go to that project and click on 'Gantt Chart'
-<img class="screenshot" alt="Project - View Gantt Chart" src="/docs/assets/img/project/project_view_gantt_chart.png">
+<img class="screenshot" alt="Project - View Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_view_gantt_chart.png">
-<img class="screenshot" alt="Project - Gantt Chart" src="/docs/assets/img/project/project_gantt_chart.png">
+<img class="screenshot" alt="Project - Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_gantt_chart.png">
{next}
diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
index 9447a2e..cae54f4 100644
--- a/erpnext/docs/user/manual/en/projects/tasks.md
+++ b/erpnext/docs/user/manual/en/projects/tasks.md
@@ -3,13 +3,13 @@
Project is divided into Tasks.
In ERPNext, you can also create a Task independently.
-<img class="screenshot" alt="Task" src="/docs/assets/img/project/task.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/project/task.png">
### Status of the Task
A Task can have one of the following statuses - Open, Working, Pending Review, Closed, or Cancelled.
-<img class="screenshot" alt="Task - Status" src="/docs/assets/img/project/task_status.png">
+<img class="screenshot" alt="Task - Status" src="{{docs_base_url}}/assets/img/project/task_status.png">
* By default each new Task created has the status set to 'Open'.
@@ -19,7 +19,7 @@
You can specify a list of dependent tasks under the 'Depends On' section.
-<img class="screenshot" alt="Depends On" src="/docs/assets/img/project/task_depends_on.png">
+<img class="screenshot" alt="Depends On" src="{{docs_base_url}}/assets/img/project/task_depends_on.png">
* You cannot close the parent task until all dependent tasks are closed.
@@ -33,13 +33,13 @@
* To view Time Log made against a Task click on 'Time Logs'
-<img class="screenshot" alt="Task - View Time Log" src="/docs/assets/img/project/task_view_time_log.png">
+<img class="screenshot" alt="Task - View Time Log" src="{{docs_base_url}}/assets/img/project/task_view_time_log.png">
-<img class="screenshot" alt="Task - Time Log List" src="/docs/assets/img/project/task_time_log_list.png">
+<img class="screenshot" alt="Task - Time Log List" src="{{docs_base_url}}/assets/img/project/task_time_log_list.png">
* You can also create a Time Log directly and link it to the Task.
-<img class="screenshot" alt="Task - Link Time Log" src="/docs/assets/img/project/task_time_log_link.png">
+<img class="screenshot" alt="Task - Link Time Log" src="{{docs_base_url}}/assets/img/project/task_time_log_link.png">
### Managing Expenses
@@ -48,14 +48,14 @@
* To view Expense Claims made against a Task click on 'Expense Claims'
-<img class="screenshot" alt="Task - View Expense Claim" src="/docs/assets/img/project/task_view_expense_claim.png">
+<img class="screenshot" alt="Task - View Expense Claim" src="{{docs_base_url}}/assets/img/project/task_view_expense_claim.png">
* You can also create a Expense Claims directly and link it to the Task.
-<img class="screenshot" alt="Task - Link Expense Claim" src="/docs/assets/img/project/task_expense_claim_link.png">
+<img class="screenshot" alt="Task - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/task_expense_claim_link.png">
* Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section
-<img class="screenshot" alt="Task - Total Expense Claim" src="/docs/assets/img/project/task_total_expense_claim.png">
+<img class="screenshot" alt="Task - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/task_total_expense_claim.png">
{next}
diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
index b307f6a..6904f4e 100644
--- a/erpnext/docs/user/manual/en/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md
@@ -8,17 +8,17 @@
Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Sheet" button and these Time Logs will be selected.
-<img class="screenshot" alt="Time Log - Drag Calender" src="/docs/assets/img/project/time_sheet.gif">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet.gif">
###Making Sales Invoice
* After submitting the Time Sheet, "Make Invoice" button shall appear.
-<img class="screenshot" alt="Time Log - Drag Calender" src="/docs/assets/img/project/time_sheet_make_invoice.png">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet_make_invoice.png">
* Click on that button to raise a Sales Invoice against the Time Sheet.
-<img class="screenshot" alt="Time Log - Drag Calender" src="/docs/assets/img/project/time_sheet_sales_invoice.png">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet_sales_invoice.png">
* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Sheet and their status will change to "Billed".
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md b/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md
index 35d99aa..32faf03 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md
@@ -6,7 +6,7 @@
To track actual hours employee has worked for, create Timesheet for each Employee. We suggest you to create Timesheet based on a payment period. For example, if you paying employee on a weekly bases, create one Timesheet for an Employee for one week. However, you can create multiple Timesheets, and create one Salary Slip for the multiple Timesheets.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-salary-slip-1.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-1.png">
####Salary Structure for the Employee
@@ -16,17 +16,17 @@
Amount directly for other Salary Components (eg: House Rent Allowance, Phone Allowance) can be define directly. When creating Salary Slip, Amount for these Salary Component will be fetched as it is.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-salary-slip-2.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-2.png">
####Create Salary Slip from Timesheet
To create Salary Slip against Timesheet, open Timesheet and click on "Salary Slip".
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-salary-slip-3.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-3.png">
In the Salary Slip, Timesheet ID will be updated. You can select more Timesheet to be paid via this Salary Slip. Based on the Timesheets selected, Total Working Hours will be calculated.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-salary-slip-4.gif">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-4.gif">
Hour Rate will be fetched from the Salary Structure of an Employee. Based on Total Working Hours and Hour Rate, Amount will be calculated for the Salary Component is to be calculated based on actual hours worked.
@@ -34,7 +34,7 @@
On Submission of Salary Slip, Timesheet's status will be updated to "Payslip".
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-salary-slip-5.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-slip-5.png">
<div class=well>
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md b/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
index 4dbdcbb..89c6b63 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
@@ -14,7 +14,7 @@
In the Employee field, only ones having ative Salary Structure will be selectable. Further in the Salary Structure , is created for the E on the actual hours worked, Employee can create Timesheet. To be able to create Sales Invoice against this Timesheet, ensure `Billable` field is checked.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-salary-structure.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-salary-structure.png">
#### Step 3:Activity Type
@@ -22,7 +22,7 @@
To learn more on how to setup Activity Type and Activity Cost, click [here](/docs/user/manual/en/projects/articles/project-costing).
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-cost.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-cost.png">
#### Step 4: Enter Actual Time
@@ -30,7 +30,7 @@
To be able to create Sales Invoice from the Time Sheet, ensure 'Is Billable' field is checked.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project//timesheet/timesheet-billable.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project//timesheet/timesheet-billable.png">
Based on the actual hours worked and Activity Cost of an Employee, Total Billing Amount will be calculated for Timesheet.
@@ -46,7 +46,7 @@
In the Timesheet, if "Is Billable" is checked, you will find option to create Sales Invoice against it.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-invoice-1.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-invoice-1.png">
<img class="screenshot" alt="Sales Invoice timesheet" src="{{docs_base_url}}/assets/img/project/timesheet/make_invoice_from_timesheet.gif">
@@ -54,7 +54,7 @@
Sales Invoice has dedicated table for the Timesheet table where Timesheet details will be updated. You can select more Timesheets in this table.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-to-invoice.gif">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-to-invoice.gif">
####Select Customer and Item
@@ -67,4 +67,4 @@
On submitting Sales Invoice, status of the Timesheets linked to the Sales Invoice will be updated as Billed.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-billed.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-billed.png">
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
index f51e049..6e108b3 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
@@ -4,7 +4,7 @@
When a Production Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-capacity-planning.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-capacity-planning.png">
Let's assume we are manufacturing a mobile phone. As per the Bill of Material, time required for the assembly of components could be one hour. However the actual time taken for it's completion could be more than planned. The actual time tracking provides actual operation cost, hence helps in determining accurate valuation of the manufacturing item.
@@ -12,28 +12,28 @@
As per the Bill of Materials of manufacturing item, following are the Operations and Workstation through which raw-material items are processed.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-production-order-1.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-1.png">
On submission on Production Order, Timesheet will be created automatically.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-production-order-2.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-2.png">
####Time Sheet created from Production Order
In the Timesheet, unique row will be added for each Operation - Workstation. This allows operator/supervisor at the workstation to enter actual From Time and To Time taken for each Operation.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-production-order-3.gif">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-3.gif">
After enter From Time and To Time for all the Operations, Total Hours will be calculated.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-production-order-6.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-6.png">
With updating actual time, you can also enter "Completed Qty". If all the items are not processed in the same Timesheet, you can create another Timesheet from the Production Order.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-production-order-4.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-4.png">
####Save and Submit Timesheet
On the submission of Timesheet, Total Hours is calculated. Also, in the Production Order, for each Operation, actual Start and End Time is updated.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-production-order-5.png">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-5.png">
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
index 2086673..1524677 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
@@ -2,7 +2,7 @@
Timesheets can be tracked against Project and Tasks so that you can get reports on how much time was spent on each Task or Project.
-<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-project.gif">
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-project.gif">
####Billable Timesheet
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/docs/user/manual/en/regional/france/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/docs/user/manual/en/regional/france/__init__.py
diff --git a/erpnext/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md b/erpnext/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md
new file mode 100644
index 0000000..ac82aea
--- /dev/null
+++ b/erpnext/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md
@@ -0,0 +1,24 @@
+# Le Fichier des Écritures Comptables [FEC]
+
+Since 2014, a legal requirement makes it mandatory for companies operating in France to provide a file of their general accounting postings by fiscal year corresponding to an electronic accounting journal.
+
+For ERPNext users this file can be generated using a report available if you system's country is France.
+
+
+### Requirements
+
+To generate the report correctly, your Chart of Account needs to be setup according to the french accounting rules.
+
+All accounts need to have a number in line with the General Chart of Account (PCG) and a name.
+
+The SIREN number of your company can be added in the "Company" doctype.
+
+
+### CSV generation
+
+You can generate the required CSV file by clicking on "Export" in the top right corner of the report.
+
+
+### Testing Instructions
+
+To test the validity of your file, the tax administration provides a testing tool at the following address: [Outil de test des fichiers des écritures comptables (FEC)](http://www.economie.gouv.fr/dgfip/outil-test-des-fichiers-des-ecritures-comptables-fec)
diff --git a/erpnext/docs/user/manual/en/regional/france/index.txt b/erpnext/docs/user/manual/en/regional/france/index.txt
new file mode 100644
index 0000000..2edf323
--- /dev/null
+++ b/erpnext/docs/user/manual/en/regional/france/index.txt
@@ -0,0 +1 @@
+fichier_des_ecritures_comptables
diff --git a/erpnext/docs/user/manual/en/regional/index.txt b/erpnext/docs/user/manual/en/regional/index.txt
new file mode 100644
index 0000000..1a6cf1b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/regional/index.txt
@@ -0,0 +1,3 @@
+france
+india
+united_arab_emirates
diff --git a/erpnext/docs/user/manual/en/regional/india/gst-remimders.md b/erpnext/docs/user/manual/en/regional/india/gst-remimders.md
index b1061e4..97f016d 100644
--- a/erpnext/docs/user/manual/en/regional/india/gst-remimders.md
+++ b/erpnext/docs/user/manual/en/regional/india/gst-remimders.md
@@ -4,7 +4,7 @@
To send GSTIN Reminders, you can either open the Customer / Supplier record or **GST Settings**
-<img class="screenshot" alt="GST Settings" src="/docs/assets/img/regional/india/gst-settings.png">
+<img class="screenshot" alt="GST Settings" src="{{docs_base_url}}/assets/img/regional/india/gst-settings.png">
Here you can click on the "Send GSTIN Update Reminders" button to send email reminders to all your customers
@@ -12,10 +12,10 @@
Your customers will receive an email asking them to update their GSTIN and that email will link them to a portal page:
-<img class="screenshot" alt="GST Portal Page" src="/docs/assets/img/regional/india/gstin-portal-update.png">
+<img class="screenshot" alt="GST Portal Page" src="{{docs_base_url}}/assets/img/regional/india/gstin-portal-update.png">
Here they can update their GSTIN and it will automatically be added to your customer GSTIN record.
#### Sample GSTIN Reminder Email
-<img class="screenshot" alt="GST Reminder Email" src="/docs/assets/img/regional/india/gstin-reminder-email.png">
+<img class="screenshot" alt="GST Reminder Email" src="{{docs_base_url}}/assets/img/regional/india/gstin-reminder-email.png">
diff --git a/erpnext/docs/user/manual/en/regional/india/gst-setup.md b/erpnext/docs/user/manual/en/regional/india/gst-setup.md
index b89be53..49d75b1 100644
--- a/erpnext/docs/user/manual/en/regional/india/gst-setup.md
+++ b/erpnext/docs/user/manual/en/regional/india/gst-setup.md
@@ -4,7 +4,7 @@
GST Law requires that you maintain the GSTIN number for all your suppliers and vendors. In ERPNext, GSTIN is linked to the **Address**
-<img class="screenshot" alt="GST in Customer" src="/docs/assets/img/regional/india/gstin-customer.gif">
+<img class="screenshot" alt="GST in Customer" src="{{docs_base_url}}/assets/img/regional/india/gstin-customer.gif">
**GST for your Company Address**
@@ -12,20 +12,20 @@
Go to the Company master and add the GSTIN to your default address.
-<img class="screenshot" alt="GST in Company" src="/docs/assets/img/regional/india/gstin-company.gif">
+<img class="screenshot" alt="GST in Company" src="{{docs_base_url}}/assets/img/regional/india/gstin-company.gif">
**Include GSTIN number in the Address Template**
Open Address Template record for India, add GSTIN number and State Code there if not exists.
-<img class="screenshot" alt="GST in Company" src="/docs/assets/img/regional/india/address-template-gstin.png">
+<img class="screenshot" alt="GST in Company" src="{{docs_base_url}}/assets/img/regional/india/address-template-gstin.png">
### 2. Setting up HSN Codes
According to the GST Law, your itemised invoices must contain the HSN Code related to that Item. ERPNext comes pre-installed with all 12,000+ HSN Codes so that you can easily select the relevant HSN Code in your Item
-<img class="screenshot" alt="HSN in Item" src="/docs/assets/img/regional/india/hsn-item.gif">
+<img class="screenshot" alt="HSN in Item" src="{{docs_base_url}}/assets/img/regional/india/hsn-item.gif">
### 3. Making Tax Masters
@@ -35,7 +35,7 @@
**Note:** Usually the rate in CGST and SGST is half of IGST. For example if most of your items are billed at 18%, then create IGST at 18%, CGST and SGST at 9% each.
-<img class="screenshot" alt="GST in Customer" src="/docs/assets/img/regional/india/gst-in-coa.png">
+<img class="screenshot" alt="GST in Customer" src="{{docs_base_url}}/assets/img/regional/india/gst-in-coa.png">
### 4. Make Tax Templates
@@ -43,7 +43,7 @@
In your **In State GST** template, select 2 accounts, SGST and CGST
-<img class="screenshot" alt="GST in Customer" src="/docs/assets/img/regional/india/gst-template-in-state.png">
+<img class="screenshot" alt="GST in Customer" src="{{docs_base_url}}/assets/img/regional/india/gst-template-in-state.png">
In your **Out of State GST** template, select IGST
@@ -59,22 +59,22 @@
4. Select the the **In State GST** or **Out of State GST** template that you have created based on the type of transaction
5. Save and Submit the Invoice
-<img class="screenshot" alt="GST Invoice" src="/docs/assets/img/regional/india/gst-invoice.gif">
+<img class="screenshot" alt="GST Invoice" src="{{docs_base_url}}/assets/img/regional/india/gst-invoice.gif">
### 6. Print GST Tax Invoice
To print Tax Invoice as per GSTN guidelines, please select **GST Tax Invoice** print format. This print format includes company address, GSTIN numbers, HSN/SAC Code and item-wise tax breakup. And while printing select correct value of Invoice Copy field, to mention whether it is for the Customer, Supplier or Transporter.
-<img class="screenshot" alt="Sample GST Tax Invoice" src="/docs/assets/img/regional/india/sample-gst-tax-invoice.png">
+<img class="screenshot" alt="Sample GST Tax Invoice" src="{{docs_base_url}}/assets/img/regional/india/sample-gst-tax-invoice.png">
### Reports
ERPNext comes with most of your reports you need to prepare your GST Returns. Go to Accounts > GST India head for the list.
-<img class="screenshot" alt="GST Menus" src="/docs/assets/img/regional/india/gst-menu.png">
+<img class="screenshot" alt="GST Menus" src="{{docs_base_url}}/assets/img/regional/india/gst-menu.png">
You can check the impact of your invoice in the **GST Sales Register** and **GST Itemised Sales Register**
-<img class="screenshot" alt="GST Itemised Sales Register" src="/docs/assets/img/regional/india/gst-itemised.png">
+<img class="screenshot" alt="GST Itemised Sales Register" src="{{docs_base_url}}/assets/img/regional/india/gst-itemised.png">
diff --git a/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md b/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md
index b2a38c9..3debdc0 100644
--- a/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md
+++ b/erpnext/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md
@@ -5,20 +5,20 @@
Set tax registation number in the field tax id for the customer, supplier and company
1. For Customer
-<img class="screenshot" alt="TRN in Customer" src="/docs/assets/img/regional/uae/tax-id-customer.png">
+<img class="screenshot" alt="TRN in Customer" src="{{docs_base_url}}/assets/img/regional/uae/tax-id-customer.png">
2. For Company
-<img class="screenshot" alt="TRN in Company" src="/docs/assets/img/regional/uae/tax-id-company.png">
+<img class="screenshot" alt="TRN in Company" src="{{docs_base_url}}/assets/img/regional/uae/tax-id-company.png">
### 2. Setting up TAX Code for Products
Setup tax code in the item master, system will fetch same code in the sales/purchase invoice on selection of an item.
-<img class="screenshot" alt="Tax Code in Item" src="/docs/assets/img/regional/uae/tax-code-item.png">
+<img class="screenshot" alt="Tax Code in Item" src="{{docs_base_url}}/assets/img/regional/uae/tax-code-item.png">
### 3. Default Tax Templates
ERPNext provides you default tax template for vat(5%, zero, exempted) and excise(50%, 100%). You can create your own [tax template](/docs/user/manual/en/setting-up/setting-up-taxes.html).
-<img class="screenshot" alt="Default Tax Template" src="/docs/assets/img/regional/uae/uae-tax-templates.png">
+<img class="screenshot" alt="Default Tax Template" src="{{docs_base_url}}/assets/img/regional/uae/uae-tax-templates.png">
### 3. Making VAT Ready Invoices
@@ -32,14 +32,14 @@
4. Select the template that you have created based on the type of transaction
5. Save and Submit the Invoice
-<img class="screenshot" alt="VAT Invoice" src="/docs/assets/img/regional/uae/vat-invoice.gif">
+<img class="screenshot" alt="VAT Invoice" src="{{docs_base_url}}/assets/img/regional/uae/vat-invoice.gif">
### 4. Print Tax Invoice
ERPNext provides 2 default print foramt
1. Simplified Tax Invoice
-<img class="screenshot" alt="Simplified Tax Invoice" src="/docs/assets/img/regional/uae/simplified-invoice.png">
+<img class="screenshot" alt="Simplified Tax Invoice" src="{{docs_base_url}}/assets/img/regional/uae/simplified-invoice.png">
2. Detailed Tax Invoice
-<img class="screenshot" alt="Detailed Tax Invoice" src="/docs/assets/img/regional/uae/detailed-invoice.png">
+<img class="screenshot" alt="Detailed Tax Invoice" src="{{docs_base_url}}/assets/img/regional/uae/detailed-invoice.png">
diff --git a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
index bd40808..1efed75 100644
--- a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
+++ b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
@@ -7,7 +7,7 @@
###Step 1: In the Item master, under Unit of Measure section, you can list all the possible UoM of an item, with its UoM Conversion Factor. Update UoM Conversion Factors
In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10.
-<img class="screenshot" alt="Item Unit of Measure" src="/docs/assets/img/selling/Item-UOM.png">
+<img class="screenshot" alt="Item Unit of Measure" src="{{docs_base_url}}/assets/img/selling/Item-UOM.png">
###Setp 2: In the Sale Order, you will find two UoM fields
@@ -17,7 +17,7 @@
In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Sale UoM (Box in this case). Updating Sales UoM is mainly for the reference of the Customer. In the print format, you will see item quantity in the Sales UoM.
-<img class="screenshot" alt="Sale order Unit of Measure" src="/docs/assets/img/selling/Sale-Order-UOM.png">
+<img class="screenshot" alt="Sale order Unit of Measure" src="{{docs_base_url}}/assets/img/selling/Sale-Order-UOM.png">
Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you sell just one Box, then Qty as per stock UoM will be set as 10.
@@ -26,4 +26,4 @@
Irrespective of the Sales UoM selected in the Sale Order, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while selling item in different UoM.
-<img class="screenshot" alt="Stock report in UOM" src="/docs/assets/img/selling/stock ledger for as STOCK-UOM.png">
+<img class="screenshot" alt="Stock report in UOM" src="{{docs_base_url}}/assets/img/selling/stock ledger for as STOCK-UOM.png">
diff --git a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
index 3fcd4f4..2725fee 100644
--- a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
+++ b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
@@ -9,7 +9,7 @@
####Adding Margin in Pricing Rule
-<img alt="Adding Margin in Pricing Rule" class="screenshot" src="/docs/assets/img/selling/margin-pricing-rule.png">
+<img alt="Adding Margin in Pricing Rule" class="screenshot" src="{{docs_base_url}}/assets/img/selling/margin-pricing-rule.png">
Total Margin is calculated as follows:
`Rate = Price List Rate + Margin Rate`
@@ -22,7 +22,7 @@
####Adding Item Price
-<img alt="Adding Margin in Pricing Rule" class="screenshot" src="/docs/assets/img/selling/margin-item-price-list.png">
+<img alt="Adding Margin in Pricing Rule" class="screenshot" src="{{docs_base_url}}/assets/img/selling/margin-item-price-list.png">
2) Apply margin direct on Item: If user wants to apply the margin without pricing rule, they can use this option. In Quotation Item and Sales Order Item, user can select the margin type and rate or amount. The system will calculate the margin and apply it on price list rate to calculate the rate of the product.
@@ -34,4 +34,4 @@
####Adding Margin in Quotation
-<img alt="Adding Margin in Quotation" class="screenshot" src="/docs/assets/img/selling/margin-quotation-item.png">
+<img alt="Adding Margin in Quotation" class="screenshot" src="{{docs_base_url}}/assets/img/selling/margin-quotation-item.png">
diff --git a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
index 92273ba..26dd58b 100644
--- a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
+++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
@@ -6,7 +6,7 @@
You can find the Discount (%) field in the Item table. Discount (%) is applied on the Price List Rate to get the selling Rate of the Item.
-<img alt="Discount Percentage" class="screenshot" src="/docs/assets/img/articles/discount-1.png">
+<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-1.png">
The feature of Discount (%) is available in all sales and purchase transactions.
@@ -16,18 +16,18 @@
In the "Additional Discount" section, you can apply discount as amount or as percentage.
-<img alt="Discount Percentage" class="screenshot" src="/docs/assets/img/articles/discount-2.png">
+<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-2.png">
##### Discount on Net Total
If Discount Amount is applied on **Net Total**, then item's Net Rate and Net Amount is calculated as per the Discount Amount. Net Rate and Amount field will be visible only if Discount is applied using this feature.
-<img alt="Discount Percentage" class="screenshot" src="/docs/assets/img/articles/discount-on-net-total.png">
+<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-on-net-total.png">
##### Discount on Grand Total
If Discount Amount is applied based on the **Grand Total**, then with item's Net Rate, Net Amount as well as taxes are also re-calculated as per Discount Amount.
-<img alt="Discount Percentage" class="screenshot" src="/docs/assets/img/articles/discount-on-grand-total.png">
+<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-on-grand-total.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md b/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
index 78f7836..3990e7d 100644
--- a/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
@@ -2,7 +2,7 @@
In the submitted Sales Orders, you will find **Stop** option. Stopping Sales Order will restrict user from creating Delivery Note and Sales Invoice against it.
-<img alt="Close SO" class="screenshot" src="/docs/assets/img/articles/close-1.png">
+<img alt="Close SO" class="screenshot" src="{{docs_base_url}}/assets/img/articles/close-1.png">
####Scenario
@@ -10,7 +10,7 @@
In this case, create Delivery Note and Sales Invoice will be created only for the seven units. And the Sales Order should be set as stopped.
-<img alt="Closed SO" class="screenshot" src="/docs/assets/img/articles/close-2.png">
+<img alt="Closed SO" class="screenshot" src="{{docs_base_url}}/assets/img/articles/close-2.png">
Once Sales Order is set as stopped, you will not have pending quantities (three in this case) reflecting in Pending to Deliver and Pending to Invoice reports. To make further transactions against Stopped Sales Order, you should first Unstop it.
diff --git a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
index 2a1d979..2d12ff4 100644
--- a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -10,19 +10,19 @@
Set **_Delivered by Supplier (Drop Ship)_** and **_Default Supplier_** in Item Master.
-<img class="screenshot" alt="Setup Item Master" src="/docs/assets/img/selling/setup-drop-ship-on-item-master.png">
+<img class="screenshot" alt="Setup Item Master" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-item-master.png">
#### Setup on Sales Order
If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Sales Order Item.
You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
-<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="/docs/assets/img/selling/setup-drop-ship-on-sales-order-item.png">
+<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-sales-order-item.png">
#### Create Purchase Order
After submitting a Sales Order, create Puchase Order.
-<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="/docs/assets/img/selling/drop-ship-sales-order.png">
+<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="{{docs_base_url}}/assets/img/selling/drop-ship-sales-order.png">
From Sales Order, all items, having **Supplier delivers to Customer** checked or **Supplier**(matching with supplier selected on For Supplier popup) mentioned, will get mapped onto Purchase Order.
@@ -30,16 +30,16 @@
After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order.
-<img class="screenshot" alt="Purchase Order for Drop Shipping" src="/docs/assets/img/selling/drop-ship-purchase-order.png">
+<img class="screenshot" alt="Purchase Order for Drop Shipping" src="{{docs_base_url}}/assets/img/selling/drop-ship-purchase-order.png">
<span style="color:#18B52D">**_Close_**</span>, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment.
-<img class="screenshot" alt="Close Sales Order" src="/docs/assets/img/selling/close-sales-order.png">
+<img class="screenshot" alt="Close Sales Order" src="{{docs_base_url}}/assets/img/selling/close-sales-order.png">
###Drop Shipping Print Format
You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format.
-<img class="screenshot" alt="Drop Dhip Print Format" src="/docs/assets/img/selling/drop-ship-print-format.png">
+<img class="screenshot" alt="Drop Dhip Print Format" src="{{docs_base_url}}/assets/img/selling/drop-ship-print-format.png">
###Video Help on Drop Ship
diff --git a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
index cd874fc..0e1e683 100644
--- a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
+++ b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
@@ -14,7 +14,7 @@
To create a Service (non-stock) Item, in the item master, uncheck "Maintain Stock" field.
-<img alt="Service Item" class="screenshot" src="/docs/assets/img/articles/services-1.png">
+<img alt="Service Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/services-1.png">
When creating Sales Order for the services, select Order Type as **Maintenance**. Sales Order of Maintenance Type needs lesser details compared to stock item's order like Delivery Note, item warehouse etc.
diff --git a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
index aaee304..17291ec 100644
--- a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
+++ b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
@@ -4,13 +4,13 @@
Sales Persons can be updated in the Customer master as well. On selection of Customer in the transactions, Sales Persons as updated in the Customer will fetch into sales transaction.
-<img class="screenshot" alt="Sales Person Customer" src="/docs/assets/img/articles/sales-person-transaction-1.png">
+<img class="screenshot" alt="Sales Person Customer" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-1.png">
####Sales Person Contribution
If more than one sales persons are working together on an order, then contribution (%) should be set for each Sales Person.
-<img class="screenshot" alt="Sales Person Order" src="/docs/assets/img/articles/sales-person-transaction-2.png">
+<img class="screenshot" alt="Sales Person Order" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-2.png">
On saving transaction, based on the Net Total and Contriution (%), `Contribution to Net Total` will be calculated for each Sales Person.
@@ -24,7 +24,7 @@
This report can be generated based on Sales Order, Delivery Note and Sales Invoice. It will give you total amount of sale made by an employe.
-<img class="screenshot" alt="Sales Person Report" src="/docs/assets/img/articles/sales-person-transaction-3.png">
+<img class="screenshot" alt="Sales Person Report" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-3.png">
####Sales Person wise Commission
diff --git a/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md b/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
index fa745ca..d87ba36 100644
--- a/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
+++ b/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
@@ -10,7 +10,7 @@
####Shipping Rule Conditions
-<img alt="Shipping Rule Prices" class="screenshot" src="/docs/assets/img/articles/shipping-charges-1.png">
+<img alt="Shipping Rule Prices" class="screenshot" src="{{docs_base_url}}/assets/img/articles/shipping-charges-1.png">
Referring above, you will notice that shipping charges are reducing as valye is increasing. This shipping charge will only be applied if transaction total falls under one of the above range.
@@ -18,16 +18,16 @@
You can set Shipping Charges valid for all the countries, or specify specific Country. If specific countries mentioned, then Shipping Charges will be applied only if Customer's country matches Country mentioned in the Shipping Rule.
-<img alt="Shipping Rule " class="screenshot" src="/docs/assets/img/articles/shipping-charges-2.gif">
+<img alt="Shipping Rule " class="screenshot" src="{{docs_base_url}}/assets/img/articles/shipping-charges-2.gif">
####Shipping Account
If shipping charges are applied based on Shipping Rule, then more values like Shipping Account, Cost Center will be needed as well to add row in the Taxes and Other Charges table of transaction. Hence these details are tracked as well in the Shipping Rule.
-<img alt="Shipping Account" class="screenshot" src="/docs/assets/img/articles/shipping-charges-3.png">
+<img alt="Shipping Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/shipping-charges-3.png">
####Shipping Rule Application
Following is an example of how shipping charges is auto-applied on Sales Order based on Shipping Rule.
-<img alt="Shipping Rule Application" class="screenshot" src="/docs/assets/img/articles/shipping-charges-4.gif">
\ No newline at end of file
+<img alt="Shipping Rule Application" class="screenshot" src="{{docs_base_url}}/assets/img/articles/shipping-charges-4.gif">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
index 80af009..7f95e11 100644
--- a/erpnext/docs/user/manual/en/selling/quotation.md
+++ b/erpnext/docs/user/manual/en/selling/quotation.md
@@ -7,7 +7,7 @@
A typical Selling flow looks like:
-<img class="screenshot" alt="Make Quotation from Opportunity" src="/docs/assets/img/selling/selling-flow.png">
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/selling-flow.png">
To create a new Quotation navigate to:
@@ -17,7 +17,7 @@
You can also create a Quotation from an Opportunity.
-<img class="screenshot" alt="Make Quotation from Opportunity" src="/docs/assets/img/selling/make-quote-from-opp.png">
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quote-from-opp.png">
A Quotation contains details about:
@@ -46,7 +46,7 @@
For e.g
-<img class="screenshot" alt="Taxes and Charges" src="/docs/assets/img/selling/taxes-and-charges.gif">
+<img class="screenshot" alt="Taxes and Charges" src="{{docs_base_url}}/assets/img/selling/taxes-and-charges.gif">
To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html).
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index 05f178b..43d7f1b 100644
--- a/erpnext/docs/user/manual/en/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -11,7 +11,7 @@
### Sales Order Flow-Chart
-<img class="screenshot" alt="Sales Order flow" src="/docs/assets/img/selling/sales-order-f.jpg">
+<img class="screenshot" alt="Sales Order flow" src="{{docs_base_url}}/assets/img/selling/sales-order-f.jpg">
To create a new Sales Order go to:
@@ -21,11 +21,11 @@
You can also create a Sales Order from a submitted Quotation.
-<img class="screenshot" alt="Make Sales Order from Quotation" src="/docs/assets/img/selling/make-SO-from-quote.png">
+<img class="screenshot" alt="Make Sales Order from Quotation" src="{{docs_base_url}}/assets/img/selling/make-SO-from-quote.png">
Or you can create a new Sales Order and pull details from an Quotation.
-<img class="screenshot" alt="Make Sales Order from Quotation" src="/docs/assets/img/selling/make-so.gif">
+<img class="screenshot" alt="Make Sales Order from Quotation" src="{{docs_base_url}}/assets/img/selling/make-so.gif">
Most of the information in your Sales Order is the same as the Quotation.
There are a few amongst other things that a Sales Order will ask you to
@@ -56,7 +56,7 @@
For e.g
-<img class="screenshot" alt="Taxes and Charges" src="/docs/assets/img/selling/taxes-and-charges.gif">
+<img class="screenshot" alt="Taxes and Charges" src="{{docs_base_url}}/assets/img/selling/taxes-and-charges.gif">
To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html).
@@ -82,7 +82,7 @@
ERPNext will automatically create new Order and mail a notification to the Email Addresses you set in the 'Notification Email Address'field.
-<img class="screenshot" alt="Reccuring Sales Order" src="/docs/assets/img/selling/recurring-sales-order.png">
+<img class="screenshot" alt="Reccuring Sales Order" src="{{docs_base_url}}/assets/img/selling/recurring-sales-order.png">
### Next Steps
diff --git a/erpnext/docs/user/manual/en/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
index 7e352b9..adeeee4 100644
--- a/erpnext/docs/user/manual/en/selling/setup/item-price.md
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md
@@ -16,7 +16,7 @@
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-+<img class="screenshot" alt="Item Price list" src="/docs/assets/img/stock/item-price-1.png">
++<img class="screenshot" alt="Item Price list" src="{{docs_base_url}}/assets/img/stock/item-price-1.png">
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -26,13 +26,13 @@
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-+<img class="screenshot" alt="Item Price list" src="/docs/assets/img/stock/item-price-2.png">
++<img class="screenshot" alt="Item Price list" src="{{docs_base_url}}/assets/img/stock/item-price-2.png">
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-+<img class="screenshot" alt="Item Price list" src="/docs/assets/img/stock/item-price-3.png">
++<img class="screenshot" alt="Item Price list" src="{{docs_base_url}}/assets/img/stock/item-price-3.png">
Step 4: Save Item Price
diff --git a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
index 560b730..123eeaf 100644
--- a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
+++ b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
@@ -11,7 +11,7 @@
Selling > Setup > Product Bundle > New
-<img class="screenshot" alt="Product Bundle" src="/docs/assets/img/selling/product-bundle.png">
+<img class="screenshot" alt="Product Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.png">
###Select Parent Item
@@ -33,7 +33,7 @@
When making Sales transactions (Sales Invoice, Sales Order, Delivery Note)
the Parent Item will be selected in the main item table.
-<img class="screenshot" alt="Product Bundle" src="/docs/assets/img/selling/product-bundle.gif">
+<img class="screenshot" alt="Product Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.gif">
On selection of a Parent Item in the main item table, its child items will be fetched in Packing List
table of the transaction. If child item is the serialized item, you will be able to specify its Serial Mo.
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
index d8bf0d0..0eee169 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
@@ -12,7 +12,7 @@
Sales Partners are saved with Sales Partner name provided by user.
-<img class="screenshot" alt="Sales Partner" src="/docs/assets/img/selling/sales-partner.png">
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/selling/sales-partner.png">
You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount.
@@ -21,13 +21,13 @@
To include the name of your Partner on your website, check the "Show in
Website" box. When click on "Show in Website", you will see field where you can attach logo of partner's company and enter brief and introduction of partner.
-<img class="screenshot" alt="Sales Partner" src="/docs/assets/img/selling/sales-partner-website.png">
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/selling/sales-partner-website.png">
To see listing of partner, you should go to:
https://example.erpnext.com/partners
-<img class="screenshot" alt="Sales Partner" src="/docs/assets/img/crm/sales-partner-listing.png">
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/crm/sales-partner-listing.png">
{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index 874a95e..edaf47d 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -14,7 +14,7 @@
In the Sales Person master, you will find table called Sales Person Target.
-<img class="screenshot" alt="Sales person target " src="/docs/assets/img/selling/sales-person-target-item-group.png">
+<img class="screenshot" alt="Sales person target " src="{{docs_base_url}}/assets/img/selling/sales-person-target-item-group.png">
In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
@@ -36,7 +36,7 @@
This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
-<img class="screenshot" alt="Target Item Group" src="/docs/assets/img/selling/sales-person-item-group-report.png">
+<img class="screenshot" alt="Target Item Group" src="{{docs_base_url}}/assets/img/selling/sales-person-item-group-report.png">
As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report.
@@ -52,7 +52,7 @@
In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
-<img class="screenshot" alt="Sales Person Territory Manager" src="/docs/assets/img/selling/sales-person-territory-manager.png">
+<img class="screenshot" alt="Sales Person Territory Manager" src="{{docs_base_url}}/assets/img/selling/sales-person-territory-manager.png">
####2.2 Allocating Target
@@ -66,7 +66,7 @@
This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report.
-<img class="screenshot" alt="Sales Person Territory Report" src="/docs/assets/img/selling/sales-person-territory-report.png">
+<img class="screenshot" alt="Sales Person Territory Report" src="{{docs_base_url}}/assets/img/selling/sales-person-territory-report.png">
---
@@ -78,7 +78,7 @@
`Accounts > Monthly Distributon`
-<img class="screenshot" alt="Target Distribution" src="/docs/assets/img.selling/erpnext/target-distribution.png">
+<img class="screenshot" alt="Target Distribution" src="{{docs_base_url}}/assets/img.selling/erpnext/target-distribution.png">
You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.
diff --git a/erpnext/docs/user/manual/en/selling/setup/selling-settings.md b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
index 96dbc29..840abe5 100644
--- a/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
+++ b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
@@ -3,7 +3,7 @@
Selling Setting is where you can define propertiese which will be applied in your selling transactions.
Let's check into each property one by one.
-<img class="screenshot" alt="Selling Settings" src="/docs/assets/img/selling/selling-settings.png">
+<img class="screenshot" alt="Selling Settings" src="{{docs_base_url}}/assets/img/selling/selling-settings.png">
####1. Customer Naming By
diff --git a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
index 9b25c8c..1996172 100644
--- a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
+++ b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
@@ -3,6 +3,6 @@
Using Shipping Rule you can define the cost for delivering the product to the customer and also to the supplier.
You can define different shipping rules or a fixed shipping amount for the same item across different territories.
-<img class="screenshot" alt="Shipping Rule" src="/docs/assets/img/selling/shipping-rule.png">
+<img class="screenshot" alt="Shipping Rule" src="{{docs_base_url}}/assets/img/selling/shipping-rule.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
index 5da4730..505d6f3 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
@@ -5,11 +5,11 @@
####Step 1: Go to My Setting
-<img alt="Change Password" class="screenshot" src="/docs/assets/img/articles/change-password-1.png">
+<img alt="Change Password" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-password-1.png">
####Step 2: Set New Password
-<img alt="Change Password" class="screenshot" src="/docs/assets/img/articles/change-password-2.png">
+<img alt="Change Password" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-password-2.png">
Enter the new password and save the form to save changes.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
index 4c4be74..fa7614f 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
@@ -12,7 +12,7 @@
This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful
-<img alt="Delete Transactions" class="screenshot" src="/docs/assets/img/articles/delete-transactions.gif">
+<img alt="Delete Transactions" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-transactions.gif">
**Note:** If you want to delete the company record itself, use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md b/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md
index a11aa21..969518d 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md
@@ -16,4 +16,4 @@
In the Role master, if field "Desk Access" is checked, that Role is for System User. If Desk Access field is unchecked, then that Role is for Website User.
-<img alt="Role Desk Permission" class="screenshot" src="/docs/assets/img/articles/role-deskperm.png">
\ No newline at end of file
+<img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/role-deskperm.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
index ee02438..7148611 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
@@ -6,19 +6,19 @@
You will find Cancel button on upper right corner of submitted document.
-<img alt="Cancel Doc" class="screenshot" src="/docs/assets/img/articles/edit-submitted-doc-1.png">
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-1.png">
####Step 2: Amend the document
On cancellation of submitted document, Amend button will be became visible.
-<img alt="Amend Doc" class="screenshot" src="/docs/assets/img/articles/edit-submitted-doc-2.png">
+<img alt="Amend Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-2.png">
####Step 3: Save and Submit the document
On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
-<img alt="Resave and Submit Doc" class="screenshot" src="/docs/assets/img/articles/edit-submitted-doc-3.png">
+<img alt="Resave and Submit Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-3.png">
<div class="well">Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/email-error.md b/erpnext/docs/user/manual/en/setting-up/articles/email-error.md
index 9d5abd0..6113ed5 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/email-error.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/email-error.md
@@ -2,7 +2,7 @@
In ERPNext, you can customize the Incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account is saved successfully. If not, then you might receive an error as below.
-<img class="screenshot" alt="Email Error" src="/docs/assets/img/articles/email-error.png">
+<img class="screenshot" alt="Email Error" src="{{docs_base_url}}/assets/img/articles/email-error.png">
This indicates that using login credentials and other email gateway details provided in the Email Account, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
index e4362fb..fc198ce 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
@@ -16,7 +16,7 @@
Company will be saved with Company Name provided.
-<img alt="New Company" class="screenshot" src="/docs/assets/img/articles/new-company-1.png">
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-1.png">
Also, you can define other properties for new company like:
@@ -28,12 +28,12 @@
Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement.
-<img alt="New Company" class="screenshot" src="/docs/assets/img/articles/new-company-2.png">
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-2.png">
####Chart of Account for New Company
A separate Chart of Account master will be set for each company in the ERPNext. This allows you managing Accounts/Ledger master separately for each company. Also it allows you avail financial statement and reports like Balance Sheet and Profit and Loss Statement separately for each company.
-<img alt="New Company" class="screenshot" src="/docs/assets/img/articles/new-company-3.png">
+<img alt="New Company" class="screenshot" src="{{docs_base_url}}/assets/img/articles/new-company-3.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
index 9a4e4f7..7123964 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -4,7 +4,7 @@
Perm Level for a field can be defined in the [Customize Form](/docs/user/manual/en/customize-erpnext/customize-form.html).
-<img alt="Perm Level Field" class="screenshot" src="/docs/assets/img/articles/perm-level-1.gif">
+<img alt="Perm Level Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-1.gif">
If you need to assign different permission of particular field to different users, you can achieve it via Perm Level. Let's consider an example for better understanding.
@@ -14,11 +14,11 @@
For Stock Manager, they will have permission on fields on Delivery Note as Perm Level 2 whereas a Stock User will not have any permission on Perm Level 2 for Delivery Note.
-<img alt="Perm Level Rule" class="screenshot" src="/docs/assets/img/articles/perm-level-2.png">
+<img alt="Perm Level Rule" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-2.png">
Considering the same scenario, if you want a Stock User to access a field at Perm Level 2, but not edit it, the Stock User will be assigned permission on Perm Level 2, but only for read, and not for write/edit.
-<img alt="Perm Level Rule 2" class="screenshot" src="/docs/assets/img/articles/perm-level-3.png">
+<img alt="Perm Level Rule 2" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-3.png">
Perm Level (1, 2, 3) not need be in order. Perm Level is primarily for grouping number of fields together, and then assigning permission to Roles for that group. Hence, you can set any perm level for an item, and then do permission setting for it.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
index 73c9870..98e67c6 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
@@ -24,7 +24,7 @@
####Step 2 : Parent Territory
-<img alt="Default Territories" class="screenshot" src="/docs/assets/img/articles/territory-2.png">
+<img alt="Default Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-2.png">
When click on Parent territory, you will see option to add child territory under it. All default Territory groups will be listed under Parent group called "All Territories". You can add further Parent or child Territory Groups under it.
@@ -42,11 +42,11 @@
<div class="well">Only child Territory Groups are selectable in another masters and transactions.</div>
-<img alt="Default Territories" class="screenshot" src="/docs/assets/img/articles/territory-1.gif">
+<img alt="Default Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-1.gif">
Following is how Child Territories will be listed under a Parent Territory.
-<img alt="Adding new Territories" class="screenshot" src="/docs/assets/img/articles/territory-3.png">
+<img alt="Adding new Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-3.png">
Following this steps, you can manage other tree masters as well in ERPNext.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
index 7e80d81..fbb7e87 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
@@ -14,19 +14,19 @@
#### Update Series Section
-<img alt="Update Series Section" class="screenshot" src="/docs/assets/img/articles/current-no-1.png">
+<img alt="Update Series Section" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-1.png">
#### Select Prefix
Considering our scenario, prefix for Sales Order will be "SO".
-<img alt="Series Prefix" class="screenshot" src="/docs/assets/img/articles/current-no-2.png">
+<img alt="Series Prefix" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-2.png">
#### Current Value
If you have currently 12 Sales Orders created in your account, then current value updated will be 12. You can edit Current Value to 322, and then click on Update Series Number.
-<img alt="Series Current Value" class="screenshot" src="/docs/assets/img/articles/current-no-3.png">
+<img alt="Series Current Value" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-3.png">
With this setting, you will have numbering for the New Sales Orders starting with #323.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md b/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md
index 9694da1..fe90cb1 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md
@@ -2,7 +2,7 @@
In the ERPNext, you can customize incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account master is saved. If not, then you might receive an error as indicated below.
-<img alt="Email Setup Error" class="screenshot" src="/docs/assets/img/articles/email-setup-error.png">
+<img alt="Email Setup Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/email-setup-error.png">
This indicates that using login credentials and other email gateway details provided, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
index f42060c..dafac3b 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
@@ -14,7 +14,7 @@
Since items to be over-written will be already available in the system, while downloading template, click on "Download with data" to get all the existing items in the template.
-<img alt="Download Template" class="screenshot" src="/docs/assets/img/articles/overwrite-1.gif">
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-1.gif">
####Step 2: Prepare Data
@@ -22,7 +22,7 @@
Enter new value in the Item Group column for an item. Since Item Group is a master in itself, ensure Item Group entered in the spreadsheet file is already added in the Item Group master.
-<img alt="Update Values" class="screenshot" src="/docs/assets/img/articles/overwrite-2.png">
+<img alt="Update Values" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-2.png">
Since we are overwriting only Item Group, only following columns will be mandatory.
@@ -36,13 +36,13 @@
After updating Item Groups in spreadheet, come back to Data Import Tool in ERPNext. Browse and select the File/template which has data to be overwritten.
-<img alt="Browse template" class="screenshot" src="/docs/assets/img/articles/overwrite-3.gif">
+<img alt="Browse template" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-3.gif">
####Step 4: Upload
On clicking Import, Item Group will be over-written.
-<img alt="Upload" class="screenshot" src="/docs/assets/img/articles/overwrite-4.png">
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-4.png">
If validation of values fails, then it will indicate row no. of spreadsheet for which validation failed and needs correction. In that case, you should corrected value in that row of spreadsheet, and then import same file again. If validation fails even for one row, none of the records are imported/overwritten.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md b/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md
index 93542e6..00bbe9d 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/print-format-sections.md
@@ -2,10 +2,10 @@
**Question:** In the Print Format, I am getting link breaks for each section. How can I disable it?
-<img alt="Email Setup Error" class="screenshot" src="/docs/assets/img/articles/sections-1.png">
+<img alt="Email Setup Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/sections-1.png">
**Answer:** To disable line breaks for the section breaks, you should uncheck field "Show Line Breaks after Sections" in its Print Format.
Print Format Builder > Select Print Format > Edit Settings > Uncheck field "Show Line Breaks after Sections"
-<img alt="Email Setup Error" class="screenshot" src="/docs/assets/img/articles/sections-2.gif">
\ No newline at end of file
+<img alt="Email Setup Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/sections-2.gif">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
index 19eef9e..643d243 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
@@ -14,13 +14,13 @@
From Menu, select Rename.
-<img alt="Rename" class="screenshot" src="/docs/assets/img/articles/rename-user-1.png">
+<img alt="Rename" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-user-1.png">
#### Step 3: Update
Enter valid Email Address and click on Rename.
-<img alt="Update" class="screenshot" src="/docs/assets/img/articles/rename-user-2.png">
+<img alt="Update" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-user-2.png">
After successful renaming, User will be able login using updated user id.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md b/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md
index c345d0a..2130e18 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/report-permission-error.md
@@ -1,6 +1,6 @@
**Question:** User has roles like Account User and Account Manager assigned. Still, when accessing Account Receivable report, User is getting an error message of no permission the territory master.
-<img alt="Report Permission Error" class="screenshot" src="/docs/assets/img/articles/report-permission-1.png">
+<img alt="Report Permission Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/report-permission-1.png">
**Answer:**
@@ -12,6 +12,6 @@
3. To resolve this issue, I have assigned Account User permission to Read Territory master.
- <img alt="Permission Manager" class="screenshot" src="/docs/assets/img/articles/report-permission-2.png">
+ <img alt="Permission Manager" class="screenshot" src="{{docs_base_url}}/assets/img/articles/report-permission-2.png">
As per this permission update, User should be able to access Account Receivable report fine.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md b/erpnext/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md
index cdb4e34..4e048ad 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md
@@ -12,30 +12,30 @@
* The expiry time for the QR Code on the server if OTP App is specified
* The OTP Issuer Name.
-<img alt="Enable Two Factor Auth" class="screenshot" src="/docs/assets/img/articles/twofactor/twofactor-1.png">
+<img alt="Enable Two Factor Auth" class="screenshot" src="{{docs_base_url}}/assets/img/articles/twofactor/twofactor-1.png">
On activation of 2FA from setup, it is also activated for the Role "All". In this way, all users including the Administrator have to perform a 2nd level authentication with a token. By unchecking the "Two Factor Authentication" checkbox in the "All" role and enabling it in other roles, the need to login with a token can be limited to specific roles. 2FA does not apply to login by Web Users and API login
-<img alt="Role Enable Two Factor Auth" class="screenshot" src="/docs/assets/img/articles/twofactor/twofactor-2.png">
+<img alt="Role Enable Two Factor Auth" class="screenshot" src="{{docs_base_url}}/assets/img/articles/twofactor/twofactor-2.png">
If using SMS authentication, please make sure that your SMS settings are updated
-<img alt="SMS Settings" class="screenshot" src="/docs/assets/img/articles/twofactor/twofactor-3.png">
+<img alt="SMS Settings" class="screenshot" src="{{docs_base_url}}/assets/img/articles/twofactor/twofactor-3.png">
If using Email, make sure that your outgoing Email account settings are updated
-<img alt="Email Settings" class="screenshot" src="/docs/assets/img/articles/twofactor/twofactor-4.png">
+<img alt="Email Settings" class="screenshot" src="{{docs_base_url}}/assets/img/articles/twofactor/twofactor-4.png">
When the new user tries to log in for the first time in a system that has two-factor authentication enabled and which has the authentication option as OTP App, an email is sent containing a link to the QR Code.
-<img alt="Email Notify Two Factor" class="screenshot" src="/docs/assets/img/articles/twofactor/twofactor-5.png">
-<img alt="QR Code Page" class="screenshot" src="/docs/assets/img/articles/twofactor/twofactor-6.png">
+<img alt="Email Notify Two Factor" class="screenshot" src="{{docs_base_url}}/assets/img/articles/twofactor/twofactor-5.png">
+<img alt="QR Code Page" class="screenshot" src="{{docs_base_url}}/assets/img/articles/twofactor/twofactor-6.png">
Scanning the QR Code with an authentication app like Google Authenticator registers the access for the user and automatically starts to generate tokens that can be used to login
-<img alt="Two Factor Scan App" class="screenshot" src="/docs/assets/img/articles/twofactor/twofactor_app.jpeg">
+<img alt="Two Factor Scan App" class="screenshot" src="{{docs_base_url}}/assets/img/articles/twofactor/twofactor_app.jpeg">
If either of Email/SMS is used as the authentication method, you get notifications also
-<img alt="Email and SMS" class="screenshot" src="/docs/assets/img/articles/twofactor/twofactor-8.png">
\ No newline at end of file
+<img alt="Email and SMS" class="screenshot" src="{{docs_base_url}}/assets/img/articles/twofactor/twofactor-8.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/authorization-rule.md b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
index 8221366..8b99894 100644
--- a/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
+++ b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
@@ -36,7 +36,7 @@
Set Above Value. Given the exmaple, Above Value will be set as 10000.
-<img class="screenshot" alt="Authorization Rule" src="/docs/assets/img/setup/auth-rule.png">
+<img class="screenshot" alt="Authorization Rule" src="{{docs_base_url}}/assets/img/setup/auth-rule.png">
If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message.
diff --git a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
index 57db1a5..e1c8b13 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
@@ -12,4 +12,4 @@
To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**.
-<img class="screenshot" alt="Bulk Rename" src="/docs/assets/img/setup/data/rename.png">
\ No newline at end of file
+<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index b9c6ccc..6678223 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -4,7 +4,7 @@
To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button:
-<img alt="Start Import" class="screenshot" src="/docs/assets/img/setup/data-import/data-import-1.png">
+<img alt="Start Import" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-1.png">
The tool has two sections, one to download a template and the second to upload
the data.
@@ -25,33 +25,33 @@
* Click on "Download Blank Template".
* For bulk editing, you can click on "Download With Data".
-<img alt="Download Template" class="screenshot" src="/docs/assets/img/setup/data-import/data-import-tool-template.gif">
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-tool-template.gif">
### 2\. Fill in the Template
After downloading the template, open it in a spreadsheet application and fill
in the data below the column headings.
-<img alt="Download Template" class="screenshot" src="/docs/assets/img/setup/data-import/import-file.png">
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-file.png">
Then export your template or save it as a Excel or Comma Separated Values (CSV)
file. To export the document in Excel tick the checkbox for Download in Excel File Format
-<img alt="Download Template" class="screenshot" src="/docs/assets/img/setup/data-import/import-csv.png">
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-csv.png">
### Download in Excel
-<img alt="Download Template" class="screenshot" src="/docs/assets/img/setup/data-import/data-import-excel.png">
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-excel.png">
### 3\. Upload the File ethier in .xlsx or .csv
Finally attach the file in the section. Click on the "Upload". Once the upload is successfull click Import"
button.
-<img alt="Upload" class="screenshot" src="/docs/assets/img/setup/data-import/data-import-3.png">
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-3.png">
-<img alt="Upload" class="screenshot" src="/docs/assets/img/setup/data-import/data-import-4.png">
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-4.png">
#### Notes:
diff --git a/erpnext/docs/user/manual/en/setting-up/data/download-backup.md b/erpnext/docs/user/manual/en/setting-up/data/download-backup.md
index 6c98cf3..8f27d50 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/download-backup.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/download-backup.md
@@ -6,8 +6,8 @@
Backup available for the download is updated in every eight hours. Click on the link to download the backups at a given time.
-<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/download-backup-1.png">
+<img class="screenshot" alt="Download Backup" src="{{docs_base_url}}/assets/img/articles/download-backup-1.png">
By default three latest backups will be available for the download. If you want to customize no. of backups, then click on "Set Number of Backups". In the System Settings, you can set Number of Backups available for the download at a time.
-<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/download-backup-2.gif">
\ No newline at end of file
+<img class="screenshot" alt="Download Backup" src="{{docs_base_url}}/assets/img/articles/download-backup-2.gif">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
index 7e9b8a7..d5aca1a 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
@@ -10,7 +10,7 @@
There are 2 types of email accounts, outgoing and incoming. Outgoing email accounts use an SMTP service to send emails and emails are retrived from your inbox using a IMAP or POP service. Most email providers such as GMail, Outlook or Yahoo provide these services.
-<img class="screenshot" alt="Defining Criteria" src="/docs/assets/img/setup/email/email-account-list.png">
+<img class="screenshot" alt="Defining Criteria" src="{{docs_base_url}}/assets/img/setup/email/email-account-list.png">
### Outgoing Email Accounts
@@ -18,19 +18,19 @@
To setup an outgoing Email Account, check on **Enable Outgoing** and set your SMTP server settings, if you are using a popular email service, these will be preset for you.
-<img class="screenshot" alt="Outgoing EMail" src="/docs/assets/img/setup/email/email-account-sending.png">
+<img class="screenshot" alt="Outgoing EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-sending.png">
### Incoming Email Accounts
To setup an incoming Email Account, check on **Enable Incoming** and set your POP3 settings, if you are using a popular email service, these will be preset for you.
-<img class="screenshot" alt="Incoming EMail" src="/docs/assets/img/setup/email/email-account-incoming.png">
+<img class="screenshot" alt="Incoming EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-incoming.png">
### Setting Import Conditions for Email Import
Email Accounts allows you to set conditions according to the data of the incoming emails. The email will be imported to ERPNext only if the all conditions are true. For example if you want to import an email if the subject is "Some important email", you put doc.subject == "Some important email" in the conditions textbox. You can also set more complex conditions by combining them, as shown on the following screenshot.
-<img class="screenshot" alt="Incoming EMail Conditions" src="/docs/assets/img/setup/email/email-account-incoming-conditions.png">
+<img class="screenshot" alt="Incoming EMail Conditions" src="{{docs_base_url}}/assets/img/setup/email/email-account-incoming-conditions.png">
### How ERPNext handles replies
@@ -40,6 +40,6 @@
If you would like ERPNext to notify you if an email is unreplied for a certain amount of time, then you can set **Notify if Unreplied**. Here you can set the number of minutes to wait before notifications are sent and whom the notifications must go to.
-<img class="screenshot" alt="Incoming EMail" src="/docs/assets/img/setup/email/email-account-unreplied.png">
+<img class="screenshot" alt="Incoming EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-unreplied.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
index 2b89d7d..8d239ea 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
@@ -32,13 +32,13 @@
### Setting a Subject
You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject / message, you have to surround it with `{% raw %}{{ }}{% endraw %}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example to get the name of a document, you use `{% raw %}{{ doc.name }}{% endraw %}`. The below example sends an email on saving a Task with the Subject, "TASK##### has been created"
-<img class="screenshot" alt="Setting Subject" src="/docs/assets/img/setup/email/email-alert-subject.png">
+<img class="screenshot" alt="Setting Subject" src="{{docs_base_url}}/assets/img/setup/email/email-alert-subject.png">
### Setting Conditions
Email alerts allow you to set conditions according to the field data in your documents. For example, if you want to recieve an Email if a Lead has been saved as "Interested" as it's status, you put `doc.status == "Interested"` in the conditions textbox. You can also set more complex conditions by combining them.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/email/email-alert-condition.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/email/email-alert-condition.png">
The above example will send an Email Alert when a Task is saved with the status "Open" and the Expected End Date for the Task is the date on or before the date on which it was saved on.
@@ -74,14 +74,14 @@
Then you can use that as a condition in the **Condition** rules to ensure emails are not sent multiple times
-<img class="screenshot" alt="Setting Property in Email Alert" src="/docs/assets/img/setup/email/email-alert-subject.png">
+<img class="screenshot" alt="Setting Property in Email Alert" src="{{docs_base_url}}/assets/img/setup/email/email-alert-subject.png">
### Example
1. Defining the Criteria
- <img class="screenshot" alt="Defining Criteria" src="/docs/assets/img/setup/email/email-alert-1.png">
+ <img class="screenshot" alt="Defining Criteria" src="{{docs_base_url}}/assets/img/setup/email/email-alert-1.png">
1. Setting the Recipients and Message
- <img class="screenshot" alt="Set Message" src="/docs/assets/img/setup/email/email-alert-2.png">
+ <img class="screenshot" alt="Set Message" src="{{docs_base_url}}/assets/img/setup/email/email-alert-2.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-digest.md b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
index bceba37..5fa836e 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
@@ -12,6 +12,6 @@
Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to.
-<img class="screenshot" alt="Email Digest" src="/docs/assets/img/setup/email/email-digest.png">
+<img class="screenshot" alt="Email Digest" src="{{docs_base_url}}/assets/img/setup/email/email-digest.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
index 14dad78..445fe26 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
@@ -12,7 +12,7 @@
`Setup > User > New User`
-<img class="screenshot" alt="Email User" src="/docs/assets/img/setup/email/email-user.png">
+<img class="screenshot" alt="Email User" src="{{docs_base_url}}/assets/img/setup/email/email-user.png">
#### Step 2: Create Email Domain
@@ -22,7 +22,7 @@
`Setup > Emails > Email Domain > New`
-<img class="screenshot" alt="Email Domain" src="/docs/assets/img/setup/email/email-domain.png">
+<img class="screenshot" alt="Email Domain" src="{{docs_base_url}}/assets/img/setup/email/email-domain.png">
Once you have configured an Email Domain for your Email Service, it will be used for creating Email Accounts for all the Users in your ERPNext account.
@@ -43,11 +43,11 @@
If you are creating an Email Account for your colleague who's Email Password is unknown to you, then check field "Awaiting Password". As per this setting, a User (for whom Email Account is created) will get a prompt to enter email password when accessing his/her ERPNext Account.
-<img class="screenshot" alt="Email Password" src="/docs/assets/img/setup/email/email-password.png">
+<img class="screenshot" alt="Email Password" src="{{docs_base_url}}/assets/img/setup/email/email-password.png">
In the Email Account, select Email Domain only if you are using Email Service other than Email Services listed above. Else, you can just select Email Service, leave Email Domain blank and proceed forward.
-<img class="screenshot" alt="Email Service" src="/docs/assets/img/setup/email/email-service.png">
+<img class="screenshot" alt="Email Service" src="{{docs_base_url}}/assets/img/setup/email/email-service.png">
>If you are creating an Email Account for Email Inbox of a User, then leave Append To field as blank.
@@ -57,30 +57,30 @@
Once an Email Account is created for an User, select that Email Account in the User. This will ensure that emails pulled from the said Email ID will accessible only to this User in your ERPNext account.
-<img class="screenshot" alt="Email User Link" src="/docs/assets/img/setup/email/email-user-link.png">
+<img class="screenshot" alt="Email User Link" src="{{docs_base_url}}/assets/img/setup/email/email-user-link.png">
## Email Inbox
If you have correctly configured Email Inbox as instructed above, then on the login of a User, Email Inbox icon will be visible. This will navigate user to Email Inbox view within the ERPNext account. All the Emails received on that email will be fetch and listed in the Email Inbox view. User will be able to open emails and take various actions against it.
-<img class="screenshot" alt="Email Inbox" src="/docs/assets/img/setup/email/email-inbox.png">
+<img class="screenshot" alt="Email Inbox" src="{{docs_base_url}}/assets/img/setup/email/email-inbox.png">
#### Folders
In ERPNext, you can link multiple Email Accounts with the single User. To switch to Inbox of different email account and access other folders like Sent Emails, Spam, Trash, check Email Inbox option in the left bar.
-<img class="screenshot" alt="Email Folders" src="/docs/assets/img/setup/email/email-folders.png">
+<img class="screenshot" alt="Email Folders" src="{{docs_base_url}}/assets/img/setup/email/email-folders.png">
#### Actions
On the emails in your inbox, you can take various actions like Reply, Forward, Mark as Spam or Trash.
-<img class="screenshot" alt="Email Actions" src="/docs/assets/img/setup/email/email-actions.png">
+<img class="screenshot" alt="Email Actions" src="{{docs_base_url}}/assets/img/setup/email/email-actions.png">
#### Make Options
The Email Inbox within ERPNext also allow you to quickly create ERPNext transaction based on email received. From an Email itself, you can a Issue, Lead or Opportunity based on the context of the email.
-<img class="screenshot" alt="Make from Email" src="/docs/assets/img/setup/email/make-from-email.png">
+<img class="screenshot" alt="Make from Email" src="{{docs_base_url}}/assets/img/setup/email/make-from-email.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
index 95db8ba..a27a2dc 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
@@ -14,7 +14,7 @@
Select the Report, the user for which you want to create this report (permissions will apply for this user), the Email Addresses where you want this report emailed and the frequency of the report.
-<img class="screenshot" alt="Make Auto Email Report" src="/docs/assets/img/setup/email/auto-email-1.png">
+<img class="screenshot" alt="Make Auto Email Report" src="{{docs_base_url}}/assets/img/setup/email/auto-email-1.png">
#### Step 2
@@ -22,11 +22,11 @@
Step 1. Select the Report, the user for which you want to create this report. Permissions will apply for this user
-<img class="screenshot" alt="With Filters" src="/docs/assets/img/setup/email/auto-email-2.png">
+<img class="screenshot" alt="With Filters" src="{{docs_base_url}}/assets/img/setup/email/auto-email-2.png">
Click on the table to edit the table
-<img class="screenshot" alt="Edit Filters" src="/docs/assets/img/setup/email/auto-email-3.png">
+<img class="screenshot" alt="Edit Filters" src="{{docs_base_url}}/assets/img/setup/email/auto-email-3.png">
#### Test
@@ -34,4 +34,4 @@
Here is an example of the email you will receive for a report
-<img class="screenshot" alt="Report by Email" src="/docs/assets/img/setup/email/auto-email-4.png">
+<img class="screenshot" alt="Report by Email" src="{{docs_base_url}}/assets/img/setup/email/auto-email-4.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
index b4566de..2fd163b 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
@@ -2,7 +2,7 @@
In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document.
-<img class="screenshot" alt="Send Email" src="/docs/assets/img/setup/email/send-email.gif">
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/email/send-email.gif">
**Note:** You must have outgoing [email accounts](/docs/user/manual/en/setting-up/email/email-account.html) setup for this.
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md b/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md
index 7f873ce..4afaee1 100644
--- a/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md
@@ -6,12 +6,12 @@
To request a feedback manually go to respective document e.g. Sales Order, Issue etc.
and click on Ask a Feedback option in Menu.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/manual-feedback-request-option.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/manual-feedback-request-option.png">
Then, user can enter the feedback request details like email id, message and send the
feedback request mail.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/manual-feedback-request.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/manual-feedback-request.png">
Note. If Feedback Trigger is already configured for the document then system will fetch
Feedback Request details (email id, message)
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md b/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
index 641d0a0..0dbb3b7 100644
--- a/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
@@ -2,15 +2,15 @@
We can also Resend the Feedback Request to the Customer/User.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/timeline-rating-and-feedback.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/timeline-rating-and-feedback.png">
To resend the Feedback Request we will need to navigate the Communication by clicking the `Details` link on Timeline Feedback.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/resend-feedback-request-button.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/resend-feedback-request-button.png">
On Resend Button click a dialog with the Feedback Request message will appear user can either send the
Feedback Request with same message or he/she can make the changes in the Feedback Request message.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/resend-feedback-request-custom-message.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/resend-feedback-request-custom-message.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md b/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
index 441e78e..373d703 100644
--- a/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
@@ -19,13 +19,13 @@
### Setting a Subject
You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject/message, you have to surround it with `{% raw %}{{ }}{% endraw %}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example, to get the name of a document, you use `{% raw %}{{ doc.name }}{% endraw %}`. The below example sends an feedback request whenever Issue is Closed with the Subject, "ISS-##### Issue is Resolved"
-<img class="screenshot" alt="Setting Subject" src="/docs/assets/img/setup/feedback/feedback-trigger-subject.png">
+<img class="screenshot" alt="Setting Subject" src="{{docs_base_url}}/assets/img/setup/feedback/feedback-trigger-subject.png">
### Setting Conditions
Feedback Trigger allows you to set conditions according to the field data in your documents. The feedback request email will be sent on document save only if the all conditions are true For example if you want to trigger the feedback request mail to a customer if an Issue is has been saved as "Closed" as it's status, you put `doc.status == "Closed"` in the conditions textbox. You can also set more complex conditions by combining them.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/feedback-trigger-condition.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/feedback-trigger-condition.png">
### Setting a Message
@@ -45,9 +45,9 @@
### Example
1. Setting up Feedback Trigger
- <img class="screenshot" alt="Defining Criteria" src="/docs/assets/img/setup/feedback/setting-up-feedback-trigger.png">
+ <img class="screenshot" alt="Defining Criteria" src="{{docs_base_url}}/assets/img/setup/feedback/setting-up-feedback-trigger.png">
1. Setting the Recipients and Message
- <img class="screenshot" alt="Set Message" src="/docs/assets/img/setup/feedback/setting-up-feedback-trigger-message.png">
+ <img class="screenshot" alt="Set Message" src="{{docs_base_url}}/assets/img/setup/feedback/setting-up-feedback-trigger-message.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md b/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md
index 663aae1..9069f37 100644
--- a/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md
@@ -3,17 +3,17 @@
Once feedback request mail is sent the user/customer. He/She can visit the URL to submit the feedback
as well as rating for the document.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/submit-feedback.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/submit-feedback.png">
Once Feedback is submitted the feedback details message and ratings will be recorded and will be shown on Document sidebar and timeline. Also once the Feedback is successfully submitted by the user the link shared to the user will be expired and can not be used to submit the Feedback again.
On Document sidebar the latest feedback ratings will displayed.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/sidebar-ratings.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/sidebar-ratings.png">
Also, The Feedback details such as Feedback message and ratings will be shown in the Document's Timeline along
with Comment, Email.
-<img class="screenshot" alt="Setting Condition" src="/docs/assets/img/setup/feedback/timeline-rating-and-feedback.png">
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/timeline-rating-and-feedback.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md b/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md
index 818b3b9..a9a23dd 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md
@@ -7,11 +7,15 @@
To setup Dropbox Backup,
`Explore > Integrations > Dropbox Settings`
+##Steps are different for ERPnext managed versions and open-source versions
+
+###ERPnext Managed Version Instructions
+
####Step 1: Set Frequency
Set Frequency to download backup in your Dropbox account.
-<img class="screenshot" alt="set frequency" src="/docs/assets/img/setup/integrations/setup-backup-frequency.png">
+<img class="screenshot" alt="set frequency" src="{{docs_base_url}}/assets/img/setup/integrations/setup-backup-frequency.png">
####Step 2: Allow Dropbox Access
@@ -21,40 +25,53 @@
Login to your Dropbox account by entering login credentials.
-<img class="screenshot" alt="Login" src="/docs/assets/img/setup/integrations/dropbox-2.png">
+<img class="screenshot" alt="Login" src="{{docs_base_url}}/assets/img/setup/integrations/dropbox-2.png">
####Step 4: Allow
On successful login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
-<img class="screenshot" alt="Allow" src="/docs/assets/img/setup/integrations/dropbox-3.png">
+<img class="screenshot" alt="Allow" src="{{docs_base_url}}/assets/img/setup/integrations/dropbox-3.png">
With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
-##Open Source Users
-####Step 1: Go to
+##Open Source Version Instructions
+
+####Step 1: Login to Dropbox Developer area
<a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
-####Step 2:Create a new app
+####Step 2: Create a new Dropbox app
-<img class="screenshot" alt="Create new" src="/docs/assets/img/setup/integrations/dropbox-open-3.png">
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integrations/dropbox-open-3.png">
-####Step 3: Fill in details for the app
+####Step 3: Fill in the details for your new app
-<img class="screenshot" alt="Choose Dropbox API and type as APP Folder" src="/docs/assets/img/setup/integrations/dropbox-open-1.png">
+<img class="screenshot" alt="Choose Dropbox API and type as APP Folder" src="{{docs_base_url}}/assets/img/setup/integrations/dropbox-open-1.png">
-
-<img class="screenshot" alt="Setup APP Name" src="/docs/assets/img/setup/integrations/dropbox-open-2.png">
+<img class="screenshot" alt="Setup APP Name" src="{{docs_base_url}}/assets/img/setup/integrations/dropbox-open-2.png">
-####Step 4: Setup Redirect URL in app
+####Step 4: Insert your custom domain Redirect URI
-<img class="screenshot" alt="Set Redirect URL" src="/docs/assets/img/setup/integrations/dropbox_redirect_uri.png">
+`https://{yourwebsite.com}/api/method/frappe.integrations.doctype.dropbox_settings.dropbox_settings.dropbox_auth_finish`
-####Step 5: Settings in Site Config
+<img class="screenshot" alt="Set Redirect URL" src="{{docs_base_url}}/assets/img/setup/integrations/dropbox_redirect_uri.png">
-After the app is created, note the app key and app secret on Dropbox Settings page or enter in `sites/{sitename}/site_config.json` as follows,
+####Step 5: In a new window, open the Dropbox Settings page in your ERPnext installation
+
+####Step 6: Set backup frequency and email
+
+Set the frequency to download your site backups to your Dropbox account.
+
+<img class="screenshot" alt="set frequency" src="/docs/assets/img/setup/integrations/setup-backup-frequency.png">
+
+####Step 7: Input Keys from your Dropbox App window
+
+From your Dropbox App page, enter the app key and (unhidden) app secret into the ERPnext Dropbox settings page.
+
+Alternatively, you can enter it manually in `sites/{sitename}/site_config.json` as follows,
<div>
<pre>
@@ -68,6 +85,18 @@
</pre>
</div>
-####Step 5: Complete Backup
+####Step 8: Click Save before continuing!!!
-Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file
+####Step 9: After saving, click "Allow Dropbox Access"
+
+The Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account.
+
+####Step 11: Allow Dropbox Access
+
+On successful login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
+
+<img class="screenshot" alt="Allow" src="/docs/assets/img/setup/integrations/dropbox-3.png">
+
+####Step 12: Confirm Backups Work
+
+From the ERPnext Dropbox page, click `Take Backup Now` and then go to you Dropbox files view. You should see a new folder in Dropbox named `Apps` and inside of it your {New App} folder. Inside of it should be backup folders for both files and database.
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md
index 2fa8f57..ec6e848 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md
@@ -11,9 +11,9 @@
To enable ldap service, you need to configure parameters like LDAP Server Url, Organizational Unit, UID, Base Distinguished Name (DN) and Password for Base DN
-<img class="screenshot" alt="LDAP Settings" src="/docs/assets/img/setup/integrations/ldap_settings.png">
+<img class="screenshot" alt="LDAP Settings" src="{{docs_base_url}}/assets/img/setup/integrations/ldap_settings.png">
After setting up LDAP parameters, on login screen, the system enables **Login Via LDAP** option.
-<img class="screenshot" alt="LOGIN via LDAP" src="/docs/assets/img/setup/integrations/login_via_ldap.png">
+<img class="screenshot" alt="LOGIN via LDAP" src="{{docs_base_url}}/assets/img/setup/integrations/login_via_ldap.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md
index d7c5ae6..9c6cb18 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md
@@ -11,17 +11,17 @@
To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature.
-<img class="screenshot" alt="PayPal Settings" src="/docs/assets/img/setup/integrations/paypal_settings.png">
+<img class="screenshot" alt="PayPal Settings" src="{{docs_base_url}}/assets/img/setup/integrations/paypal_settings.png">
You also can set test payment environment, by settings `Use Sandbox`
On enabling service, the system will create Payment Gateway record and Account head in chart of accounts having account type as Bank.
-<img class="screenshot" alt="PayPal COA" src="/docs/assets/img/setup/integrations/paypal_coa.png">
+<img class="screenshot" alt="PayPal COA" src="{{docs_base_url}}/assets/img/setup/integrations/paypal_coa.png">
Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-<img class="screenshot" alt="Payment Gateway Account" src="/docs/assets/img/setup/integrations/payment_gateway_account_paypal.png">
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integrations/payment_gateway_account_paypal.png">
After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
@@ -33,20 +33,20 @@
#### Paypal Sanbox API Signature
- Login to paypal developer account, <a href="https://developer.paypal.com/">PayPal Developer Account</a>
- From **Accounts** tab. create a new business account.
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/setup/integrations/setup-sanbox-1.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/setup/integrations/setup-sanbox-1.png">
- From this account profile you will get your sandbox api credentials
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/setup/integrations/sanbox-credentials.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/setup/integrations/sanbox-credentials.png">
---
#### PayPal Account API Signature
- Login to PayPal Account and go to profile
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/setup/integrations/api-step-1.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/setup/integrations/api-step-1.png">
- From **My Selling Tools** go to **api Access**
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/setup/integrations/api-step-2.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/setup/integrations/api-step-2.png">
- On API Access Page, choose option 2 to generate API credentials
-<img class="screenshot" alt="Payment Request" src="/docs/assets/img/setup/integrations/api-step-3.png">
+<img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/setup/integrations/api-step-3.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
index d41283c..fe5c885 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
@@ -8,21 +8,21 @@
`Explore > Integrations > RazorPay Settings`
-<img class="screenshot" alt="Razorpay Settings" src="/docs/assets/img/setup/integrations/razorpay-api.gif">
+<img class="screenshot" alt="Razorpay Settings" src="{{docs_base_url}}/assets/img/setup/integrations/razorpay-api.gif">
#### Setup RazorPay
To enable RazorPay payment service, you need to configure parameters like API Key, API Secret
-<img class="screenshot" alt="Razorpay Settings" src="/docs/assets/img/setup/integrations/razorpay_settings.png">
+<img class="screenshot" alt="Razorpay Settings" src="{{docs_base_url}}/assets/img/setup/integrations/razorpay_settings.png">
On enabling service, the system will create Payment Gateway record and Account head in the Chart of Account with account type as Bank.
-<img class="screenshot" alt="Razorpay COA" src="/docs/assets/img/setup/integrations/razorpay_coa.png">
+<img class="screenshot" alt="Razorpay COA" src="{{docs_base_url}}/assets/img/setup/integrations/razorpay_coa.png">
Also, it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-<img class="screenshot" alt="Payment Gateway Account" src="/docs/assets/img/setup/integrations/payment_gateway_account_razorpay.png">
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integrations/payment_gateway_account_razorpay.png">
After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md
index ba62ebe..05f70f0 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md
@@ -6,15 +6,15 @@
#### Setup Stripe
To enable Stripe payment service, you need to configure parameters like Publishable Key, Secret Key
-<img class="screenshot" alt="Razorpay Settings" src="/docs/assets/img/setup/integrations/stripe_setting.png">
+<img class="screenshot" alt="Razorpay Settings" src="{{docs_base_url}}/assets/img/setup/integrations/stripe_setting.png">
On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
-<img class="screenshot" alt="Stripe COA" src="/docs/assets/img/setup/integrations/stripe_coa.png">
+<img class="screenshot" alt="Stripe COA" src="{{docs_base_url}}/assets/img/setup/integrations/stripe_coa.png">
Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-<img class="screenshot" alt="Payment Gateway Account" src="/docs/assets/img/setup/integrations/payment_gateway_account_stripe.png">
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integrations/payment_gateway_account_stripe.png">
After configuring Payment Gateway Account your system is able to accept online payments.
diff --git a/erpnext/docs/user/manual/en/setting-up/pos-setting.md b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
index 375c251..5bd8a1f 100644
--- a/erpnext/docs/user/manual/en/setting-up/pos-setting.md
+++ b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
@@ -14,13 +14,13 @@
Set default values as defined.
-<img class="screenshot" alt="POS Setting" src="/docs/assets/img/pos-setting/pos_profile.png">
+<img class="screenshot" alt="POS Setting" src="{{docs_base_url}}/assets/img/pos-setting/pos_profile.png">
To set the default mode of payment, enabled the option default in the mode of payments table
-<img class="screenshot" alt="POS Setting" src="/docs/assets/img/pos-setting/default_mop.png">
+<img class="screenshot" alt="POS Setting" src="{{docs_base_url}}/assets/img/pos-setting/default_mop.png">
User can sale the particular products to the particular customers from the POS by adding item groups, customer groups in the POS Profile.
-<img class="screenshot" alt="POS Setting" src="/docs/assets/img/pos-setting/item_customer_group.png">
+<img class="screenshot" alt="POS Setting" src="{{docs_base_url}}/assets/img/pos-setting/item_customer_group.png">
> Important : If you specify a particular User, the POS setting will be
applied only to that User. If the User option is left blank, the setting will
diff --git a/erpnext/docs/user/manual/en/setting-up/price-lists.md b/erpnext/docs/user/manual/en/setting-up/price-lists.md
index a965581..4710b6c 100644
--- a/erpnext/docs/user/manual/en/setting-up/price-lists.md
+++ b/erpnext/docs/user/manual/en/setting-up/price-lists.md
@@ -10,7 +10,7 @@
> Selling/Buying/Stock > Setup > Price List >> New
-<img class="screenshot" alt="Price List" src="/docs/assets/img/price-list/price-list.png">
+<img class="screenshot" alt="Price List" src="{{docs_base_url}}/assets/img/price-list/price-list.png">
* These Price List will be used when creating Item Price record to track selling or buying price of an item. Click here to learn more about Item Price.
diff --git a/erpnext/docs/user/manual/en/setting-up/print/address-template.md b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
index 34df11c..53dfef1 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/address-template.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
@@ -26,6 +26,6 @@
### Example
-<img class="screenshot" alt="Print Heading" src="/docs/assets/img/setup/print/address-format.png">
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/address-format.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
index e93f309..44dd412 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
@@ -2,7 +2,7 @@
Business involves making payment to various parties like suppliers and employees. Payment can be made in various modes like cash, NEFT or cheque. If you are making a payment via cheque, you can also create a Print Format for printing Cheque from ERPNext based on the Payment Entry.
-<img class="screenshot" alt="Sample Cheque" src="/docs/assets/img/setup/print/sample-cheque.jpg">
+<img class="screenshot" alt="Sample Cheque" src="{{docs_base_url}}/assets/img/setup/print/sample-cheque.jpg">
Using the Cheque Print Template you can generate a new Print Format based. It will be created based the cheque format provided by your bank.
@@ -14,13 +14,13 @@
In the Cheque Print Template, for each value (say Payee, Date), exact co-ordinates are provided based on where that value should be printed on a cheque. Co-ordinates are provided in centi-meter.
-<img class="screenshot" alt="Sample Cheque" src="/docs/assets/img/setup/print/cheque-1.png">
+<img class="screenshot" alt="Sample Cheque" src="{{docs_base_url}}/assets/img/setup/print/cheque-1.png">
####New Format via Scanning
To speed up creation of a new cheque printing format, you can upload scanned image of the cheque. Considering the scanned image for the cheque, system automatically updates co-ordinates for each value like party name, amount, date, amount in words etc.
-<img class="screenshot" alt="Sample Cheque" src="/docs/assets/img/setup/print/cheque-2.png">
+<img class="screenshot" alt="Sample Cheque" src="{{docs_base_url}}/assets/img/setup/print/cheque-2.png">
####New format by manual entry
You can manually provide the co-ordinate for each value based on where you want to to be printed on the cheque.
@@ -28,18 +28,18 @@
####Preview
Based on co-ordinates provided for all the values, a preview be shown as to how the values will be printed on the cheque.
-<img class="screenshot" alt="Sample Cheque" src="/docs/assets/img/setup/print/cheque-3.png">
+<img class="screenshot" alt="Sample Cheque" src="{{docs_base_url}}/assets/img/setup/print/cheque-3.png">
####New Print Format
If the preview looks promising, click on the button to create a new Print Format for printing cheque. Based on the values provided in the Cheque Print Template, the system will auto-generate an HTML script for the cheque’s Print Format.
-<img class="screenshot" alt="Sample Cheque" src="/docs/assets/img/setup/print/cheque-4.png">
+<img class="screenshot" alt="Sample Cheque" src="{{docs_base_url}}/assets/img/setup/print/cheque-4.png">
####Printing Cheque
New print format generated for the cheque will be visible in the Payment Entry form. After creating the payment entry, you will be able to print transaction details on the cheque.
-<img class="screenshot" alt="Sample Cheque" src="/docs/assets/img/setup/print/cheque-5.gif">
+<img class="screenshot" alt="Sample Cheque" src="{{docs_base_url}}/assets/img/setup/print/cheque-5.gif">
diff --git a/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
index 5fe6a61..644e3dd 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
@@ -6,11 +6,11 @@
In the Customer master, select default Language. Say default language for the Customer is <b>deutsch</b>.
-<img src="/docs/assets/img/multilingual_print_format/set_customer_default_lang.png" class="screenshot">
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/set_customer_default_lang.png" class="screenshot">
Same way, you can also set default language in the Supplier master.
-<img src="/docs/assets/img/multilingual_print_format/set_supplier_default_lang.png" class="screenshot">
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/set_supplier_default_lang.png" class="screenshot">
####Print Preview in the Party's Language
@@ -18,17 +18,17 @@
Customer Quotation print preview in customer's default language.
-<img src="/docs/assets/img/multilingual_print_format/customer_quotation.png" class="screenshot">
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/customer_quotation.png" class="screenshot">
Supplier Quotation print preview in supplier's default language.
-<img src="/docs/assets/img/multilingual_print_format/supplier_quotation.png" class="screenshot">
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/supplier_quotation.png" class="screenshot">
####What to do if want to print with another language?
User can have option to select alternate language on print view.
-<img src="/docs/assets/img/multilingual_print_format/alternate_language.png" class="screenshot">
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/alternate_language.png" class="screenshot">
####Custom Translation
@@ -36,11 +36,11 @@
`Setup > Settings > Translation List > New`
-<img src="/docs/assets/img/multilingual_print_format/translation.png" class="screenshot">
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/translation.png" class="screenshot">
The translation is applied when user select language as Italiano on supplier quotation's print preview.
-<img src="/docs/assets/img/multilingual_print_format/custom_translation.png" class="screenshot">
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/custom_translation.png" class="screenshot">
diff --git a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
index e1612d7..72b79e1 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
@@ -19,7 +19,7 @@
* Logo Image: You can insert the image in your Letter Head record by clicking on image icon. Once image is inserted, HTML for it will be generated automatically.
* Other information (like Address, tax ID etc.) that you want to put on your letter head.
-<img class="screenshot" alt="Print Heading" src="/docs/assets/img/setup/print/letter-head.png">
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/letter-head.png">
> If you want to make this the default letter head, click on “Is Default”.
@@ -31,7 +31,7 @@
This is how the letter head looks in a document's print.
-<img class="screenshot" alt="Print Heading" src="/docs/assets/img/setup/print/letter-head-1.png">
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/letter-head-1.png">
> Please note that Footer will be visible only when document's print is seen in the PDF. Footer will not be visible in the HTML based print preview.
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
index 4e94045..f979927 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
@@ -10,19 +10,19 @@
### Step 1: Make a new Format
-<img class="screenshot" alt="Send Email" src="/docs/assets/img/setup/print/print-format-builder-1.gif">
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-1.gif">
### Step 2: Add a new Field
To add a field, just drag it from the left sidebar and add it in your layout. You can edit the layout by clicking on the settings <i class="octicon octicon-gear"></i> icon.
-<img class="screenshot" alt="Send Email" src="/docs/assets/img/setup/print/print-format-builder-2.gif">
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-2.gif">
### Step 3
To remove a field, just drag it back into the fields sidebar.
-<img class="screenshot" alt="Send Email" src="/docs/assets/img/setup/print/print-format-builder-3.gif">
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-3.gif">
### Step 4
@@ -30,7 +30,7 @@
Then click on **Edit HTML** to edit your content.
-<img class="screenshot" alt="Send Email" src="/docs/assets/img/setup/print/print-format-builder-4.gif">
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-4.gif">
To save your format, just click on the **Save** button on the top.
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
index de3395b..7cf9b54 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
@@ -10,10 +10,10 @@
#### Figure 1: Save Print Heading
-<img class="screenshot" alt="Print Heading" src="/docs/assets/img/setup/print/print-heading.png">
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/print-heading.png">
Example of a change in print heading is shown below:
-<img class="screenshot" alt="Print Heading" src="/docs/assets/img/setup/print/print-heading-1.png">
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/print-heading-1.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-settings.md b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
index 220b467..cdf3c54 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
@@ -6,6 +6,6 @@
> Setup > Printing and Branding > Print Settings
-<img class="screenshot" alt="Print Settings" src="/docs/assets/img/setup/print/print-settings.png">
+<img class="screenshot" alt="Print Settings" src="{{docs_base_url}}/assets/img/setup/print/print-settings.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-style.md b/erpnext/docs/user/manual/en/setting-up/print/print-style.md
index bdb0ab0..4f2cdea 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-style.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-style.md
@@ -10,6 +10,6 @@
All Print Format styles are based on Bootstrap (Version 3) CSS Framework.
-<img class="screenshot" alt="Print Style" src="/docs/assets/img/setup/print/print-style.png">
+<img class="screenshot" alt="Print Style" src="{{docs_base_url}}/assets/img/setup/print/print-style.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
index 28e803d..8314ae1 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
@@ -8,13 +8,13 @@
`Selling > Terms and Condition > New`
-<img class="screenshot" alt="Terms and Conditions" src="/docs/assets/img/setup/print/terms-1.png">
+<img class="screenshot" alt="Terms and Conditions" src="{{docs_base_url}}/assets/img/setup/print/terms-1.png">
### 2. Editing in HTML
Content of Terms and Condition can be formatted as per your preference, and also insert images where needed. If you have expertise in HTML, you will also find option to edit the content of Terms and Condition in HTML.
-<img class="screenshot" alt="Terms and Conditions, Edit HTML" src="/docs/assets/img/setup/print/terms-2.png">
+<img class="screenshot" alt="Terms and Conditions, Edit HTML" src="{{docs_base_url}}/assets/img/setup/print/terms-2.png">
This also allows you to use Terms and Condition master for footer, which otherwise is not available in ERPNext as dedicated functionality. Since contents of Terms and Condition is always the last to appear in the print format, details of footer should be inserted at the end of the content, so that it actually appears as footer in the print format.
@@ -22,6 +22,6 @@
In transactions, you will find section of Terms and Condition where you will be able to search and fetched required Terms and Condition master.
-<img class="screenshot" alt="Terms and Conditions, Select in document" src="/docs/assets/img/setup/print/terms-3.png">
+<img class="screenshot" alt="Terms and Conditions, Select in document" src="{{docs_base_url}}/assets/img/setup/print/terms-3.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md b/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md
index ca0c32a..e18ad05 100644
--- a/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md
@@ -2,14 +2,14 @@
Monthly sales targets can be set for a company via the Company master. By default, the Company master dashboard features past sales stats.
-<img class="screenshot" alt="Sales Graph" src="/docs/assets/img/sales_goal/sales_history_graph.png">
+<img class="screenshot" alt="Sales Graph" src="{{docs_base_url}}/assets/img/sales_goal/sales_history_graph.png">
You can set the **Sales Target** field to track progress to track progress with respect to it.
-<img class="screenshot" alt="Setting Sales Goal" src="/docs/assets/img/sales_goal/setting_sales_goal.gif">
+<img class="screenshot" alt="Setting Sales Goal" src="{{docs_base_url}}/assets/img/sales_goal/setting_sales_goal.gif">
The target progress is also shown in notifications:
-<img class="screenshot" alt="Sales Notification" src="/docs/assets/img/sales_goal/sales_goal_notification.png">
+<img class="screenshot" alt="Sales Notification" src="{{docs_base_url}}/assets/img/sales_goal/sales_goal_notification.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
index 18f2f01..5a8b2d2 100644
--- a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -24,11 +24,11 @@
Item Tax table can be found as a section within the Item Master document.
-<img class="screenshot" alt="Item Tax" src="/docs/assets/img/taxes/item-tax.png">
+<img class="screenshot" alt="Item Tax" src="{{docs_base_url}}/assets/img/taxes/item-tax.png">
* **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive.
-<img class="screenshot" alt="Inclusive Tax" src="/docs/assets/img/taxes/inclusive-tax.png">
+<img class="screenshot" alt="Inclusive Tax" src="{{docs_base_url}}/assets/img/taxes/inclusive-tax.png">
* **Exception to the rule**: Item tax settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account
* **Item tax is overwrite-able**: You can overwrite or change the item tax rate by going to the Item master in the Item tax table.
@@ -51,7 +51,7 @@
> Setup > Accounts > Sales Taxes and Charge Master
-<img class="screenshot" alt="Sales Tax Master" src="/docs/assets/img/taxes/sales-tax-master.png">
+<img class="screenshot" alt="Sales Tax Master" src="{{docs_base_url}}/assets/img/taxes/sales-tax-master.png">
When you create a new master, you will have to add a row for each tax type.
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
index 87ebcba..412572a 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
@@ -6,6 +6,6 @@
Whenever a new document is created, these values will be set as default.
-<img class="screenshot" alt="Global Defaults" src="/docs/assets/img/setup/settings/global-defaults.png">
+<img class="screenshot" alt="Global Defaults" src="{{docs_base_url}}/assets/img/setup/settings/global-defaults.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
index f6ede50..3e2a109 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
@@ -10,6 +10,6 @@
Check / uncheck the items to show / hide.
-<img class="screenshot" alt="Module Settings" src="/docs/assets/img/setup/settings/show-hide-modules.png">
+<img class="screenshot" alt="Module Settings" src="{{docs_base_url}}/assets/img/setup/settings/show-hide-modules.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
index 71029bc..086a272 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
@@ -42,7 +42,7 @@
See how to set the naming series
-<img class="screenshot" alt="Naming Series" src="/docs/assets/img/setup/settings/naming-series.gif">
+<img class="screenshot" alt="Naming Series" src="{{docs_base_url}}/assets/img/setup/settings/naming-series.gif">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
index e3f7453..67e116e 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
@@ -8,7 +8,7 @@
> Setup > Settings > System Settings
-<img class="screenshot" alt="System Settings" src="/docs/assets/img/setup/settings/system-settings.png">
+<img class="screenshot" alt="System Settings" src="{{docs_base_url}}/assets/img/setup/settings/system-settings.png">
####Two Factor Authentication.
Settings for Two Factor Authentication can be configured here.
@@ -17,7 +17,7 @@
* Expiry time for QRCode image if "OTP App" is selected in method
* Issuer name of the One Time Password
-<img class="screenshot" alt="Two Factor Auth" src="/docs/assets/img/setup/settings/twofactor-settings.png">
+<img class="screenshot" alt="Two Factor Auth" src="{{docs_base_url}}/assets/img/setup/settings/twofactor-settings.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
index c8fba43..00219fd 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
@@ -2,7 +2,7 @@
Select your language. ERPNext is available in more than 20 languages.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-1.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-1.png">
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md
index 4f0fbcc..eab5b4a 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md
@@ -2,7 +2,7 @@
Set your Country Name, Time Zone and Currency.
-<img alt="Currency" class="screenshot" src="/docs/assets/img/setup-wizard/step-2.png">
+<img alt="Currency" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-2.png">
### Default Currency
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md
index d85c940..65e2583 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md
@@ -2,7 +2,7 @@
Enter the First User. Give the Full Name, Email Address (as User ID) and Password. This first user will be setup as a System Manager with privileges similar to the Administrator account.
-<img alt="User" class="screenshot" src="/docs/assets/img/setup-wizard/step-3.png">
+<img alt="User" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-3.png">
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
index 523195b..37027f0 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
@@ -2,7 +2,7 @@
Select the domain(s) that will be enabled after setup.
-<img alt="Domains" class="screenshot" src="/docs/assets/img/setup-wizard/step-4.png">
+<img alt="Domains" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-4.png">
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
index a310144..5e3dcb7 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
@@ -2,7 +2,7 @@
Enter Company Name, Abbreviation and add a logo.
-<img alt="Company Details" class="screenshot" src="/docs/assets/img/setup-wizard/step-5.png">
+<img alt="Company Details" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-5.png">
### Company Abbreviation
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
index 301e529..0e5b7f4 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
@@ -4,7 +4,7 @@
Add the name of the organization's primary financial institution. This information will populate **Accounts**.
-<img alt="Company Details" class="screenshot" src="/docs/assets/img/setup-wizard/step-6.png">
+<img alt="Company Details" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-6.png">
### Chart of Accounts
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
index 477a2ca..1927a9b 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
@@ -2,11 +2,11 @@
The initial setup wizard will create all the settings needed including the first system manager user.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-6a.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-6a.png">
When complete, the Setup Wizard will go to the Desk and begin a secondary set of steps. This screen shows that the initial setup wizard is complete and begins the secondary setup wizard.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-7.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-7.png">
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
index 98d9f75..fc4f3b0 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
@@ -2,11 +2,11 @@
Set a monthly sales target for the organization in the currency selected during Step 2.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-8.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-8.png">
If a sales target is not known, then clicking **Mark as Done** will complete the step.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-8a.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-8a.png">
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
index 9b38ae6..a196e8c 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
@@ -2,11 +2,11 @@
Add known customers to the system.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-9.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-9.png">
If customers are not known, then clicking **Mark as Done** will complete the step.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-9a.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-9a.png">
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
index 55dccb1..75628f3 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
@@ -2,11 +2,11 @@
Add a company logo to be used as a standard letter head on all printed invoices and other document types. Ideally the logo is 900px by 100px.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-10.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-10.png">
If a letter head logo file is not available, the clicking **Mark as Done** will complete the step.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-10a.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-10a.png">
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
index f1e9967..e798e1d 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
@@ -2,11 +2,11 @@
Add known suppliers to the system.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-11.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-11.png">
If suppliers are not known, then clicking **Mark as Done** will complete the step.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-11a.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-11a.png">
## Step 11a: Other Domain Specific Steps
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
index cc2a4ae..774b0cd 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
@@ -2,11 +2,11 @@
The last step in the secondary setup wizard will prompt to add more users to the system. These users will be regular non-privileged users.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-12.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-12.png">
If users are not known, then clicking **Mark as Done** will complete the step.
-<img alt="Language" class="screenshot" src="/docs/assets/img/setup-wizard/step-12a.png">
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-12a.png">
---
diff --git a/erpnext/docs/user/manual/en/setting-up/sms-setting.md b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
index 1cb7c36..7c66692 100644
--- a/erpnext/docs/user/manual/en/setting-up/sms-setting.md
+++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
@@ -17,7 +17,7 @@
http://instant.smses.com/web2sms.php?username=<USERNAME>&password;=<PASSWORD>&to;=<MOBILENUMBER>&sender;=<SENDERID>&message;=<MESSAGE>
-<img class="screenshot" alt="SMS Setting 2" src="/docs/assets/img/setup/sms-settings2.jpg">
+<img class="screenshot" alt="SMS Setting 2" src="{{docs_base_url}}/assets/img/setup/sms-settings2.jpg">
> Note: the string up to the "?" is the SMS Gateway URL
@@ -36,6 +36,6 @@
from your SMS Provider like username, password etc. These static values should
be entered in the Static Parameters table.
-<img class="screenshot" alt="SMS Setting" src="/docs/assets/img/setup/sms-settings1.png">
+<img class="screenshot" alt="SMS Setting" src="{{docs_base_url}}/assets/img/setup/sms-settings1.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
index 36ad65a..3f9a8c9 100644
--- a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
+++ b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -13,7 +13,7 @@
Non Serialized items are generally fast moving and low value item, hence doesn't need tracking for each unit. Items like screw, cotton waste, other consumables, stationary products can be categorized as non-serialized.
-> Stock Reconciliation option is available for the non serialized Items only. For serialized and batch items, you should create Material Receipt entry in Stock Entry form.
+> Stock Reconciliation option is available for the non serialized Items only. For serialized and batch items, you should create Material Receipt (to increase stock) or Material Issue (to decrease stock) via Stock Entry.
### Opening Stocks
@@ -29,17 +29,17 @@
A predefined template of an spreadsheet file should be followed for importing item's stock levels and valuations. Open new Stock Reconciliation form to see download option.
-<img class="screenshot" alt="Stock Reconciliation" src="/docs/assets/img/setup/stock-recon-1.png">
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-recon-1.png">
#### Step 2: Enter Data in csv file.
-<img class="screenshot" alt="Stock Reconciliation" src="/docs/assets/img/setup/stock-reco-data.png">
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-reco-data.png">
The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse.
#### Step 3: Upload file and Enter Values in Stock Reconciliation Form
-<img class="screenshot" alt="Stock Reconciliation" src="/docs/assets/img/setup/stock-recon-2.png">
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-recon-2.png">
**Posting Date**
@@ -61,11 +61,11 @@
#### Step 4: Review the reconciliation data
-<img class="screenshot" alt="Stock Reconciliation" src="/docs/assets/img/setup/stock-reco-upload.gif">
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-reco-upload.gif">
### Stock Ledger Report
-<img class="screenshot" alt="Stock Reconciliation" src="/docs/assets/img/setup//stock-reco-ledger.png">
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup//stock-reco-ledger.png">
**How Stock Reconciliation Works**
diff --git a/erpnext/docs/user/manual/en/setting-up/territory.md b/erpnext/docs/user/manual/en/setting-up/territory.md
index c82bfe4..e892489 100644
--- a/erpnext/docs/user/manual/en/setting-up/territory.md
+++ b/erpnext/docs/user/manual/en/setting-up/territory.md
@@ -7,6 +7,6 @@
territory v/s what you had planned.
You can also set different pricing for the same product sold across different territories.
-<img class="screenshot" alt="Territory Tree" src="/docs/assets/img/crm/territory-tree.png">
+<img class="screenshot" alt="Territory Tree" src="{{docs_base_url}}/assets/img/crm/territory-tree.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
index 16bf19e..6fb64df 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
@@ -11,7 +11,7 @@
### 1. List of Users
-<img class="screenshot" src="/docs/assets/img/setup/users/user-1.png" alt="User List">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-1.png" alt="User List">
To add a new user, click on "New"
@@ -22,8 +22,8 @@
The user's Email will become the user id. Mobile No can also be used to log in if you check the Allow Login using Mobile No checkbox under the Security section in System Settings. While Mobile No will be unique, it will not be treated as a user id.
-<img class="screenshot" src="/docs/assets/img/setup/users/user-login-email.png" alt="Email Login">
-<img class="screenshot" src="/docs/assets/img/setup/users/user-login-mobile.png" alt="Mobile No Login">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-login-email.png" alt="Email Login">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-login-mobile.png" alt="Mobile No Login">
After adding these details, save the user.
@@ -32,19 +32,19 @@
After saving, you will see a list of roles and a checkbox next to it. Just check the roles you want the user to have and save the document. To click on what permissions translate into roles, click on the role
name.
-<img class="screenshot" src="/docs/assets/img/setup/users/user-2.png" alt="User Roles">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-2.png" alt="User Roles">
### 4. Setting Module Access
Users will have access to all modules for which they have role based access. If you want to block certain modules for certain users, un-check the module from the list.
-<img class="screenshot" src="/docs/assets/img/setup/users/user-3.png" alt="User Block Module">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-3.png" alt="User Block Module">
### 5. Security Settings
If you wish to give the user access to the system only between office hours,
or during weekends, mention it under security settings.
-<img class="screenshot" src="/docs/assets/img/setup/users/user-4.png" alt="User Security">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-4.png" alt="User Security">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
index a65a295..d75609f 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
@@ -5,7 +5,7 @@
To start with, go to:
> Setup > Permissions > Role Permissions Manager
-<img alt="Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager" class="screenshot" src="/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application.png">
+<img alt="Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-application.png">
Permissions are applied on a combination of:
@@ -38,12 +38,12 @@
Leave Application is a good **example** that encompasses all areas of Permission System.
-<img class="screenshot" alt="Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User" src="/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png">
+<img class="screenshot" alt="Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png">
1. **It should be created by an Employee.**
For this, Employee Role should be given Read, Write, Create permissions.
-<img class="screenshot" alt="Giving Read, Write and Create Permissions to Employee for Leave Application" src="/docs/assets/img/users-and-permissions/setting-up-permissions-employee-role.png">
+<img class="screenshot" alt="Giving Read, Write and Create Permissions to Employee for Leave Application" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-employee-role.png">
1. **An Employee should only be able to access his/her Leave Application.**
Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.)
@@ -53,12 +53,12 @@
1. **HR Manager should be able to see all Leave Applications.**
Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled.
-<img class="screenshot" alt="Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access." src="/docs/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png">
+<img class="screenshot" alt="Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png">
2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.**
Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.)
-<img class="screenshot" alt="Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee." src="/docs/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png">
+<img class="screenshot" alt="Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png">
3. **It should be Approved / Rejected only by HR User or Leave Approver.**
The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1.
@@ -69,6 +69,6 @@
4. **HR User should be able to delegate Leave Applications to his/her subordinates**
HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users.
-<img class="screenshot" alt="Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application'" src="/docs/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png">
+<img class="screenshot" alt="Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application'" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md
index 5483af7..3a26a32 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md
@@ -5,10 +5,10 @@
If user has enabled the developer mode, then they can add the roles directly in the page and report record. But in that case, the permissions will also be reflected in the json file for the page / report.
### For Page
-<img alt="Assign roles to the page" class="screenshot" src="/docs/assets/img/users-and-permissions/roles-for-page.png">
+<img alt="Assign roles to the page" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/roles-for-page.png">
### For Report
-<img alt="Assign roles to the report" class="screenshot" src="/docs/assets/img/users-and-permissions/roles-for-report.png">
+<img alt="Assign roles to the report" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/roles-for-report.png">
## Tool for custom roles assignment
@@ -16,10 +16,10 @@
To access, goto Setup > Permissions > Role Permission for Page and Report
-<img alt="Tools to assign custom roles to the page" class="screenshot" src="/docs/assets/img/users-and-permissions/role-permission-for-page-and-report.png">
+<img alt="Tools to assign custom roles to the page" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/role-permission-for-page-and-report.png">
### Reset to defaults
Using "Reset to Default" button, user can remove the custom permissions applied on a page or report. Then default permissions will be applicable on that page or report.
-<img alt="Reset the default roles" class="screenshot" src="/docs/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png">
+<img alt="Reset the default roles" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
index 23e5b32..a939e65 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
@@ -4,6 +4,6 @@
To share a document, open the document, click on the "+" icon under sharing and select the user
-<img class="screenshot" src="/docs/assets/img/setup/users/share.gif">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/share.gif">
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
index 2bf4f3f..db444d1 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -15,7 +15,7 @@
1. The type of document which will be allowed (for example "Company")
1. The specific item that you want to allow (the name of the "Company)
-<img src="/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png" class="screenshot" alt="Creating a new user permission">
+<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/new-user-permission.png" class="screenshot" alt="Creating a new user permission">
If you want to apply the permissions to all Roles for that user, keep the "Apply Permissions for all Roles of this User" checked. If you check this, it will automatically setup the rules for Roles to check for User Permissions.
@@ -25,11 +25,11 @@
Note that the "Apply User Permissions" is already checked for this role. Then click on "Select Document Types"
-<img src="/docs/assets/img/users-and-permissions/user-perms/select-document-types.png" class="screenshot" alt="Select Document Types to Edit the Setting">
+<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/select-document-types.png" class="screenshot" alt="Select Document Types to Edit the Setting">
Here you will see that Company has already been checked. If you want user permissions not be applied for that particular rule, you can un check it.
-<img src="/docs/assets/img/users-and-permissions/user-perms/view-selected-documents.png" class="screenshot" alt="Select Document Types to Edit the Setting">
+<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/view-selected-documents.png" class="screenshot" alt="Select Document Types to Edit the Setting">
### Ignoring User Permissions on Certain Fields
@@ -37,7 +37,9 @@
For example you don't want Assets to be restricited for any user, then select **Asset** in **Customize Form** and in the Company field, check on "Ignore User Permissions"
-<img src="/docs/assets/img/users-and-permissions/user-perms/ignore-user-permissions.png" class="screenshot" alt="Ignore User Permissions on specific properties">
+
+<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/ignore-user-user-permissions.png" class="screenshot" alt="Ignore User Permissions on specific properties">
+
### Strict Permissions
@@ -49,4 +51,4 @@
Finally once you have created your air-tight permission model, and you want to check how it applies to various users, you can see it via the **Permitted Documents for User** report. Using this report, you can select the **User** and document type and check how user permissions get applied.
-<img src="/docs/assets/img/users-and-permissions/user-perms/permitted-documents.png" class="screenshot" alt="Permitted Documents for User report">
+<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-perms/permitted-documents.png" class="screenshot" alt="Permitted Documents for User report">
diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
index 4b2cabb..06c47d7 100644
--- a/erpnext/docs/user/manual/en/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md
@@ -13,7 +13,7 @@
Manager, who is the approving authority, will either Approve or Reject this
request. Accordingly,the user will get his Approved or Rejected status.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-leave-fl.jpg">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-leave-fl.jpg">
To make this Workflow and transition rules go to :
@@ -21,11 +21,11 @@
#### Step 1: Enter the different states of Leave Approval Process.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-1.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-1.png">
#### Step 2: Enter Transition Rules.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-2.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-2.png">
#### Notes:
@@ -48,15 +48,15 @@
When a Leave Application is saved by Employee, the status of the document changes to "Applied"
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-3.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-3.png">
When the HR User logs in, he can either Approve or Reject. If approved the
status of the document changes to "Approved by HR". However, it is yet to be approved by Leave Approver.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-4.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-4.png">
When the Leave Approver opens the Leave Application page, he can finally "Approve" or "Reject" the Leave Application.
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/workflow-5.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-5.png">
{next}
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
index 0e4d2d7..847c807 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
@@ -22,7 +22,7 @@
`Explore > Accounts > Accounts Settings`
- <img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-1.png">
+ <img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-1.png">
* Create Stock Entry (Material Transfer) to transfer available stock from existing warehouse to new warehouse. As stock will be available in the new warehouse, you should select the new warehouse for all the future transactions.
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
index 90bdbbf..a3102ae 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -12,7 +12,7 @@
> Setup > Company > Stock Settings > "Enable Perpetual Inventory"
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-1.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-1.png">
* Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts.
@@ -133,11 +133,11 @@
**Stock Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-receipt-sl-1.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-sl-1.png">
**General Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-receipt-gl-2.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-gl-2.png">
As stock balance increases through Purchase Receipt, "Store" accounts are debited and a temporary account "Stock Receipt But Not Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
@@ -149,7 +149,7 @@
**General Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-pinv-gl-3.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-pinv-gl-3.png">
Here "Stock Received But Not Billed" account is debited and nullified the
effect of Purchase Receipt.
@@ -207,11 +207,11 @@
**Stock Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-dn-sl-4.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-sl-4.png">
**General Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-dn-gl-5.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-gl-5.png">
As item is delivered from "Stores" warehouse, "Stores" account is credited and
equal amount is debited to the expense account "Cost of Goods Sold". The
@@ -240,11 +240,11 @@
**Stock Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-inv-sl-6.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-sl-6.png">
**General Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-inv-gl-7.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-gl-7.png">
Here, apart from normal account entries for invoice, "Stores" and "Cost of
Goods Sold" accounts are also affected based on the valuation amount.
@@ -278,11 +278,11 @@
**Stock Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-st-receipt-sl.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-sl.png">
**General Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-st-receipt-gl.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-gl.png">
* * *
@@ -313,11 +313,11 @@
**Stock Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-st-issue-sl.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-sl.png">
**General Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-st-issue-gl.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-gl.png">
* * *
@@ -350,10 +350,10 @@
**Stock Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-st-transfer-sl.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-sl.png">
**General Ledger**
-<img class="screenshot" alt="Perpetual Inventory" src="/docs/assets/img/accounts/perpetual-st-transfer-gl.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-gl.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
index 839ae4d..9b140a6 100644
--- a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
+++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
@@ -2,7 +2,7 @@
While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master.
-<img alt="Item wise Allowance percentage" class="screenshot" src="/docs/assets/img/articles/allowance-percentage-1.png">
+<img alt="Item wise Allowance percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allowance-percentage-1.png">
Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions.
@@ -16,7 +16,7 @@
3. Save Stock Settings.
-<img alt="Item wise Allowance percentage" class="screenshot" src="/docs/assets/img/articles/allowance-percentage-2.png">
+<img alt="Item wise Allowance percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allowance-percentage-2.png">
<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
index e95697d..9d44702 100644
--- a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
+++ b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
@@ -4,17 +4,17 @@
In ERPNext, you can update item's Reorder Level and Reorder Qty in the Item master. If same item has different reorder level, you can also update warehouse-wise reorder level and reorder qty.
-<img alt="reorder level" class="screenshot" src="/docs/assets/img/articles/reorder-request-1.png">
+<img alt="reorder level" class="screenshot" src="{{docs_base_url}}/assets/img/articles/reorder-request-1.png">
With reorder level, you can also define what should be the next action. Either new purchase or transfer from another warehouse. Based on setting in Item master, purpose will be updated in the Material Request as well.
-<img alt="reorder level next action" class="screenshot" src="/docs/assets/img/articles/reorder-request-2.png">
+<img alt="reorder level next action" class="screenshot" src="{{docs_base_url}}/assets/img/articles/reorder-request-2.png">
When item's stock reaches reorder level, Material Request is auto-created automatically. You can enable this feature from:
`Stock > Setup > Stock Settings`
-<img alt="active auto-material request" class="screenshot" src="/docs/assets/img/articles/reorder-request-3.png">
+<img alt="active auto-material request" class="screenshot" src="{{docs_base_url}}/assets/img/articles/reorder-request-3.png">
A separate Material Request will be created for each item. User with Purchase Manager's role will receive email alert about these Material Requests.
diff --git a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
index c502e71..f236cfa 100644
--- a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
@@ -13,7 +13,7 @@
- **Qty (Quantity)** Leave this column blank.
- **Valuation Rate** will be item's value after depreciation.
-<img alt="reorder level" class="screenshot" src="/docs/assets/img/articles/fixed-asset-dep-1.gif">
+<img alt="reorder level" class="screenshot" src="{{docs_base_url}}/assets/img/articles/fixed-asset-dep-1.gif">
After updating Valuation Rate for an item, come back to Stock Reconciliation and upload save .csv file.
@@ -21,7 +21,7 @@
Select Expense account for depreciation in **Difference Account**. Value booked in the depreciation account will be the difference of old and next valuation rate of the fixed asset item, which will be actually the depreciation amount.
-<img alt="reorder level" class="screenshot" src="/docs/assets/img/articles/fixed-asset-dep-2.png">
+<img alt="reorder level" class="screenshot" src="{{docs_base_url}}/assets/img/articles/fixed-asset-dep-2.png">
####Stock Reconciliation Help Video
diff --git a/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md b/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md
index 5cc6529..0cd2006 100644
--- a/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md
+++ b/erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md
@@ -8,10 +8,10 @@
You can select valuation method based on which item's value will be calculated. Valuation Method can be set globally for all the items from the Stock Settings.
-<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/item-valuation-1.png">
+<img class="screenshot" alt="Download Backup" src="{{docs_base_url}}/assets/img/articles/item-valuation-1.png">
You can also set Valuation Method in the item master, especially when a valuation method for an item is different from the default Method.
-<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/item-valuation-2.png">
+<img class="screenshot" alt="Download Backup" src="{{docs_base_url}}/assets/img/articles/item-valuation-2.png">
[Click here to learn about the valuation methods available in the ERPNext, and how it works.](https://frappe.io/blog/erpnext-features/inventory-valuation-method-fifo-vs-moving-average)
diff --git a/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
index 8fa2f92..f93e668 100644
--- a/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
+++ b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
@@ -6,7 +6,7 @@
1. Has Batch No.
1. Has Serial No.
-<img alt="Item Field Frozen" class="screenshot" src="/docs/assets/img/articles/maintain-stock-1.png">
+<img alt="Item Field Frozen" class="screenshot" src="{{docs_base_url}}/assets/img/articles/maintain-stock-1.png">
For an item, once stock ledger entry is created, values in these fields will be froze. This is to prevent user from changing value which can lead to mis-match of actual stock, and stock level in the system of an item.
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
index d550019..82408bd 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
@@ -4,7 +4,7 @@
To maintain batches against an Item you need to mention 'Has Batch No' as yes in the Item Master.
-<img alt="Batch Item" class="screenshot" src="/docs/assets/img/articles/batchwise-stock-1.png">
+<img alt="Batch Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/batchwise-stock-1.png">
You can create a new Batch from:
@@ -18,13 +18,13 @@
When creating Purchase Receipt, you should create new Batch, or select one of the existing Batch master. One Batch can be associated with one Batch Item.
-<img alt="Batch in Purchase Receipt" class="screenshot" src="/docs/assets/img/articles/batchwise-stock-2.png">
+<img alt="Batch in Purchase Receipt" class="screenshot" src="{{docs_base_url}}/assets/img/articles/batchwise-stock-2.png">
#### Delivery Note
Define Batch in Delivery Note Item table. If Batch item is added under Product Bundle, you can update it's Batch No. in the Packing List table sa well.
-<img alt="Batch in Delivery Note" class="screenshot" src="/docs/assets/img/articles/batchwise-stock-3.png">
+<img alt="Batch in Delivery Note" class="screenshot" src="{{docs_base_url}}/assets/img/articles/batchwise-stock-3.png">
#### Batch-wise Stock Balance Report
@@ -32,4 +32,4 @@
Stock > Standard Reports > Batch-wise Balance History
-<img alt="Batchwise Stock Balance" class="screenshot" src="/docs/assets/img/articles/batchwise-stock-4.png">
+<img alt="Batchwise Stock Balance" class="screenshot" src="{{docs_base_url}}/assets/img/articles/batchwise-stock-4.png">
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
index de971c0..12447e0 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
@@ -18,7 +18,7 @@
In the UoM master, you will find a field called "Must be whole number". Check this field to restrict user from enter value in decimal places in quantity field, for item having this UoM.
-<img alt="UoM Must be Whole No" class="screenshot" src="/docs/assets/img/articles/uom-fraction-1.png">
+<img alt="UoM Must be Whole No" class="screenshot" src="{{docs_base_url}}/assets/img/articles/uom-fraction-1.png">
####Validation
@@ -26,7 +26,7 @@
`Quantity cannot be a fraction at row #`
-<img alt="UoM Validation Message" class="screenshot" src="/docs/assets/img/articles/uom-fraction-2.png">
+<img alt="UoM Validation Message" class="screenshot" src="{{docs_base_url}}/assets/img/articles/uom-fraction-2.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
index f69ddbb..6ed111b 100644
--- a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
@@ -50,7 +50,7 @@
As per perpetual inventory valuation system, accounting entry is created for every stock transaction. Double entry accounting system requires Total Debit matching with Total Credit in an entry. On the submission of Stock Entry, system debits Warehouse account by total value of items. To balance the same, we use Temporary Opening account as a Difference Account.
-<img alt="Difference Account" class="screenshot" src="/docs/assets/img/articles/difference-account-1.png">
+<img alt="Difference Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/difference-account-1.png">
#### Step 9: Save and Submit Stock Entry
diff --git a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
index d822a23..1d758c8 100644
--- a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
+++ b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
@@ -22,7 +22,7 @@
For repacked/output items, only Target Warehouse will be provided. You will have to provide valuation for the repack items.
-<img alt="Repack Entry" class="screenshot" src="/docs/assets/img/articles/repack-1.png">
+<img alt="Repack Entry" class="screenshot" src="{{docs_base_url}}/assets/img/articles/repack-1.png">
Update Qty for all the items selected.
@@ -30,6 +30,6 @@
On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repack/output item will be added in the Target Warehouse.
-<img alt="Repack Stock Entry" class="screenshot" src="/docs/assets/img/articles/repack-2.png">
+<img alt="Repack Stock Entry" class="screenshot" src="{{docs_base_url}}/assets/img/articles/repack-2.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md b/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md
index aaaec2d..f3b9966 100644
--- a/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md
@@ -10,4 +10,4 @@
For detailed steps on how to create Purchase Return Entry for the Rejected Item, refer to the below example.
-<img class="screenshot" alt="Returning Rejected Items" src="/docs/assets/img/articles/purchase-return.gif">
\ No newline at end of file
+<img class="screenshot" alt="Returning Rejected Items" src="{{docs_base_url}}/assets/img/articles/purchase-return.gif">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
index c0292f2..4f2425f 100644
--- a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
+++ b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
@@ -14,11 +14,11 @@
On submission of Purchase Receipt or Stock entry for the serialized item, Serial Nos. will be auto-generated.
-<img alt="Serial Nos Entry" class="screenshot" src="/docs/assets/img/articles/serial-naming-1.png">
+<img alt="Serial Nos Entry" class="screenshot" src="{{docs_base_url}}/assets/img/articles/serial-naming-1.png">
Generated Serial numbers will be updated for each item.
-<img alt="Serial Nos Created" class="screenshot" src="/docs/assets/img/articles/serial-naming-2.png">
+<img alt="Serial Nos Created" class="screenshot" src="{{docs_base_url}}/assets/img/articles/serial-naming-2.png">
###2. Serializing Manufacturing Item
@@ -28,12 +28,12 @@
When Item is set as serialized, it will allow you to mentioned Series for it.
-<img alt="Serial Nos Created" class="screenshot" src="/docs/assets/img/articles/serial-naming-3.png">
+<img alt="Serial Nos Created" class="screenshot" src="{{docs_base_url}}/assets/img/articles/serial-naming-3.png">
####2.2 Production Entry for Serialized Item
On submission of production entry for manufacturing item, system will automatically generate Serial Nos. following Series as specified in the Item master.
-<img alt="Serial Nos Created" class="screenshot" src="/docs/assets/img/articles/serial-naming-4.png">
+<img alt="Serial Nos Created" class="screenshot" src="{{docs_base_url}}/assets/img/articles/serial-naming-4.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
index ba29334..ce22d8e 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
@@ -8,7 +8,7 @@
Material Issue is generally made for the low value consumable items like office stationary, product consumables etc. Also you can create Material Issue to reconcile serialized and batched item's stock.
-<img alt="Material Issue" class="screenshot" src="/docs/assets/img/articles/stock-entry-issue.png">
+<img alt="Material Issue" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-issue.png">
#### 2.Purpose: Material Receipt
@@ -16,25 +16,25 @@
For the stock valuation purpose, provided Item Valuation becomes a mandatory field in the Material Receipt entry.
-<img alt="Material Receipt" class="screenshot" src="/docs/assets/img/articles/stock-entry-receipt.png">
+<img alt="Material Receipt" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-receipt.png">
#### 3.Purpose: Material Transfer
Material Transfer entry is created for the inter-warehouse Material Transfer.
-<img alt="Material Transfer" class="screenshot" src="/docs/assets/img/articles/stock-entry-transfer.png">
+<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-transfer.png">
#### 4.Purpose: Material Transfer for Manufacture
In the manufacturing process, raw-materials are issued from the stores to the production department (generally WIP warehouse). This Material Transfer entry is created from Production Order. Items in this entry are fetched from the BOM of production Item, as selected in Production Order.
-<img alt="Transfer for Manufacture" class="screenshot" src="/docs/assets/img/articles/stock-entry-manufacture-transfer.gif">
+<img alt="Transfer for Manufacture" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-manufacture-transfer.gif">
#### 4.Purpose: Manufacture
Manufacture is created from Production Order. In this entry, both raw-material item as well as production item are fetched from the BOM, selected in the Production Order. For the raw-material items, only Source Warehouse (generally WIP warehouse) is mentioned. For the production item, only target warehouse as mentioned in the Production Order is updated. On submission, stock of raw-material items are deducted from Source Warehouse, which indicates that raw-material items were consumed in the manufacturing process. Production Item is added to the Target Warehouse marking the completion of production cycle.
-<img alt="Manufacture" class="screenshot" src="/docs/assets/img/articles/stock-entry-manufacture.gif">
+<img alt="Manufacture" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-manufacture.gif">
#### 5.Purpose: Repack
@@ -44,6 +44,6 @@
Subcontracting transaction involves company transfer raw-material items to the sub-contractors warehouse. This requires adding a warehouse for the sub-contractor as well. Sub-contract entry transfers stock from the companies warehouse to the sub-contractors warehouse..
-<img alt="Subcontract" class="screenshot" src="/docs/assets/img/articles/stock-entry-subcontract.gif">
+<img alt="Subcontract" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-subcontract.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
index 052ed11..6d8fcb6 100644
--- a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
+++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
@@ -6,10 +6,10 @@
To set the barcode of a particular item, you will have to open the Item record. You can also enter barcode while creating a new item.
-<img alt="Material Transfer" class="screenshot" src="/docs/assets/img/articles/barcode-item-master.png">
+<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-item-master.png">
Once barcode field is updated in item master, items can be fetched using barcode. This feature will be availble in Delivery Note, Sales Invoice and Purchase Receipt transactions only.
-<img alt="Material Transfer" class="screenshot" src="/docs/assets/img/articles/barcode-item-selection.gif">
+<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-item-selection.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/batch.md b/erpnext/docs/user/manual/en/stock/batch.md
index a97be92..8283af3 100644
--- a/erpnext/docs/user/manual/en/stock/batch.md
+++ b/erpnext/docs/user/manual/en/stock/batch.md
@@ -11,7 +11,7 @@
If you want automatic batch creation at the time of Purchase Receipt, you must check "Create New Batches Automatically"
-<img class="screenshot" alt="Item Setup for Batches" src="/docs/assets/img/stock/item_setup_for_batch.png">
+<img class="screenshot" alt="Item Setup for Batches" src="{{docs_base_url}}/assets/img/stock/item_setup_for_batch.png">
### Creating Batches
@@ -25,7 +25,7 @@
When you open a batch, you will see all the quantities relating this that batch on the page.
-<img class="screenshot" alt="Batch View" src="/docs/assets/img/stock/batch_view.png">
+<img class="screenshot" alt="Batch View" src="{{docs_base_url}}/assets/img/stock/batch_view.png">
To move the batch from one warehouse to another, you can click on the move button.
diff --git a/erpnext/docs/user/manual/en/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md
index a59ac35..de7f676 100644
--- a/erpnext/docs/user/manual/en/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/en/stock/delivery-note.md
@@ -15,7 +15,7 @@
or from a “Submitted” Sales Order (that is not already shipped) by clicking on
“Make Delivery Note”.
-<img class="screenshot" alt="Delivery Note" src="/docs/assets/img/stock/delivery-note.png">
+<img class="screenshot" alt="Delivery Note" src="{{docs_base_url}}/assets/img/stock/delivery-note.png">
You can also “fetch” the details from an unshipped Sales Order.
diff --git a/erpnext/docs/user/manual/en/stock/delivery-trip.md b/erpnext/docs/user/manual/en/stock/delivery-trip.md
index 5e0911a..37b284c 100644
--- a/erpnext/docs/user/manual/en/stock/delivery-trip.md
+++ b/erpnext/docs/user/manual/en/stock/delivery-trip.md
@@ -8,10 +8,10 @@
Delivery
-<img class="screenshot" alt="Delivery" src="/docs/assets/img/stock/delivery_trip.png">
+<img class="screenshot" alt="Delivery" src="{{docs_base_url}}/assets/img/stock/delivery_trip.png">
Delivery Stops
-<img class="screenshot" alt="Delivery" src="/docs/assets/img/stock/delivery_stops.png">
+<img class="screenshot" alt="Delivery" src="{{docs_base_url}}/assets/img/stock/delivery_stops.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/installation-note.md b/erpnext/docs/user/manual/en/stock/installation-note.md
index a75e15f..2a85a4f 100644
--- a/erpnext/docs/user/manual/en/stock/installation-note.md
+++ b/erpnext/docs/user/manual/en/stock/installation-note.md
@@ -2,6 +2,6 @@
You can use installation note to record the instalation of a product having a serial number.
-<img class="screenshot" alt="Installation Note" src="/docs/assets/img/stock/installation-note.png">
+<img class="screenshot" alt="Installation Note" src="{{docs_base_url}}/assets/img/stock/installation-note.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
index 3e2bdd3..5b57c60 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.md
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -31,7 +31,7 @@
These numbers help to track individual units or batches of Items which you sell. It also tracks warranty and returns. In case any individual Item is recalled by the supplier the number system helps to track individual Item. The numbering system also manages expiry dates. Please note that if you sell your items in thousands, and if the items are very small like pens or erasers, you need not serialize them. In ERPNext, you will have to mention the serial number in some accounting entries. To create serial numbers you will have to manually create all the numbers in your entries. If your product is not a big consumer durable Item, if it has no warranty and has no chances of being recalled, avoid giving serial numbers.
> Tip: While entering an item code in an items table, if the table requires inventory details, then depending on whether the entered item is batched or serialized, you can enter serial or batch numbers right away in a pop-up dialog.
-<img alt="Serial No modal" class="screenshot" src="/docs/assets/img/stock/serial_no_modal.gif"><img alt="Batch No modal" class="screenshot" src="/docs/assets/img/stock/batch_no_modal.png">
+<img alt="Serial No modal" class="screenshot" src="{{docs_base_url}}/assets/img/stock/serial_no_modal.gif"><img alt="Batch No modal" class="screenshot" src="{{docs_base_url}}/assets/img/stock/batch_no_modal.png">
> Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
@@ -57,9 +57,9 @@
### Purchase Details
-<img alt="Item Purchase Details" class="screenshot" src="/docs/assets/img/stock/item-purchase.png">
+<img alt="Item Purchase Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
-<img class="screenshot" alt="Purchase details" src="/docs/assets/img/stock/item-purchase.png">
+<img class="screenshot" alt="Purchase details" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
* **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse.
@@ -69,7 +69,7 @@
###Supplier Details
-<img alt="Item Supplier Details" class="screenshot" src="/docs/assets/img/stock/item-supplier.png">
+<img alt="Item Supplier Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-supplier.png">
* **Default Supplier:** Supplier from whom you generally purchase this item.
@@ -79,23 +79,23 @@
### Sales Details
-<img alt="Item Sales Details" class="screenshot" src="/docs/assets/img/stock/item-sales.png">
+<img alt="Item Sales Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-sales.png">
* **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
-<img class="screenshot" alt="Sales details" src="/docs/assets/img/stock/item-sales.png)">
+<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)">
-<img class="screenshot" alt="Sales details" src="/docs/assets/img/stock/item-sales.png">
+<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png">
***Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.
***Customer Codes:** Track Item Code assigned by the Customers for this Item. This will help you in searching item while creating Sales Order based on the Item Code in the Customer's Purchase Order.
-<img class="screenshot" alt="Sales details" src="/docs/assets/img/stock/item-sales.png)">
+<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)">
### Manufacturing And Website
-<img class="screenshot" alt="Manufaturing details" src="/docs/assets/img/stock/item-manufacturing-website.png">
+<img class="screenshot" alt="Manufaturing details" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-website.png">
Visit [Manufacturing](/docs/user/manual/en/manufacturing.html) and [Website ](/docs/user/manual/en/website.html)to understand these topics in detail.
diff --git a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
index cc59618..8784f68 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
@@ -21,7 +21,7 @@
* **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y.
-<img alt="FIFO" class="screenshot" src="/docs/assets/img/stock/fifo.png">
+<img alt="FIFO" class="screenshot" src="{{docs_base_url}}/assets/img/stock/fifo.png">
* **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
diff --git a/erpnext/docs/user/manual/en/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
index eeee0e1..08f8855 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-variants.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md
@@ -19,20 +19,20 @@
* The Item shall then be referred to as a so called 'Template'. Such a Template is not identical to a regular 'Item' any longer. For example it (the Template) can not be used directly in any Transactions (Sales Order, Delivery Note, Purchase Invoice) itself. Only the Variants of an Item (_blue_ t-shirt in size _small)_ can be practically used in such. Therefore it would be ideal to decide whether an item 'Has Variants' or not directly when creating it.
-<img class="screenshot" alt="Has Variants" src="/docs/assets/img/stock/item-has-variants.png">
+<img class="screenshot" alt="Has Variants" src="{{docs_base_url}}/assets/img/stock/item-has-variants.png">
On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table.
In case the attribute has Numeric Values, you can specify the range and increment values here.
-<img class="screenshot" alt="Valid Attributes" src="/docs/assets/img/stock/item-attributes.png">
+<img class="screenshot" alt="Valid Attributes" src="{{docs_base_url}}/assets/img/stock/item-attributes.png">
> Note: You cannot make Transactions against a 'Template'
To create 'Item Variants' against a 'Template' select 'Make Variants'
-<img class="screenshot" alt="Make Variants" src="/docs/assets/img/stock/make-variant.png">
+<img class="screenshot" alt="Make Variants" src="{{docs_base_url}}/assets/img/stock/make-variant.png">
-<img class="screenshot" alt="Make Variants" src="/docs/assets/img/stock/make-variant-1.png">
+<img class="screenshot" alt="Make Variants" src="{{docs_base_url}}/assets/img/stock/make-variant-1.png">
To learn more about setting Attributes Master check [Item Attributes](/docs/user/manual/en/stock/setup/item-attribute.html)
@@ -41,12 +41,12 @@
To setup variants based on Manufactueres, in your Item template, set "Variants Based On" as "Manufacturers"
<img class='screenshot' alt='Setup Item Variant by Manufacturer'
- src='/docs/assets/img/stock/select-mfg-for-variant.png'>
+ src='{{docs_base_url}}/assets/img/stock/select-mfg-for-variant.png'>
When you make a new Variant, the system will prompt you to select a Manufacturer. You can also optionally put in a Manufacturer Part Number
<img class='screenshot' alt='Setup Item Variant by Manufacturer'
- src='/docs/assets/img/stock/set-variant-by-mfg.png'>
+ src='{{docs_base_url}}/assets/img/stock/set-variant-by-mfg.png'>
The naming of the variant will be the name (ID) of the template Item with a number suffix. e.g. "ITEM000" will have variant "ITEM000-1"
@@ -55,4 +55,4 @@
To set the fields Goto Stock > Item Variant Settings
<img class='screenshot' alt='Item Variant Settings'
- src='/docs/assets/img/stock/item_variants_settings.png'>
+ src='{{docs_base_url}}/assets/img/stock/item_variants_settings.png'>
diff --git a/erpnext/docs/user/manual/en/stock/item/purchase-details.md b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
index 3de1724..134d551 100644
--- a/erpnext/docs/user/manual/en/stock/item/purchase-details.md
+++ b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
@@ -4,4 +4,4 @@
A warranty means a guarantee or a promise which provides assurance by one party to the other party which allows for a legal remedy if that promise is not true or followed. A warranty period is a time period in which a purchased product may be returned or exchanged.
-<img class="screenshot" alt="Item Warranty" src="/docs/assets/img/stock/item-warranty.png">
\ No newline at end of file
+<img class="screenshot" alt="Item Warranty" src="{{docs_base_url}}/assets/img/stock/item-warranty.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md
index 06caa2c..548a8a9 100644
--- a/erpnext/docs/user/manual/en/stock/item/reorder.md
+++ b/erpnext/docs/user/manual/en/stock/item/reorder.md
@@ -10,4 +10,4 @@
For example, If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption.
-<img alt="Item Reorder" class="screenshot" src="/docs/assets/img/stock/item-reorder.png">
\ No newline at end of file
+<img alt="Item Reorder" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-reorder.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
index c3ba13c..96b9cea 100644
--- a/erpnext/docs/user/manual/en/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -3,7 +3,7 @@
A Material Request is a simple document identifying a requirement of a set of
Items (products or services) for a particular reason.
-<img class="screenshot" alt="Material Request" src="/docs/assets/img/buying/material-request-flowchart.png">
+<img class="screenshot" alt="Material Request" src="{{docs_base_url}}/assets/img/buying/material-request-flowchart.png">
To generate a Material Request manually go to:
@@ -11,7 +11,7 @@
#### Creating Material Request
-<img class="screenshot" alt="Material Request" src="/docs/assets/img/buying/material-request.png">
+<img class="screenshot" alt="Material Request" src="{{docs_base_url}}/assets/img/buying/material-request.png">
A Material Request can be generated:
diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
index e02b2c3..2f432fc 100644
--- a/erpnext/docs/user/manual/en/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md
@@ -13,7 +13,7 @@
Having a tight control of the projected inventory is crucial to determine
shortages and to calculate the right order quantity.
-<img class="screenshot" alt="Projected Quantity" src="/docs/assets/img/stock/projected_quantity.png">
+<img class="screenshot" alt="Projected Quantity" src="{{docs_base_url}}/assets/img/stock/projected_quantity.png">
> Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
diff --git a/erpnext/docs/user/manual/en/stock/purchase-receipt.md b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
index 523b0fa..7241d31 100644
--- a/erpnext/docs/user/manual/en/stock/purchase-receipt.md
+++ b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
@@ -12,7 +12,7 @@
or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”.
-<img class="screenshot" alt="Purchase Receipt" src="/docs/assets/img/stock/purchase-receipt.png">
+<img class="screenshot" alt="Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-receipt.png">
### Rejections
diff --git a/erpnext/docs/user/manual/en/stock/purchase-return.md b/erpnext/docs/user/manual/en/stock/purchase-return.md
index 2b63034..4096452 100644
--- a/erpnext/docs/user/manual/en/stock/purchase-return.md
+++ b/erpnext/docs/user/manual/en/stock/purchase-return.md
@@ -8,16 +8,16 @@
First open the original Purchase Receipt, against which supplier delivered the items.
-<img class="screenshot" alt="Original Purchase Receipt" src="/docs/assets/img/stock/purchase-return-original-purchase-receipt.png">
+<img class="screenshot" alt="Original Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-return-original-purchase-receipt.png">
Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount.
-<img class="screenshot" alt="Return Against Purchase Receipt" src="/docs/assets/img/stock/purchase-return-against-purchase-receipt.png">
+<img class="screenshot" alt="Return Against Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-return-against-purchase-receipt.png">
On submission of Return Purchase Return, system will decrease item qty from the mentioned warehouse. To maintain correct stock valuation, stock balance will also go up according to the original purchase rate of the returned items.
-<img class="screenshot" alt="Return Stock Ledger" src="/docs/assets/img/stock/purchase-return-stock-ledger.png">
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/purchase-return-stock-ledger.png">
If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
-<img class="screenshot" alt="Return Stock Ledger" src="/docs/assets/img/stock/purchase-return-general-ledger.png">
\ No newline at end of file
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/purchase-return-general-ledger.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/retain-sample-stock.md b/erpnext/docs/user/manual/en/stock/retain-sample-stock.md
index 0f8199a..12e737f 100644
--- a/erpnext/docs/user/manual/en/stock/retain-sample-stock.md
+++ b/erpnext/docs/user/manual/en/stock/retain-sample-stock.md
@@ -6,21 +6,21 @@
It is advised to create a new warehouse just for retaining samples and not use it in production.
-<img class="screenshot" alt="Sample Retention Warehouse" src="/docs/assets/img/stock/sample-warehouse.png">
+<img class="screenshot" alt="Sample Retention Warehouse" src="{{docs_base_url}}/assets/img/stock/sample-warehouse.png">
### Enable Retain Sample in Item master
Check Retain Sample and Maximum allowed samples in Item Master for a batch. Please note that Retain Sample is based
on Batch hence Has Batch No should be enabled as well.
-<img class="screenshot" alt="Retain Sample" src="/docs/assets/img/stock/retain-sample.png">
+<img class="screenshot" alt="Retain Sample" src="{{docs_base_url}}/assets/img/stock/retain-sample.png">
### Stock Entry
Whenever a Stock Entry is created with the purpose as Material Receipt, for items which have Retain Sample enabled, the Sample Quantity can be set during that Stock Entry. Sample quantity cannot be more than the Maximum sample quantity set in Item Master.
-<img class="screenshot" alt="Retain Sample" src="/docs/assets/img/stock/material-receipt-sample.png">
+<img class="screenshot" alt="Retain Sample" src="{{docs_base_url}}/assets/img/stock/material-receipt-sample.png">
On submission of this Stock Entry, button 'Make Retention Stock Entry' will be available to make another Stock Entry for the transfer of sample items from the mentioned batch to the retention warehouse set in Stock Settings. On clicking this button it will direct you to new Stock Entry with all the information, verify the information and click Submit.
-<img class="screenshot" alt="Retain Sample" src="/docs/assets/img/stock/material-transfer-sample.png">
\ No newline at end of file
+<img class="screenshot" alt="Retain Sample" src="{{docs_base_url}}/assets/img/stock/material-transfer-sample.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/sales-return.md b/erpnext/docs/user/manual/en/stock/sales-return.md
index 1ba17c2..6b2ee1c 100644
--- a/erpnext/docs/user/manual/en/stock/sales-return.md
+++ b/erpnext/docs/user/manual/en/stock/sales-return.md
@@ -8,22 +8,22 @@
First open the original Delivery Note / Sales Invoice, against which customer returned the items.
-<img class="screenshot" alt="Original Delivery Note" src="/docs/assets/img/stock/sales-return-original-delivery-note.png">
+<img class="screenshot" alt="Original Delivery Note" src="{{docs_base_url}}/assets/img/stock/sales-return-original-delivery-note.png">
Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount.
-<img class="screenshot" alt="Return Against Delivery Note" src="/docs/assets/img/stock/sales-return-against-delivery-note.png">
+<img class="screenshot" alt="Return Against Delivery Note" src="{{docs_base_url}}/assets/img/stock/sales-return-against-delivery-note.png">
You can also create the return entry against original Sales Invoice, to return stock along with credit note, check "Update Stock" option in Return Sales Invoice.
-<img class="screenshot" alt="Return Against Sales Invoice" src="/docs/assets/img/stock/sales-return-against-sales-invoice.png">
+<img class="screenshot" alt="Return Against Sales Invoice" src="{{docs_base_url}}/assets/img/stock/sales-return-against-sales-invoice.png">
On submission of Return Delivery Note / Sales Invoice, system will increase stock balance in the mentioned warehouse. To maintain correct stock valuation, stock balance will go up according to the original purchase rate of the returned items.
-<img class="screenshot" alt="Return Stock Ledger" src="/docs/assets/img/stock/sales-return-stock-ledger.png">
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/sales-return-stock-ledger.png">
In case of Return Sales Invoice, Customer account will be credited and associated income and tax account will be debited.
If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
-<img class="screenshot" alt="Return Stock Ledger" src="/docs/assets/img/stock/sales-return-general-ledger.png">
\ No newline at end of file
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/sales-return-general-ledger.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/serial-no.md b/erpnext/docs/user/manual/en/stock/serial-no.md
index cb766ba..0158124 100644
--- a/erpnext/docs/user/manual/en/stock/serial-no.md
+++ b/erpnext/docs/user/manual/en/stock/serial-no.md
@@ -22,7 +22,7 @@
Invoice). When a new Serial No is created directly, its warehouse cannot be
set.
-<img class="screenshot" alt="Serial Number" src="/docs/assets/img/stock/serial-no.png">
+<img class="screenshot" alt="Serial Number" src="{{docs_base_url}}/assets/img/stock/serial-no.png">
* The Status is set based on Stock Entry.
diff --git a/erpnext/docs/user/manual/en/stock/setup/item-attribute.md b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
index a6e0eec..8d37afc 100644
--- a/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
+++ b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
@@ -2,17 +2,17 @@
You can define Attributes and attribute values for your Item Variants here.
-<img class="screenshot" alt="Attribute Master" src="/docs/assets/img/stock/item-attribute.png">
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute.png">
#### Non Numeric Attributes
* For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table.
-<img class="screenshot" alt="Attribute Master" src="/docs/assets/img/stock/item-attribute-non-numeric.png">
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute-non-numeric.png">
#### Numeric Attributes
* If your attribute is Numeric, select Numeric Values
* Specify the Range and the Increment Value
-<img class="screenshot" alt="Attribute Master" src="/docs/assets/img/stock/item-attribute-numeric.png">
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute-numeric.png">
diff --git a/erpnext/docs/user/manual/en/stock/setup/item-group.md b/erpnext/docs/user/manual/en/stock/setup/item-group.md
index a280090..667f29f 100644
--- a/erpnext/docs/user/manual/en/stock/setup/item-group.md
+++ b/erpnext/docs/user/manual/en/stock/setup/item-group.md
@@ -7,7 +7,7 @@
category. In case, your product is used only in trading, you can categorise it
under Trading.
-<img class="screenshot" alt="Item Group Tree" src="/docs/assets/img/stock/item-group-tree.png">
+<img class="screenshot" alt="Item Group Tree" src="{{docs_base_url}}/assets/img/stock/item-group-tree.png">
### Create a Item Group
@@ -15,7 +15,7 @@
* Select 'Add Child'
-<img class="screenshot" alt="Add Item Group" src="/docs/assets/img/stock/item-group-new.gif">
+<img class="screenshot" alt="Add Item Group" src="{{docs_base_url}}/assets/img/stock/item-group-new.gif">
### Delete an Item Group
@@ -23,6 +23,6 @@
* Select 'delete'
-<img class="screenshot" alt="Add Item Group" src="/docs/assets/img/stock/item-group-del.gif">
+<img class="screenshot" alt="Add Item Group" src="{{docs_base_url}}/assets/img/stock/item-group-del.gif">
{next}
diff --git a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
index 96d1627..91718b3 100644
--- a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
+++ b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
@@ -2,7 +2,7 @@
You can set default settings for your stock related transactions here.
-<img class="screenshot" alt="Stock Settings" src="/docs/assets/img/stock/stock-settings.png">
+<img class="screenshot" alt="Stock Settings" src="{{docs_base_url}}/assets/img/stock/stock-settings.png">
### Clean HTML Description
diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
index e2ac6a1..e931b88 100644
--- a/erpnext/docs/user/manual/en/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md
@@ -7,7 +7,7 @@
> Stock > Stock Entry > New
-<img class="screenshot" alt="Stock Entry" src="/docs/assets/img/stock/stock-entry.png">
+<img class="screenshot" alt="Stock Entry" src="{{docs_base_url}}/assets/img/stock/stock-entry.png">
Stock Entries can be made for the following purposes:
@@ -29,15 +29,15 @@
To add additional costs, enter the description and amount of the cost in the Additional Costs table.
-<img class="screenshot" alt="Stock Entry Additional Costs" src="/docs/assets/img/stock/additional-costs-table.png">
+<img class="screenshot" alt="Stock Entry Additional Costs" src="{{docs_base_url}}/assets/img/stock/additional-costs-table.png">
The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate.
-<img class="screenshot" alt="Stock Entry Item Valuation Rate" src="/docs/assets/img/stock/stock-entry-item-valuation-rate.png">
+<img class="screenshot" alt="Stock Entry Item Valuation Rate" src="{{docs_base_url}}/assets/img/stock/stock-entry-item-valuation-rate.png">
If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account.
-<img class="screenshot" alt="Additional Costs General Ledger" src="/docs/assets/img/stock/additional-costs-general-ledger.png">
+<img class="screenshot" alt="Additional Costs General Ledger" src="{{docs_base_url}}/assets/img/stock/additional-costs-general-ledger.png">
> **Note:** To update Stock from a spreadsheet, see [Stock Reconciliation]({{doc_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html).
diff --git a/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
index a11759d..979b155 100644
--- a/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
+++ b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
@@ -22,7 +22,7 @@
In the document, you can select multiple Purchase Receipts and fetch all items from those Purchase Receipts. Then you should add applicable charges in “Taxes and Charges” table. You can easily delete an item if the added charges is not applicable to that item. The added charges are proportionately distributed among all the items based their amount.
-<img class="screenshot" alt="Landed Cost Vouher" src="/docs/assets/img/stock/landed-cost.png">
+<img class="screenshot" alt="Landed Cost Vouher" src="{{docs_base_url}}/assets/img/stock/landed-cost.png">
### What happend on submission?
diff --git a/erpnext/docs/user/manual/en/stock/tools/packing-slip.md b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
index 60cfb5d..11543ee 100644
--- a/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
+++ b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
@@ -4,6 +4,6 @@
While Shipping a product 'Draft' for Delivery Notes are created.
You can make a Packing Slip from these Delivery Notes (Draft)
-<img class="screenshot" alt="Packing Slip" src="/docs/assets/img/stock/packing-slip.png">
+<img class="screenshot" alt="Packing Slip" src="{{docs_base_url}}/assets/img/stock/packing-slip.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
index 254da8a..3d0331a 100644
--- a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
+++ b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
@@ -5,6 +5,6 @@
> Stock > Quality Inspection > New
-<img class="screenshot" alt="Quality Inspection" src="/docs/assets/img/stock/quality-inspection.png">
+<img class="screenshot" alt="Quality Inspection" src="{{docs_base_url}}/assets/img/stock/quality-inspection.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md
index d90e3f9..7c49463 100644
--- a/erpnext/docs/user/manual/en/stock/warehouse.md
+++ b/erpnext/docs/user/manual/en/stock/warehouse.md
@@ -14,7 +14,7 @@
To go to Warehouse, click on Stock and go to Warehouse under Setup. You
could also switch to 'Tree' View or simply type warehouse tree in the awsone bar.
-<img class="screenshot" alt="Warehouse" src="/docs/assets/img/stock/warehouse.png">
+<img class="screenshot" alt="Warehouse" src="{{docs_base_url}}/assets/img/stock/warehouse.png">
In ERPNext, every Warehouse must belong to a specific company, to maintain
company wise stock balance. In order to do so each Warehouse is linked with an
diff --git a/erpnext/docs/user/manual/en/support/issue.md b/erpnext/docs/user/manual/en/support/issue.md
index 56d0058..7fa535b 100644
--- a/erpnext/docs/user/manual/en/support/issue.md
+++ b/erpnext/docs/user/manual/en/support/issue.md
@@ -13,7 +13,7 @@
> Support > Issue > New Issue
-<img class="screenshot" alt="Issue" src="/docs/assets/img/support/issue.png">
+<img class="screenshot" alt="Issue" src="{{docs_base_url}}/assets/img/support/issue.png">
#### Discussion Thread
diff --git a/erpnext/docs/user/manual/en/support/maintenance-schedule.md b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
index a9be3b9..fa62489 100644
--- a/erpnext/docs/user/manual/en/support/maintenance-schedule.md
+++ b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
@@ -12,7 +12,7 @@
> Support > Maintenance Schedule > New Maintenance Schedule
-<img class="screenshot" alt="Maintenance Schedule" src="/docs/assets/img/support/maintenance-schedule.png">
+<img class="screenshot" alt="Maintenance Schedule" src="{{docs_base_url}}/assets/img/support/maintenance-schedule.png">
In the Maintenance Schedule, there are two sections:
diff --git a/erpnext/docs/user/manual/en/support/maintenance-visit.md b/erpnext/docs/user/manual/en/support/maintenance-visit.md
index 5bda36a..87afd4a 100644
--- a/erpnext/docs/user/manual/en/support/maintenance-visit.md
+++ b/erpnext/docs/user/manual/en/support/maintenance-visit.md
@@ -6,7 +6,7 @@
> Support > Maintenance Visit > New Maintenance Visit
-<img class="screenshot" alt="Maintenance Visit" src="/docs/assets/img/support/maintenance-visit.png">
+<img class="screenshot" alt="Maintenance Visit" src="{{docs_base_url}}/assets/img/support/maintenance-visit.png">
The Maintenance Visit contains information about the:
diff --git a/erpnext/docs/user/manual/en/support/support_reports.md b/erpnext/docs/user/manual/en/support/support_reports.md
index 7ef6cea..e136694 100644
--- a/erpnext/docs/user/manual/en/support/support_reports.md
+++ b/erpnext/docs/user/manual/en/support/support_reports.md
@@ -7,4 +7,4 @@
> Support > Reports > Support Hours
-<img class="screenshot" alt="Maintenance Visit" src="/docs/assets/img/support/support_hours.png">
+<img class="screenshot" alt="Maintenance Visit" src="{{docs_base_url}}/assets/img/support/support_hours.png">
diff --git a/erpnext/docs/user/manual/en/support/warranty-claim.md b/erpnext/docs/user/manual/en/support/warranty-claim.md
index 8080e65..abe2c35 100644
--- a/erpnext/docs/user/manual/en/support/warranty-claim.md
+++ b/erpnext/docs/user/manual/en/support/warranty-claim.md
@@ -17,7 +17,7 @@
> Support > Warranty Claim > New Warranty Claim
-
+
If a Customer visit is required to address the issue, you can create a new
Maintenance Visit record from this.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md b/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md
index 482f12f..a556dde 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md
@@ -10,9 +10,9 @@
### Using Awesome bar for Global Search.
-<img alt="Global Search" class="screenshot" src="/docs/assets/img/articles/Global Search .gif">
+<img alt="Global Search" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Global Search .gif">
### Enable Global Search for fields in a Doctype.
-<img alt="Global Search" class="screenshot" src="/docs/assets/img/articles/Enable Global Search .gif">
+<img alt="Global Search" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Enable Global Search .gif">
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
index e5188e2..cd538cf 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
@@ -4,6 +4,6 @@
If you have file attached to the document (say Purchase Order), and same file needs to be emailed as attachment, following is how you can achieve it.
-<img alt="Emailing Attachments" class="screenshot" src="/docs/assets/img/articles/email-file-attachment.gif">
+<img alt="Emailing Attachments" class="screenshot" src="{{docs_base_url}}/assets/img/articles/email-file-attachment.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
index e7434f0..f0f42c0 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
@@ -8,11 +8,11 @@
####From Browser
-<img alt="Sales Order File Attachment" class="screenshot" src="/docs/assets/img/articles/attach-file-1.gif">
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-1.gif">
####By drag and drop
-<img alt="Sales Order File Attachment" class="screenshot" src="/docs/assets/img/articles/attach-file-2.gif">
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-2.gif">
Click on Attach to browse and select the file.
@@ -20,7 +20,7 @@
If you use separate server for files, or use online service like Dropbox, you can attach file by providing link of a particular file.
-<img alt="Sales Order Select File" class="screenshot" src="/docs/assets/img/articles/attach-file-3.gif">
+<img alt="Sales Order Select File" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-3.gif">
`For hosted users, limit of 5 MB is applied on file size.`
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
index 874d0d7..a753358 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
@@ -10,7 +10,7 @@
In a spreadsheet file, enter old Item IDs in the first column, and new Item Ids in the second column. Save spreadsheet file in a CSV format.
-<img alt="Data File" class="screenshot" src="/docs/assets/img/articles/rename-docs-1.png">
+<img alt="Data File" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-docs-1.png">
#### Step 2: Upload Data File
@@ -20,7 +20,7 @@
Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
index 5e79638..76cdeb7 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
@@ -2,7 +2,7 @@
Links option shows one document is linked to which other documents. Check Menu for the Links options.
-<img alt="Cancel Doc" class="screenshot" src="/docs/assets/img/articles/links-1.gif">
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/links-1.gif">
####Scenario
@@ -18,6 +18,6 @@
Links only shows forward linkages. For the backward links, you should check current document itself. In the Purchase Receipt Item table table, you can check which Purchase Order it is linked to.
-<img alt="Cancel Doc" class="screenshot" src="/docs/assets/img/articles/links-2.gif">
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/links-2.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
index d624ffb..8d7700a 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
@@ -12,18 +12,18 @@
You will find option to Cancel in the submitted document. If document is at draft stage, it can delete directly. Also if document is not submittable, but only save, it can be deleted directly.
-<img alt="Cancel Doc" class="screenshot" src="/docs/assets/img/articles/delete-submitted-doc-1.png">
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-1.png">
####Step 2: Delete Document
After cancellation, go to Menu and click on Delete.
-<img alt="Delete Doc" class="screenshot" src="/docs/assets/img/articles/delete-submitted-doc-2.png">
+<img alt="Delete Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-2.png">
####Step 3: Deleting from List
For bulk deletion, you can select multiple Cancelled records and delete at once from the List View.
-<img alt="Delete Doc from List" class="screenshot" src="/docs/assets/img/articles/delete-submitted-doc-3.gif">
+<img alt="Delete Doc from List" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-3.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
index c8d78a0..69b4ecf 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
@@ -10,6 +10,6 @@
`Menu > Copy`
-<img alt="Duplicate" class="screenshot" src="/docs/assets/img/articles/duplicate.gif">
+<img alt="Duplicate" class="screenshot" src="{{docs_base_url}}/assets/img/articles/duplicate.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md b/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
index 4f8b2e9..fd57048 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
@@ -4,11 +4,11 @@
`Explore > Accounts > Company`
-<img class="screenshot" alt="Company Letter" src="/docs/assets/img/articles/report-header-1.png">
+<img class="screenshot" alt="Company Letter" src="{{docs_base_url}}/assets/img/articles/report-header-1.png">
In a Company master, if no Letter Head is set as default, then in the reports, Letter Head having Default field checked will be fetched.
-<img class="screenshot" alt="Default Letter Head" src="/docs/assets/img/articles/report-header-2.png">
+<img class="screenshot" alt="Default Letter Head" src="{{docs_base_url}}/assets/img/articles/report-header-2.png">
If you are managing multiple companies in a single ERPNext account, then ensure that for each Company, default Letter Head is set in the Company master.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
index 64672fa..f03bbd8 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -12,7 +12,7 @@
For an Account to be merged, click on the "Rename" option.
-<img alt="Sales Order File Attachment" class="screenshot" src="/docs/assets/img/articles/merge-docs-1.png">
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-1.png">
#### Step 3: Merge Account
@@ -20,7 +20,7 @@
Following is how the merged account will appear in the Chart of Accounts master.
-<img alt="Sales Order File Attachment" class="screenshot" src="/docs/assets/img/articles/merge-docs-2.gif">
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-2.gif">
###Effect of Merging
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md b/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md
index b8e13ad..839e820 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md
@@ -4,7 +4,7 @@
Using POS View, you can only create Sales Invoice, without switching to standard form view. For other transactions, like Sales Order, Delivery Note, Purchase Order, Purchase Receipt etc., POS View is only used for Item selection. For entering other values in the transaction, you should switch to form view.
-<img alt="POS View" class="screenshot" src="/docs/assets/img/articles/pos-view.gif">
+<img alt="POS View" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pos-view.gif">
For creating POS Invoice, check following help video.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
index f96bcb5..23bfaa4 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
@@ -8,7 +8,7 @@
#### 2. Rename
-<img alt="Renamed Item" class="screenshot" src="/docs/assets/img/articles/rename-a-doc.gif">
+<img alt="Renamed Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-a-doc.gif">
###Effect of Renaming
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
index ec15a35..8a0a67b 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
@@ -8,20 +8,20 @@
Select field of the document based on which you wish to filter records.
-<img alt="Search Filter Field" class="screenshot" src="/docs/assets/img/articles/search-filter-field.gif">
+<img alt="Search Filter Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-field.gif">
#### Based On
With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
-<img alt="Search Filter Based On" class="screenshot" src="/docs/assets/img/articles/search-filter-based-on.gif">
+<img alt="Search Filter Based On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-based-on.gif">
#### Value
A value should be entered in this field based on while records will be filtered. After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
-<img alt="Search Filter Based On" class="screenshot" src="/docs/assets/img/articles/search-filter-result.png">
+<img alt="Search Filter Based On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-result.png">
You can apply multiple filters at a time. To remove specific filter, just click on cancelled (X) sign ahead of it.
@@ -30,6 +30,6 @@
From the list views, you can also apply filters by clicking on the Status field.
-<img alt="Renamed Item" class="screenshot" src="/docs/assets/img/articles/search-filter-auto.gif">
+<img alt="Renamed Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-auto.gif">
<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
index 53b8864..a68f483 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
@@ -12,12 +12,12 @@
When click on the Account, you will find Rename option.
-<img alt="Account" class="screenshot" src="/docs/assets/img/articles/rename-account.png">
+<img alt="Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-account.png">
#### Step 2: Rename Account
On clicking Rename, you will get field to enter New Name. After entering new name for the Account, click on the "Rename" button.
-<img alt="Renamed Account" class="screenshot" src="/docs/assets/img/articles/rename-account-2.gif">
+<img alt="Renamed Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-account-2.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
index ffd0abd..6fcc34e 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/assignment.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
@@ -12,13 +12,13 @@
Assign to option is located at the footer of document. Clicking on Assignment Icon on the tool bar will fast-forward you to footer of same document.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/assign-1.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-1.png">
#### Step 2: Assign to User
In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/assign-2.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-2.png">
With assignment, you can also leave a comment for the review of assignee.
@@ -26,13 +26,13 @@
This transaction will appear in the To-do list of the user in “Todo” section.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/assign-3.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-3.png">
####Removing Assignment
User will be able to remove assignment by clicking on "Assignment Completed" button in the document.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/assign-4.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-4.png">
Once assignment is set as completed, the Status of its ToDo record will be set as Closed.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
index bf0412b..9003c8e 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/calendar.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
@@ -4,7 +4,7 @@
You can switch calendar view based on Month, Week and Day.
-<img class="screenshot" alt="Calendar" src="/docs/assets/img/collaboration-tools/calendar-1.png">
+<img class="screenshot" alt="Calendar" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-1.png">
### Creating Events in Calendar
@@ -14,7 +14,7 @@
This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time.
-<img class="screenshot" alt="Calendar" src="/docs/assets/img/collaboration-tools/calendar-2.gif">
+<img class="screenshot" alt="Calendar" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-2.gif">
Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it.
@@ -22,7 +22,7 @@
In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person specified in this field.
-<img class="screenshot" alt="Lead Event" src="/docs/assets/img/collaboration-tools/calendar-3.png">
+<img class="screenshot" alt="Lead Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-3.png">
#### Birthday Event
@@ -33,7 +33,7 @@
You can set events as recurring in specific interval by Checking the "Repeat This
Event".
-<img class="screenshot" alt="Calendar Recurring Event" src="/docs/assets/img/collaboration-tools/calendar-4.png">
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-4.png">
### Event Reminders
@@ -43,7 +43,7 @@
In the Event master, checking "Send an email reminder in the morning" will trigger notification email to all the participants for this event.
-<img class="screenshot" alt="Calendar Recurring Event" src="/docs/assets/img/collaboration-tools/calendar-6.png">
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-6.png">
#### Create Email Digest
@@ -53,6 +53,6 @@
`Setup > Email > Email Digest`
-<img class="screenshot" alt="Calendar Recurring Event" src="/docs/assets/img/collaboration-tools/calender-email-digest.png">
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calender-email-digest.png">
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/chat.md b/erpnext/docs/user/manual/en/using-erpnext/chat.md
index 867c4b4..4c92a20 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/chat.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/chat.md
@@ -7,10 +7,10 @@
If you send a message to a user, and the user is logged in, it will appear as a popup message and the unread messages counter in the top toolbar will be
updated.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/chat-1.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/chat-1.png">
You can choose to send message to all the users, or to specific user.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/chat-2.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/chat-2.png">
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
index b0cf945..b143dff 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
@@ -11,13 +11,13 @@
Comments are a great way to add information about a transaction that is not a
part of the transactions. Like some background information etc.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/comments-1.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/comments-1.png">
###Share
You can share document with the specific User. If Document is shared with the specific User, he/she will be able to access it, even if that User doesn't have permission to access that document or Document Type.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/share-1.gif">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/share-1.gif">
### Tags
diff --git a/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md
index 75c4e6d..bbcdc55 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md
@@ -6,16 +6,16 @@
Document Versioning can be enabled for one Document Type as a time. Let's assume that we need to enable it from Purchase Order. Then, we will check Customize Form tool for Purchase Order and check field `Track Changes`. With this, document versioning will be enabled for all the Purchase Orders create and edited hence forth.
-<img class="screenshot" alt="Enable Versioning" src="/docs/assets/img/collaboration-tools/enable-versioning.png">
+<img class="screenshot" alt="Enable Versioning" src="{{docs_base_url}}/assets/img/collaboration-tools/enable-versioning.png">
####Version Log
Following is link of version in a Purchase Order form. Each time a document is edited, a version's link will be added in that document. To check more details on specific version, click on it's link.
-<img class="screenshot" alt="Version Links" src="/docs/assets/img/collaboration-tools/version-links.png">
+<img class="screenshot" alt="Version Links" src="{{docs_base_url}}/assets/img/collaboration-tools/version-links.png">
####Version Details
In the Version document, you will find log of all the fields and values changes in it.
-<img class="screenshot" alt="Version Details" src="/docs/assets/img/collaboration-tools/version-details.png">
\ No newline at end of file
+<img class="screenshot" alt="Version Details" src="{{docs_base_url}}/assets/img/collaboration-tools/version-details.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/notes.md b/erpnext/docs/user/manual/en/using-erpnext/notes.md
index 91c1689..1a18b9b 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/notes.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/notes.md
@@ -8,12 +8,12 @@
Enter Title and Context.
-<img class="screenshot" alt="Note New" src="/docs/assets/img/collaboration-tools/note-1.png">
+<img class="screenshot" alt="Note New" src="{{docs_base_url}}/assets/img/collaboration-tools/note-1.png">
####Set Permissions to select Users
To make Note accessible for all, check "Public" under links section. Else you can share it with the specific User by using Share feature.
-<img class="screenshot" alt="Note New" src="/docs/assets/img/collaboration-tools/share-1.gif">
+<img class="screenshot" alt="Note New" src="{{docs_base_url}}/assets/img/collaboration-tools/share-1.gif">
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md
index eba61bb..2c60d35 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md
@@ -2,7 +2,7 @@
In ERPNext, you can delete a records if not needed. They can be masters like Items, Customer or transactions like Sales Order, Payment Entries etc.
-<img class="screenshot" alt="Delete a Docuemnt" src="/docs/assets/img/collaboration-tools/delete-a-doc.png">
+<img class="screenshot" alt="Delete a Docuemnt" src="{{docs_base_url}}/assets/img/collaboration-tools/delete-a-doc.png">
If you have deleted an entry by mistake and wish to restore it back into your ERPNext account.
@@ -14,18 +14,18 @@
For the list of deleted document, just type Deleted Document in the Search Bar and go to list.
-<img class="screenshot" alt="Deleted Docs List" src="/docs/assets/img/collaboration-tools/deleted-docs-list.gif">
+<img class="screenshot" alt="Deleted Docs List" src="{{docs_base_url}}/assets/img/collaboration-tools/deleted-docs-list.gif">
####Step 2: Open Doc and Restore
Open the document to be restored from the list. Click on Restore button.
-<img class="screenshot" alt="Restored Doc" src="/docs/assets/img/collaboration-tools/restore-a-doc.png">
+<img class="screenshot" alt="Restored Doc" src="{{docs_base_url}}/assets/img/collaboration-tools/restore-a-doc.png">
####Step 3: Restored
Once a document is restored, you will be able to use it for creating entries in your ERPNext account.
-<img class="screenshot" alt="Restored Doc" src="/docs/assets/img/collaboration-tools/restored-doc.png">
+<img class="screenshot" alt="Restored Doc" src="{{docs_base_url}}/assets/img/collaboration-tools/restored-doc.png">
> If canceled document is deleted, then it will not be restored.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/tags.md b/erpnext/docs/user/manual/en/using-erpnext/tags.md
index 99a6aac..547ef7d 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/tags.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/tags.md
@@ -2,10 +2,10 @@
Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/tags-1.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/tags-1.png">
ERPNext will also show you all the important tags in the document list.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/tags-2.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/tags-2.png">
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/to-do.md b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
index c6cd280..e1d4da5 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/to-do.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
@@ -2,10 +2,10 @@
To Do is a simple tool where all the activities [assigned](/docs/user/manual/en/using-erpnext/assignments.html) to you and assigned by you are listed. You can also add your own to-do items in the list.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/assign-3.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-3.png">
When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo master itself.
-<img class="screenshot" alt="Assign" src="/docs/assets/img/collaboration-tools/assign-4.png">
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-4.png">
{next}
diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
index e148919..bb5106f 100644
--- a/erpnext/docs/user/manual/en/website/add-products-to-website.md
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md
@@ -13,14 +13,14 @@
For this example, click on the **New** button to create a new item. Fill in the form and then click **Save**.
-
+
#### Step 2: Save Image
1. Click the new item from the list to edit it.
1. In the upper left, click the image block to give the product a picture. Be sure to uncheck the **Private** box so the image will be publicly viewable.
-
+
#### Step 3: Check the 'Show in Website' box
@@ -28,17 +28,17 @@
* Give the page a route on the website.
-
+
#### Step 4: Enter Website Details
Once the `Show in Website` checkbox is checked, a new section called **Website Specifications** appears. Expand this section to add more details about the rocking chair to the website.
-
+
Click **Save** in the upper right and then click `See on Website` on the left under the product image to see the item on your website.
-
+
### Item Groups
@@ -49,17 +49,17 @@
* Fill in a description for your products page.
* Click **Save**.
-
+
* Go back to the rocking chair item, expand the **website** section.
* Click **Add new row** button under the `Item Group` table.
* Select `Products` from the list.
* Click **Save**.
-
+
To see on the website, go back to the `Item Group` and then click **See on website**.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
index 33793e2..b2250e0 100644
--- a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
@@ -2,7 +2,7 @@
Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
-<img class="screenshot" alt="Website User Signup" src="/docs/assets/img/website/website-login.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
diff --git a/erpnext/docs/user/manual/en/website/articles/website-banner.md b/erpnext/docs/user/manual/en/website/articles/website-banner.md
index 514e23e..a16f776 100644
--- a/erpnext/docs/user/manual/en/website/articles/website-banner.md
+++ b/erpnext/docs/user/manual/en/website/articles/website-banner.md
@@ -6,4 +6,4 @@
For the exact steps on how to upload a Website Banner and resize it, please refer to the help given below.
-<img class="screenshot" alt="Website Banner image" src="/docs/assets/img/articles/brand-logo.gif">
\ No newline at end of file
+<img class="screenshot" alt="Website Banner image" src="{{docs_base_url}}/assets/img/articles/brand-logo.gif">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/website-home-page.md b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
index 92bcc77..d44a31a 100644
--- a/erpnext/docs/user/manual/en/website/articles/website-home-page.md
+++ b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
@@ -18,7 +18,7 @@
Enter the same value you entered for the `route` field in the previous section to the `Home Page` field. ERPNext will set this route to be the same as /index for your page.
-
+
#### **Step 4: Save Website Settings Form.**
diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.md b/erpnext/docs/user/manual/en/website/articles/website-security.md
index eb4223f..ef7986a 100644
--- a/erpnext/docs/user/manual/en/website/articles/website-security.md
+++ b/erpnext/docs/user/manual/en/website/articles/website-security.md
@@ -4,8 +4,8 @@
Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to `Selling > Items and Pricing > Item` and in the Item form check the `show in website` checkbox.
-<img src="/docs/assets/img/articles/item-show-on-website-checkbox.png">
+<img src="{{docs_base_url}}/assets/img/articles/item-show-on-website-checkbox.png">
Once the check box has been checked, then more details will appear that you can fill in for the details of the product as to be shown on the website.
-<img src="/docs/assets/img/articles/item-show-on-website-checkbox-checked.png">
\ No newline at end of file
+<img src="{{docs_base_url}}/assets/img/articles/item-show-on-website-checkbox-checked.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/blog-post.md b/erpnext/docs/user/manual/en/website/blog-post.md
index e6f7960..2b270e2 100644
--- a/erpnext/docs/user/manual/en/website/blog-post.md
+++ b/erpnext/docs/user/manual/en/website/blog-post.md
@@ -10,13 +10,13 @@
> Website > Blog > New Blog
-<img class="screenshot" alt="Blog Post" src="/docs/assets/img/website/blog-post.png">
+<img class="screenshot" alt="Blog Post" src="{{docs_base_url}}/assets/img/website/blog-post.png">
You can format a blog using the Markdown format.You can also access your blog
by going to the page “blog.html”.
#### A sample blog-page.
-<img class="screenshot" alt="Blog Sample" src="/docs/assets/img/website/blog-sample.png">
+<img class="screenshot" alt="Blog Sample" src="{{docs_base_url}}/assets/img/website/blog-sample.png">
{next}
diff --git a/erpnext/docs/user/manual/en/website/blogger.md b/erpnext/docs/user/manual/en/website/blogger.md
index a47bdee..469ada1 100644
--- a/erpnext/docs/user/manual/en/website/blogger.md
+++ b/erpnext/docs/user/manual/en/website/blogger.md
@@ -3,6 +3,6 @@
Blogger is a user who can post blogs.
You can mention a short bio about the blogger and also set a avatar here.
-<img class="screenshot" alt="Blogger" src="/docs/assets/img/website/blogger.png">
+<img class="screenshot" alt="Blogger" src="{{docs_base_url}}/assets/img/website/blogger.png">
{next}
diff --git a/erpnext/docs/user/manual/en/website/setup/website-settings.md b/erpnext/docs/user/manual/en/website/setup/website-settings.md
index 6d5ad23..75f9872 100644
--- a/erpnext/docs/user/manual/en/website/setup/website-settings.md
+++ b/erpnext/docs/user/manual/en/website/setup/website-settings.md
@@ -2,7 +2,7 @@
Most of the website related settings can be defined here.
-<img class="screenshot" alt="Website Settings" src="/docs/assets/img/website/website-settings.png">
+<img class="screenshot" alt="Website Settings" src="{{docs_base_url}}/assets/img/website/website-settings.png">
####Landing Page
@@ -16,7 +16,7 @@
Select the theme for the website. You can create new Theme for you website also.
-<img class="screenshot" alt="Website Theme" src="/docs/assets/img/website/website-theme.png">
+<img class="screenshot" alt="Website Theme" src="{{docs_base_url}}/assets/img/website/website-theme.png">
* Select 'create new website theme' if you wish to customize the default website theme.
@@ -25,13 +25,13 @@
You can add a banner/ logo to your website here. Attach the image and click on set banner from Image.
An HTML code will be generated by the system under Banner HTML.
-<img class="screenshot" alt="Banner" src="/docs/assets/img/website/banner.png">
+<img class="screenshot" alt="Banner" src="{{docs_base_url}}/assets/img/website/banner.png">
####Top Bar
You can set the menus items in the Top Bar here.
-<img class="screenshot" alt="Top Bar" src="/docs/assets/img/website/top-bar.png">
+<img class="screenshot" alt="Top Bar" src="{{docs_base_url}}/assets/img/website/top-bar.png">
* Similarlly you can also set sidebar and footer links.
@@ -39,7 +39,7 @@
You can integrate the website using Google Analytics and enable social media sharing for post shared on the website.
-<img class="screenshot" alt="Integrations" src="/docs/assets/img/website/integrations.png">
+<img class="screenshot" alt="Integrations" src="{{docs_base_url}}/assets/img/website/integrations.png">
* You can disable public signup to your ERPNext account by checking 'disable signup'
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 8fe5244..26284f5 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -16,7 +16,7 @@
#### Enter Company Details and Checkout Details.
-<img class="screenshot" alt="Shopping Cart Settings" src="/docs/assets/img/website/item-website-specs.png">
+<img class="screenshot" alt="Shopping Cart Settings" src="{{docs_base_url}}/assets/img/website/item-website-specs.png">
To make item available on website go to Item master.
@@ -24,11 +24,11 @@
#### Enable Item for website.
-<img class="screenshot" alt="Item" src="/docs/assets/img/website/item-in-webiste.png">
+<img class="screenshot" alt="Item" src="{{docs_base_url}}/assets/img/website/item-in-webiste.png">
#### Enter Website Specifications for Item.
-<img class="screenshot" alt="Website Specifications" src="/docs/assets/img/website/item-website-specs.png">
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/item-website-specs.png">
### Shop using Shopping Cart
@@ -37,20 +37,20 @@
Click on "Add to Cart" to add item to shopping cart.
-<img class="screenshot" alt="Website Specifications" src="/docs/assets/img/website/item-website-view.png">
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/item-website-view.png">
#### Goto Checkout
Click on "Go to Cart" to checkout or on "Cart" which is on upper right side
of the screen.
-<img class="screenshot" alt="Website Specifications" src="/docs/assets/img/website/checkout.png">
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/checkout.png">
#### Checkout
Change quantity, select Shipping and Billing Address and click
on "Place Order" to place the order.
-<img class="screenshot" alt="Website Specifications" src="/docs/assets/img/website/place-order.png">
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/place-order.png">
{next}
diff --git a/erpnext/docs/user/manual/en/website/web-form.md b/erpnext/docs/user/manual/en/website/web-form.md
index b75ef0b..1668ac0 100644
--- a/erpnext/docs/user/manual/en/website/web-form.md
+++ b/erpnext/docs/user/manual/en/website/web-form.md
@@ -17,7 +17,7 @@
1. Select if you require the user to login, edit records, manage multiple records etc.
1. Add the fields you want in the record.
-<img class="screenshot" alt="Web Form" src="/docs/assets/img/website/web-form.png">
+<img class="screenshot" alt="Web Form" src="{{docs_base_url}}/assets/img/website/web-form.png">
---
@@ -25,7 +25,7 @@
Once you create the web form, you can view it on the url and test it out!
-<img class="screenshot" alt="Web form" src="/docs/assets/img/website/web-form-view.png">
+<img class="screenshot" alt="Web form" src="{{docs_base_url}}/assets/img/website/web-form-view.png">
---
diff --git a/erpnext/docs/user/manual/en/website/web-page.md b/erpnext/docs/user/manual/en/website/web-page.md
index f931f02..5b4d46b 100644
--- a/erpnext/docs/user/manual/en/website/web-page.md
+++ b/erpnext/docs/user/manual/en/website/web-page.md
@@ -6,7 +6,7 @@
> Website > Web Page > New
-<img class="screenshot" alt="Web Page" src="/docs/assets/img/website/web-page.png">
+<img class="screenshot" alt="Web Page" src="{{docs_base_url}}/assets/img/website/web-page.png">
#### Title
diff --git a/erpnext/docs/user/manual/es/accounts/accounting-reports.md b/erpnext/docs/user/manual/es/accounts/accounting-reports.md
index a887f9a..7827e1a 100644
--- a/erpnext/docs/user/manual/es/accounts/accounting-reports.md
+++ b/erpnext/docs/user/manual/es/accounts/accounting-reports.md
@@ -14,7 +14,7 @@
periodo determinado.
<img alt="Libro Mayor" class="screenshot"
- src="/docs/assets/img/accounts/general-ledger.png">
+ src="{{docs_base_url}}/assets/img/accounts/general-ledger.png">
### Balance Contable
@@ -26,7 +26,7 @@
* Creditos
* Cierre
-<img alt="Balance Contable" class="screenshot" src="/docs/assets/img/accounts/trial-balance.png">
+<img alt="Balance Contable" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/trial-balance.png">
La suma de todos los balances de cierre en el Balance Contable debe ser igual a cero.
@@ -35,7 +35,7 @@
Este reporte permite hacer seguimiento a las facturas enviadas a los clientes y proveedores. En este
reporte, se resaltan diferentes periodos de tiempo. p.e. entre 0-30 días, 30-60 días y así por el estilo.
-<img alt="Accounts Receivable" class="screenshot" src="/docs/assets/img/accounts/accounts-receivable.png">
+<img alt="Accounts Receivable" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
### Registro de Ventas y Compras
@@ -43,7 +43,7 @@
se puede obtener la cantidad de impuestos individuales que debe ser pagados, de acuerdo a la
tabla de Impuestos y Contribuciones,
-<img alt="Sales Register" class="screenshot" src="/docs/assets/img/accounts/sales-register.png">
+<img alt="Sales Register" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/sales-register.png">
**Trabajo en progreso.**
diff --git a/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md
index e373c7b..2778f29 100644
--- a/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md
@@ -26,7 +26,7 @@
#### Figure 1 : Journal Entry -Advance Entry
-<img class="screenshot" alt="Advace Payment" src="/docs/assets/img/accounts/advance-payment-1.png">
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-1.png">
### Double Entry Accounting
@@ -43,7 +43,7 @@
#### Figure 2: Transaction and Difference Entry
-<img class="screenshot" alt="Advace Payment" src="/docs/assets/img/accounts/advance-payment-2.png">
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-2.png">
Save and submit the JV. If this document is not saved it will not be pulled in
other accounting documents.
@@ -57,7 +57,7 @@
#### Figure 3: Receive Advance
-<img class="screenshot" alt="Advace Payment" src="/docs/assets/img/accounts/advance-payment-3.png">
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-3.png">
Save and submit the Sales Invoice.
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md
index 31e710a..25d85c4 100644
--- a/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_criteria.md
@@ -2,12 +2,12 @@
Criterios de evaluación es el parámetro basado en el que se evalúa el estudiante.
-<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/education/assessment/assessment-criteria.png">
+<img class="screenshot" alt="Assessment Criteria" src="{{docs_base_url}}/assets/img/education/assessment/assessment-criteria.png">
Después de la evaluación para un curso, las calificaciones obtenidas se ingresan en base a los criterios de evaluación. Por ejemplo, si la evaluación se llevó a cabo para el tema de la ciencia, entonces usted puede evaluar al estudiante en ciencia en varios criterios como la escritura, prácticas, presentación, etc
Los Criterios de Evaluación se usan al programar el Plan de Evaluación para el Grupo de Estudiantes y el Curso.
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
+<img class="screenshot" alt="Assessment Plan Criteria" src="{{docs_base_url}}/assets/img/education/assessment/assessment-plan-criteria.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md
index aaabda1..ce37fe0 100644
--- a/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_group.md
@@ -4,10 +4,10 @@
Por ejemplo, si realiza dos evaluaciones en un año académico, configure el Grupo de evaluación de la siguiente manera.
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-term.png">
+<img class="screenshot" alt="Assessment Group Term" src="{{docs_base_url}}/assets/img/education/assessment/assessment-group-term.png">
En la misma línea, también puede definir varios Grupo de Evaluación basado sobre la evaluación llevada a cabo en su instituto.
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-details.png">
+<img class="screenshot" alt="Assessment Group Term" src="{{docs_base_url}}/assets/img/education/assessment/assessment-group-details.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md
index 5661892..eab8b00 100644
--- a/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_plan.md
@@ -10,10 +10,10 @@
4. Examinador y Supervisor
-<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/education/assessment/assessment-plan-details.png">
+<img class="screenshot" alt="Assessment Plan Details" src="{{docs_base_url}}/assets/img/education/assessment/assessment-plan-details.png">
5. Los Criterios de Evaluación son la lista de criterios basados en que cada estudiante en será evaluado y los grados serán asignados.
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
+<img class="screenshot" alt="Assessment Plan Criteria" src="{{docs_base_url}}/assets/img/education/assessment/assessment-plan-criteria.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md
index 67a6f9a..14bf16a 100644
--- a/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_result.md
@@ -2,6 +2,6 @@
El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/education/assessment/assessment_result_tool.html).
-<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/education/assessment/assessment-result.png">
+<img class="screenshot" alt="Assessment Result" src="{{docs_base_url}}/assets/img/education/assessment/assessment-result.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md
index a6a44e5..b05be7e 100644
--- a/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md
+++ b/erpnext/docs/user/manual/es/education/Assessment/assessment_result_tool.md
@@ -3,7 +3,7 @@
Herramienta de resultados de evaluación le ayuda a ingresar las calificaciones obtenidas por los estudiantes para un curso específico. En esta herramienta, basada en el plan de evaluación, todos los estudiantes van a ser filtrados dentro de la herramienta de resultados de la evaluación. También, Columnas para los Criterios de Evaluación serán donde las calificaciones ganadas pueden ser ingresadas para cada Estudiante.
-<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/education/assessment/assessment-result-tool.png">
+<img class="screenshot" alt="Assessment Result Tool" src="{{docs_base_url}}/assets/img/education/assessment/assessment-result-tool.png">
A medida que vaya introduciendo las notas para un Estudiante y cambie al siguiente alumno, en el backend, el registro de Resultados del Estudiante se creará automáticamente para ese Estudiante.
diff --git a/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md b/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md
index bf362b4..ebd1069 100644
--- a/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md
+++ b/erpnext/docs/user/manual/es/education/Assessment/grading_scale.md
@@ -2,6 +2,6 @@
En la escala de calificación, puedes definir varios grados y límites para los estudiantes. Basado en la calificación obtenida por el estudiante en la evaluación, el grado (Grade) será asignado.
-<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/education/assessment/grading-scale.png">
+<img class="screenshot" alt="Grading Scale" src="{{docs_base_url}}/assets/img/education/assessment/grading-scale.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/admission/program-enrollment.md b/erpnext/docs/user/manual/es/education/admission/program-enrollment.md
index 6a24284..f55a577 100644
--- a/erpnext/docs/user/manual/es/education/admission/program-enrollment.md
+++ b/erpnext/docs/user/manual/es/education/admission/program-enrollment.md
@@ -2,6 +2,6 @@
Este formulario te permite inscribir un estudiante a un programa. Un estudiante puede ser inscrito en multiples programas.
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment.png">
+<img class="screenshot" alt="Student Applicant Enrollment" src="{{docs_base_url}}/assets/img/education/admission/program-enrollment.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/admission/student-applicant.md b/erpnext/docs/user/manual/es/education/admission/student-applicant.md
index 4d8723c..b50e69c 100644
--- a/erpnext/docs/user/manual/es/education/admission/student-applicant.md
+++ b/erpnext/docs/user/manual/es/education/admission/student-applicant.md
@@ -3,7 +3,7 @@
Un registro de Aplicación de Estudiante necesita ser creado cuando un estudiante aplica para un programa en su institución.
Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicación de un estudiante puedes agregarlos al master de estudiantes.
-<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-applicant.png">
+<img class="screenshot" alt="Student Applicant" src="{{docs_base_url}}/assets/img/education/admission/student-applicant.png">
### Estados de la Aplicación
@@ -23,6 +23,6 @@
Una vez aprobada una Aplicación de Estudiante, puedes inscribirlo a un programa. Cuando le das click al butón 'Inscribir',
el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/education/student/program-enrollment.html).
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-applicant-enroll.png">
+<img class="screenshot" alt="Student Applicant Enrollment" src="{{docs_base_url}}/assets/img/education/admission/student-applicant-enroll.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/fees/fee-category.md b/erpnext/docs/user/manual/es/education/fees/fee-category.md
index a38ba7e..bd62a0c 100644
--- a/erpnext/docs/user/manual/es/education/fees/fee-category.md
+++ b/erpnext/docs/user/manual/es/education/fees/fee-category.md
@@ -2,6 +2,6 @@
Todos los tipos diferentes de cuotas que se cobran
-<img class="screenshot" alt="Fees Category" src="/docs/assets/img/education/fees/fee-category.png">
+<img class="screenshot" alt="Fees Category" src="{{docs_base_url}}/assets/img/education/fees/fee-category.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/fees/fee-structure.md b/erpnext/docs/user/manual/es/education/fees/fee-structure.md
index 6fe6af9..0fa187e 100644
--- a/erpnext/docs/user/manual/es/education/fees/fee-structure.md
+++ b/erpnext/docs/user/manual/es/education/fees/fee-structure.md
@@ -2,6 +2,6 @@
Una Estructura de Cuota es una plantilla que puede ser usada cuando se hacen registros de cuotas.
-<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/education/fees/fee-structure.png">
+<img class="screenshot" alt="Fees Structure" src="{{docs_base_url}}/assets/img/education/fees/fee-structure.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/fees/fees.md b/erpnext/docs/user/manual/es/education/fees/fees.md
index 5f6eee4..bfbd48e 100644
--- a/erpnext/docs/user/manual/es/education/fees/fees.md
+++ b/erpnext/docs/user/manual/es/education/fees/fees.md
@@ -3,6 +3,6 @@
Mantiene un registro de todas las cuotas recolectadas de los estudiantes.
La [Estructura de Cuota](/docs/user/manual/es/education/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos.
-<img class="screenshot" alt="Fees" src="/docs/assets/img/education/fees/fees.png">
+<img class="screenshot" alt="Fees" src="{{docs_base_url}}/assets/img/education/fees/fees.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/fees/index.md b/erpnext/docs/user/manual/es/education/fees/index.md
index c1b5bb5..a183fdc 100644
--- a/erpnext/docs/user/manual/es/education/fees/index.md
+++ b/erpnext/docs/user/manual/es/education/fees/index.md
@@ -2,7 +2,7 @@
Esta sección contiene todos los documentos relacionado a las 'Cuota'
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/fees/fees-section.png">
+<img class="screenshot" alt="Fees Section" src="{{docs_base_url}}/assets/img/education/fees/fees-section.png">
### Temas
diff --git a/erpnext/docs/user/manual/es/education/index.md b/erpnext/docs/user/manual/es/education/index.md
index feca830..c95004e 100644
--- a/erpnext/docs/user/manual/es/education/index.md
+++ b/erpnext/docs/user/manual/es/education/index.md
@@ -3,6 +3,6 @@
Los módulos de School estan diseñados para satisfacer los requerimientos de Escuelas, Colegios e Institutos Educacionales.
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/module.png">
+<img class="screenshot" alt="Fees Section" src="{{docs_base_url}}/assets/img/education/module.png">
{index}
diff --git a/erpnext/docs/user/manual/es/education/schedule/course-schedule.md b/erpnext/docs/user/manual/es/education/schedule/course-schedule.md
index 7bf40ff..014728b 100644
--- a/erpnext/docs/user/manual/es/education/schedule/course-schedule.md
+++ b/erpnext/docs/user/manual/es/education/schedule/course-schedule.md
@@ -3,13 +3,13 @@
El Horario de Curso es el horario de una sesión de un profesor para un Curso en particular.
Puedes ver un resumen del horario del curso en la vista de Calendario.
-<img class="screenshot" alt="Course Schedule" src="/docs/assets/img/education/schedule/course-schedule.png">
+<img class="screenshot" alt="Course Schedule" src="{{docs_base_url}}/assets/img/education/schedule/course-schedule.png">
### Marcando asistencia
Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Curso.
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att.png">
+<img class="screenshot" alt="Course Schedule Attendance" src="{{docs_base_url}}/assets/img/education/schedule/course-schedule-att.png">
- Para hacer la asistencia, expandir la sección de asistencia.
- Selecciona los estudiantes que estaban presentes para esa sesión.
@@ -20,6 +20,6 @@
Una vez hayas marcado la asistencia usando la sección de asistencia en el Horario de un Curso, esta sección debería estar oculta.
Un botón de Ver Asistencia debería aparecer. Click en el botón para ver todos los registros de asistencia creados para ese Horario de Curso.
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att-1.png">
+<img class="screenshot" alt="Course Schedule Attendance" src="{{docs_base_url}}/assets/img/education/schedule/course-schedule-att-1.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/schedule/examination.md b/erpnext/docs/user/manual/es/education/schedule/examination.md
index b8cef3e..9f614b7 100644
--- a/erpnext/docs/user/manual/es/education/schedule/examination.md
+++ b/erpnext/docs/user/manual/es/education/schedule/examination.md
@@ -2,7 +2,7 @@
El registro de examinación puede ser usado para hacer el seguimiento del horario de los examenes y los resultados de los mismos.
-<img class="screenshot" alt="Examination" src="/docs/assets/img/education/schedule/examination.png">
+<img class="screenshot" alt="Examination" src="{{docs_base_url}}/assets/img/education/schedule/examination.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/schedule/index.md b/erpnext/docs/user/manual/es/education/schedule/index.md
index 016aa10..c077ed9 100644
--- a/erpnext/docs/user/manual/es/education/schedule/index.md
+++ b/erpnext/docs/user/manual/es/education/schedule/index.md
@@ -1,6 +1,6 @@
# Horario
-<img class="screenshot" alt="Schedule Section" src="/docs/assets/img/education/schedule/schedule-section.png">
+<img class="screenshot" alt="Schedule Section" src="{{docs_base_url}}/assets/img/education/schedule/schedule-section.png">
### Temas
diff --git a/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md b/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md
index 55ff425..752ad1a 100644
--- a/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md
+++ b/erpnext/docs/user/manual/es/education/schedule/scheduling-tool.md
@@ -2,7 +2,7 @@
Esta herramienta puede ser usada para crear los Horarios de los Cursos.
-<img class="screenshot" alt="Scheduling Tool" src="/docs/assets/img/education/schedule/scheduling-tool.png">
+<img class="screenshot" alt="Scheduling Tool" src="{{docs_base_url}}/assets/img/education/schedule/scheduling-tool.png">
### Creando Horarios de Cursos
diff --git a/erpnext/docs/user/manual/es/education/schedule/student-attendance.md b/erpnext/docs/user/manual/es/education/schedule/student-attendance.md
index 53bd4e9..1ae7555 100644
--- a/erpnext/docs/user/manual/es/education/schedule/student-attendance.md
+++ b/erpnext/docs/user/manual/es/education/schedule/student-attendance.md
@@ -2,6 +2,6 @@
Mantiene los registros de la asistencia del estudiante. Los registros de asistencia pueden ser creados sobre los horarios de los cursos (Course Schedules).
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-attendance.png">
+<img class="screenshot" alt="Student Attendance" src="{{docs_base_url}}/assets/img/education/schedule/student-attendance.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/academic-term.md b/erpnext/docs/user/manual/es/education/setup/academic-term.md
index 7a6b405..5938e59 100644
--- a/erpnext/docs/user/manual/es/education/setup/academic-term.md
+++ b/erpnext/docs/user/manual/es/education/setup/academic-term.md
@@ -1,6 +1,6 @@
# Término Académico
-<img class="screenshot" alt="Academic Term" src="/docs/assets/img/education/setup/academic-term.png">
+<img class="screenshot" alt="Academic Term" src="{{docs_base_url}}/assets/img/education/setup/academic-term.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/academic-year.md b/erpnext/docs/user/manual/es/education/setup/academic-year.md
index 7fe2a8f..2dfa7a4 100644
--- a/erpnext/docs/user/manual/es/education/setup/academic-year.md
+++ b/erpnext/docs/user/manual/es/education/setup/academic-year.md
@@ -1,5 +1,5 @@
# Año Académico
-<img class="screenshot" alt="Academic Year" src="/docs/assets/img/education/setup/academic-year.png">
+<img class="screenshot" alt="Academic Year" src="{{docs_base_url}}/assets/img/education/setup/academic-year.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/course.md b/erpnext/docs/user/manual/es/education/setup/course.md
index fbbce62..25fbf1b 100644
--- a/erpnext/docs/user/manual/es/education/setup/course.md
+++ b/erpnext/docs/user/manual/es/education/setup/course.md
@@ -1,5 +1,5 @@
# Curso
-<img class="screenshot" alt="Course" src="/docs/assets/img/education/setup/course.png">
+<img class="screenshot" alt="Course" src="{{docs_base_url}}/assets/img/education/setup/course.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/index.md b/erpnext/docs/user/manual/es/education/setup/index.md
index 59df995..f23f754 100644
--- a/erpnext/docs/user/manual/es/education/setup/index.md
+++ b/erpnext/docs/user/manual/es/education/setup/index.md
@@ -1,6 +1,6 @@
# Configuración
-<img class="screenshot" alt="Setup Section" src="/docs/assets/img/education/setup/setup-section.png">
+<img class="screenshot" alt="Setup Section" src="{{docs_base_url}}/assets/img/education/setup/setup-section.png">
### Temas
diff --git a/erpnext/docs/user/manual/es/education/setup/instructor.md b/erpnext/docs/user/manual/es/education/setup/instructor.md
index 4812c15..b92141f 100644
--- a/erpnext/docs/user/manual/es/education/setup/instructor.md
+++ b/erpnext/docs/user/manual/es/education/setup/instructor.md
@@ -1,5 +1,5 @@
# Instructor
-<img class="screenshot" alt="Instructor" src="/docs/assets/img/education/setup/instructor.png">
+<img class="screenshot" alt="Instructor" src="{{docs_base_url}}/assets/img/education/setup/instructor.png">
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/es/education/setup/program.md b/erpnext/docs/user/manual/es/education/setup/program.md
index 1236057..4c4725c 100644
--- a/erpnext/docs/user/manual/es/education/setup/program.md
+++ b/erpnext/docs/user/manual/es/education/setup/program.md
@@ -1,5 +1,5 @@
# Programa
-<img class="screenshot" alt="Program" src="/docs/assets/img/education/setup/program.png">
+<img class="screenshot" alt="Program" src="{{docs_base_url}}/assets/img/education/setup/program.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/setup/room.md b/erpnext/docs/user/manual/es/education/setup/room.md
index 7750dcf..23667b1 100644
--- a/erpnext/docs/user/manual/es/education/setup/room.md
+++ b/erpnext/docs/user/manual/es/education/setup/room.md
@@ -1,6 +1,6 @@
# Aula
-<img class="screenshot" alt="Room" src="/docs/assets/img/education/setup/room.png">
+<img class="screenshot" alt="Room" src="{{docs_base_url}}/assets/img/education/setup/room.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student-batch.md b/erpnext/docs/user/manual/es/education/student/student-batch.md
index bb7c9d5..7ff67b9 100644
--- a/erpnext/docs/user/manual/es/education/student/student-batch.md
+++ b/erpnext/docs/user/manual/es/education/student/student-batch.md
@@ -3,6 +3,6 @@
Un lote de estudiantes es una colección de estudiantes desde los Grupos de Estudiantes.
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-batch.png">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/student-batch.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md b/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md
index 942fadf..c894102 100644
--- a/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md
+++ b/erpnext/docs/user/manual/es/education/student/student-group-creation-tool.md
@@ -3,6 +3,6 @@
Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos.
-<img class="screenshot" alt="Student Group Creation Tool" src="/docs/assets/img/education/student/student-group-creation-tool.png">
+<img class="screenshot" alt="Student Group Creation Tool" src="{{docs_base_url}}/assets/img/education/student/student-group-creation-tool.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student-group.md b/erpnext/docs/user/manual/es/education/student/student-group.md
index 59dfcbc..d8f3955 100644
--- a/erpnext/docs/user/manual/es/education/student/student-group.md
+++ b/erpnext/docs/user/manual/es/education/student/student-group.md
@@ -3,6 +3,6 @@
Un Grupo de Estudiante es una colección de estudiantes tomando el mismo curso. Puedes crear calendarios para los cursos y examinaciones para un Grupo de Estudiante.
Un Grupo de Estudiante necesita ser creado para cada curso en un año o término académico en particular.
-<img class="screenshot" alt="Student Group" src="/docs/assets/img/education/student/student-group.png">
+<img class="screenshot" alt="Student Group" src="{{docs_base_url}}/assets/img/education/student/student-group.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student-log.md b/erpnext/docs/user/manual/es/education/student/student-log.md
index e5a5e2c..72ccbfa 100644
--- a/erpnext/docs/user/manual/es/education/student/student-log.md
+++ b/erpnext/docs/user/manual/es/education/student/student-log.md
@@ -3,6 +3,6 @@
Puedes crear una nota de una actividad de un estudiante usando la bitácora de estudiante (log)
Los registros de bitágora pueden ser categorizadas como 'General', 'Academic', 'Medical' or 'Achievement'
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student-log.png">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/student-log.png">
{next}
diff --git a/erpnext/docs/user/manual/es/education/student/student.md b/erpnext/docs/user/manual/es/education/student/student.md
index 21724a7..cbf437d 100644
--- a/erpnext/docs/user/manual/es/education/student/student.md
+++ b/erpnext/docs/user/manual/es/education/student/student.md
@@ -5,6 +5,6 @@
Puedes ver todo lo relacionado a un estudiante en particular en esta página. Ejemplo: Pagos, Grupo de Estudiante, etc.
-<img class="screenshot" alt="Student" src="/docs/assets/img/education/student/student.png">
+<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/student.png">
{next}
diff --git a/erpnext/docs/user/manual/es/introduction/key-workflows.md b/erpnext/docs/user/manual/es/introduction/key-workflows.md
index 6877fb3..cb06638 100644
--- a/erpnext/docs/user/manual/es/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/es/introduction/key-workflows.md
@@ -6,7 +6,7 @@
-<img class="screenshot" alt="Workflow" src="/docs/assets/img/setup/overview.png">
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/overview.png">
_Nota: No todos los pasos son obligatorios. ERPNext te permite pasar algunos pasos si deseas simplificar el proceso._
diff --git a/erpnext/docs/user/manual/es/introduction/the-champion.md b/erpnext/docs/user/manual/es/introduction/the-champion.md
index 0d2106e..5978078 100644
--- a/erpnext/docs/user/manual/es/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/es/introduction/the-champion.md
@@ -4,7 +4,7 @@
<h1 class="white">El campeón</h1>
-<img alt="Champion" class="screenshot" src="/docs/assets/img/setup/implementation-image.png">
+<img alt="Champion" class="screenshot" src="{{docs_base_url}}/assets/img/setup/implementation-image.png">
Hemos visto docenas de implementaciones de sistemas ERP en los últimos años
y nos hemos dado cuenta que una implementación exitosa es más sobre cosas intangibles y actitudes.
diff --git a/erpnext/docs/user/manual/es/projects/activity-cost.md b/erpnext/docs/user/manual/es/projects/activity-cost.md
index 71eb15e..8738175 100644
--- a/erpnext/docs/user/manual/es/projects/activity-cost.md
+++ b/erpnext/docs/user/manual/es/projects/activity-cost.md
@@ -3,4 +3,4 @@
El costo de la actividad registra la tasa de facturación por hora y la tasa de costos de un empleado en comparación con un tipo de actividad.
El sistema hace uso de esta tasa mientras hace registros de tiempo. Se usa para Costeo de proyectos.
-<img class="screenshot" alt="Activity Cost" src="/docs/assets/img/project/activity_cost.png">
+<img class="screenshot" alt="Activity Cost" src="{{docs_base_url}}/assets/img/project/activity_cost.png">
diff --git a/erpnext/docs/user/manual/es/projects/activity-type.md b/erpnext/docs/user/manual/es/projects/activity-type.md
index 20a03e2..9e0c777 100644
--- a/erpnext/docs/user/manual/es/projects/activity-type.md
+++ b/erpnext/docs/user/manual/es/projects/activity-type.md
@@ -2,7 +2,7 @@
Los tipos de actividad son la lista de los diferentes tipos de actividades sobre las que se hacen registro de tiempo.
-<img class="screenshot" alt="Activity Type" src="/docs/assets/img/project/activity_type.png">
+<img class="screenshot" alt="Activity Type" src="{{docs_base_url}}/assets/img/project/activity_type.png">
Por defecto, los siguientes tipos de actividades son creados.
diff --git a/erpnext/docs/user/manual/es/projects/articles/project-costing.md b/erpnext/docs/user/manual/es/projects/articles/project-costing.md
index a8820c7..feb3f29 100644
--- a/erpnext/docs/user/manual/es/projects/articles/project-costing.md
+++ b/erpnext/docs/user/manual/es/projects/articles/project-costing.md
@@ -13,17 +13,17 @@
Costo de actividad es un maestro donde puedes hacer el seguimiento de los montos de facturación y costo de cada empleado, y por cada tipo de Tipo de Actividad.
-<img alt="Activity Cost" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png">
+<img alt="Activity Cost" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png">
#### Registro de Tiempo
Basados en el tiempo actual invertido en una Tarea del Proyecto, El empleado va a crear un registro de tiempo.
-<img alt="Time Log" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png">
+<img alt="Time Log" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png">
Al momento de seleccionar el Tipo de Actividad en el Registro de tiempo, el monto de Facturación y Costo del empleado va a ser traído de su respectivo registro en el master de Costo de Actividad.
-<img alt="Time Log Costing" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png">
+<img alt="Time Log Costing" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png">
Multiplicando esos montos con el total de número de horas en el registro de tiempo, nos da el monto de costos y Facturación para el registro de tiempo específico.
@@ -31,10 +31,10 @@
Basados en el total de registros de tiempos creados por una tarea en específico, su costo va a ser actualizado en el registro maestro de la tarea, o sea, en el detalle de la tarea.
-<img alt="Costing in Task" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png">
+<img alt="Costing in Task" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png">
De la misma manera, el detalle del Proyecto va a actualizar su costo basado en el total de registros de tiempo a ese proyecto, y las tareas asociadas a ese proyecto.
-<img alt="Costing in Project" class="screenshot" src="/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png">
+<img alt="Costing in Project" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/es/projects/project.md b/erpnext/docs/user/manual/es/projects/project.md
index 942433b..94a7c73 100644
--- a/erpnext/docs/user/manual/es/projects/project.md
+++ b/erpnext/docs/user/manual/es/projects/project.md
@@ -2,7 +2,7 @@
El manejo de proyectos en ERPNext se hace a traves de tareas. Puedes crear un proyecto y asignar varias tareas al mismo.
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/project.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project.png">
También puedes hacer el seguimiento del % completado del proyecto usando diferentes métodos.
@@ -10,35 +10,35 @@
2. Progreso de tareas
3. Peso de tarea
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/project-percent-complete.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project-percent-complete.png">
Algunos ejemplos de como el % completado es cálculado basado en tareas.
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/percent-complete-calc.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/percent-complete-calc.png">
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/percent-complete-formula.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/percent-complete-formula.png">
### Manejando tareas
Los proyecto pueden ser divididos en multiples tareas.
Las tareas pueden ser creadas a traves del documento de Proyecto o pueden ser creadas via [Tarea](/docs/user/manual/en/projects/tasks.html)
-<img class="screenshot" alt="Project" src="/docs/assets/img/project/project_task.png">
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project_task.png">
* Para ver las tareas creadas a un proyecto click en 'Tasks'
-<img class="screenshot" alt="Project - View Task" src="/docs/assets/img/project/project_view_task.png">
+<img class="screenshot" alt="Project - View Task" src="{{docs_base_url}}/assets/img/project/project_view_task.png">
-<img class="screenshot" alt="Project - Task List" src="/docs/assets/img/project/project_task_list.png">
+<img class="screenshot" alt="Project - Task List" src="{{docs_base_url}}/assets/img/project/project_task_list.png">
* También puedes ver las tareas desde la misma vista del proyecto.
-<img class="screenshot" alt="Project - Task Grid" src="/docs/assets/img/project/project_task_grid.png">
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/project_task_grid.png">
* Para agregar peso a las tareas puedes seguir los pasos siguientes
-<img class="screenshot" alt="Project - Task Grid" src="/docs/assets/img/project/tasks.png">
-<img class="screenshot" alt="Project - Task Grid" src="/docs/assets/img/project/task-weights.png">
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/tasks.png">
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/task-weights.png">
### Manejando tiempo
@@ -49,13 +49,13 @@
* Para ver los Registros de Tiempo realizados a un proyecto, dar click en 'Time Logs'
-<img class="screenshot" alt="Project - View Time Log" src="/docs/assets/img/project/project_view_time_log.png">
+<img class="screenshot" alt="Project - View Time Log" src="{{docs_base_url}}/assets/img/project/project_view_time_log.png">
-<img class="screenshot" alt="Project - Time Log List" src="/docs/assets/img/project/project_time_log_list.png">
+<img class="screenshot" alt="Project - Time Log List" src="{{docs_base_url}}/assets/img/project/project_time_log_list.png">
* Puedes agregar un registro de tiempo directamente y luego asociarlo con el proyecto.
-<img class="screenshot" alt="Project - Link Time Log" src="/docs/assets/img/project/project_time_log_link.png">
+<img class="screenshot" alt="Project - Link Time Log" src="{{docs_base_url}}/assets/img/project/project_time_log_link.png">
### Gestión de gastos
@@ -64,27 +64,27 @@
* Para ver las reclamaciones de gastos realizadas en un proyecto, haga clic en 'Reclamaciones de gastos'
-<img class="screenshot" alt="Project - View Expense Claim" src="/docs/assets/img/project/project_view_expense_claim.png">
+<img class="screenshot" alt="Project - View Expense Claim" src="{{docs_base_url}}/assets/img/project/project_view_expense_claim.png">
* También puede crear un Reclamo de gastos directamente y vincularlo al Proyecto.
-<img class="screenshot" alt="Project - Link Expense Claim" src="/docs/assets/img/project/project_expense_claim_link.png">
+<img class="screenshot" alt="Project - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
* El monto total de los Reclamos de gastos reservados contra un proyecto se muestra en 'Reclamo de gastos totales' en la Sección de Costos del proyecto
-<img class="screenshot" alt="Project - Total Expense Claim" src="/docs/assets/img/project/project_total_expense_claim.png">
+<img class="screenshot" alt="Project - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/project_total_expense_claim.png">
### Centro de Costo
Puedes crear un [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) sobre un proyecto o usar un centro de costo existente para hacer el seguimiento de todos los gastos realizados al proyecto.
-<img class="screenshot" alt="Project - Cost Center" src="/docs/assets/img/project/project_cost_center.png">
+<img class="screenshot" alt="Project - Cost Center" src="{{docs_base_url}}/assets/img/project/project_cost_center.png">
###Costeo del proyecto
La sección Costeo del proyecto le ayuda a rastrear el tiempo y los gastos incurridos en relación con el proyecto.
-<img class="screenshot" alt="Project - Costing" src="/docs/assets/img/project/project_costing.png">
+<img class="screenshot" alt="Project - Costing" src="{{docs_base_url}}/assets/img/project/project_costing.png">
* La sección de cálculo de costos se actualiza según los registros de tiempo realizados.
@@ -94,7 +94,7 @@
Puedes crear/enlazar una [Sales Order](/docs/user/manual/en/selling/sales-order.html) a un proyecto. Una vez asociada puedes usar el módulo de ventas para facturar a un cliente sobre el proyecto.
-<img class="screenshot" alt="Project - Sales Order" src="/docs/assets/img/project/project_sales_order.png">
+<img class="screenshot" alt="Project - Sales Order" src="{{docs_base_url}}/assets/img/project/project_sales_order.png">
###Gantt Chart
@@ -103,8 +103,8 @@
* Para visualizar el gantt chart de un proyecto, ve hasta el proyecto y dar click en 'Gantt Chart'
-<img class="screenshot" alt="Project - View Gantt Chart" src="/docs/assets/img/project/project_view_gantt_chart.png">
+<img class="screenshot" alt="Project - View Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_view_gantt_chart.png">
-<img class="screenshot" alt="Project - Gantt Chart" src="/docs/assets/img/project/project_gantt_chart.png">
+<img class="screenshot" alt="Project - Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_gantt_chart.png">
{next}
diff --git a/erpnext/docs/user/manual/es/projects/tasks.md b/erpnext/docs/user/manual/es/projects/tasks.md
index b07b305..7af7296 100644
--- a/erpnext/docs/user/manual/es/projects/tasks.md
+++ b/erpnext/docs/user/manual/es/projects/tasks.md
@@ -3,13 +3,13 @@
Proyecto es dividido en Tareas.
En ERPNext, puedes crear las tareas de forma independiente.
-<img class="screenshot" alt="Task" src="/docs/assets/img/project/task.png">
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/project/task.png">
### Estado de una Tarea
Una tarea puede tener uno de los siguientes estados - Abierto, Trabajando, Pendiente de Revisión, Cerrado, o Cancelado.
-<img class="screenshot" alt="Task - Status" src="/docs/assets/img/project/task_status.png">
+<img class="screenshot" alt="Task - Status" src="{{docs_base_url}}/assets/img/project/task_status.png">
* Por defecto, cada nueva tarea creada se le establece el estado 'Abierto'.
@@ -19,7 +19,7 @@
Puedes especificar una lista de tareas dependientes en la sección 'Depende de'
-<img class="screenshot" alt="Depends On" src="/docs/assets/img/project/task_depends_on.png">
+<img class="screenshot" alt="Depends On" src="{{docs_base_url}}/assets/img/project/task_depends_on.png">
* No puedes cerrar una tarea padre hasta que todas las tareas dependientes esten cerradas.
@@ -33,13 +33,13 @@
* Para ver el Registro de tiempo realizado a una tarea, dar click en 'Time Logs'
-<img class="screenshot" alt="Task - View Time Log" src="/docs/assets/img/project/task_view_time_log.png">
+<img class="screenshot" alt="Task - View Time Log" src="{{docs_base_url}}/assets/img/project/task_view_time_log.png">
-<img class="screenshot" alt="Task - Time Log List" src="/docs/assets/img/project/task_time_log_list.png">
+<img class="screenshot" alt="Task - Time Log List" src="{{docs_base_url}}/assets/img/project/task_time_log_list.png">
* Puedes también crear un Registro de Tiempo directamente y luego asociarlo a una Tarea.
-<img class="screenshot" alt="Task - Link Time Log" src="/docs/assets/img/project/task_time_log_link.png">
+<img class="screenshot" alt="Task - Link Time Log" src="{{docs_base_url}}/assets/img/project/task_time_log_link.png">
### Gestión de gastos
@@ -48,14 +48,14 @@
* Para ver las reclamaciones de gastos realizadas en un proyecto, haga clic en 'Reclamaciones de gastos'
-<img class="screenshot" alt="Task - View Expense Claim" src="/docs/assets/img/project/task_view_expense_claim.png">
+<img class="screenshot" alt="Task - View Expense Claim" src="{{docs_base_url}}/assets/img/project/task_view_expense_claim.png">
* También puede crear un Reclamo de gastos directamente y vincularlo al Proyecto.
-<img class="screenshot" alt="Task - Link Expense Claim" src="/docs/assets/img/project/task_expense_claim_link.png">
+<img class="screenshot" alt="Task - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/task_expense_claim_link.png">
* El monto total de los Reclamos de gastos reservados contra un proyecto se muestra en 'Reclamo de gastos totales' en la Sección de Costos del proyecto
-<img class="screenshot" alt="Task - Total Expense Claim" src="/docs/assets/img/project/task_total_expense_claim.png">
+<img class="screenshot" alt="Task - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/task_total_expense_claim.png">
{next}
diff --git a/erpnext/docs/user/manual/es/projects/time-log-batch.md b/erpnext/docs/user/manual/es/projects/time-log-batch.md
index 72c77b4..c211fd3 100644
--- a/erpnext/docs/user/manual/es/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/es/projects/time-log-batch.md
@@ -8,17 +8,17 @@
Simplemente abra su lista de registro de tiempo y marque los elementos que desea agregar al registro de tiempo. A continuación, haga clic en el botón "Crear hoja de tiempo" y se seleccionarán estos registros de tiempo.
-<img class="screenshot" alt="Time Log - Drag Calender" src="/docs/assets/img/project/time_sheet.gif">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet.gif">
###Creando Factura de Venta
* Despues de crear la Hoja de Tiempo/Horario, el botón "Crear Factura" debe aparecer.
-<img class="screenshot" alt="Time Log - Drag Calender" src="/docs/assets/img/project/time_sheet_make_invoice.png">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet_make_invoice.png">
* Haga clic en ese botón para hacer una factura de venta usando la hoja de tiempo.
-<img class="screenshot" alt="Time Log - Drag Calender" src="/docs/assets/img/project/time_sheet_sales_invoice.png">
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_sheet_sales_invoice.png">
* Cuando "Presente" la Factura de Ventas, el número de Factura de Ventas se actualizará en los Registros de Tiempo y la Hoja de Horario y su estado cambiará a "Facturado".
diff --git a/erpnext/domains/hospitality.py b/erpnext/domains/hospitality.py
index bc55d9c..09b98c2 100644
--- a/erpnext/domains/hospitality.py
+++ b/erpnext/domains/hospitality.py
@@ -1,6 +1,7 @@
data = {
'desktop_icons': [
'Restaurant',
+ 'Hotels',
'Accounts',
'Buying',
'Stock',
@@ -9,7 +10,9 @@
'ToDo'
],
'restricted_roles': [
- 'Restaurant Manager'
+ 'Restaurant Manager',
+ 'Hotel Manager',
+ 'Hotel Reservation User'
],
'custom_fields': {
'Sales Invoice': [
diff --git a/erpnext/education/api.py b/erpnext/education/api.py
index ea4da69..5edc037 100644
--- a/erpnext/education/api.py
+++ b/erpnext/education/api.py
@@ -269,7 +269,10 @@
:param Percentage: Score Percentage Percentage
"""
grading_scale_intervals = {}
- for d in frappe.get_all("Grading Scale Interval", fields=["grade_code", "threshold"], filters={"parent": grading_scale}):
+ if not hasattr(frappe.local, 'grading_scale'):
+ grading_scale = frappe.get_all("Grading Scale Interval", fields=["grade_code", "threshold"], filters={"parent": grading_scale})
+ frappe.local.grading_scale = grading_scale
+ for d in frappe.local.grading_scale:
grading_scale_intervals.update({d.threshold:d.grade_code})
intervals = sorted(grading_scale_intervals.keys(), key=float, reverse=True)
for interval in intervals:
@@ -332,7 +335,7 @@
if doc.docstatus == 0:
return doc
elif doc.docstatus == 1:
- frappe.msgprint("Result already Submitted")
+ frappe.msgprint(_("Result already Submitted"))
return None
else:
return frappe.new_doc("Assessment Result")
diff --git a/erpnext/education/doctype/assessment_criteria/assessment_criteria.py b/erpnext/education/doctype/assessment_criteria/assessment_criteria.py
index e666a74..1ea3702 100644
--- a/erpnext/education/doctype/assessment_criteria/assessment_criteria.py
+++ b/erpnext/education/doctype/assessment_criteria/assessment_criteria.py
@@ -4,7 +4,12 @@
from __future__ import unicode_literals
import frappe
+from frappe import _
from frappe.model.document import Document
+STD_CRITERIA = ["total", "total score", "total grade", "maximum score", "score", "grade"]
+
class AssessmentCriteria(Document):
- pass
+ def validate(self):
+ if self.assessment_criteria.lower() in STD_CRITERIA:
+ frappe.throw(_("Can't create standard criteria. Please rename the criteria"))
\ No newline at end of file
diff --git a/erpnext/education/doctype/fees/fees.json b/erpnext/education/doctype/fees/fees.json
index c4e1f82..971197c 100644
--- a/erpnext/education/doctype/fees/fees.json
+++ b/erpnext/education/doctype/fees/fees.json
@@ -4,7 +4,7 @@
"allow_import": 1,
"allow_rename": 0,
"autoname": "naming_series:",
- "beta": 1,
+ "beta": 0,
"creation": "2015-09-22 16:57:22.143710",
"custom": 0,
"docstatus": 0,
@@ -1276,7 +1276,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2017-12-06 05:55:10.502567",
+ "modified": "2018-02-08 02:12:34.185245",
"modified_by": "Administrator",
"module": "Education",
"name": "Fees",
diff --git a/erpnext/education/doctype/guardian/guardian.py b/erpnext/education/doctype/guardian/guardian.py
index 3741a06..e82cc54 100644
--- a/erpnext/education/doctype/guardian/guardian.py
+++ b/erpnext/education/doctype/guardian/guardian.py
@@ -37,7 +37,6 @@
frappe.throw(_("Please set Email Address"))
else:
guardian_as_user = frappe.get_value('User', dict(email=guardian_doc.email_address))
- print guardian_as_user
if guardian_as_user:
frappe.msgprint(_("User {0} already exists").format(getlink("User", guardian_as_user)))
return guardian_as_user
diff --git a/erpnext/education/doctype/instructor/instructor.py b/erpnext/education/doctype/instructor/instructor.py
index 44a4e4c..78e4261 100644
--- a/erpnext/education/doctype/instructor/instructor.py
+++ b/erpnext/education/doctype/instructor/instructor.py
@@ -18,7 +18,7 @@
self.name = make_autoname(self.naming_series + '.####')
elif naming_method == 'Employee Number':
if not self.employee:
- frappe.throw("Please select Employee")
+ frappe.throw(_("Please select Employee"))
self.name = self.employee
elif naming_method == 'Full Name':
self.name = self.instructor_name
diff --git a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py
index bc60218..e15be50 100644
--- a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py
+++ b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py
@@ -63,4 +63,4 @@
prog_enrollment.academic_term = self.academic_term
prog_enrollment.student_batch_name = stud.student_batch_name if stud.student_batch_name else self.new_student_batch
prog_enrollment.save()
- frappe.msgprint("{0} Students have been enrolled.".format(total))
+ frappe.msgprint(_("{0} Students have been enrolled").format(total))
diff --git a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html
index 60300b0..e46a5e7 100644
--- a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html
+++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html
@@ -6,9 +6,15 @@
{% } %}
<h4 class="text-center">{%= __("Assessment Report") %}</h4>
<hr>
+<h5 class="text-center">{%= __("Academic Year: ") %} {%= filters.academic_year %} </h5>
+{% if (filters.academic_term){ %}
+<h5 class="text-center">{%= __("Academic Term: ") %} {%= filters.academic_term %} </h5>
+{% } %}
<h5 class="text-center">{%= __("Course Code: ") %} {%= filters.course %}</h5>
<h5 class="text-center">{%= __("Assessment Group: ") %} {%= filters.assessment_group %}</h5>
-<h5 class="text-center">{%= __("Assessment Plan: ") %} {%= data_to_be_printed[0]["assessment_plan"] %} </h5>
+{% if (filters.student_group){ %}
+<h5 class="text-center">{%= __("Student Group: ") %} {%= filters.student_group %} </h5>
+{% } %}
<hr>
<table class="table table-bordered">
diff --git a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.js b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.js
index 42b19eb..8c42d48 100644
--- a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.js
+++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.js
@@ -4,18 +4,17 @@
frappe.query_reports["Course wise Assessment Report"] = {
"filters": [
{
- "fieldname":"assessment_group",
- "label": __("Assessment Group"),
+ "fieldname":"academic_year",
+ "label": __("Academic Year"),
"fieldtype": "Link",
- "options": "Assessment Group",
- "reqd": 1,
- "get_query": function() {
- return{
- filters: {
- 'is_group': 0
- }
- };
- }
+ "options": "Academic Year",
+ "reqd": 1
+ },
+ {
+ "fieldname":"academic_term",
+ "label": __("Academic Term"),
+ "fieldtype": "Link",
+ "options": "Academic Term"
},
{
"fieldname":"course",
@@ -29,6 +28,13 @@
"label": __("Student Group"),
"fieldtype": "Link",
"options": "Student Group"
+ },
+ {
+ "fieldname":"assessment_group",
+ "label": __("Assessment Group"),
+ "fieldtype": "Link",
+ "options": "Assessment Group",
+ "reqd": 1
}
]
};
diff --git a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
index e153f8c..61976b4 100644
--- a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
+++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.json
@@ -7,7 +7,7 @@
"doctype": "Report",
"idx": 0,
"is_standard": "Yes",
- "modified": "2017-11-10 19:41:46.641227",
+ "modified": "2018-02-08 15:11:24.904628",
"modified_by": "Administrator",
"module": "Education",
"name": "Course wise Assessment Report",
@@ -17,7 +17,10 @@
"report_type": "Script Report",
"roles": [
{
- "role": "Academics User"
+ "role": "Instructor"
+ },
+ {
+ "role": "Education Manager"
}
]
}
\ No newline at end of file
diff --git a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py
index ff17238..a50ad7b 100644
--- a/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py
+++ b/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py
@@ -5,129 +5,189 @@
import frappe
from frappe import _
from frappe.utils import flt
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
from erpnext.education.api import get_grade
def execute(filters=None):
- data = []
-
+ data, chart, grades = [], [], []
args = frappe._dict()
+ grade_wise_analysis = defaultdict(dict)
+
+ args["academic_year"] = filters.get("academic_year")
+ args["course"] = filters.get("course")
args["assessment_group"] = filters.get("assessment_group")
+
+ args["academic_term"] = filters.get("academic_term")
+ args["student_group"] = filters.get("student_group")
+
if args["assessment_group"] == "All Assessment Groups":
frappe.throw(_("Please select the assessment group other than 'All Assessment Groups'"))
- args["course"] = filters.get("course")
- args["student_group"] = filters.get("student_group")
+ returned_values = get_formatted_result(args, get_assessment_criteria=True)
+ student_dict = returned_values["student_details"]
+ result_dict = returned_values["assessment_result"]
+ assessment_criteria_dict = returned_values["assessment_criteria"]
+
+ for student in result_dict:
+ student_row = {}
+ student_row["student"] = student
+ student_row["student_name"] = student_dict[student]
+ for criteria in assessment_criteria_dict:
+ scrub_criteria = frappe.scrub(criteria)
+ if criteria in result_dict[student][args.course][args.assessment_group]:
+ student_row[scrub_criteria] = result_dict[student][args.course][args.assessment_group][criteria]["grade"]
+ student_row[scrub_criteria + "_score"] = result_dict[student][args.course][args.assessment_group][criteria]["score"]
+
+ # create the list of possible grades
+ if student_row[scrub_criteria] not in grades:
+ grades.append(student_row[scrub_criteria])
+
+ # create the dict of for gradewise analysis
+ if student_row[scrub_criteria] not in grade_wise_analysis[criteria]:
+ grade_wise_analysis[criteria][student_row[scrub_criteria]] = 1
+ else:
+ grade_wise_analysis[criteria][student_row[scrub_criteria]] += 1
+ else:
+ student_row[frappe.scrub(criteria)] = ""
+ student_row[frappe.scrub(criteria)+ "_score"] = ""
+ data.append(student_row)
+
+ assessment_criteria_list = [d for d in assessment_criteria_dict]
+ columns = get_column(assessment_criteria_dict)
+ chart = get_chart_data(grades, assessment_criteria_list, grade_wise_analysis)
+
+ return columns, data, None, chart
- # find all assessment plan and related details linked with the given filters
- def get_assessment_details():
- if args["student_group"]:
- cond = "and ap.student_group=%(student_group)s"
+def get_formatted_result(args, get_assessment_criteria=False, get_course=False):
+ cond, cond1, cond2, cond3, cond4 = " ", " ", " ", " ", " "
+ args_list = [args.academic_year]
+
+ if args.course:
+ cond = " and ar.course=%s"
+ args_list.append(args.course)
+
+ if args.academic_term:
+ cond1 = " and ar.academic_term=%s"
+ args_list.append(args.academic_term)
+
+ if args.student_group:
+ cond2 = " and ar.student_group=%s"
+ args_list.append(args.student_group)
+
+ create_total_dict = False
+ group_type = frappe.get_value("Assessment Group", args.assessment_group, "is_group")
+ if group_type:
+ from frappe.desk.treeview import get_children
+ assessment_groups = [d.get("value") for d in get_children("Assessment Group",
+ args.assessment_group) if d.get("value") and not d.get("expandable")]
+ cond3 = " and ar.assessment_group in (%s)"%(', '.join(['%s']*len(assessment_groups)))
+ else:
+ assessment_groups = [args.assessment_group]
+ cond3 = " and ar.assessment_group=%s"
+ args_list += assessment_groups
+
+ if args.students:
+ cond4 = " and ar.student in (%s)"%(', '.join(['%s']*len(args.students)))
+ args_list += args.students
+
+ assessment_result = frappe.db.sql('''
+ SELECT
+ ar.student, ar.student_name, ar.academic_year, ar.academic_term, ar.program, ar.course,
+ ar.assessment_plan, ar.grading_scale, ar.assessment_group, ar.student_group,
+ ard.assessment_criteria, ard.maximum_score, ard.grade, ard.score
+ FROM
+ `tabAssessment Result` ar, `tabAssessment Result Detail` ard
+ WHERE
+ ar.name=ard.parent and ar.docstatus=1 and ar.academic_year=%s {0} {1} {2} {3} {4}
+ ORDER BY
+ ard.assessment_criteria'''.format(cond, cond1, cond2, cond3, cond4),
+ tuple(args_list), as_dict=1)
+
+ # create the nested dictionary structure as given below:
+ # <variable_name>.<student_name>.<course>.<assessment_group>.<assessment_criteria>.<grade/score/max_score>
+ # "Total Score" -> assessment criteria used for totaling and args.assessment_group -> for totaling all the assesments
+
+ student_details = {}
+ formatted_assessment_result = defaultdict(dict)
+ assessment_criteria_dict = OrderedDict()
+ course_dict = OrderedDict()
+ total_maximum_score = None
+ if not (len(assessment_groups) == 1 and assessment_groups[0] == args.assessment_group):
+ create_total_dict = True
+
+ # add the score for a given score and recalculate the grades
+ def add_score_and_recalculate_grade(result, assessment_group, assessment_criteria):
+ formatted_assessment_result[result.student][result.course][assessment_group]\
+ [assessment_criteria]["maximum_score"] += result.maximum_score
+ formatted_assessment_result[result.student][result.course][assessment_group]\
+ [assessment_criteria]["score"] += result.score
+ tmp_grade = get_grade(result.grading_scale, ((formatted_assessment_result[result.student][result.course]
+ [assessment_group][assessment_criteria]["score"])/(formatted_assessment_result[result.student]
+ [result.course][assessment_group][assessment_criteria]["maximum_score"]))*100)
+ formatted_assessment_result[result.student][result.course][assessment_group]\
+ [assessment_criteria]["grade"] = tmp_grade
+
+ # create the assessment criteria "Total Score" with the sum of all the scores of the assessment criteria in a given assessment group
+ def add_total_score(result, assessment_group):
+ if "Total Score" not in formatted_assessment_result[result.student][result.course][assessment_group]:
+ formatted_assessment_result[result.student][result.course][assessment_group]["Total Score"] = frappe._dict({
+ "assessment_criteria": "Total Score", "maximum_score": result.maximum_score, "score": result.score, "grade": result.grade})
else:
- cond = ''
+ add_score_and_recalculate_grade(result, assessment_group, "Total Score")
- assessment_plan = frappe.db.sql('''
- select
- ap.name, ap.student_group, ap.grading_scale, apc.assessment_criteria, apc.maximum_score as max_score
- from
- `tabAssessment Plan` ap, `tabAssessment Plan Criteria` apc
- where
- ap.assessment_group=%(assessment_group)s and ap.course=%(course)s and
- ap.name=apc.parent and ap.docstatus=1 {0}
- order by
- apc.assessment_criteria'''.format(cond), (args), as_dict=1)
+ for result in assessment_result:
+ if result.student not in student_details:
+ student_details[result.student] = result.student_name
- assessment_plan_list = list(set([d["name"] for d in assessment_plan]))
- if not assessment_plan_list:
- frappe.throw(_("No assessment plan linked with this assessment group"))
+ assessment_criteria_details = frappe._dict({"assessment_criteria": result.assessment_criteria,
+ "maximum_score": result.maximum_score, "score": result.score, "grade": result.grade})
- assessment_criteria_list = list(set([(d["assessment_criteria"],d["max_score"]) for d in assessment_plan]))
- student_group_list = list(set([d["student_group"] for d in assessment_plan]))
- total_maximum_score = flt(sum([flt(d[1]) for d in assessment_criteria_list]))
- grading_scale = assessment_plan[0]["grading_scale"]
+ if not formatted_assessment_result[result.student]:
+ formatted_assessment_result[result.student] = defaultdict(dict)
+ if not formatted_assessment_result[result.student][result.course]:
+ formatted_assessment_result[result.student][result.course] = defaultdict(dict)
- return assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale, student_group_list
+ if not create_total_dict:
+ formatted_assessment_result[result.student][result.course][result.assessment_group]\
+ [result.assessment_criteria] = assessment_criteria_details
+ add_total_score(result, result.assessment_group)
+
+ # create the total of all the assessment groups criteria-wise
+ elif create_total_dict:
+ if not formatted_assessment_result[result.student][result.course][args.assessment_group]:
+ formatted_assessment_result[result.student][result.course][args.assessment_group] = defaultdict(dict)
+ formatted_assessment_result[result.student][result.course][args.assessment_group]\
+ [result.assessment_criteria] = assessment_criteria_details
+ elif result.assessment_criteria not in formatted_assessment_result[result.student][result.course][args.assessment_group]:
+ formatted_assessment_result[result.student][result.course][args.assessment_group]\
+ [result.assessment_criteria] = assessment_criteria_details
+ elif result.assessment_criteria in formatted_assessment_result[result.student][result.course][args.assessment_group]:
+ add_score_and_recalculate_grade(result, args.assessment_group, result.assessment_criteria)
+
+ add_total_score(result, args.assessment_group)
+
+ total_maximum_score = formatted_assessment_result[result.student][result.course][args.assessment_group]\
+ ["Total Score"]["maximum_score"]
+ if get_assessment_criteria:
+ assessment_criteria_dict[result.assessment_criteria] = formatted_assessment_result[result.student][result.course]\
+ [args.assessment_group][result.assessment_criteria]["maximum_score"]
+ if get_course:
+ course_dict[result.course] = total_maximum_score
+
+ if get_assessment_criteria and total_maximum_score:
+ assessment_criteria_dict["Total Score"] = total_maximum_score
+
+ return {
+ "student_details": student_details,
+ "assessment_result": formatted_assessment_result,
+ "assessment_criteria": assessment_criteria_dict,
+ "course_dict": course_dict
+ }
- # get all the result and make a dict map student as the key and value as dict of result
- def get_result_map():
- result_dict = defaultdict(dict)
- kounter = defaultdict(dict)
- assessment_result = frappe.db.sql('''select ar.student, ard.assessment_criteria, ard.grade, ard.score
- from `tabAssessment Result` ar, `tabAssessment Result Detail` ard
- where ar.assessment_plan in (%s) and ar.name=ard.parent and ar.docstatus=1
- order by ard.assessment_criteria''' %', '.join(['%s']*len(assessment_plan_list)),
- tuple(assessment_plan_list), as_dict=1)
-
- for result in assessment_result:
- if "total_score" in result_dict[result.student]:
- total_score = result_dict[result.student]["total_score"] + result.score
- else:
- total_score = result.score
- total = get_grade(grading_scale, (total_score/total_maximum_score)*100)
-
- if result.grade in kounter[result.assessment_criteria]:
- kounter[result.assessment_criteria][result.grade] += 1
- else:
- kounter[result.assessment_criteria].update({result.grade: 1})
-
- if "Total" not in kounter:
- kounter["Total"] = {}
-
- if "total" in result_dict[result.student]:
- prev_grade = result_dict[result.student]["total"]
- prev_grade_count = kounter["Total"].get(prev_grade) - 1
- kounter["Total"].update({prev_grade: prev_grade_count})
- latest_grade_count = kounter["Total"].get(total)+1 if kounter["Total"].get(total) else 1
- kounter["Total"].update({total: latest_grade_count})
-
- result_dict[result.student].update({
- frappe.scrub(result.assessment_criteria): result.grade,
- frappe.scrub(result.assessment_criteria)+"_score": result.score,
- "total_score": total_score,
- "total": total
- })
-
- return result_dict, kounter
-
- # make data from the result dict
- def get_data():
- student_list = frappe.db.sql('''select sgs.student, sgs.student_name
- from `tabStudent Group` sg, `tabStudent Group Student` sgs
- where sg.name = sgs.parent and sg.name in (%s)
- order by sgs.group_roll_number asc''' %', '.join(['%s']*len(student_group_list)),
- tuple(student_group_list), as_dict=1)
-
- for student in student_list:
- student.update(result_dict[student.student])
- return student_list
-
-
- # get chart data
- def get_chart():
- grading_scale = frappe.db.get_value("Assessment Plan", list(assessment_plan_list)[0], "grading_scale")
- grades = frappe.db.sql_list('''select grade_code from `tabGrading Scale Interval` where parent=%s''',
- (grading_scale))
- criteria_list = [d[0] for d in assessment_criteria_list] + ["Total"]
- return get_chart_data(grades, criteria_list, kounter)
-
-
- assessment_plan_list, assessment_criteria_list, total_maximum_score, grading_scale,\
- student_group_list = get_assessment_details()
- result_dict, kounter = get_result_map()
- data = get_data()
-
- columns = get_column(assessment_criteria_list, total_maximum_score)
- chart = get_chart()
- data_to_be_printed = [{
- "assessment_plan": ", ".join(assessment_plan_list)
- }]
-
- return columns, data, None, chart, data_to_be_printed
-
-def get_column(assessment_criteria, total_maximum_score):
+def get_column(assessment_criteria):
columns = [{
"fieldname": "student",
"label": _("Student ID"),
@@ -143,40 +203,28 @@
}]
for d in assessment_criteria:
columns.append({
- "fieldname": frappe.scrub(d[0]),
- "label": d[0],
+ "fieldname": frappe.scrub(d),
+ "label": d,
"fieldtype": "Data",
"width": 110
})
columns.append({
- "fieldname": frappe.scrub(d[0]) +"_score",
- "label": "Score(" + str(int(d[1])) + ")",
+ "fieldname": frappe.scrub(d) +"_score",
+ "label": "Score(" + str(int(assessment_criteria[d])) + ")",
"fieldtype": "Float",
"width": 100
})
- columns += [{
- "fieldname": "total",
- "label": "Total",
- "fieldtype": "Data",
- "width": 100
- },
- {
- "fieldname": "total_score",
- "label": "Total Score("+ str(int(total_maximum_score)) + ")",
- "fieldtype": "Float",
- "width": 110
- }]
-
return columns
-def get_chart_data(grades, assessment_criteria_list, kounter):
+
+def get_chart_data(grades, criteria_list, kounter):
grades = sorted(grades)
datasets = []
for grade in grades:
tmp = frappe._dict({"values":[], "title": grade})
- for criteria in assessment_criteria_list:
+ for criteria in criteria_list:
if grade in kounter[criteria]:
tmp["values"].append(kounter[criteria][grade])
else:
@@ -185,7 +233,7 @@
return {
"data": {
- "labels": assessment_criteria_list,
+ "labels": criteria_list,
"datasets": datasets
},
"type": 'bar',
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/education/report/final_assessment_grades/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/education/report/final_assessment_grades/__init__.py
diff --git a/erpnext/education/report/final_assessment_grades/final_assessment_grades.js b/erpnext/education/report/final_assessment_grades/final_assessment_grades.js
new file mode 100644
index 0000000..ba0a42f
--- /dev/null
+++ b/erpnext/education/report/final_assessment_grades/final_assessment_grades.js
@@ -0,0 +1,38 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Final Assessment Grades"] = {
+ "filters": [
+ {
+ "fieldname":"academic_year",
+ "label": __("Academic Year"),
+ "fieldtype": "Link",
+ "options": "Academic Year",
+ "reqd": 1
+ },
+ {
+ "fieldname":"student_group",
+ "label": __("Student Group"),
+ "fieldtype": "Link",
+ "options": "Student Group",
+ "reqd": 1,
+ "get_query": function() {
+ return{
+ filters: {
+ "group_based_on": "Batch",
+ "academic_year": frappe.query_report_filters_by_name.academic_year.value
+ }
+ };
+ }
+ },
+ {
+ "fieldname":"assessment_group",
+ "label": __("Assessment Group"),
+ "fieldtype": "Link",
+ "options": "Assessment Group",
+ "reqd": 1
+ }
+
+ ]
+}
diff --git a/erpnext/education/report/final_assessment_grades/final_assessment_grades.json b/erpnext/education/report/final_assessment_grades/final_assessment_grades.json
new file mode 100644
index 0000000..e748efa
--- /dev/null
+++ b/erpnext/education/report/final_assessment_grades/final_assessment_grades.json
@@ -0,0 +1,27 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2018-01-22 17:04:43.412054",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "letter_head": "Shishuvan Secondary School",
+ "modified": "2018-02-08 15:11:35.339434",
+ "modified_by": "Administrator",
+ "module": "Education",
+ "name": "Final Assessment Grades",
+ "owner": "Administrator",
+ "ref_doctype": "Assessment Result",
+ "report_name": "Final Assessment Grades",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "Instructor"
+ },
+ {
+ "role": "Education Manager"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/education/report/final_assessment_grades/final_assessment_grades.py b/erpnext/education/report/final_assessment_grades/final_assessment_grades.py
new file mode 100644
index 0000000..efc9aff
--- /dev/null
+++ b/erpnext/education/report/final_assessment_grades/final_assessment_grades.py
@@ -0,0 +1,85 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from collections import defaultdict
+
+from erpnext.education.report.course_wise_assessment_report.course_wise_assessment_report import get_formatted_result
+from erpnext.education.report.course_wise_assessment_report.course_wise_assessment_report import get_chart_data
+
+
+def execute(filters=None):
+ columns, data, grades = [], [], []
+ args = frappe._dict()
+ course_wise_analysis = defaultdict(dict)
+
+ args["academic_year"] = filters.get("academic_year")
+ assessment_group = args["assessment_group"] = filters.get("assessment_group")
+
+ student_group = filters.get("student_group")
+ args.students = frappe.db.sql_list("select student from `tabStudent Group Student` where parent=%s", (student_group))
+
+ values = get_formatted_result(args, get_course=True)
+ student_details = values.get("student_details")
+ assessment_result = values.get("assessment_result")
+ course_dict = values.get("course_dict")
+
+ for student in args.students:
+ student_row = {}
+ student_row["student"] = student
+ student_row["student_name"] = student_details[student]
+ for course in course_dict:
+ scrub_course = frappe.scrub(course)
+ if assessment_group in assessment_result[student][course]:
+ student_row["grade_" + scrub_course] = assessment_result[student][course][assessment_group]["Total Score"]["grade"]
+ student_row["score_" + scrub_course] = assessment_result[student][course][assessment_group]["Total Score"]["score"]
+
+ # create the list of possible grades
+ if student_row["grade_" + scrub_course] not in grades:
+ grades.append(student_row["grade_" + scrub_course])
+
+ # create the dict of for gradewise analysis
+ if student_row["grade_" + scrub_course] not in course_wise_analysis[course]:
+ course_wise_analysis[course][student_row["grade_" + scrub_course]] = 1
+ else:
+ course_wise_analysis[course][student_row["grade_" + scrub_course]] += 1
+
+ data.append(student_row)
+
+ course_list = [d for d in course_dict]
+ columns = get_column(course_dict)
+ chart = get_chart_data(grades, course_list, course_wise_analysis)
+ return columns, data, None, chart
+
+
+def get_column(course_dict):
+ columns = [{
+ "fieldname": "student",
+ "label": _("Student ID"),
+ "fieldtype": "Link",
+ "options": "Student",
+ "width": 90
+ },
+ {
+ "fieldname": "student_name",
+ "label": _("Student Name"),
+ "fieldtype": "Data",
+ "width": 160
+ }]
+ for course in course_dict:
+ columns.append({
+ "fieldname": "grade_" + frappe.scrub(course),
+ "label": course,
+ "fieldtype": "Data",
+ "width": 110
+ })
+ columns.append({
+ "fieldname": "score_" + frappe.scrub(course),
+ "label": "Score(" + str(course_dict[course]) + ")",
+ "fieldtype": "Float",
+ "width": 100
+ })
+
+ return columns
diff --git a/erpnext/healthcare/doctype/consultation/consultation.js b/erpnext/healthcare/doctype/consultation/consultation.js
index 89b8861..b0dbff5 100644
--- a/erpnext/healthcare/doctype/consultation/consultation.js
+++ b/erpnext/healthcare/doctype/consultation/consultation.js
@@ -41,7 +41,7 @@
frappe.route_options = {"patient": frm.doc.patient};
frappe.set_route("medical_record");
} else {
- frappe.msgprint("Please select Patient");
+ frappe.msgprint(__("Please select Patient"));
}
},"View");
frm.add_custom_button(__('Vital Signs'), function() {
@@ -121,7 +121,7 @@
var create_medical_record = function (frm) {
if(!frm.doc.patient){
- frappe.throw("Please select patient");
+ frappe.throw(__("Please select patient"));
}
frappe.route_options = {
"patient": frm.doc.patient,
@@ -134,7 +134,7 @@
var btn_create_vital_signs = function (frm) {
if(!frm.doc.patient){
- frappe.throw("Please select patient");
+ frappe.throw(__("Please select patient"));
}
frappe.route_options = {
"patient": frm.doc.patient,
diff --git a/erpnext/healthcare/doctype/consultation/consultation.py b/erpnext/healthcare/doctype/consultation/consultation.py
index 809074e..7d41afe 100755
--- a/erpnext/healthcare/doctype/consultation/consultation.py
+++ b/erpnext/healthcare/doctype/consultation/consultation.py
@@ -21,7 +21,7 @@
def on_submit(self):
if not self.diagnosis or not self.symptoms:
- frappe.throw("Diagnosis and Complaints cannot be left blank")
+ frappe.throw(_("Diagnosis and Complaints cannot be left blank"))
def on_cancel(self):
if(self.appointment):
diff --git a/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py b/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py
index 7206e4b..ae7c4c5 100644
--- a/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py
+++ b/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py
@@ -4,65 +4,66 @@
from __future__ import unicode_literals
import frappe
+from frappe import _
from frappe.model.document import Document
from frappe.core.doctype.sms_settings.sms_settings import send_sms
import json
class HealthcareSettings(Document):
- def validate(self):
- for key in ["collect_registration_fee","manage_customer","patient_master_name",
- "require_test_result_approval","require_sample_collection", "default_medical_code_standard"]:
- frappe.db.set_default(key, self.get(key, ""))
- if(self.collect_registration_fee):
- if self.registration_fee <= 0 :
- frappe.throw("Registration fee can not be Zero")
+ def validate(self):
+ for key in ["collect_registration_fee","manage_customer","patient_master_name",
+ "require_test_result_approval","require_sample_collection", "default_medical_code_standard"]:
+ frappe.db.set_default(key, self.get(key, ""))
+ if(self.collect_registration_fee):
+ if self.registration_fee <= 0 :
+ frappe.throw(_("Registration fee can not be Zero"))
@frappe.whitelist()
def get_sms_text(doc):
- sms_text = {}
- doc = frappe.get_doc("Lab Test",doc)
- #doc = json.loads(doc)
- context = {"doc": doc, "alert": doc, "comments": None}
- emailed = frappe.db.get_value("Healthcare Settings", None, "sms_emailed")
- sms_text['emailed'] = frappe.render_template(emailed, context)
- printed = frappe.db.get_value("Healthcare Settings", None, "sms_printed")
- sms_text['printed'] = frappe.render_template(printed, context)
- return sms_text
+ sms_text = {}
+ doc = frappe.get_doc("Lab Test",doc)
+ #doc = json.loads(doc)
+ context = {"doc": doc, "alert": doc, "comments": None}
+ emailed = frappe.db.get_value("Healthcare Settings", None, "sms_emailed")
+ sms_text['emailed'] = frappe.render_template(emailed, context)
+ printed = frappe.db.get_value("Healthcare Settings", None, "sms_printed")
+ sms_text['printed'] = frappe.render_template(printed, context)
+ return sms_text
def send_registration_sms(doc):
- if (frappe.db.get_value("Healthcare Settings", None, "reg_sms")=='1'):
- if doc.mobile:
- context = {"doc": doc, "alert": doc, "comments": None}
- if doc.get("_comments"):
- context["comments"] = json.loads(doc.get("_comments"))
- messages = frappe.db.get_value("Healthcare Settings", None, "reg_msg")
- messages = frappe.render_template(messages, context)
- number = [doc.mobile]
- send_sms(number,messages)
- else:
- frappe.msgprint(doc.name + " Has no mobile number to send registration SMS", alert=True)
+ if (frappe.db.get_value("Healthcare Settings", None, "reg_sms")=='1'):
+ if doc.mobile:
+ context = {"doc": doc, "alert": doc, "comments": None}
+ if doc.get("_comments"):
+ context["comments"] = json.loads(doc.get("_comments"))
+ messages = frappe.db.get_value("Healthcare Settings", None, "reg_msg")
+ messages = frappe.render_template(messages, context)
+ number = [doc.mobile]
+ send_sms(number,messages)
+ else:
+ frappe.msgprint(doc.name + " Has no mobile number to send registration SMS", alert=True)
def get_receivable_account(company):
- receivable_account = get_account(None, "receivable_account", "Healthcare Settings", company)
- if receivable_account:
- return receivable_account
- return frappe.db.get_value("Company", company, "default_receivable_account")
+ receivable_account = get_account(None, "receivable_account", "Healthcare Settings", company)
+ if receivable_account:
+ return receivable_account
+ return frappe.db.get_value("Company", company, "default_receivable_account")
def get_income_account(physician, company):
- if(physician):
- income_account = get_account("Physician", None, physician, company)
- if income_account:
- return income_account
- income_account = get_account(None, "income_account", "Healthcare Settings", company)
- if income_account:
- return income_account
- return frappe.db.get_value("Company", company, "default_income_account")
+ if(physician):
+ income_account = get_account("Physician", None, physician, company)
+ if income_account:
+ return income_account
+ income_account = get_account(None, "income_account", "Healthcare Settings", company)
+ if income_account:
+ return income_account
+ return frappe.db.get_value("Company", company, "default_income_account")
def get_account(parent_type, parent_field, parent, company):
- if(parent_type):
- return frappe.db.get_value("Party Account",
- {"parenttype": parent_type, "parent": parent, "company": company}, "account")
- if(parent_field):
- return frappe.db.get_value("Party Account",
- {"parentfield": parent_field, "parent": parent, "company": company}, "account")
+ if(parent_type):
+ return frappe.db.get_value("Party Account",
+ {"parenttype": parent_type, "parent": parent, "company": company}, "account")
+ if(parent_field):
+ return frappe.db.get_value("Party Account",
+ {"parentfield": parent_field, "parent": parent, "company": company}, "account")
diff --git a/erpnext/healthcare/doctype/lab_test/lab_test.js b/erpnext/healthcare/doctype/lab_test/lab_test.js
index 2a453cd..02aa001 100644
--- a/erpnext/healthcare/doctype/lab_test/lab_test.js
+++ b/erpnext/healthcare/doctype/lab_test/lab_test.js
@@ -101,14 +101,14 @@
frappe.ui.form.on('Normal Test Items', {
normal_test_items_remove: function() {
- frappe.msgprint("Not permitted, configure Lab Test Template as required");
+ frappe.msgprint(__("Not permitted, configure Lab Test Template as required"));
cur_frm.reload_doc();
}
});
frappe.ui.form.on('Special Test Items', {
special_test_items_remove: function() {
- frappe.msgprint("Not permitted, configure Lab Test Template as required");
+ frappe.msgprint(__("Not permitted, configure Lab Test Template as required"));
cur_frm.reload_doc();
}
});
@@ -142,7 +142,7 @@
});
}
else{
- frappe.msgprint("Please select Patient to get Lab Tests");
+ frappe.msgprint(__("Please select Patient to get Lab Tests"));
}
};
@@ -217,7 +217,7 @@
if(doc.normal_test_items){
for(let result in doc.normal_test_items){
if(!doc.normal_test_items[result].result_value && doc.normal_test_items[result].require_result_value == 1){
- frappe.msgprint("Please input all required Result Value(s)");
+ frappe.msgprint(__("Please input all required Result Value(s)"));
throw("Error");
}
}
@@ -225,7 +225,7 @@
if(doc.special_test_items){
for(let result in doc.special_test_items){
if(!doc.special_test_items[result].result_value && doc.special_test_items[result].require_result_value == 1){
- frappe.msgprint("Please input all required Result Value(s)");
+ frappe.msgprint(__("Please input all required Result Value(s)"));
throw("Error");
}
}
diff --git a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py
index bb0ead6..d178b0b 100644
--- a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py
+++ b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py
@@ -36,7 +36,7 @@
try:
frappe.delete_doc("Item",self.item)
except Exception:
- frappe.throw("""Not permitted. Please disable the Test Template""")
+ frappe.throw(_("""Not permitted. Please disable the Test Template"""))
def item_price_exist(doc):
item_price = frappe.db.exists({
diff --git a/erpnext/healthcare/doctype/patient/patient.js b/erpnext/healthcare/doctype/patient/patient.js
index 57e5eef..b1150ab 100644
--- a/erpnext/healthcare/doctype/patient/patient.js
+++ b/erpnext/healthcare/doctype/patient/patient.js
@@ -53,7 +53,7 @@
var today = new Date();
var birthDate = new Date(frm.doc.dob);
if(today < birthDate){
- frappe.msgprint("Please select a valid Date");
+ frappe.msgprint(__("Please select a valid Date"));
frappe.model.set_value(frm.doctype,frm.docname, "dob", "");
}
else{
@@ -83,7 +83,7 @@
var btn_create_vital_signs = function (frm) {
if (!frm.doc.name) {
- frappe.throw("Please save the patient first");
+ frappe.throw(__("Please save the patient first"));
}
frappe.route_options = {
"patient": frm.doc.name,
@@ -93,7 +93,7 @@
var btn_create_consultation = function (frm) {
if (!frm.doc.name) {
- frappe.throw("Please save the patient first");
+ frappe.throw(__("Please save the patient first"));
}
frappe.route_options = {
"patient": frm.doc.name,
diff --git a/erpnext/healthcare/doctype/patient/patient.py b/erpnext/healthcare/doctype/patient/patient.py
index e73482d..b01f56a 100644
--- a/erpnext/healthcare/doctype/patient/patient.py
+++ b/erpnext/healthcare/doctype/patient/patient.py
@@ -116,8 +116,9 @@
def get_patient_detail(patient):
patient_dict = frappe.db.sql("""select * from tabPatient where name=%s""", (patient), as_dict=1)
if not patient_dict:
- frappe.throw("Patient not found")
- vital_sign = frappe.db.sql("""select * from `tabVital Signs` where patient=%s order by signs_date desc limit 1""", (patient), as_dict=1)
+ frappe.throw(_("Patient not found"))
+ vital_sign = frappe.db.sql("""select * from `tabVital Signs` where patient=%s
+ order by signs_date desc limit 1""", (patient), as_dict=1)
details = patient_dict[0]
if vital_sign:
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
index a58516c..8912157 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -181,7 +181,7 @@
var btn_create_vital_signs = function (frm) {
if(!frm.doc.patient){
- frappe.throw("Please select patient");
+ frappe.throw(__("Please select patient"));
}
frappe.route_options = {
"patient": frm.doc.patient,
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
index 4379986..90d4d0e 100755
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
@@ -11,7 +11,7 @@
import datetime
from frappe.core.doctype.sms_settings.sms_settings import send_sms
from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_receivable_account,get_income_account
-
+from erpnext.hr.doctype.employee.employee import is_holiday
class PatientAppointment(Document):
def on_update(self):
@@ -82,6 +82,34 @@
physician_schedule_name = None
physician_schedule = None
time_per_appointment = None
+ employee = None
+
+ physician_obj = frappe.get_doc("Physician", physician)
+
+ # Get Physician employee relation
+ if physician_obj.employee:
+ employee = physician_obj.employee
+ elif physician_obj.user_id:
+ if frappe.db.exists({
+ "doctype": "Employee",
+ "user_id": physician_obj.user_id
+ }):
+ employee = frappe.get_doc("Employee", {"user_id": physician_obj.user_id}).name
+
+ if employee:
+ # Check if it is Holiday
+ if is_holiday(employee, date):
+ frappe.throw(_("{0} is a company holiday".format(date)))
+
+ # Check if He/She on Leave
+ leave_record = frappe.db.sql("""select half_day from `tabLeave Application`
+ where employee = %s and %s between from_date and to_date
+ and docstatus = 1""", (employee, date), as_dict=True)
+ if leave_record:
+ if leave_record[0].half_day:
+ frappe.throw(_("Dr {0} on Half day Leave on {1}").format(physician, date))
+ else:
+ frappe.throw(_("Dr {0} on Leave on {1}").format(physician, date))
# get physicians schedule
physician_schedule_name = frappe.db.get_value("Physician", physician, "physician_schedule")
diff --git a/erpnext/healthcare/doctype/physician/physician.js b/erpnext/healthcare/doctype/physician/physician.js
index c607f23..c224b5d 100755
--- a/erpnext/healthcare/doctype/physician/physician.js
+++ b/erpnext/healthcare/doctype/physician/physician.js
@@ -31,21 +31,26 @@
name: frm.doc.user_id
},
callback: function (data) {
- if(!frm.doc.employee){
- frappe.model.get_value('Employee', {'user_id': frm.doc.user_id}, 'name',
- function(data) {
- if(data)
+
+ frappe.model.get_value('Employee', {'user_id': frm.doc.user_id}, 'name',
+ function(data) {
+ if(data){
+ if(!frm.doc.employee || frm.doc.employee != data.name)
frappe.model.set_value(frm.doctype,frm.docname, "employee", data.name);
- });
- }
- if(!frm.doc.first_name)
+ }else{
+ frappe.model.set_value(frm.doctype,frm.docname, "employee", "");
+ }
+ }
+ );
+
+ if(!frm.doc.first_name || frm.doc.first_name != data.message.first_name)
frappe.model.set_value(frm.doctype,frm.docname, "first_name", data.message.first_name);
- if(!frm.doc.middle_name)
+ if(!frm.doc.middle_name || frm.doc.middle_name != data.message.middle_name)
frappe.model.set_value(frm.doctype,frm.docname, "middle_name", data.message.middle_name);
- if(!frm.doc.last_name)
+ if(!frm.doc.last_name || frm.doc.last_name != data.message.last_name)
frappe.model.set_value(frm.doctype,frm.docname, "last_name", data.message.last_name);
- if(!frm.doc.mobile_phone)
- frappe.model.set_value(frm.doctype,frm.docname, "mobile_phone", data.message.phone);
+ if(!frm.doc.mobile_phone || frm.doc.mobile_phone != data.message.mobile_no)
+ frappe.model.set_value(frm.doctype,frm.docname, "mobile_phone", data.message.mobile_no);
}
});
}
@@ -60,13 +65,18 @@
name: frm.doc.employee
},
callback: function (data) {
- if(!frm.doc.designation)
+ if(!frm.doc.user_id || frm.doc.user_id != data.message.user_id)
+ frm.set_value("user_id", data.message.user_id);
+ if(!frm.doc.designation || frm.doc.designation != data.message.designation)
frappe.model.set_value(frm.doctype,frm.docname, "designation", data.message.designation);
- if(!frm.doc.first_name)
+ if(!frm.doc.first_name || !frm.doc.user_id){
frappe.model.set_value(frm.doctype,frm.docname, "first_name", data.message.employee_name);
- if(!frm.doc.mobile_phone)
+ frappe.model.set_value(frm.doctype,frm.docname, "middle_name", "");
+ frappe.model.set_value(frm.doctype,frm.docname, "last_name", "");
+ }
+ if(!frm.doc.mobile_phone || !frm.doc.user_id)
frappe.model.set_value(frm.doctype,frm.docname, "mobile_phone", data.message.cell_number);
- if(!frm.doc.address)
+ if(!frm.doc.address || frm.doc.address != data.message.current_address)
frappe.model.set_value(frm.doctype,frm.docname, "address", data.message.current_address);
}
});
diff --git a/erpnext/healthcare/doctype/physician/physician.json b/erpnext/healthcare/doctype/physician/physician.json
index 3edad0b..1d9794e 100644
--- a/erpnext/healthcare/doctype/physician/physician.json
+++ b/erpnext/healthcare/doctype/physician/physician.json
@@ -155,7 +155,7 @@
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
- "read_only": 1,
+ "read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
@@ -810,8 +810,8 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-10-05 16:08:24.624644",
- "modified_by": "Administrator",
+ "modified": "2018-01-19 15:25:43.166877",
+ "modified_by": "jams@hcf.com",
"module": "Healthcare",
"name": "Physician",
"name_case": "",
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index ebc1921..45abbdb 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -204,7 +204,7 @@
'Address': {
'validate': 'erpnext.regional.india.utils.validate_gstin_for_india'
},
- 'Sales Invoice': {
+ ('Sales Invoice', 'Purchase Invoice'): {
'validate': 'erpnext.regional.india.utils.set_place_of_supply'
}
}
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/hotels/__init__.py
similarity index 100%
rename from erpnext/hub_node/page/__init__.py
rename to erpnext/hotels/__init__.py
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/hotels/doctype/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/hotels/doctype/__init__.py
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/hotels/doctype/hotel_room/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/hotels/doctype/hotel_room/__init__.py
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.js b/erpnext/hotels/doctype/hotel_room/hotel_room.js
similarity index 80%
rename from erpnext/hub_node/doctype/hub_category/hub_category.js
rename to erpnext/hotels/doctype/hotel_room/hotel_room.js
index 9f54166..76f22d5 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room/hotel_room.js
@@ -1,7 +1,7 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Hub Category', {
+frappe.ui.form.on('Hotel Room', {
refresh: function(frm) {
}
diff --git a/erpnext/hotels/doctype/hotel_room/hotel_room.json b/erpnext/hotels/doctype/hotel_room/hotel_room.json
new file mode 100644
index 0000000..2567c07
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room/hotel_room.json
@@ -0,0 +1,175 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "prompt",
+ "beta": 1,
+ "creation": "2017-12-08 12:33:56.320420",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "hotel_room_type",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Hotel Room Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Hotel Room Type",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "capacity",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Capacity",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "extra_bed_capacity",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Extra Bed Capacity",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-12-09 12:10:50.670113",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Room",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Hotel Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hotels/doctype/hotel_room/hotel_room.py b/erpnext/hotels/doctype/hotel_room/hotel_room.py
new file mode 100644
index 0000000..8471aee
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room/hotel_room.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class HotelRoom(Document):
+ def validate(self):
+ if not self.capacity:
+ self.capacity, self.extra_bed_capacity = frappe.db.get_value('Hotel Room Type',
+ self.hotel_room_type, ['capacity', 'extra_bed_capacity'])
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/hotels/doctype/hotel_room/test_hotel_room.js
similarity index 72%
rename from erpnext/hub_node/doctype/hub_category/test_hub_category.js
rename to erpnext/hotels/doctype/hotel_room/test_hotel_room.js
index 73c06d5..8b2b833 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room/test_hotel_room.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Hotel Room", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Hotel Room
+ () => frappe.tests.make('Hotel Room', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hotels/doctype/hotel_room/test_hotel_room.py b/erpnext/hotels/doctype/hotel_room/test_hotel_room.py
new file mode 100644
index 0000000..e307b5a
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room/test_hotel_room.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+test_dependencies = ["Hotel Room Package"]
+test_records = [
+ dict(doctype="Hotel Room", name="1001",
+ hotel_room_type="Basic Room"),
+ dict(doctype="Hotel Room", name="1002",
+ hotel_room_type="Basic Room"),
+ dict(doctype="Hotel Room", name="1003",
+ hotel_room_type="Basic Room"),
+ dict(doctype="Hotel Room", name="1004",
+ hotel_room_type="Basic Room"),
+ dict(doctype="Hotel Room", name="1005",
+ hotel_room_type="Basic Room"),
+ dict(doctype="Hotel Room", name="1006",
+ hotel_room_type="Basic Room")
+]
+
+class TestHotelRoom(unittest.TestCase):
+ pass
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/hotels/doctype/hotel_room_amenity/__init__.py
similarity index 100%
rename from erpnext/hub_node/doctype/hub_category/__init__.py
rename to erpnext/hotels/doctype/hotel_room_amenity/__init__.py
diff --git a/erpnext/hotels/doctype/hotel_room_amenity/hotel_room_amenity.json b/erpnext/hotels/doctype/hotel_room_amenity/hotel_room_amenity.json
new file mode 100644
index 0000000..29a0407
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_amenity/hotel_room_amenity.json
@@ -0,0 +1,103 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-12-08 12:35:36.572185",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "item",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Item",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "billable",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Billable",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-12-09 12:05:07.125687",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Room Amenity",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/hotels/doctype/hotel_room_amenity/hotel_room_amenity.py
similarity index 76%
copy from erpnext/hub_node/doctype/hub_category/hub_category.py
copy to erpnext/hotels/doctype/hotel_room_amenity/hotel_room_amenity.py
index 5d19082..69da007 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/hotels/doctype/hotel_room_amenity/hotel_room_amenity.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils.nestedset import NestedSet
from frappe.model.document import Document
-class HubCategory(NestedSet):
+class HotelRoomAmenity(Document):
pass
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/hotels/doctype/hotel_room_package/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/hotels/doctype/hotel_room_package/__init__.py
diff --git a/erpnext/hotels/doctype/hotel_room_package/hotel_room_package.js b/erpnext/hotels/doctype/hotel_room_package/hotel_room_package.js
new file mode 100644
index 0000000..5b09ae5
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_package/hotel_room_package.js
@@ -0,0 +1,23 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Hotel Room Package', {
+ hotel_room_type: function(frm) {
+ if (frm.doc.hotel_room_type) {
+ frappe.model.with_doc('Hotel Room Type', frm.doc.hotel_room_type, () => {
+ let hotel_room_type = frappe.get_doc('Hotel Room Type', frm.doc.hotel_room_type);
+
+ // reset the amenities
+ frm.doc.amenities = [];
+
+ for (let amenity of hotel_room_type.amenities) {
+ let d = frm.add_child('amenities');
+ d.item = amenity.item;
+ d.billable = amenity.billable;
+ }
+
+ frm.refresh();
+ });
+ }
+ }
+});
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.json b/erpnext/hotels/doctype/hotel_room_package/hotel_room_package.json
similarity index 65%
copy from erpnext/hub_node/doctype/hub_category/hub_category.json
copy to erpnext/hotels/doctype/hotel_room_package/hotel_room_package.json
index 4f8d66a..57dad44 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.json
+++ b/erpnext/hotels/doctype/hotel_room_package/hotel_room_package.json
@@ -3,13 +3,13 @@
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
- "autoname": "field:hub_category_name",
- "beta": 0,
- "creation": "2017-08-22 11:31:10.410322",
+ "autoname": "prompt",
+ "beta": 1,
+ "creation": "2017-12-08 12:43:17.211064",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
- "document_type": "",
+ "document_type": "Setup",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
@@ -19,8 +19,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "hub_category_name",
- "fieldtype": "Data",
+ "fieldname": "hotel_room_type",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -28,9 +28,10 @@
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
- "label": "Category Name",
+ "label": "Hotel Room Type",
"length": 0,
"no_copy": 0,
+ "options": "Hotel Room Type",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -49,7 +50,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "parent_hub_category",
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "item",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -58,10 +88,10 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Parent Category",
+ "label": "Item",
"length": 0,
"no_copy": 0,
- "options": "Hub Category",
+ "options": "Item",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -80,8 +110,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "is_group",
- "fieldtype": "Check",
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -89,7 +119,6 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Is Group",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -110,8 +139,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
+ "fieldname": "amenities",
+ "fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -119,9 +148,10 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Description",
+ "label": "Amenities",
"length": 0,
"no_copy": 0,
+ "options": "Hotel Room Amenity",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -129,97 +159,7 @@
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "lft",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Left",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "rgt",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Right",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "old_parent",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Old Parent",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
+ "reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -235,10 +175,10 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-09-03 22:04:22.958831",
+ "modified": "2017-12-09 12:10:31.111952",
"modified_by": "Administrator",
- "module": "Hub Node",
- "name": "Hub Category",
+ "module": "Hotels",
+ "name": "Hotel Room Package",
"name_case": "",
"owner": "Administrator",
"permissions": [
@@ -263,13 +203,13 @@
"write": 1
}
],
- "quick_entry": 1,
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
- "title_field": "hub_category_name",
"track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/hotels/doctype/hotel_room_package/hotel_room_package.py b/erpnext/hotels/doctype/hotel_room_package/hotel_room_package.py
new file mode 100644
index 0000000..8a62eea
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_package/hotel_room_package.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class HotelRoomPackage(Document):
+ def validate(self):
+ if not self.item:
+ item = frappe.get_doc(dict(
+ doctype = 'Item',
+ item_code = self.name,
+ item_group = 'Products',
+ is_stock_item = 0,
+ stock_uom = 'Unit'
+ ))
+ item.insert()
+ self.item = item.name
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/hotels/doctype/hotel_room_package/test_hotel_room_package.js
similarity index 69%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/hotels/doctype/hotel_room_package/test_hotel_room_package.js
index 73c06d5..f1ebad4 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room_package/test_hotel_room_package.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Hotel Room Package", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Hotel Room Package
+ () => frappe.tests.make('Hotel Room Package', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hotels/doctype/hotel_room_package/test_hotel_room_package.py b/erpnext/hotels/doctype/hotel_room_package/test_hotel_room_package.py
new file mode 100644
index 0000000..ebf7f2b
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_package/test_hotel_room_package.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+test_records = [
+ dict(doctype='Item', item_code='Breakfast',
+ item_group='Products', is_stock_item=0),
+ dict(doctype='Item', item_code='Lunch',
+ item_group='Products', is_stock_item=0),
+ dict(doctype='Item', item_code='Dinner',
+ item_group='Products', is_stock_item=0),
+ dict(doctype='Item', item_code='WiFi',
+ item_group='Products', is_stock_item=0),
+ dict(doctype='Hotel Room Type', name="Delux Room",
+ capacity=4,
+ extra_bed_capacity=2,
+ amenities = [
+ dict(item='WiFi', billable=0)
+ ]),
+ dict(doctype='Hotel Room Type', name="Basic Room",
+ capacity=4,
+ extra_bed_capacity=2,
+ amenities = [
+ dict(item='Breakfast', billable=0)
+ ]),
+ dict(doctype="Hotel Room Package", name="Basic Room with Breakfast",
+ hotel_room_type="Basic Room",
+ amenities = [
+ dict(item="Breakfast", billable=0)
+ ]),
+ dict(doctype="Hotel Room Package", name="Basic Room with Lunch",
+ hotel_room_type="Basic Room",
+ amenities = [
+ dict(item="Breakfast", billable=0),
+ dict(item="Lunch", billable=0)
+ ]),
+ dict(doctype="Hotel Room Package", name="Basic Room with Dinner",
+ hotel_room_type="Basic Room",
+ amenities = [
+ dict(item="Breakfast", billable=0),
+ dict(item="Dinner", billable=0)
+ ])
+]
+
+class TestHotelRoomPackage(unittest.TestCase):
+ pass
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/hotels/doctype/hotel_room_pricing/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/hotels/doctype/hotel_room_pricing/__init__.py
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.js b/erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.js
similarity index 78%
copy from erpnext/hub_node/doctype/hub_category/hub_category.js
copy to erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.js
index 9f54166..87bb192 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.js
@@ -1,7 +1,7 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Hub Category', {
+frappe.ui.form.on('Hotel Room Pricing', {
refresh: function(frm) {
}
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.json b/erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.json
similarity index 75%
rename from erpnext/hub_node/doctype/hub_category/hub_category.json
rename to erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.json
index 4f8d66a..0f5a776 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.json
+++ b/erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.json
@@ -1,15 +1,15 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
- "allow_import": 0,
+ "allow_import": 1,
"allow_rename": 0,
- "autoname": "field:hub_category_name",
- "beta": 0,
- "creation": "2017-08-22 11:31:10.410322",
+ "autoname": "prompt",
+ "beta": 1,
+ "creation": "2017-12-08 12:51:47.088174",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
- "document_type": "",
+ "document_type": "Setup",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
@@ -19,8 +19,39 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "hub_category_name",
- "fieldtype": "Data",
+ "default": "1",
+ "fieldname": "enabled",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Enabled",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "currency",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -28,7 +59,38 @@
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 0,
- "label": "Category Name",
+ "label": "Currency",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "From Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -49,8 +111,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "parent_hub_category",
- "fieldtype": "Link",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -58,10 +120,9 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Parent Category",
+ "label": "To Date",
"length": 0,
"no_copy": 0,
- "options": "Hub Category",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -69,7 +130,7 @@
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
- "reqd": 0,
+ "reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -80,8 +141,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "is_group",
- "fieldtype": "Check",
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -89,7 +150,6 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Is Group",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -110,8 +170,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
+ "fieldname": "items",
+ "fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -119,9 +179,10 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Description",
+ "label": "Items",
"length": 0,
"no_copy": 0,
+ "options": "Hotel Room Pricing Item",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -129,97 +190,7 @@
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "lft",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Left",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "rgt",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Right",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "old_parent",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Old Parent",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
+ "reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -235,10 +206,10 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-09-03 22:04:22.958831",
+ "modified": "2017-12-09 12:10:41.559559",
"modified_by": "Administrator",
- "module": "Hub Node",
- "name": "Hub Category",
+ "module": "Hotels",
+ "name": "Hotel Room Pricing",
"name_case": "",
"owner": "Administrator",
"permissions": [
@@ -261,15 +232,35 @@
"share": 1,
"submit": 0,
"write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Hotel Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
- "title_field": "hub_category_name",
"track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.py
similarity index 76%
copy from erpnext/hub_node/doctype/hub_category/hub_category.py
copy to erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.py
index 5d19082..8eee0f2 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/hotels/doctype/hotel_room_pricing/hotel_room_pricing.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils.nestedset import NestedSet
from frappe.model.document import Document
-class HubCategory(NestedSet):
+class HotelRoomPricing(Document):
pass
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/hotels/doctype/hotel_room_pricing/test_hotel_room_pricing.js
similarity index 69%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/hotels/doctype/hotel_room_pricing/test_hotel_room_pricing.js
index 73c06d5..ba0d1fd 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room_pricing/test_hotel_room_pricing.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Hotel Room Pricing", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Hotel Room Pricing
+ () => frappe.tests.make('Hotel Room Pricing', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hotels/doctype/hotel_room_pricing/test_hotel_room_pricing.py b/erpnext/hotels/doctype/hotel_room_pricing/test_hotel_room_pricing.py
new file mode 100644
index 0000000..b73fd44
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_pricing/test_hotel_room_pricing.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+test_dependencies = ["Hotel Room Package"]
+test_records = [
+ dict(doctype="Hotel Room Pricing", enabled=1,
+ name="Winter 2017",
+ from_date="2017-01-01", to_date="2017-01-10",
+ items = [
+ dict(item="Basic Room with Breakfast", rate=10000),
+ dict(item="Basic Room with Lunch", rate=11000),
+ dict(item="Basic Room with Dinner", rate=12000)
+ ])
+]
+
+class TestHotelRoomPricing(unittest.TestCase):
+ pass
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/hotels/doctype/hotel_room_pricing_item/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/hotels/doctype/hotel_room_pricing_item/__init__.py
diff --git a/erpnext/hotels/doctype/hotel_room_pricing_item/hotel_room_pricing_item.json b/erpnext/hotels/doctype/hotel_room_pricing_item/hotel_room_pricing_item.json
new file mode 100644
index 0000000..d6cd826
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_pricing_item/hotel_room_pricing_item.json
@@ -0,0 +1,103 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-12-08 12:50:13.486090",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "item",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Item",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-12-09 12:04:58.641703",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Room Pricing Item",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/hotels/doctype/hotel_room_pricing_item/hotel_room_pricing_item.py
similarity index 76%
rename from erpnext/hub_node/doctype/hub_category/hub_category.py
rename to erpnext/hotels/doctype/hotel_room_pricing_item/hotel_room_pricing_item.py
index 5d19082..6bf01bf 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/hotels/doctype/hotel_room_pricing_item/hotel_room_pricing_item.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils.nestedset import NestedSet
from frappe.model.document import Document
-class HubCategory(NestedSet):
+class HotelRoomPricingItem(Document):
pass
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/hotels/doctype/hotel_room_pricing_package/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/hotels/doctype/hotel_room_pricing_package/__init__.py
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.js b/erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.js
similarity index 75%
copy from erpnext/hub_node/doctype/hub_category/hub_category.js
copy to erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.js
index 9f54166..f6decd9 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.js
@@ -1,7 +1,7 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Hub Category', {
+frappe.ui.form.on('Hotel Room Pricing Package', {
refresh: function(frm) {
}
diff --git a/erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.json b/erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.json
new file mode 100644
index 0000000..92bd980
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.json
@@ -0,0 +1,162 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2017-12-08 12:50:13.486090",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "From Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "To Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "hotel_room_package",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Hotel Room Package",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Hotel Room Package",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-12-08 12:52:01.743866",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Room Pricing Package",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.py
similarity index 76%
copy from erpnext/hub_node/doctype/hub_category/hub_category.py
copy to erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.py
index 5d19082..9ae9fcf 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/hotels/doctype/hotel_room_pricing_package/hotel_room_pricing_package.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils.nestedset import NestedSet
from frappe.model.document import Document
-class HubCategory(NestedSet):
+class HotelRoomPricingPackage(Document):
pass
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/hotels/doctype/hotel_room_pricing_package/test_hotel_room_pricing_package.js
similarity index 66%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/hotels/doctype/hotel_room_pricing_package/test_hotel_room_pricing_package.js
index 73c06d5..73a561c 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room_pricing_package/test_hotel_room_pricing_package.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Hotel Room Pricing Package", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Hotel Room Pricing Package
+ () => frappe.tests.make('Hotel Room Pricing Package', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.py b/erpnext/hotels/doctype/hotel_room_pricing_package/test_hotel_room_pricing_package.py
similarity index 77%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.py
copy to erpnext/hotels/doctype/hotel_room_pricing_package/test_hotel_room_pricing_package.py
index 7df2088..fec1c86 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.py
+++ b/erpnext/hotels/doctype/hotel_room_pricing_package/test_hotel_room_pricing_package.py
@@ -6,5 +6,5 @@
import frappe
import unittest
-class TestHubCategory(unittest.TestCase):
+class TestHotelRoomPricingPackage(unittest.TestCase):
pass
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/hotels/doctype/hotel_room_reservation/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/hotels/doctype/hotel_room_reservation/__init__.py
diff --git a/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js
new file mode 100644
index 0000000..2c9fd7b
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js
@@ -0,0 +1,68 @@
+// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Hotel Room Reservation', {
+ refresh: function(frm) {
+ if(frm.doc.docstatus == 1){
+ frm.add_custom_button(__("Make Invoice"), ()=> {
+ frm.trigger("make_invoice");
+ });
+ }
+ },
+ from_date: function(frm) {
+ frm.trigger("recalculate_rates");
+ },
+ to_date: function(frm) {
+ frm.trigger("recalculate_rates");
+ },
+ recalculate_rates: function(frm) {
+ if (!frm.doc.from_date || !frm.doc.to_date
+ || !frm.doc.items.length){
+ return;
+ }
+ frappe.call({
+ "method": "erpnext.hotels.doctype.hotel_room_reservation.hotel_room_reservation.get_room_rate",
+ "args": {"hotel_room_reservation": frm.doc}
+ }).done((r)=> {
+ for (var i = 0; i < r.message.items.length; i++) {
+ frm.doc.items[i].rate = r.message.items[i].rate;
+ frm.doc.items[i].amount = r.message.items[i].amount;
+ }
+ frappe.run_serially([
+ ()=> frm.set_value("net_total", r.message.net_total),
+ ()=> frm.refresh_field("items")
+ ]);
+ });
+ },
+ make_invoice: function(frm) {
+ frappe.model.with_doc("Hotel Settings", "Hotel Settings", ()=>{
+ frappe.model.with_doctype("Sales Invoice", ()=>{
+ let hotel_settings = frappe.get_doc("Hotel Settings", "Hotel Settings");
+ let invoice = frappe.model.get_new_doc("Sales Invoice");
+ invoice.customer = frm.doc.customer || hotel_settings.default_customer;
+ if (hotel_settings.default_invoice_naming_series){
+ invoice.naming_series = hotel_settings.default_invoice_naming_series;
+ }
+ for (let d of frm.doc.items){
+ let invoice_item = frappe.model.add_child(invoice, "items")
+ invoice_item.item_code = d.item;
+ invoice_item.qty = d.qty;
+ invoice_item.rate = d.rate;
+ }
+ if (hotel_settings.default_taxes_and_charges){
+ invoice.taxes_and_charges = hotel_settings.default_taxes_and_charges;
+ }
+ frappe.set_route("Form", invoice.doctype, invoice.name);
+ });
+ });
+ }
+});
+
+frappe.ui.form.on('Hotel Room Reservation Item', {
+ item: function(frm, doctype, name) {
+ frm.trigger("recalculate_rates");
+ },
+ qty: function(frm) {
+ frm.trigger("recalculate_rates");
+ }
+});
diff --git a/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.json b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.json
new file mode 100644
index 0000000..c65c4e1
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.json
@@ -0,0 +1,415 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "HRES.#######",
+ "beta": 1,
+ "creation": "2017-12-08 13:01:34.829175",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "guest_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Guest Name",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Customer",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "From Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "To Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "late_checkin",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Late Checkin",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_6",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Status",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Booked\nAdvance Paid\nInvoiced\nPaid\nCompleted\nCancelled",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_8",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Items",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Hotel Room Reservation Item",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "net_total",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Net Total",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Hotel Room Reservation",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-12-09 12:11:26.395419",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Room Reservation",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Hotel Reservation User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py
new file mode 100644
index 0000000..f3f76a9
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, json
+from frappe.model.document import Document
+from frappe import _
+from frappe.utils import date_diff, add_days, flt
+
+class HotelRoomUnavailableError(frappe.ValidationError): pass
+class HotelRoomPricingNotSetError(frappe.ValidationError): pass
+
+class HotelRoomReservation(Document):
+ def validate(self):
+ self.total_rooms = {}
+ self.set_rates()
+ self.validate_availability()
+
+ def validate_availability(self):
+ for i in xrange(date_diff(self.to_date, self.from_date)):
+ day = add_days(self.from_date, i)
+ self.rooms_booked = {}
+
+ for d in self.items:
+ if not d.item in self.rooms_booked:
+ self.rooms_booked[d.item] = 0
+
+ room_type = frappe.db.get_value("Hotel Room Package",
+ d.item, 'hotel_room_type')
+ rooms_booked = get_rooms_booked(room_type, day, exclude_reservation=self.name) \
+ + d.qty + self.rooms_booked.get(d.item)
+ total_rooms = self.get_total_rooms(d.item)
+ if total_rooms < rooms_booked:
+ frappe.throw(_("Hotel Rooms of type {0} are unavailable on {1}".format(d.item,
+ frappe.format(day, dict(fieldtype="Date")))), exc=HotelRoomUnavailableError)
+
+ self.rooms_booked[d.item] += rooms_booked
+
+ def get_total_rooms(self, item):
+ if not item in self.total_rooms:
+ self.total_rooms[item] = frappe.db.sql("""
+ select count(*)
+ from
+ `tabHotel Room Package` package
+ inner join
+ `tabHotel Room` room on package.hotel_room_type = room.hotel_room_type
+ where
+ package.item = %s""", item)[0][0] or 0
+
+ return self.total_rooms[item]
+
+ def set_rates(self):
+ self.net_total = 0
+ for d in self.items:
+ net_rate = 0.0
+ for i in xrange(date_diff(self.to_date, self.from_date)):
+ day = add_days(self.from_date, i)
+ if not d.item:
+ continue
+ day_rate = frappe.db.sql("""
+ select
+ item.rate
+ from
+ `tabHotel Room Pricing Item` item,
+ `tabHotel Room Pricing` pricing
+ where
+ item.parent = pricing.name
+ and item.item = %s
+ and %s between pricing.from_date
+ and pricing.to_date""", (d.item, day))
+
+ if day_rate:
+ net_rate += day_rate[0][0]
+ else:
+ frappe.throw(
+ _("Please set Hotel Room Rate on {}".format(
+ frappe.format(day, dict(fieldtype="Date")))), exc=HotelRoomPricingNotSetError)
+ d.rate = net_rate
+ d.amount = net_rate * flt(d.qty)
+ self.net_total += d.amount
+
+@frappe.whitelist()
+def get_room_rate(hotel_room_reservation):
+ """Calculate rate for each day as it may belong to different Hotel Room Pricing Item"""
+ doc = frappe.get_doc(json.loads(hotel_room_reservation))
+ doc.set_rates()
+ return doc.as_dict()
+
+def get_rooms_booked(room_type, day, exclude_reservation=None):
+ exclude_condition = ''
+ if exclude_reservation:
+ exclude_condition = 'and reservation.name != "{0}"'.format(frappe.db.escape(exclude_reservation))
+
+ return frappe.db.sql("""
+ select sum(item.qty)
+ from
+ `tabHotel Room Package` room_package,
+ `tabHotel Room Reservation Item` item,
+ `tabHotel Room Reservation` reservation
+ where
+ item.parent = reservation.name
+ and room_package.item = item.item
+ and room_package.hotel_room_type = %s
+ and reservation.docstatus = 1
+ {exclude_condition}
+ and %s between reservation.from_date
+ and reservation.to_date""".format(exclude_condition=exclude_condition),
+ (room_type, day))[0][0] or 0
diff --git a/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation_calendar.js b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation_calendar.js
new file mode 100644
index 0000000..7f7322c
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation_calendar.js
@@ -0,0 +1,9 @@
+frappe.views.calendar["Hotel Room Reservation"] = {
+ field_map: {
+ "start": "from_date",
+ "end": "to_date",
+ "id": "name",
+ "title": "guest_name",
+ "status": "status"
+ }
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/hotels/doctype/hotel_room_reservation/test_hotel_room_reservation.js
similarity index 67%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/hotels/doctype/hotel_room_reservation/test_hotel_room_reservation.js
index 73c06d5..2897139 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room_reservation/test_hotel_room_reservation.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Hotel Room Reservation", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Hotel Room Reservation
+ () => frappe.tests.make('Hotel Room Reservation', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hotels/doctype/hotel_room_reservation/test_hotel_room_reservation.py b/erpnext/hotels/doctype/hotel_room_reservation/test_hotel_room_reservation.py
new file mode 100644
index 0000000..d497996
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_reservation/test_hotel_room_reservation.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.hotels.doctype.hotel_room_reservation.hotel_room_reservation import HotelRoomPricingNotSetError, HotelRoomUnavailableError
+test_dependencies = ["Hotel Room Package", "Hotel Room Pricing", "Hotel Room"]
+
+class TestHotelRoomReservation(unittest.TestCase):
+ def setUp(self):
+ frappe.db.sql("delete from `tabHotel Room Reservation`")
+ frappe.db.sql("delete from `tabHotel Room Reservation Item`")
+
+ def test_reservation(self):
+ reservation = make_reservation(
+ from_date="2017-01-01",
+ to_date="2017-01-03",
+ items=[
+ dict(item="Basic Room with Dinner", qty=2)
+ ]
+ )
+ reservation.insert()
+ self.assertEqual(reservation.net_total, 48000)
+
+ def test_price_not_set(self):
+ reservation = make_reservation(
+ from_date="2016-01-01",
+ to_date="2016-01-03",
+ items=[
+ dict(item="Basic Room with Dinner", qty=2)
+ ]
+ )
+ self.assertRaises(HotelRoomPricingNotSetError, reservation.insert)
+
+ def test_room_unavailable(self):
+ reservation = make_reservation(
+ from_date="2017-01-01",
+ to_date="2017-01-03",
+ items=[
+ dict(item="Basic Room with Dinner", qty=2),
+ ]
+ )
+ reservation.insert()
+
+ reservation = make_reservation(
+ from_date="2017-01-01",
+ to_date="2017-01-03",
+ items=[
+ dict(item="Basic Room with Dinner", qty=20),
+ ]
+ )
+ self.assertRaises(HotelRoomUnavailableError, reservation.insert)
+
+def make_reservation(**kwargs):
+ kwargs["doctype"] = "Hotel Room Reservation"
+ if not "guest_name" in kwargs:
+ kwargs["guest_name"] = "Test Guest"
+ doc = frappe.get_doc(kwargs)
+ return doc
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/hotels/doctype/hotel_room_reservation_item/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/hotels/doctype/hotel_room_reservation_item/__init__.py
diff --git a/erpnext/hotels/doctype/hotel_room_reservation_item/hotel_room_reservation_item.json b/erpnext/hotels/doctype/hotel_room_reservation_item/hotel_room_reservation_item.json
new file mode 100644
index 0000000..2b7931e
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_reservation_item/hotel_room_reservation_item.json
@@ -0,0 +1,195 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "",
+ "beta": 0,
+ "creation": "2017-12-08 12:58:21.733330",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "item",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Item",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "qty",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Currency",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Amount",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-12-09 12:04:34.562956",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Room Reservation Item",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/hotels/doctype/hotel_room_reservation_item/hotel_room_reservation_item.py
similarity index 76%
copy from erpnext/hub_node/doctype/hub_category/hub_category.py
copy to erpnext/hotels/doctype/hotel_room_reservation_item/hotel_room_reservation_item.py
index 5d19082..3406fae 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/hotels/doctype/hotel_room_reservation_item/hotel_room_reservation_item.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils.nestedset import NestedSet
from frappe.model.document import Document
-class HubCategory(NestedSet):
+class HotelRoomReservationItem(Document):
pass
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/hotels/doctype/hotel_room_type/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/hotels/doctype/hotel_room_type/__init__.py
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.js b/erpnext/hotels/doctype/hotel_room_type/hotel_room_type.js
similarity index 79%
copy from erpnext/hub_node/doctype/hub_category/hub_category.js
copy to erpnext/hotels/doctype/hotel_room_type/hotel_room_type.js
index 9f54166..d73835d 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room_type/hotel_room_type.js
@@ -1,7 +1,7 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Hub Category', {
+frappe.ui.form.on('Hotel Room Type', {
refresh: function(frm) {
}
diff --git a/erpnext/hotels/doctype/hotel_room_type/hotel_room_type.json b/erpnext/hotels/doctype/hotel_room_type/hotel_room_type.json
new file mode 100644
index 0000000..3d26413
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_room_type/hotel_room_type.json
@@ -0,0 +1,204 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "prompt",
+ "beta": 1,
+ "creation": "2017-12-08 12:38:29.485175",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "capacity",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Capacity",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "extra_bed_capacity",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Extra Bed Capacity",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_3",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "amenities",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amenities",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Hotel Room Amenity",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-12-09 12:10:23.355486",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Room Type",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Hotel Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/hotels/doctype/hotel_room_type/hotel_room_type.py
similarity index 76%
copy from erpnext/hub_node/doctype/hub_category/hub_category.py
copy to erpnext/hotels/doctype/hotel_room_type/hotel_room_type.py
index 5d19082..1fc1303 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/hotels/doctype/hotel_room_type/hotel_room_type.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils.nestedset import NestedSet
from frappe.model.document import Document
-class HubCategory(NestedSet):
+class HotelRoomType(Document):
pass
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/hotels/doctype/hotel_room_type/test_hotel_room_type.js
similarity index 70%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/hotels/doctype/hotel_room_type/test_hotel_room_type.js
index 73c06d5..e2dd578 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/hotels/doctype/hotel_room_type/test_hotel_room_type.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Hotel Room Type", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Hotel Room Type
+ () => frappe.tests.make('Hotel Room Type', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.py b/erpnext/hotels/doctype/hotel_room_type/test_hotel_room_type.py
similarity index 80%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.py
copy to erpnext/hotels/doctype/hotel_room_type/test_hotel_room_type.py
index 7df2088..3b243e9 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.py
+++ b/erpnext/hotels/doctype/hotel_room_type/test_hotel_room_type.py
@@ -6,5 +6,5 @@
import frappe
import unittest
-class TestHubCategory(unittest.TestCase):
+class TestHotelRoomType(unittest.TestCase):
pass
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/hotels/doctype/hotel_settings/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/hotels/doctype/hotel_settings/__init__.py
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.js b/erpnext/hotels/doctype/hotel_settings/hotel_settings.js
similarity index 79%
copy from erpnext/hub_node/doctype/hub_category/hub_category.js
copy to erpnext/hotels/doctype/hotel_settings/hotel_settings.js
index 9f54166..0b4a2c3 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.js
+++ b/erpnext/hotels/doctype/hotel_settings/hotel_settings.js
@@ -1,7 +1,7 @@
// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Hub Category', {
+frappe.ui.form.on('Hotel Settings', {
refresh: function(frm) {
}
diff --git a/erpnext/hotels/doctype/hotel_settings/hotel_settings.json b/erpnext/hotels/doctype/hotel_settings/hotel_settings.json
new file mode 100644
index 0000000..d9f5572
--- /dev/null
+++ b/erpnext/hotels/doctype/hotel_settings/hotel_settings.json
@@ -0,0 +1,175 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 1,
+ "creation": "2017-12-08 17:50:24.523107",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_customer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Default Customer",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Customer",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_taxes_and_charges",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Taxes and Charges",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Sales Taxes and Charges Template",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_invoice_naming_series",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Invoice Naming Series",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2017-12-09 12:11:12.857308",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Settings",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Hotel Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "restrict_to_domain": "Hospitality",
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/hotels/doctype/hotel_settings/hotel_settings.py
similarity index 76%
copy from erpnext/hub_node/doctype/hub_category/hub_category.py
copy to erpnext/hotels/doctype/hotel_settings/hotel_settings.py
index 5d19082..d78bca1 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/hotels/doctype/hotel_settings/hotel_settings.py
@@ -4,8 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils.nestedset import NestedSet
from frappe.model.document import Document
-class HubCategory(NestedSet):
+class HotelSettings(Document):
pass
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.js b/erpnext/hotels/doctype/hotel_settings/test_hotel_settings.js
similarity index 71%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.js
copy to erpnext/hotels/doctype/hotel_settings/test_hotel_settings.js
index 73c06d5..bc0b7f8 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.js
+++ b/erpnext/hotels/doctype/hotel_settings/test_hotel_settings.js
@@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate
// and remove above this line
-QUnit.test("test: Hub Category", function (assert) {
+QUnit.test("test: Hotel Settings", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(1);
frappe.run_serially([
- // insert a new Hub Category
- () => frappe.tests.make('Hub Category', [
+ // insert a new Hotel Settings
+ () => frappe.tests.make('Hotel Settings', [
// values to be set
{key: 'value'}
]),
diff --git a/erpnext/hub_node/doctype/hub_category/test_hub_category.py b/erpnext/hotels/doctype/hotel_settings/test_hotel_settings.py
similarity index 80%
copy from erpnext/hub_node/doctype/hub_category/test_hub_category.py
copy to erpnext/hotels/doctype/hotel_settings/test_hotel_settings.py
index 7df2088..a081acc 100644
--- a/erpnext/hub_node/doctype/hub_category/test_hub_category.py
+++ b/erpnext/hotels/doctype/hotel_settings/test_hotel_settings.py
@@ -6,5 +6,5 @@
import frappe
import unittest
-class TestHubCategory(unittest.TestCase):
+class TestHotelSettings(unittest.TestCase):
pass
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/hotels/report/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/hotels/report/__init__.py
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py b/erpnext/hotels/report/hotel_room_occupancy/__init__.py
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to erpnext/hotels/report/hotel_room_occupancy/__init__.py
diff --git a/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.js b/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.js
new file mode 100644
index 0000000..81efb2d
--- /dev/null
+++ b/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.js
@@ -0,0 +1,22 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Hotel Room Occupancy"] = {
+ "filters": [
+ {
+ "fieldname":"from_date",
+ "label": __("From Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.now_date(),
+ "reqd":1
+ },
+ {
+ "fieldname":"to_date",
+ "label": __("To Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.now_date(),
+ "reqd":1
+ }
+ ]
+}
diff --git a/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.json b/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.json
new file mode 100644
index 0000000..782a48b
--- /dev/null
+++ b/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.json
@@ -0,0 +1,26 @@
+{
+ "add_total_row": 1,
+ "apply_user_permissions": 1,
+ "creation": "2017-12-09 14:31:26.306705",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2017-12-09 14:31:26.306705",
+ "modified_by": "Administrator",
+ "module": "Hotels",
+ "name": "Hotel Room Occupancy",
+ "owner": "Administrator",
+ "ref_doctype": "Hotel Room Reservation",
+ "report_name": "Hotel Room Occupancy",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "System Manager"
+ },
+ {
+ "role": "Hotel Reservation User"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py b/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py
new file mode 100644
index 0000000..aebeb45
--- /dev/null
+++ b/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py
@@ -0,0 +1,33 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import add_days, date_diff
+
+from erpnext.hotels.doctype.hotel_room_reservation.hotel_room_reservation import get_rooms_booked
+
+def execute(filters=None):
+ columns = get_columns(filters)
+ data = get_data(filters)
+ return columns, data
+
+def get_columns(filters):
+ columns = [
+ dict(label=_("Room Type"), fieldname="room_type"),
+ dict(label=_("Rooms Booked"), fieldtype="Int")
+ ]
+ return columns
+
+def get_data(filters):
+ out = []
+ for room_type in frappe.get_all('Hotel Room Type'):
+ total_booked = 0
+ for i in xrange(date_diff(filters.to_date, filters.from_date)):
+ day = add_days(filters.from_date, i)
+ total_booked += get_rooms_booked(room_type.name, day)
+
+ out.append([room_type.name, total_booked])
+
+ return out
\ No newline at end of file
diff --git a/erpnext/hr/doctype/attendance/attendance.py b/erpnext/hr/doctype/attendance/attendance.py
index 458b2dd..7b04f7d 100644
--- a/erpnext/hr/doctype/attendance/attendance.py
+++ b/erpnext/hr/doctype/attendance/attendance.py
@@ -21,7 +21,7 @@
def check_leave_record(self):
leave_record = frappe.db.sql("""select leave_type, half_day from `tabLeave Application`
- where employee = %s and %s between from_date and to_date and status = 'Approved'
+ where employee = %s and %s between from_date and to_date
and docstatus = 1""", (self.employee, self.attendance_date), as_dict=True)
if leave_record:
if leave_record[0].half_day:
diff --git a/erpnext/hr/doctype/employee_loan/employee_loan.py b/erpnext/hr/doctype/employee_loan/employee_loan.py
index dadd769..1751835 100644
--- a/erpnext/hr/doctype/employee_loan/employee_loan.py
+++ b/erpnext/hr/doctype/employee_loan/employee_loan.py
@@ -135,7 +135,7 @@
return employee_loan.as_dict()
@frappe.whitelist()
-def make_jv_entry(employee_loan, company, employee_loan_account, employee, loan_amount, payment_account):
+def make_jv_entry(employee_loan, company, employee_loan_account, employee, loan_amount, payment_account=None):
journal_entry = frappe.new_doc('Journal Entry')
journal_entry.voucher_type = 'Bank Entry'
journal_entry.user_remark = _('Against Employee Loan: {0}').format(employee_loan)
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index f40e77c..a99311d 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -311,7 +311,7 @@
employee_advance: function(frm, cdt, cdn) {
var child = locals[cdt][cdn];
if(!frm.doc.employee){
- frappe.msgprint('Select an employee to get the employee advance.');
+ frappe.msgprint(__('Select an employee to get the employee advance.'));
frm.doc.advances = [];
refresh_field("advances");
}
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js
index 6541a8c..6385c0e 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.js
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.js
@@ -21,8 +21,7 @@
"designation": frm.doc.job_opening,
};
frappe.new_doc("Offer Letter");
- }, __("Make"));
- cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+ });
}
}
diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js
index 2eb155d..2e6e451 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.js
+++ b/erpnext/hr/doctype/leave_application/leave_application.js
@@ -10,15 +10,6 @@
frm.set_value("posting_date", frappe.datetime.get_today());
}
- frm.set_query("leave_approver", function() {
- return {
- query: "erpnext.hr.doctype.leave_application.leave_application.get_approvers",
- filters: {
- employee: frm.doc.employee
- }
- };
- });
-
frm.set_query("employee", erpnext.queries.employee);
},
@@ -29,14 +20,11 @@
refresh: function(frm) {
if (frm.is_new()) {
- frm.set_value("status", "Open");
frm.trigger("calculate_total_days");
}
- },
-
- leave_approver: function(frm) {
- if(frm.doc.leave_approver){
- frm.set_value("leave_approver_name", frappe.user.full_name(frm.doc.leave_approver));
+ cur_frm.set_intro("");
+ if(frm.doc.__islocal && !in_list(frappe.user_roles, "Employee")) {
+ frm.set_intro(__("Fill the form and save it"));
}
},
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 7afbc4d..2435d06 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -50,66 +50,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "default": "Open",
- "fieldname": "status",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 1,
- "label": "Status",
- "length": 0,
- "no_copy": 1,
- "options": "Open\nApproved\nRejected",
- "permlevel": 1,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_12",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "leave_type",
"fieldtype": "Link",
"hidden": 0,
@@ -493,96 +433,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "column_break_15",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "leave_approver",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 1,
- "label": "Leave Approver",
- "length": 0,
- "no_copy": 0,
- "options": "User",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "leave_approver_name",
- "fieldtype": "Read Only",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Leave Approver Name",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "sb10",
"fieldtype": "Section Break",
"hidden": 0,
@@ -796,7 +646,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 3,
- "modified": "2017-06-13 14:28:52.426044",
+ "modified": "2018-02-12 13:10:05.766762",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Application",
@@ -887,9 +737,9 @@
{
"amend": 1,
"apply_user_permissions": 0,
- "cancel": 0,
+ "cancel": 1,
"create": 0,
- "delete": 0,
+ "delete": 1,
"email": 1,
"export": 0,
"if_owner": 0,
@@ -945,7 +795,7 @@
"submit": 0,
"write": 1
}
- ],
+ ],
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index bfa163a..22fd0e5 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -21,16 +21,10 @@
from frappe.model.document import Document
class LeaveApplication(Document):
def get_feed(self):
- return _("{0}: From {0} of type {1}").format(self.status, self.employee_name, self.leave_type)
+ return _("{0}: From {0} of type {1}").format(self.employee_name, self.leave_type)
def validate(self):
- if not getattr(self, "__islocal", None) and frappe.db.exists(self.doctype, self.name):
- self.previous_doc = frappe.get_value(self.doctype, self.name, "leave_approver", as_dict=True)
- else:
- self.previous_doc = None
-
set_employee_name(self)
-
self.validate_dates()
self.validate_balance_leaves()
self.validate_leave_overlap()
@@ -38,24 +32,12 @@
self.show_block_day_warning()
self.validate_block_days()
self.validate_salary_processed_days()
- self.validate_leave_approver()
self.validate_attendance()
- def on_update(self):
- if (not self.previous_doc and self.leave_approver) or (self.previous_doc and \
- self.status == "Open" and self.previous_doc.leave_approver != self.leave_approver):
- # notify leave approver about creation
- self.notify_leave_approver()
-
def on_submit(self):
- if self.status == "Open":
- frappe.throw(_("Only Leave Applications with status 'Approved' and 'Rejected' can be submitted"))
self.validate_back_dated_application()
- # notify leave applier about approval
- self.notify_employee(self.status)
-
def on_cancel(self):
# notify leave applier about cancellation
self.notify_employee("cancelled")
@@ -71,10 +53,10 @@
frappe.throw(_("Half Day Date should be between From Date and To Date"))
if not is_lwp(self.leave_type):
- self.validate_dates_acorss_allocation()
+ self.validate_dates_across_allocation()
self.validate_back_dated_application()
- def validate_dates_acorss_allocation(self):
+ def validate_dates_across_allocation(self):
def _get_leave_alloction_record(date):
allocation = frappe.db.sql("""select name from `tabLeave Allocation`
where employee=%s and leave_type=%s and docstatus=1
@@ -89,7 +71,7 @@
frappe.throw(_("Application period cannot be outside leave allocation period"))
elif allocation_based_on_from_date != allocation_based_on_to_date:
- frappe.throw(_("Application period cannot be across two alocation records"))
+ frappe.throw(_("Application period cannot be across two allocation records"))
def validate_back_dated_application(self):
future_allocation = frappe.db.sql("""select name, from_date from `tabLeave Allocation`
@@ -129,7 +111,7 @@
block_dates = get_applicable_block_dates(self.from_date, self.to_date,
self.employee, self.company)
- if block_dates and self.status == "Approved":
+ if block_dates and self.docstatus == 1:
frappe.throw(_("You are not authorized to approve leaves on Block Dates"), LeaveDayBlockedError)
def validate_balance_leaves(self):
@@ -144,7 +126,7 @@
self.leave_balance = get_leave_balance_on(self.employee, self.leave_type, self.from_date,
consider_all_leaves_in_the_allocation_period=True)
- if self.status != "Rejected" and self.leave_balance < self.total_leave_days:
+ if self.leave_balance < self.total_leave_days:
if frappe.db.get_value("Leave Type", self.leave_type, "allow_negative"):
frappe.msgprint(_("Note: There is not enough leave balance for Leave Type {0}")
.format(self.leave_type))
@@ -161,7 +143,7 @@
select
name, leave_type, posting_date, from_date, to_date, total_leave_days, half_day_date
from `tabLeave Application`
- where employee = %(employee)s and docstatus < 2 and status in ("Open", "Approved")
+ where employee = %(employee)s and docstatus < 2
and to_date >= %(from_date)s and from_date <= %(to_date)s
and name != %(name)s""", {
"employee": self.employee,
@@ -182,16 +164,15 @@
self.throw_overlap_error(d)
def throw_overlap_error(self, d):
- msg = _("Employee {0} has already applied for {1} between {2} and {3}").format(self.employee,
+ msg = _("Employee {0} has already applied for {1} between {2} and {3} : ").format(self.employee,
d['leave_type'], formatdate(d['from_date']), formatdate(d['to_date'])) \
- + """ <br><b><a href="#Form/Leave Application/{0}">{0}</a></b>""".format(d["name"])
+ + """ <b><a href="#Form/Leave Application/{0}">{0}</a></b>""".format(d["name"])
frappe.throw(msg, OverlapError)
def get_total_leaves_on_half_day(self):
leave_count_on_half_day_date = frappe.db.sql("""select count(name) from `tabLeave Application`
where employee = %(employee)s
and docstatus < 2
- and status in ("Open", "Approved")
and half_day = 1
and half_day_date = %(half_day_date)s
and name != %(name)s""", {
@@ -207,23 +188,6 @@
if max_days and self.total_leave_days > cint(max_days):
frappe.throw(_("Leave of type {0} cannot be longer than {1}").format(self.leave_type, max_days))
- def validate_leave_approver(self):
- employee = frappe.get_doc("Employee", self.employee)
- leave_approvers = [l.leave_approver for l in employee.get("leave_approvers")]
-
- if len(leave_approvers) and self.leave_approver not in leave_approvers:
- frappe.throw(_("Leave approver must be one of {0}")
- .format(comma_or(leave_approvers)), InvalidLeaveApproverError)
-
- elif self.leave_approver and not frappe.db.sql("""select name from `tabHas Role`
- where parent=%s and role='Leave Approver'""", self.leave_approver):
- frappe.throw(_("{0} ({1}) must have role 'Leave Approver'")\
- .format(get_fullname(self.leave_approver), self.leave_approver), InvalidLeaveApproverError)
-
- elif self.docstatus==1 and len(leave_approvers) and self.leave_approver != frappe.session.user:
- frappe.throw(_("Only the selected Leave Approver can submit this Leave Application"),
- LeaveApproverIdentityError)
-
def validate_attendance(self):
attendance = frappe.db.sql("""select name from `tabAttendance` where employee = %s and (attendance_date between %s and %s)
and status = "Present" and docstatus = 1""",
@@ -232,7 +196,7 @@
frappe.throw(_("Attendance for employee {0} is already marked for this day").format(self.employee),
AttendanceAlreadyMarkedError)
- def notify_employee(self, status):
+ def notify_employee(self):
employee = frappe.get_doc("Employee", self.employee)
if not employee.user_id:
return
@@ -247,19 +211,15 @@
message += "Leave Type: {leave_type}".format(leave_type=self.leave_type)+"<br>"
message += "From Date: {from_date}".format(from_date=self.from_date)+"<br>"
message += "To Date: {to_date}".format(to_date=self.to_date)+"<br>"
- message += "Status: {status}".format(status=_(status))
return message
self.notify({
# for post in messages
"message": _get_message(url=True),
"message_to": employee.user_id,
- "subject": (_("Leave Application") + ": %s - %s") % (self.name, _(status))
+ "subject": (_("Leave Application") + ": %s - %s") % (self.name)
})
- def notify_leave_approver(self):
- employee = frappe.get_doc("Employee", self.employee)
-
def _get_message(url=False):
name = self.name
employee_name = cstr(employee.employee_name)
@@ -276,7 +236,6 @@
self.notify({
# for post in messages
"message": _get_message(url=True),
- "message_to": self.leave_approver,
# for email
"subject": (_("New Leave Application") + ": %s - " + _("Employee") + ": %s") % (self.name, cstr(employee.employee_name))
@@ -322,23 +281,6 @@
pass
@frappe.whitelist()
-def get_approvers(doctype, txt, searchfield, start, page_len, filters):
- if not filters.get("employee"):
- frappe.throw(_("Please select Employee Record first."))
-
- employee_user = frappe.get_value("Employee", filters.get("employee"), "user_id")
-
- approvers_list = frappe.db.sql("""select user.name, user.first_name, user.last_name from
- tabUser user, `tabEmployee Leave Approver` approver where
- approver.parent = %s
- and user.name like %s
- and approver.leave_approver=user.name""", (filters.get("employee"), "%" + txt + "%"))
-
- if not approvers_list:
- approvers_list = get_approver_list(employee_user)
- return approvers_list
-
-@frappe.whitelist()
def get_number_of_leave_days(employee, leave_type, from_date, to_date, half_day = None, half_day_date = None):
number_of_days = 0
if half_day == 1:
@@ -372,7 +314,7 @@
select employee, leave_type, from_date, to_date, total_leave_days
from `tabLeave Application`
where employee=%(employee)s and leave_type=%(leave_type)s
- and status="Approved" and docstatus=1
+ and docstatus=1
and (from_date between %(from_date)s and %(to_date)s
or to_date between %(from_date)s and %(to_date)s
or (from_date < %(from_date)s and to_date > %(to_date)s))
@@ -472,11 +414,10 @@
def add_leaves(events, start, end, match_conditions=None):
query = """select name, from_date, to_date, employee_name, half_day,
- status, employee, docstatus
+ employee, docstatus
from `tabLeave Application` where
from_date <= %(end)s and to_date >= %(start)s <= to_date
- and docstatus < 2
- and status!="Rejected" """
+ and docstatus < 2"""
if match_conditions:
query += match_conditions
@@ -486,7 +427,6 @@
"doctype": "Leave Application",
"from_date": d.from_date,
"to_date": d.to_date,
- "status": d.status,
"title": cstr(d.employee_name) + \
(d.half_day and _(" (Half Day)") or ""),
"docstatus": d.docstatus
diff --git a/erpnext/hr/doctype/leave_application/leave_application_calendar.js b/erpnext/hr/doctype/leave_application/leave_application_calendar.js
index d55c23b..0286f30 100644
--- a/erpnext/hr/doctype/leave_application/leave_application_calendar.js
+++ b/erpnext/hr/doctype/leave_application/leave_application_calendar.js
@@ -7,7 +7,7 @@
"end": "to_date",
"id": "name",
"title": "title",
- "status": "status",
+ "docstatus": 1
},
options: {
header: {
diff --git a/erpnext/hr/doctype/leave_application/leave_application_list.js b/erpnext/hr/doctype/leave_application/leave_application_list.js
index 966d1aa..d7588da 100644
--- a/erpnext/hr/doctype/leave_application/leave_application_list.js
+++ b/erpnext/hr/doctype/leave_application/leave_application_list.js
@@ -1,8 +1,3 @@
frappe.listview_settings['Leave Application'] = {
- add_fields: ["status", "leave_type", "employee", "employee_name", "total_leave_days", "from_date", "to_date"],
- filters:[["status","!=", "Rejected"]],
- get_indicator: function(doc) {
- return [__(doc.status), frappe.utils.guess_colour(doc.status),
- "status,=," + doc.status];
- }
+ add_fields: ["leave_type", "employee", "employee_name", "total_leave_days", "from_date", "to_date"]
};
diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.js b/erpnext/hr/doctype/leave_application/test_leave_application.js
index 6028405..6d7b6a7 100644
--- a/erpnext/hr/doctype/leave_application/test_leave_application.js
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.js
@@ -16,33 +16,27 @@
{to_date: leave_date},
{half_day: 1},
{employee: employee.message.name},
- {leave_approver: "Administrator"},
{follow_via_email: 0}
]);
},
+
() => frappe.timeout(1),
- // check calculated total leave days
- () => assert.ok(!cur_frm.doc.docstatus,
- "leave application not submitted with status as open"),
- () => cur_frm.set_value("status", "Approved"), // approve the application [as administrator]
- () => frappe.timeout(0.5),
- // save form
- () => cur_frm.save(),
- () => frappe.timeout(1),
- () => cur_frm.savesubmit(),
- () => frappe.timeout(1),
+ () => frappe.click_button('Actions'),
+ () => frappe.click_link('Approve'), // approve the application [as administrator]
() => frappe.click_button('Yes'),
() => frappe.timeout(1),
() => assert.ok(cur_frm.doc.docstatus,
"leave application submitted after approval"),
+
// check auto filled posting date [today]
+
() => assert.equal(today_date, cur_frm.doc.posting_date,
"posting date correctly set"),
() => frappe.set_route("List", "Leave Application", "List"),
() => frappe.timeout(1),
- // check approved application in list
- () => assert.deepEqual(["Test Employee 1", "Approved"], [cur_list.data[0].employee_name, cur_list.data[0].status],
- "leave for correct employee is approved"),
+ // // check approved application in list
+ () => assert.deepEqual(["Test Employee 1", 1], [cur_list.data[0].employee_name, cur_list.data[0].docstatus]),
+ // "leave for correct employee is submitted"),
() => done()
]);
});
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py
index 0ec3efb..4a9a001 100644
--- a/erpnext/hr/doctype/leave_application/test_leave_application.py
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.py
@@ -103,7 +103,6 @@
application = self.get_application(_test_records[0])
application.insert()
- application.status = "Approved"
self.assertRaises(LeaveDayBlockedError, application.submit)
frappe.set_user("test1@example.com")
@@ -127,11 +126,9 @@
make_allocation_record()
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.insert()
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
self.assertRaises(OverlapError, application.insert)
def test_overlap_with_half_day_1(self):
@@ -148,14 +145,12 @@
# leave from 1-5, half day on 3rd
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.half_day = 1
application.half_day_date = "2013-01-03"
application.insert()
# Apply again for a half day leave on 3rd
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.from_date = "2013-01-03"
application.to_date = "2013-01-03"
application.half_day = 1
@@ -164,7 +159,6 @@
# Apply again for a half day leave on 3rd
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.from_date = "2013-01-03"
application.to_date = "2013-01-03"
application.half_day = 1
@@ -186,12 +180,10 @@
# leave from 1-5, no half day
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.insert()
# Apply again for a half day leave on 1st
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.half_day = 1
application.half_day_date = application.from_date
@@ -211,14 +203,12 @@
# leave from 1-5, half day on 5th
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.half_day = 1
application.half_day_date = "2013-01-05"
application.insert()
# Apply leave from 4-7, half day on 5th
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.from_date = "2013-01-04"
application.to_date = "2013-01-07"
application.half_day = 1
@@ -228,7 +218,6 @@
# Apply leave from 5-7, half day on 5th
application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
application.from_date = "2013-01-05"
application.to_date = "2013-01-07"
application.half_day = 1
@@ -246,7 +235,6 @@
make_allocation_record(employee="_T-Employee-0002")
application = self.get_application(_test_records[1])
- application.leave_approver = "test@example.com"
frappe.db.set_value("Leave Block List", "_Test Leave Block List",
"applies_to_all_departments", 1)
@@ -257,124 +245,11 @@
application.insert()
frappe.set_user("test@example.com")
- application.status = "Approved"
-
- # clear permlevel access cache on change user
- del application._has_access_to
-
self.assertRaises(LeaveDayBlockedError, application.submit)
frappe.db.set_value("Leave Block List", "_Test Leave Block List",
"applies_to_all_departments", 0)
- def test_leave_approval(self):
- self._clear_roles()
-
- from frappe.utils.user import add_role
- add_role("test@example.com", "Employee")
- add_role("test1@example.com", "HR User")
- add_role("test1@example.com", "Leave Approver")
- add_role("test2@example.com", "Leave Approver")
-
- self._test_leave_approval_basic_case()
- self._test_leave_approval_invalid_leave_approver_insert()
- self._test_leave_approval_invalid_leave_approver_submit()
- self._test_leave_approval_valid_leave_approver_insert()
-
- def _test_leave_approval_basic_case(self):
- self._clear_applications()
-
- self._add_employee_leave_approver("_T-Employee-0001", "test1@example.com")
-
- # create leave application as Employee
- frappe.set_user("test@example.com")
-
- make_allocation_record()
-
- application = self.get_application(_test_records[0])
- application.leave_approver = "test1@example.com"
- application.insert()
-
- # submit leave application by Leave Approver
- frappe.set_user("test1@example.com")
- application.status = "Approved"
- del application._has_access_to
- application.submit()
- self.assertEqual(frappe.db.get_value("Leave Application", application.name,
- "docstatus"), 1)
-
- def _test_leave_approval_invalid_leave_approver_insert(self):
- from erpnext.hr.doctype.leave_application.leave_application import InvalidLeaveApproverError
-
- self._clear_applications()
-
- # add a different leave approver in the employee's list
- # should raise exception if not a valid leave approver
- self._add_employee_leave_approver("_T-Employee-0001", "test2@example.com")
- self._remove_employee_leave_approver("_T-Employee-0001", "test1@example.com")
-
- make_allocation_record()
-
- application = self.get_application(_test_records[0])
- frappe.set_user("test@example.com")
-
- application.leave_approver = "test1@example.com"
- self.assertRaises(InvalidLeaveApproverError, application.insert)
-
- frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""",
- "_T-Employee-0001")
-
- def _test_leave_approval_invalid_leave_approver_submit(self):
- self._clear_applications()
- self._add_employee_leave_approver("_T-Employee-0001", "test2@example.com")
-
- # create leave application as employee
- # but submit as invalid leave approver - should raise exception
- frappe.set_user("test@example.com")
-
- make_allocation_record()
-
- application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
- application.insert()
- frappe.set_user("test1@example.com")
- del application._has_access_to
- application.status = "Approved"
-
- from erpnext.hr.doctype.leave_application.leave_application import LeaveApproverIdentityError
- self.assertRaises(LeaveApproverIdentityError, application.submit)
-
- frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""",
- "_T-Employee-0001")
-
- def _test_leave_approval_valid_leave_approver_insert(self):
- self._clear_applications()
- self._add_employee_leave_approver("_T-Employee-0001", "test2@example.com")
-
- original_department = frappe.db.get_value("Employee", "_T-Employee-0001", "department")
- frappe.db.set_value("Employee", "_T-Employee-0001", "department", None)
-
- frappe.set_user("test@example.com")
-
- make_allocation_record()
-
- application = self.get_application(_test_records[0])
- application.leave_approver = "test2@example.com"
- application.insert()
-
- # change to valid leave approver and try to submit leave application
- frappe.set_user("test2@example.com")
- application.status = "Approved"
- del application._has_access_to
- application.submit()
- self.assertEqual(frappe.db.get_value("Leave Application", application.name,
- "docstatus"), 1)
-
- frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""",
- "_T-Employee-0001")
-
- frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department)
-
def make_allocation_record(employee=None, leave_type=None):
frappe.db.sql("delete from `tabLeave Allocation`")
@@ -388,4 +263,4 @@
})
allocation.insert(ignore_permissions=True)
- allocation.submit()
+ allocation.submit()
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
index cf15846..1e6dc51 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.js
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
@@ -5,7 +5,9 @@
frappe.ui.form.on('Payroll Entry', {
onload: function (frm) {
- frm.doc.posting_date = frappe.datetime.nowdate();
+ if (!frm.doc.posting_date) {
+ frm.doc.posting_date = frappe.datetime.nowdate();
+ }
frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
},
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
index 0b4e3bf..a023cc3 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
@@ -252,7 +252,7 @@
journal_entry.user_remark = _('Accural Journal Entry for salaries from {0} to {1}')\
.format(self.start_date, self.end_date)
journal_entry.company = self.company
- journal_entry.posting_date = nowdate()
+ journal_entry.posting_date = self.posting_date
accounts = []
payable_amount = 0
@@ -321,7 +321,7 @@
journal_entry.user_remark = _('Payment of salary from {0} to {1}')\
.format(self.start_date, self.end_date)
journal_entry.company = self.company
- journal_entry.posting_date = nowdate()
+ journal_entry.posting_date = self.posting_date
payment_amount = flt(total_salary_amount.rounded_total, precision)
@@ -455,13 +455,13 @@
def create_submit_log(submitted_ss, not_submitted_ss, jv_name):
if not submitted_ss and not not_submitted_ss:
- frappe.msgprint("No salary slip found to submit for the above selected criteria OR salary slip already submitted")
+ frappe.msgprint(_("No salary slip found to submit for the above selected criteria OR salary slip already submitted"))
if not_submitted_ss:
- frappe.msgprint("Could not submit any Salary Slip <br>\
+ frappe.msgprint(_("Could not submit any Salary Slip <br>\
Possible reasons: <br>\
1. Net pay is less than 0. <br>\
- 2. Company Email Address specified in employee master is not valid. <br>")
+ 2. Company Email Address specified in employee master is not valid. <br>"))
def get_salary_slip_list(name, docstatus, as_dict=0):
diff --git a/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
index 21b0d58..52735ef 100644
--- a/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
+++ b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
@@ -167,9 +167,9 @@
current_fiscal_year = get_fiscal_year(nowdate(), as_dict=True)
dt = getdate(nowdate())
- new_year = dt + relativedelta(month=01, day=01, year=dt.year)
- republic_day = dt + relativedelta(month=01, day=26, year=dt.year)
- test_holiday = dt + relativedelta(month=02, day=02, year=dt.year)
+ new_year = dt + relativedelta(month=1, day=1, year=dt.year)
+ republic_day = dt + relativedelta(month=1, day=26, year=dt.year)
+ test_holiday = dt + relativedelta(month=2, day=2, year=dt.year)
frappe.get_doc({
'doctype': 'Holiday List',
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index a474569..da2598f 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -300,7 +300,6 @@
where t2.name = t1.leave_type
and t2.is_lwp = 1
and t1.docstatus = 1
- and t1.status = 'Approved'
and t1.employee = %(employee)s
and CASE WHEN t2.include_holiday != 1 THEN %(dt)s not in ('{0}') and %(dt)s between from_date and to_date
WHEN t2.include_holiday THEN %(dt)s between from_date and to_date
diff --git a/erpnext/hub_node/__init__.py b/erpnext/hub_node/__init__.py
index 8eb1074..b2a98b4 100644
--- a/erpnext/hub_node/__init__.py
+++ b/erpnext/hub_node/__init__.py
@@ -15,38 +15,45 @@
return hub_settings
@frappe.whitelist()
-def get_items(start=0, limit=20, category=None, order_by=None, company=None, text=None):
+def get_list(doctype, start=0, limit=20, fields=["*"], filters="{}", order_by=None):
connection = get_client_connection()
- filters = {
- 'hub_category': category,
- }
- if text:
- filters.update({'item_name': ('like', '%' + text + '%')})
- if company:
- filters.update({'company_name': company})
+ filters = json.loads(filters)
- response = connection.get_list('Hub Item',
+ response = connection.get_list(doctype,
limit_start=start, limit_page_length=limit,
- filters=filters)
+ filters=filters, fields=fields)
return response
@frappe.whitelist()
-def get_categories():
+def get_meta(doctype):
connection = get_client_connection()
- response = connection.get_list('Hub Category')
+ meta = connection.get_doc('DocType', doctype)
+ return meta
+
+@frappe.whitelist()
+def get_categories(parent='All Categories'):
+ # get categories info with parent category and stuff
+ connection = get_client_connection()
+ categories = connection.get_list('Hub Category', filters={'parent_hub_category': parent})
+
+ response = [{'value': c.get('name'), 'expandable': c.get('is_group')} for c in categories]
return response
@frappe.whitelist()
-def get_item_details(hub_sync_id=None):
+def update_category(item_name, category):
+ connection = get_hub_connection()
+ response = connection.update('Hub Item', dict(
+ hub_category = category
+ ), item_name)
+ return response.ok
+
+@frappe.whitelist()
+def get_details(hub_sync_id=None, doctype='Hub Item'):
if not hub_sync_id:
return
connection = get_client_connection()
- return connection.get_doc('Hub Item', hub_sync_id)
-
-@frappe.whitelist()
-def get_company_details(hub_sync_id):
- connection = get_client_connection()
- return connection.get_doc('Hub Company', hub_sync_id)
+ details = connection.get_doc(doctype, hub_sync_id)
+ return details
def get_client_connection():
# frappeclient connection
diff --git a/erpnext/hub_node/data_migration_mapping/company_to_hub_company/company_to_hub_company.json b/erpnext/hub_node/data_migration_mapping/company_to_hub_company/company_to_hub_company.json
index 0a916da..ae0d492 100644
--- a/erpnext/hub_node/data_migration_mapping/company_to_hub_company/company_to_hub_company.json
+++ b/erpnext/hub_node/data_migration_mapping/company_to_hub_company/company_to_hub_company.json
@@ -1,45 +1,50 @@
{
- "condition": "{'name': ('=', frappe.db.get_single_value('Hub Settings', 'company'))}",
- "creation": "2017-09-07 11:38:43.169065",
- "docstatus": 0,
- "doctype": "Data Migration Mapping",
+ "condition": "{'name': ('=', frappe.db.get_single_value('Hub Settings', 'company'))}",
+ "creation": "2017-09-07 11:38:43.169065",
+ "docstatus": 0,
+ "doctype": "Data Migration Mapping",
"fields": [
{
- "is_child_table": 0,
- "local_fieldname": "name",
+ "is_child_table": 0,
+ "local_fieldname": "name",
"remote_fieldname": "company_name"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "country",
+ "is_child_table": 0,
+ "local_fieldname": "country",
"remote_fieldname": "country"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "\"city\"",
+ "is_child_table": 0,
+ "local_fieldname": "\"city\"",
"remote_fieldname": "seller_city"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "eval:frappe.local.site",
+ "is_child_table": 0,
+ "local_fieldname": "eval:frappe.local.site",
"remote_fieldname": "site_name"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "eval:frappe.session.user",
+ "is_child_table": 0,
+ "local_fieldname": "eval:frappe.session.user",
"remote_fieldname": "user"
+ },
+ {
+ "is_child_table": 0,
+ "local_fieldname": "company_logo",
+ "remote_fieldname": "company_logo"
}
- ],
- "idx": 2,
- "local_doctype": "Company",
- "mapping_name": "Company to Hub Company",
- "mapping_type": "Push",
- "migration_id_field": "hub_sync_id",
- "modified": "2017-10-09 17:30:17.853929",
- "modified_by": "Administrator",
- "name": "Company to Hub Company",
- "owner": "Administrator",
- "page_length": 10,
- "remote_objectname": "Hub Company",
+ ],
+ "idx": 2,
+ "local_doctype": "Company",
+ "mapping_name": "Company to Hub Company",
+ "mapping_type": "Push",
+ "migration_id_field": "hub_sync_id",
+ "modified": "2018-02-14 15:57:05.571142",
+ "modified_by": "achilles@erpnext.com",
+ "name": "Company to Hub Company",
+ "owner": "Administrator",
+ "page_length": 10,
+ "remote_objectname": "Hub Company",
"remote_primary_key": "name"
}
\ No newline at end of file
diff --git a/erpnext/hub_node/data_migration_mapping/hub_message_to_lead/hub_message_to_lead.json b/erpnext/hub_node/data_migration_mapping/hub_message_to_lead/hub_message_to_lead.json
index cd9fb69..d2af755 100644
--- a/erpnext/hub_node/data_migration_mapping/hub_message_to_lead/hub_message_to_lead.json
+++ b/erpnext/hub_node/data_migration_mapping/hub_message_to_lead/hub_message_to_lead.json
@@ -1,31 +1,31 @@
{
- "condition": "{'reference_doctype': 'Lead', 'user': frappe.db.get_single_value('Hub Settings', 'user'), 'status': 'Pending'}",
- "creation": "2017-09-20 15:06:40.279930",
- "docstatus": 0,
- "doctype": "Data Migration Mapping",
+ "condition": "{'reference_doctype': 'Lead', 'user': frappe.db.get_single_value('Hub Settings', 'user'), 'status': 'Pending'}",
+ "creation": "2017-09-20 15:06:40.279930",
+ "docstatus": 0,
+ "doctype": "Data Migration Mapping",
"fields": [
{
- "is_child_table": 0,
- "local_fieldname": "email_id",
+ "is_child_table": 0,
+ "local_fieldname": "email_id",
"remote_fieldname": "email_id"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "lead_name",
+ "is_child_table": 0,
+ "local_fieldname": "lead_name",
"remote_fieldname": "lead_name"
}
- ],
- "idx": 0,
- "local_doctype": "Lead",
- "local_primary_key": "email_id",
- "mapping_name": "Hub Message to Lead",
- "mapping_type": "Pull",
- "migration_id_field": "hub_sync_id",
- "modified": "2017-10-09 17:30:17.908830",
- "modified_by": "Administrator",
- "name": "Hub Message to Lead",
- "owner": "frappetest@gmail.com",
- "page_length": 10,
- "remote_objectname": "Hub Message",
+ ],
+ "idx": 0,
+ "local_doctype": "Lead",
+ "local_primary_key": "email_id",
+ "mapping_name": "Hub Message to Lead",
+ "mapping_type": "Pull",
+ "migration_id_field": "hub_sync_id",
+ "modified": "2018-02-14 15:57:05.606597",
+ "modified_by": "achilles@erpnext.com",
+ "name": "Hub Message to Lead",
+ "owner": "frappetest@gmail.com",
+ "page_length": 10,
+ "remote_objectname": "Hub Message",
"remote_primary_key": "name"
}
\ No newline at end of file
diff --git a/erpnext/hub_node/data_migration_mapping/item_to_hub_item/item_to_hub_item.json b/erpnext/hub_node/data_migration_mapping/item_to_hub_item/item_to_hub_item.json
index e4168c7..7423f2e 100644
--- a/erpnext/hub_node/data_migration_mapping/item_to_hub_item/item_to_hub_item.json
+++ b/erpnext/hub_node/data_migration_mapping/item_to_hub_item/item_to_hub_item.json
@@ -1,55 +1,55 @@
{
- "condition": "{\"publish_in_hub\": 1}",
- "creation": "2017-09-07 13:27:52.726350",
- "docstatus": 0,
- "doctype": "Data Migration Mapping",
+ "condition": "{\"publish_in_hub\": 1}",
+ "creation": "2017-09-07 13:27:52.726350",
+ "docstatus": 0,
+ "doctype": "Data Migration Mapping",
"fields": [
{
- "is_child_table": 0,
- "local_fieldname": "item_code",
+ "is_child_table": 0,
+ "local_fieldname": "item_code",
"remote_fieldname": "item_code"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "item_name",
+ "is_child_table": 0,
+ "local_fieldname": "item_name",
"remote_fieldname": "item_name"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "eval:frappe.db.get_default(\"company\")",
+ "is_child_table": 0,
+ "local_fieldname": "eval:frappe.db.get_default(\"company\")",
"remote_fieldname": "company_name"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "image",
+ "is_child_table": 0,
+ "local_fieldname": "image",
"remote_fieldname": "image"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "item_group",
+ "is_child_table": 0,
+ "local_fieldname": "item_group",
"remote_fieldname": "item_group"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "eval:frappe.session.user",
+ "is_child_table": 0,
+ "local_fieldname": "eval:frappe.session.user",
"remote_fieldname": "seller"
- },
+ },
{
- "is_child_table": 0,
- "local_fieldname": "eval:frappe.db.get_default(\"country\")",
+ "is_child_table": 0,
+ "local_fieldname": "eval:frappe.db.get_default(\"country\")",
"remote_fieldname": "country"
}
- ],
- "idx": 1,
- "local_doctype": "Item",
- "mapping_name": "Item to Hub Item",
- "mapping_type": "Push",
- "migration_id_field": "hub_sync_id",
- "modified": "2017-10-09 17:30:17.890337",
- "modified_by": "Administrator",
- "name": "Item to Hub Item",
- "owner": "Administrator",
- "page_length": 10,
- "remote_objectname": "Hub Item",
+ ],
+ "idx": 1,
+ "local_doctype": "Item",
+ "mapping_name": "Item to Hub Item",
+ "mapping_type": "Push",
+ "migration_id_field": "hub_sync_id",
+ "modified": "2018-02-14 15:57:05.595712",
+ "modified_by": "achilles@erpnext.com",
+ "name": "Item to Hub Item",
+ "owner": "Administrator",
+ "page_length": 10,
+ "remote_objectname": "Hub Item",
"remote_primary_key": "item_code"
}
\ No newline at end of file
diff --git a/erpnext/hub_node/data_migration_plan/hub_sync/hub_sync.json b/erpnext/hub_node/data_migration_plan/hub_sync/hub_sync.json
index 40513cd2..f6d96da 100644
--- a/erpnext/hub_node/data_migration_plan/hub_sync/hub_sync.json
+++ b/erpnext/hub_node/data_migration_plan/hub_sync/hub_sync.json
@@ -1,26 +1,26 @@
{
- "creation": "2017-09-07 11:39:38.445902",
- "docstatus": 0,
- "doctype": "Data Migration Plan",
- "idx": 1,
+ "creation": "2017-09-07 11:39:38.445902",
+ "docstatus": 0,
+ "doctype": "Data Migration Plan",
+ "idx": 1,
"mappings": [
{
- "enabled": 1,
+ "enabled": 1,
"mapping": "Company to Hub Company"
- },
+ },
{
- "enabled": 1,
+ "enabled": 1,
"mapping": "Item to Hub Item"
- },
+ },
{
- "enabled": 1,
+ "enabled": 1,
"mapping": "Hub Message to Lead"
}
- ],
- "modified": "2017-10-09 17:30:17.680059",
- "modified_by": "Administrator",
- "module": "Hub Node",
- "name": "Hub Sync",
- "owner": "Administrator",
+ ],
+ "modified": "2018-02-14 15:57:05.519715",
+ "modified_by": "achilles@erpnext.com",
+ "module": "Hub Node",
+ "name": "Hub Sync",
+ "owner": "Administrator",
"plan_name": "Hub Sync"
}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category_tree.js b/erpnext/hub_node/doctype/hub_category/hub_category_tree.js
deleted file mode 100644
index d0309e3..0000000
--- a/erpnext/hub_node/doctype/hub_category/hub_category_tree.js
+++ /dev/null
@@ -1,4 +0,0 @@
-frappe.treeview_settings["Hub Category"] = {
- title: __("Hub Category"),
- breadcrumb: "Hub"
-}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.js b/erpnext/hub_node/doctype/hub_settings/hub_settings.js
index ce0f8bc..bc78927 100644
--- a/erpnext/hub_node/doctype/hub_settings/hub_settings.js
+++ b/erpnext/hub_node/doctype/hub_settings/hub_settings.js
@@ -46,7 +46,7 @@
set_enable_hub_primary_button: (frm) => {
frm.page.set_primary_action(__("Enable Hub"), () => {
if(frappe.session.user === "Administrator") {
- frappe.msgprint("Please login as another user.")
+ frappe.msgprint(__("Please login as another user."))
} else {
frappe.verify_password(() => {
this.frm.call({
diff --git a/erpnext/hub_node/page/hub/__init__.py b/erpnext/hub_node/page/hub/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/hub_node/page/hub/__init__.py
+++ /dev/null
diff --git a/erpnext/hub_node/page/hub/hub.js b/erpnext/hub_node/page/hub/hub.js
deleted file mode 100644
index 15bd97d..0000000
--- a/erpnext/hub_node/page/hub/hub.js
+++ /dev/null
@@ -1,873 +0,0 @@
-/* globals Hub, HubList */
-
-frappe.provide('erpnext.hub');
-
-frappe.pages['hub'].on_page_load = function(wrapper) {
- const page = frappe.ui.make_app_page({
- parent: wrapper,
- title: 'Hub',
- single_col: false
- });
-
- wrapper.hub_page = new erpnext.hub.Hub({ page });
-};
-
-frappe.pages['hub'].on_page_show = function(wrapper) {
- const hub_page = wrapper.hub_page;
- const [hub, type, id] = frappe.get_route();
-
- if (!(hub || type || id)) {
- hub_page.go_to_home_page();
- return;
- }
-
- if (type === "Products") {
- hub_page.go_to_item_page(id);
- } else if (type === "Company") {
- hub_page.go_to_company_page(id);
- }
-}
-
-erpnext.hub.Hub = class Hub {
- constructor({ page }) {
- this.page = page;
- frappe.require('/assets/erpnext/css/hub.css', () => {
- this.setup();
- });
- }
-
- setup() {
- this.setup_header();
- this.company_cache = {};
- this.item_cache = {};
- this.filters = {};
- this.order_by = '';
-
- this.$hub_main_section =
- $(`<div class='hub-main-section'>`).appendTo(this.page.body);
- this.bind_events();
- this.refresh();
- }
-
- refresh() {
- this.$hub_main_section.empty();
- this.page.page_form.hide();
-
- const $layout_main = this.page.wrapper.find('.layout-main');
- const $page_head = this.page.wrapper.find('.page-head');
-
- frappe.model.with_doc('Hub Settings', 'Hub Settings', () => {
- this.hub_settings = frappe.get_doc('Hub Settings');
-
- if(this.hub_settings.enabled == 0) {
- let $empty_state = this.page.get_empty_state(
- __("Register for Hub"),
- __(`Let other ERPNext users discover your products
- and automate workflow with Supplier from within ERPNext.`),
- __("Register")
- );
-
- $page_head.hide();
- $layout_main
- .find('.layout-side-section, .layout-main-section-wrapper')
- .hide();
- $layout_main.append($empty_state);
-
- $empty_state.find('.btn-primary').on('click', () => {
- this.register_for_hub();
- });
- } else {
- $page_head.show();
- $layout_main.find('.page-card-container').remove();
- $layout_main.find('.layout-side-section, .layout-main-section-wrapper').show();
- this.setup_live_state();
- }
- });
- }
-
- register_for_hub() {
- if (frappe.session.user.includes('Administrator')) {
- frappe.throw(__('Please login as another user.'))
- }
- frappe.verify_password(() => {
- frappe.call({
- method: 'erpnext.hub_node.enable_hub',
- callback: (r) => {
- if(r.message.enabled == 1) {
- Object.assign(this.hub_settings, r.message);
- this.refresh();
- this.prompt_for_item_sync();
- }
- }
- });
- });
- }
-
- prompt_for_item_sync() {
- frappe.call({
- method: 'frappe.client.get_list',
- args: {
- doctype: 'Data Migration Run',
- filters: {
- 'data_migration_plan': 'Hub Sync'
- },
- limit_page_length: 1
- },
- callback: function(r) {
- if (!r) {
- frappe.confirm(__('Do you want to publish your Items to Hub ?'), () => {
- this.sync_items_to_hub();
- });
- }
- }
- })
- }
-
- setup_header() {
- this.page.page_title = this.page.wrapper.find('.page-title');
- this.tag_line = $(`
- <div class='tag-line-container'>
- <span class='tag-line text-muted small'>
- ${__('Product listing and discovery for ERPNext users')}
- </span>
- </div>`)
- .appendTo(this.page.page_title);
-
- this.bind_title();
- }
-
- setup_live_state() {
- if(!this.$search) {
- this.setup_filters();
- }
- this.page.page_form.show();
- this.setup_menu();
- this.setup_sidebar();
- this.render_body();
- this.setup_lists();
- }
-
- setup_filters() {
-
- // frappe.call({
- // method: 'erpnext.hub_node.get_categories'
- // }).then((r) => {
- // if (r.message) {
- // const categories = r.message;
- // console.log("categories", categories);
- // categories
- // .map(c => c.hub_category_name)
- // .map(c => this.sidebar.add_item({
- // label: c,
- // on_click: () => {
- // this.home_item_list &&
- // this.home_item_list.refresh({
- // text: '',
- // start: 0,
- // limit: 20,
- // category: c && c !== 'All Categories' ? c : undefined
- // });
- // }
- // }, __('Hub Category')));
-
-
- // }
- // });
-
- // this.category_select = this.page.add_select(__('Category'),
- // [
- // {label: __('Sort by Price ...'), value: '' },
- // {label: __('High to Low'), value: 'price desc' },
- // {label: __('Low to High'), value: 'price' },
- // ]
- // );
-
- this.price_sort_select = this.page.add_select(__('Sort by Price'),
- [
- {label: __('Sort by Price ...'), value: '' },
- {label: __('High to Low'), value: 'price desc' },
- {label: __('Low to High'), value: 'price' },
- ]
- );
-
- this.criteria_select = this.page.add_select(__('Sort by Criteria'),
- [
- {label: __('Most Popular'), value: 'request_count' },
- {label: __('Newest'), value: 'creation' },
- ]
- );
-
- this.price_sort_select.on('change', () => {
- this.refresh_item_only_page();
- });
-
- this.criteria_select.on('change', () => {
- this.refresh_item_only_page();
- });
-
- this.setup_hub_category_filter();
- this.setup_search();
- }
-
- bind_events() {
- const me = this;
- this.$hub_main_section
- .on('click', '.company-link a', function(e) {
- e.preventDefault();
- const company_name = $(this).attr('data-company-name');
- frappe.set_route('hub', 'Company', company_name);
- })
- .on('click', '.breadcrumb li', function(e) {
- e.preventDefault();
- const $li = $(this);
- if ($li.attr('data-route') === 'Home') {
- me.go_to_home_page();
- }
- });
- }
-
- update_filters() {
- let price_sort = $(this.price_sort_select).val() || '';
- let criteria = $(this.criteria_select).val() || '';
-
- let order_by_params = [];
- let query_string = '';
- if(criteria) {
- order_by_params.push(criteria);
- // query_string += 'sort_by=' + criteria
- }
- if(price_sort) order_by_params.push(price_sort);
- this.order_by = order_by_params.join(",");
- // return query_string;
- }
-
- reset_filters() {
- this.order_by = '';
- $(this.category_select).val('');
- $(this.price_sort_select).val('');
- $(this.criteria_select).val('Most Popular');
- }
-
- refresh_item_only_page() {
- this.reset_search();
- this.update_filters();
- this.go_to_items_only_page(
- ['hub', 'Products'],
- '', 'product-list'
- );
- }
-
- bind_title() {
- this.page.page_title.find('.title-text').on('click', () => {
- this.go_to_home_page();
- });
- }
-
- render_body() {
- this.$home_page = $(`
- <div class = 'hub-home-page'>
- <div class='banner'></div>
- <div class='listing-body row'>
- <div class='main-list-section'></div>
- </div>
- </div>
- `).appendTo(this.$hub_main_section);
-
- this.$banner = this.$hub_main_section.find('.banner');
- this.$listing_body = this.$hub_main_section.find('.listing-body');
- this.$main_list_section = this.$hub_main_section.find('.main-list-section');
- this.$side_list_section = this.$hub_main_section.find('.side-list-section');
- }
-
- setup_lists() {
- this.home_item_list = new erpnext.hub.HubList({
- parent: this.$main_list_section,
- title: 'New',
- page_length: 20,
- list_css_class: 'home-product-list',
- method: 'erpnext.hub_node.get_items',
- // order_by: 'request_count',
- filters: {text: '', country: this.country}, // filters at the time of creation
- on_item_click: (item_code) => {
- frappe.set_route('hub', 'Products', item_code);
- }
- });
-
- this.home_item_list.setup();
- }
-
- setup_hub_category_filter() {
- const me = this;
-
- this.hub_category_field = this.page.add_field({
- fieldtype: 'Autocomplete',
- label: 'Hub Category',
- change() {
- let value = this.get_value();
- let title = value;
- if (value === 'All Categories') {
- // show all items
- value = null;
- }
-
- me.home_item_list.title = title;
- me.home_item_list.refresh({
- text: '',
- start: 0,
- limit: 20,
- category: value
- });
- }
- });
-
- frappe.call('erpnext.hub_node.get_categories')
- .then((r) => {
- if (r.message) {
- const categories = r.message;
-
- this.hub_category_field.set_data(
- categories.map(c => c.hub_category_name)
- );
- }
- });
- }
-
- setup_search() {
- this.$search = this.page.add_data(__('Search'));
- this.$search.on('keypress', (e) => {
- if(e.which === 13) {
- var search_term = ($(this.$search).val() || '').toLowerCase();
- this.go_to_items_only_page(
- ['hub', 'search', search_term],
- 'Search results for \'' + search_term + '\'',
- 'search-product-list',
- {text: search_term}
- );
- }
- });
- }
-
- go_to_items_only_page(route, title, class_name, filters = {text: ''}, by_item_codes=0) {
- frappe.set_route(route);
- this.$hub_main_section.empty();
- this.filtered_item_list = new erpnext.hub.HubList({
- parent: this.$hub_main_section,
- title: title,
- page_length: 20,
- list_css_class: class_name,
- method: 'erpnext.hub_node.get_items',
- order_by: this.order_by,
- filters: filters,
- by_item_codes: by_item_codes
- });
- this.filtered_item_list.on_item_click = (item_code) => {
- frappe.set_route('hub', 'Products', item_code);
- }
- this.filtered_item_list.setup();
- }
-
- go_to_item_page(item_code) {
- if(this.item_cache) {
- let item = this.item_cache[item_code];
- if(item) {
- this.render_item_page(item);
- return;
- }
- } else {
- this.item_cache = {};
- }
- frappe.call({
- args:{
- hub_sync_id: item_code
- },
- method: "erpnext.hub_node.get_item_details",
- callback: (r) => {
- if (!r || !r.message) return;
- let item = r.message;
- this.item_cache[item_code] = item;
- this.render_item_page(item);
- }
- });
- }
-
- render_item_page(item) {
- this.$hub_main_section.empty();
-
-
- let $item_page =
- $(this.get_item_page(item))
- .appendTo(this.$hub_main_section);
-
- let $company_items = $item_page.find('.company-items');
-
- let company_item_list = new erpnext.hub.HubList({
- parent: $company_items,
- title: 'More by ' + item.company_name,
- page_length: 5,
- list_css_class: 'company-item-list',
- method: 'erpnext.hub_node.get_items',
- // order_by: 'request_count',
- filters: {text: '', company_name: item.company_name, country: this.country},
- paginated: 0,
- img_size: 150
- });
-
- company_item_list.on_item_click = (item_code) => {
- frappe.set_route('hub', 'Products', item_code);
- }
- company_item_list.setup();
-
- $item_page.find('.rfq-btn')
- .click((e) => {
- const $btn = $(e.target);
-
- this.show_rfq_modal(item)
- .then(values => {
- item.item_code = values.item_code;
- delete values.item_code;
-
- const supplier = values;
- return [item, supplier];
- })
- .then(([item, supplier]) => {
- return this.make_rfq(item, supplier, $btn);
- })
- .then(r => {
- console.log(r);
- if (r.message && r.message.rfq) {
- $btn.addClass('disabled').html(`<span><i class='fa fa-check'></i> ${__('Quote Requested')}</span>`);
- } else {
- throw r;
- }
- })
- .catch((e) => {
- console.log(e); //eslint-disable-line
- });
- });
- }
-
- show_rfq_modal(item) {
- return new Promise(res => {
- let fields = [
- { label: __('Item Code'), fieldtype: 'Data', fieldname: 'item_code', default: item.item_code },
- { fieldtype: 'Column Break' },
- { label: __('Item Group'), fieldtype: 'Link', fieldname: 'item_group', default: item.item_group },
- { label: __('Supplier Details'), fieldtype: 'Section Break' },
- { label: __('Supplier Name'), fieldtype: 'Data', fieldname: 'supplier_name', default: item.company_name },
- { label: __('Supplier Email'), fieldtype: 'Data', fieldname: 'supplier_email', default: item.seller },
- { fieldtype: 'Column Break' },
- { label: __('Supplier Type'), fieldname: 'supplier_type',
- fieldtype: 'Link', options: 'Supplier Type' }
- ];
- fields = fields.map(f => { f.reqd = 1; return f; });
-
- const d = new frappe.ui.Dialog({
- title: __('Request for Quotation'),
- fields: fields,
- primary_action_label: __('Send'),
- primary_action: (values) => {
- res(values);
- d.hide();
- }
- });
-
- d.show();
- });
- }
-
- get_company_details(company_id) {
- this.company_cache = this.company_cache || {};
-
- return new Promise(resolve => {
- // get from cache if exists
- let company_details = this.company_cache[company_id];
- if(company_details) {
- resolve(company_details);
- return;
- }
- frappe.call({
- method: 'erpnext.hub_node.get_company_details',
- args: {hub_sync_id: company_id}
- }).then((r) => {
- if (r.message) {
- const company_details = r.message;
- this.company_cache[company_id] = company_details;
- resolve(company_details)
- }
- });
- })
- }
-
- go_to_company_page(company_id) {
- this.get_company_details(company_id)
- .then(this.show_company_page.bind(this));
- }
-
- show_company_page(company_details) {
- this.$hub_main_section.empty();
-
- let $company_page =
- $(this.get_company_page(company_details))
- .appendTo(this.$hub_main_section);
-
- let $company_items = $company_page.find('.company-items');
-
- let company_item_list = new erpnext.hub.HubList({
- parent: $company_items,
- title: 'More by ' + company_details.company_name,
- page_length: 5,
- list_css_class: 'company-item-list',
- method: 'erpnext.hub_node.get_items',
- // order_by: 'request_count',
- filters: {text: '', company: company_details.company_name, country: this.country},
- paginated: 0,
- img_size: 150
- });
-
- company_item_list.on_item_click = (item_code) => {
- frappe.set_route('hub', 'Products', item_code);
- }
- company_item_list.setup();
- }
-
- get_item_page(item) {
- return `
- <div class="hub-item-page">
- <div class="item-header">
- <div class="item-page-image">
- ${ this.home_item_list.get_item_image(item) }
- </div>
- <div class="title-content">
- <div class="breadcrumbs">
- ${this.get_breadcrumb(item.item_name, "Products") }
- </div>
- <div class="title">
- <h2>${ item.item_name }</h2>
- </div>
- <div class="company">
- <span class="">${ item.company_name }</span>
- </div>
- <div class="category">
- <span class="text-muted">Products</span>
- </div>
- <div class="description">
- <span class="small">${ item.description ? item.description : "" }</span>
- </div>
- <div class="price">
- ${ item.formatted_price ? item.formatted_price : '' }
- </div>
- <div class="actions">
- <a class="btn btn-primary rfq-btn">Request A Quote</a>
- </div>
- </div>
-
- </div>
- <div class="item-more-info"></div>
- <div class="company-items">
-
- </div>
- </div>
- `;
- }
-
- get_company_page(company_details) {
- return `
- <div class="hub-item-page">
- <div class="item-header">
- <div class="title-content">
- <div class="breadcrumbs">
- ${this.get_breadcrumb(company_details.company_name, "Company") }
- </div>
- <div class="title">
- <h2>${ company_details.company_name }</h2>
- </div>
- <div class="company">
- <span class="">${ company_details.country }</span>
- </div>
- <div class="description">
- <span class="small">${ company_details.site_name }</span>
- </div>
- </div>
-
- </div>
- <div class="item-more-info"></div>
- <div class="company-items">
-
- </div>
- </div>
- `;
- }
-
- get_breadcrumb(name, type) {
- return `
- <ul class="breadcrumb">
- <li data-route="Home">
- <a href><span>Home</span></a>
- </li>
- <li data-route="List">
- <a href><span>${type}</span></a>
- </li>
- <li class="active">
- <span>${name}</span>
- </li>
- </ul>
- `;
- }
-
- go_to_home_page() {
- frappe.set_route('hub');
- this.reset_filters();
- this.refresh();
- }
-
- setup_menu() {
- if (this.menu_setup) return;
-
- this.page.add_menu_item(__('Hub Settings'),
- () => frappe.set_route('Form', 'Hub Settings'));
- this.page.add_menu_item(__('Refresh'), () => this.refresh());
- this.page.add_menu_item(__('Sync'), () => this.sync_items_to_hub());
-
- this.menu_setup = true;
- }
-
- sync_items_to_hub() {
- frappe.call('erpnext.hub_node.doctype.hub_settings.hub_settings.sync')
- }
-
- setup_sidebar() {
- var me = this;
- this.sidebar = new frappe.ui.Sidebar({
- wrapper: this.page.wrapper.find('.layout-side-section'),
- css_class: 'hub-sidebar'
- });
-
- this.add_account_to_sidebar();
- }
-
- add_account_to_sidebar() {
- this.sidebar.add_item({
- label: this.hub_settings.company,
- on_click: () => frappe.set_route('Form', 'Company', this.hub_settings.company)
- }, __("Account"));
-
- this.sidebar.add_item({
- label: __("My Orders"),
- on_click: () => frappe.set_route('List', 'Request for Quotation')
- }, __("Account"));
- }
-
- get_search_term() {
- return this.$search.val();
- }
-
- reset_search() {
- this.$search.val('');
- }
-
- make_rfq(item, supplier, btn) {
- console.log(supplier);
- return new Promise((resolve, reject) => {
- frappe.call({
- method: 'erpnext.hub_node.make_rfq_and_send_opportunity',
- args: { item, supplier },
- callback: resolve,
- btn,
- }).fail(reject);
- });
- }
-
- go_to_seen_items() {
- this.go_to_items_only_page(
- ['hub', 'Requested Products'],
- __('Requested Products'),
- 'requested-product-list',
- {}, 1
- );
- }
-}
-
-erpnext.hub.HubList = class HubList {
- constructor({
- parent = null,
- title = 'Products',
- page_length = 20,
- list_css_class = '',
- method = 'erpnext.hub_node.get_items',
- filters = {text: ''},
- order_by = '',
- by_item_codes = 0,
- paginated = 1,
- on_item_click = null,
- img_size = 200
- }) {
- this.parent = parent;
- this.title = title;
- this.page_length = page_length;
- this.list_css_class = list_css_class;
- this.method = method;
- this.filters = filters;
- this.order_by = order_by;
- this.by_item_codes = by_item_codes;
- this.paginated = paginated;
-
- this.on_item_click = on_item_click;
- this.img_size = img_size;
- }
-
- // to be called on demand
- setup() {
- this.container = $(`
- <div class='item-list-container ${this.list_css_class}' data-page-length='${this.page_length}'>
- <div class='item-list-header'>
- <h3>${this.title}</h3>
- </div>
- <div class='item-list'></div>
- <div class='list-state'>
- <div class='loading'>
- <p class='text-muted text-center'>${__('Loading...')}</p>
- </div>
- <div class='done hide'>
- <p class='text-muted text-center'>${__('No more results')}</p>
- </div>
- <div class='more text-right'>
- <button class='btn btn-default btn-sm'>${__('More')}</div>
- </div>
- </div>
- </div>`)
- .appendTo(this.parent);
-
- this.$item_list_title = this.container.find('.item-list-header h3');
- this.$list = this.container.find('.item-list');
- this.$loading = this.container.find('.loading').hide();
- this.$more = this.container.find('.more').hide();
- this.$done = this.container.find('.done');
-
- this.$more.on('click', () => {
- this.next_page();
- });
-
- this.next_page();
- }
-
- refresh(filters = this.filters) {
- this.reset();
- this.set_filters(filters);
- this.next_page();
- }
-
- reset() {
- this.$list.empty();
- }
-
- set_filters(filters) {
- this.filters = filters;
- }
-
- next_page() {
- this.$item_list_title.html(this.title);
- const start = this.$list.find('.hub-item-wrapper').length;
- this.$loading.show();
-
- // build args
- let args = {
- start: start,
- // query one extra
- limit: this.page_length + 1
- };
- Object.assign(args, this.filters);
- console.log("filters: ", args);
- args.order_by = this.order_by;
- args.by_item_codes = this.by_item_codes;
-
- frappe.call({
- method: this.method,
- args: args,
- callback: (r) => {
- let items = r.message;
- console.log("items: ", items);
- this.render_items(items);
- }
- });
- }
-
- render_items(items) {
- if(items) {
- // clear any filler divs
- this.$list.find('.filler').remove();
- let done = 0;
- console.log("items length", items.length);
- if(items.length && items.length > this.page_length) {
- // remove the extra queried
- items.pop();
- } else {
- done = 1;
- }
- items.forEach((item) => {
- this.make_item_card(item).appendTo(this.$list);
- });
-
- const remainder = items.length % 4;
- if (remainder > 0) {
- // fill with filler divs to make flexbox happy
- Array.from(Array(remainder))
- .map(r => $('<div class="filler">').css('width', '200px').appendTo(this.$list));
- }
- this.update_list_state(done);
- } else {
- this.update_list_state(1);
- }
- }
-
- update_list_state(done=0) {
- this.$loading.hide();
- if(done) {
- this.$done.removeClass('hide');
- this.$more.hide();
- } else {
- this.$more.show();
- this.$done.addClass('hide');
- }
- }
-
- make_item_card(item) {
- let $item_card = $(`
- <div class="hub-item-wrapper" style="max-width: ${this.img_size}px;">
- <a class="item-link" href>
- <div class="hub-item-image">
- ${ this.get_item_image(item) }
- </div>
- <div class="hub-item-title">
- <h5 class="bold">
- ${!item.seen ? item.item_name : `<span class="indicator blue">${item.item_name}</span>`}
- <h5>
- </div>
- </a>
- <div class="company-link">
- <a data-company-name="${ item.company_name }" class="">${ item.company_name }</a>
- </div>
- <div>${ item.formatted_price ? item.formatted_price : ''}</div>
- </div>
- `);
-
- $item_card.find(".item-link").click((e) => {
- e.preventDefault();
- this.on_item_click && this.on_item_click(item.name);
- });
-
- return $item_card;
- }
-
- get_item_image(item, size=this.img_size) {
- const _size = size + 'px';
- const item_image = item.image ?
- `<img src="${item.image}"><span class="helper"></span>` :
- `<div class="standard-image">${item.item_name[0]}</div>`;
-
- return `
- <div class="img-wrapper"
- style="max-width: ${_size}; width: ${_size}; height: ${_size};">
- ${item_image}
- </div>`;
- }
-}
diff --git a/erpnext/hub_node/page/hub/hub.json b/erpnext/hub_node/page/hub/hub.json
deleted file mode 100644
index 2d7c899..0000000
--- a/erpnext/hub_node/page/hub/hub.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "content": null,
- "creation": "2015-02-18 05:17:17.301735",
- "docstatus": 0,
- "doctype": "Page",
- "modified": "2015-02-18 05:17:17.301735",
- "modified_by": "Administrator",
- "module": "Hub Node",
- "name": "hub",
- "owner": "Administrator",
- "page_name": "hub",
- "roles": [
- {
- "role": "All"
- }
- ],
- "script": null,
- "standard": "Yes",
- "style": null,
- "title": "Hub"
-}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index ee30a49..8fa6517 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -9,6 +9,8 @@
from frappe.website.website_generator import WebsiteGenerator
from erpnext.stock.get_item_details import get_conversion_factor
+from six import string_types
+
from operator import itemgetter
form_grid_templates = {
@@ -109,7 +111,7 @@
if not args:
args = frappe.form_dict.get('args')
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
import json
args = json.loads(args)
@@ -544,7 +546,7 @@
group by item_code, stock_uom
order by idx"""
- if fetch_exploded:
+ if cint(fetch_exploded):
query = query.format(table="BOM Explosion Item",
where_conditions="",
select_columns = ", bom_item.source_warehouse, (Select idx from `tabBOM Item` where item_code = bom_item.item_code and parent = %(parent)s ) as idx")
@@ -599,7 +601,7 @@
@frappe.whitelist()
def get_children(doctype, parent=None, is_root=False, **filters):
- if not parent:
+ if not parent or parent=="BOM":
frappe.msgprint(_('Please select a BOM'))
return
diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js
index 854f633..6cbd7a2 100644
--- a/erpnext/manufacturing/doctype/bom/bom_tree.js
+++ b/erpnext/manufacturing/doctype/bom/bom_tree.js
@@ -11,7 +11,8 @@
title: "BOM",
breadcrumb: "Manufacturing",
disable_add_node: true,
- root_label: "All Bill of Materials", //fieldname from filters
+ root_label: "BOM", //fieldname from filters
+ get_tree_root: false,
get_label: function(node) {
if(node.data.qty) {
return node.data.qty + " x " + node.data.item_code;
@@ -19,6 +20,23 @@
return node.data.item_code || node.data.value;
}
},
+ onload: function(me) {
+ var label = frappe.get_route()[0] + "/" + frappe.get_route()[1];
+ if(frappe.pages[label]) {
+ delete frappe.pages[label];
+ }
+
+ var filter = me.opts.filters[0];
+ if(frappe.route_options && frappe.route_options[filter.fieldname]) {
+ var val = frappe.route_options[filter.fieldname];
+ delete frappe.route_options[filter.fieldname];
+ filter.default = "";
+ me.args[filter.fieldname] = val;
+ me.root_label = val;
+ me.page.set_title(val);
+ }
+ me.make_tree();
+ },
toolbar: [
{ toggle_btn: true },
{
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 8a86668..bba3e1e 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -79,6 +79,10 @@
]
}
});
+
+ // formatter for production order operation
+ frm.set_indicator_formatter('operation',
+ function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange" });
},
onload: function(frm) {
@@ -94,10 +98,6 @@
});
erpnext.production_order.set_default_warehouse(frm);
}
-
- // formatter for production order operation
- frm.set_indicator_formatter('operation',
- function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange" });
},
refresh: function(frm) {
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 7cfbab0..d3b7c5a 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -490,7 +490,7 @@
and detail.parent = entry.name
and detail.item_code = %s''', (self.name, d.item_code))[0][0]
- d.db_set('transferred_qty', transferred_qty, update_modified = False)
+ d.db_set('transferred_qty', flt(transferred_qty), update_modified = False)
@frappe.whitelist()
diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py
index 002f03b..7612461 100644
--- a/erpnext/manufacturing/doctype/production_order/test_production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py
@@ -10,7 +10,6 @@
from erpnext.manufacturing.doctype.production_order.production_order \
import make_stock_entry, ItemHasVariantError, stop_unstop
from erpnext.stock.doctype.stock_entry import test_stock_entry
-from erpnext.stock.doctype.item.test_item import get_total_projected_qty
from erpnext.stock.utils import get_bin
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
@@ -81,7 +80,7 @@
prod_order.set_production_order_operations()
prod_order.insert()
prod_order.submit()
-
+
d = prod_order.operations[0]
d.completed_qty = flt(d.completed_qty)
@@ -89,7 +88,7 @@
time_sheet_doc = frappe.get_doc('Timesheet', name)
self.assertEqual(prod_order.company, time_sheet_doc.company)
time_sheet_doc.submit()
-
+
self.assertEqual(prod_order.name, time_sheet_doc.production_order)
self.assertEqual((prod_order.qty - d.completed_qty),
@@ -108,7 +107,7 @@
self.assertEqual(prod_order.operations[0].actual_operation_time, 60)
self.assertEqual(prod_order.operations[0].actual_operating_cost, 6000)
-
+
time_sheet_doc1 = make_timesheet(prod_order.name, prod_order.company)
self.assertEqual(len(time_sheet_doc1.get('time_logs')), 0)
@@ -176,28 +175,6 @@
self.assertEqual(self.bin1_at_start.projected_qty,
cint(bin1_on_cancel.projected_qty))
- def test_projected_qty_for_production_and_sales_order(self):
- before_production_order = get_bin(self.item, self.warehouse)
- before_production_order.update_reserved_qty_for_production()
-
- self.pro_order = make_prod_order_test_record(item="_Test FG Item", qty=2,
- source_warehouse=self.warehouse)
-
- after_production_order = get_bin(self.item, self.warehouse)
-
- sales_order = make_sales_order(item = self.item, qty = 2)
- after_sales_order = get_bin(self.item, self.warehouse)
-
- self.assertEqual(cint(before_production_order.reserved_qty_for_production) + 2,
- cint(after_sales_order.reserved_qty_for_production))
- self.assertEqual(cint(before_production_order.projected_qty),
- cint(after_sales_order.projected_qty) + 2)
-
- total_projected_qty = get_total_projected_qty(self.item)
-
- item_doc = frappe.get_doc('Item', self.item)
- self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
-
def test_reserved_qty_for_production_on_stock_entry(self):
test_stock_entry.make_stock_entry(item_code="_Test Item",
target= self.warehouse, qty=100, basic_rate=100)
@@ -230,7 +207,7 @@
cint(bin1_on_start_production.reserved_qty_for_production))
self.assertEqual(cint(bin1_on_end_production.projected_qty),
cint(bin1_on_end_production.projected_qty))
-
+
def test_reserved_qty_for_stopped_production(self):
test_stock_entry.make_stock_entry(item_code="_Test Item",
target= self.warehouse, qty=100, basic_rate=100)
@@ -238,18 +215,18 @@
target= self.warehouse, qty=100, basic_rate=100)
# 0 0 0
-
+
self.test_reserved_qty_for_production_submit()
-
+
#2 0 -2
s = frappe.get_doc(make_stock_entry(self.pro_order.name,
"Material Transfer for Manufacture", 1))
s.submit()
-
+
#1 -1 0
-
+
bin1_on_start_production = get_bin(self.item, self.warehouse)
# reserved_qty_for_producion updated
@@ -259,10 +236,10 @@
# projected qty will now be 2 less (becuase of item movement)
self.assertEqual(cint(self.bin1_at_start.projected_qty),
cint(bin1_on_start_production.projected_qty) + 2)
-
+
# STOP
stop_unstop(self.pro_order.name, "Stopped")
-
+
bin1_on_stop_production = get_bin(self.item, self.warehouse)
# no change in reserved / projected
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
index 42f0f0b..d469145 100644
--- a/erpnext/modules.txt
+++ b/erpnext/modules.txt
@@ -20,4 +20,5 @@
Restaurant
Agriculture
ERPNext Integrations
-Non Profit
\ No newline at end of file
+Non Profit
+Hotels
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/donor/donor.json b/erpnext/non_profit/doctype/donor/donor.json
index d753727..7e24dac 100644
--- a/erpnext/non_profit/doctype/donor/donor.json
+++ b/erpnext/non_profit/doctype/donor/donor.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "field:email",
"beta": 0,
"creation": "2017-09-19 16:20:27.510196",
@@ -295,7 +295,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-01-15 09:40:41.153561",
+ "modified": "2018-01-22 15:53:35.059946",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Donor",
diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json
index 0eab6ae..2178aca 100644
--- a/erpnext/non_profit/doctype/member/member.json
+++ b/erpnext/non_profit/doctype/member/member.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "field:email",
"beta": 0,
"creation": "2017-09-11 09:24:52.898356",
@@ -140,7 +140,7 @@
"collapsible": 0,
"columns": 0,
"fieldname": "email",
- "fieldtype": "Data",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -151,6 +151,7 @@
"label": "Email",
"length": 0,
"no_copy": 0,
+ "options": "User",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -325,7 +326,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-01-15 09:38:41.878167",
+ "modified": "2018-01-22 15:58:46.507509",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Member",
diff --git a/erpnext/non_profit/doctype/volunteer/volunteer.json b/erpnext/non_profit/doctype/volunteer/volunteer.json
index 0d18bab..ef827e6 100644
--- a/erpnext/non_profit/doctype/volunteer/volunteer.json
+++ b/erpnext/non_profit/doctype/volunteer/volunteer.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "field:email",
"beta": 0,
"creation": "2017-09-19 16:16:45.676019",
@@ -506,7 +506,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-01-15 09:40:25.229551",
+ "modified": "2018-01-22 15:53:46.480182",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Volunteer",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index d99523f..82f58d1 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -183,7 +183,6 @@
execute:frappe.db.sql("""delete from `tabProject Task`""")
erpnext.patches.v5_0.update_item_desc_in_invoice
erpnext.patches.v5_1.fix_against_account
-erpnext.patches.v5_1.fix_credit_days_based_on
execute:frappe.rename_doc("DocType", "Salary Manager", "Process Payroll", force=True)
erpnext.patches.v5_1.rename_roles
erpnext.patches.v5_1.default_bom
@@ -346,7 +345,7 @@
erpnext.patches.v7_1.set_prefered_contact_email
execute:frappe.reload_doc('accounts', 'doctype', 'accounts_settings')
execute:frappe.db.set_value("Accounts Settings", "Accounts Settings", "unlink_payment_on_cancellation_of_invoice", 0)
-execute:frappe.db.sql("update `tabStock Entry` set total_amount = null where purpose in('Repack', 'Manufacture')")
+execute:frappe.db.sql("update `tabStock Entry` set total_amount = 0 where purpose in('Repack', 'Manufacture')")
erpnext.patches.v7_1.save_stock_settings
erpnext.patches.v7_0.repost_gle_for_pi_with_update_stock #2016-11-01
erpnext.patches.v7_1.add_account_user_role_for_timesheet
@@ -486,5 +485,14 @@
erpnext.patches.v10_0.add_guardian_role_for_parent_portal
erpnext.patches.v10_0.set_numeric_ranges_in_template_if_blank
erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
+erpnext.patches.v10_0.fichier_des_ecritures_comptables_for_france
erpnext.patches.v10_0.update_assessment_plan
erpnext.patches.v10_0.update_assessment_result
+erpnext.patches.v10_0.added_extra_gst_custom_field
+erpnext.patches.v10_0.workflow_leave_application #2018-01-24 #2018-02-02 #2018-02-08
+erpnext.patches.v10_0.set_default_payment_terms_based_on_company
+erpnext.patches.v10_0.update_sales_order_link_to_purchase_order
+erpnext.patches.v10_0.added_extra_gst_custom_field_in_gstr2 #2018-02-13
+erpnext.patches.v10_0.item_barcode_childtable_migrate
+erpnext.patches.v10_0.set_b2c_limit
+erpnext.patches.v10_0.update_translatable_fields
diff --git a/erpnext/patches/v10_0/added_extra_gst_custom_field.py b/erpnext/patches/v10_0/added_extra_gst_custom_field.py
new file mode 100644
index 0000000..a1512ed
--- /dev/null
+++ b/erpnext/patches/v10_0/added_extra_gst_custom_field.py
@@ -0,0 +1,9 @@
+import frappe
+from erpnext.regional.india.setup import make_custom_fields
+
+def execute():
+ company = frappe.get_all('Company', filters = {'country': 'India'})
+ if not company:
+ return
+
+ make_custom_fields()
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/added_extra_gst_custom_field_in_gstr2.py b/erpnext/patches/v10_0/added_extra_gst_custom_field_in_gstr2.py
new file mode 100644
index 0000000..185e20d
--- /dev/null
+++ b/erpnext/patches/v10_0/added_extra_gst_custom_field_in_gstr2.py
@@ -0,0 +1,18 @@
+import frappe
+from erpnext.regional.india.setup import make_custom_fields
+
+def execute():
+ company = frappe.get_all('Company', filters = {'country': 'India'})
+ if not company:
+ return
+
+ make_custom_fields()
+
+ frappe.db.sql("""
+ update `tabCustom Field`
+ set reqd = 0, `default` = ''
+ where fieldname = 'reason_for_issuing_document'
+ """)
+
+ frappe.db.sql("""delete from `tabCustom Field` where dt = 'Purchase Invoice'
+ and fieldname in ('port_code', 'shipping_bill_number', 'shipping_bill_date')""")
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/fichier_des_ecritures_comptables_for_france.py b/erpnext/patches/v10_0/fichier_des_ecritures_comptables_for_france.py
new file mode 100644
index 0000000..0315ae7
--- /dev/null
+++ b/erpnext/patches/v10_0/fichier_des_ecritures_comptables_for_france.py
@@ -0,0 +1,11 @@
+# Copyright (c) 2018, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from erpnext.setup.doctype.company.company import install_country_fixtures
+
+def execute():
+ frappe.reload_doc('regional', 'report', 'fichier_des_ecritures_comptables_[fec]')
+ for d in frappe.get_all('Company', filters = {'country': 'France'}):
+ install_country_fixtures(d.name)
diff --git a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
new file mode 100644
index 0000000..d985bbf
--- /dev/null
+++ b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+
+
+def execute():
+ items_barcode = frappe.db.sql("""SELECT name, barcode FROM tabItem
+ WHERE barcode IS NOT NULL and barcode != ''""", as_dict=1)
+
+ frappe.reload_doc("stock", "doctype", "item")
+ frappe.reload_doc("stock", "doctype", "item_barcode")
+
+ for item in items_barcode:
+ doc = frappe.get_doc("Item", item.get("name"))
+ if item.get("barcode"):
+ doc.append("barcodes", {"barcode": item.get("barcode")})
+ doc.flags.ignore_validate = True
+ doc.flags.ignore_mandatory = True
+ doc.save()
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/set_b2c_limit.py b/erpnext/patches/v10_0/set_b2c_limit.py
new file mode 100644
index 0000000..5d964e6
--- /dev/null
+++ b/erpnext/patches/v10_0/set_b2c_limit.py
@@ -0,0 +1,12 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.reload_doc("regional", "doctype", "gst_settings")
+ frappe.reload_doc("accounts", "doctype", "gst_account")
+ gst_settings = frappe.get_doc("GST Settings")
+ gst_settings.b2c_limit = 250000
+ gst_settings.save()
diff --git a/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py b/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py
new file mode 100644
index 0000000..a90e096
--- /dev/null
+++ b/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py
@@ -0,0 +1,37 @@
+from __future__ import unicode_literals
+import frappe
+from erpnext.patches.v8_10.change_default_customer_credit_days import make_payment_term, make_template
+
+def execute():
+ for dt in ("Company", "Customer Group"):
+ frappe.reload_doc("setup", "doctype", frappe.scrub(dt))
+
+ credit_records = frappe.db.sql("""
+ SELECT DISTINCT `credit_days`, `credit_days_based_on`, `name`
+ from `tab{0}`
+ where
+ ((credit_days_based_on='Fixed Days' or credit_days_based_on is null) and credit_days is not null)
+ or credit_days_based_on='Last Day of the Next Month'
+ """.format(dt), as_dict=1)
+
+ for d in credit_records:
+ template = create_payment_terms_template(d)
+
+ frappe.db.sql("""
+ update `tab{0}`
+ set `payment_terms` = %s
+ where name = %s
+ """.format(dt), (template.name, d.name))
+
+def create_payment_terms_template(data):
+ if data.credit_days_based_on == "Fixed Days":
+ pyt_template_name = 'Default Payment Term - N{0}'.format(data.credit_days)
+ else:
+ pyt_template_name = 'Default Payment Term - EO2M'
+
+ if not frappe.db.exists("Payment Terms Template", pyt_template_name):
+ payment_term = make_payment_term(data.credit_days, data.credit_days_based_on)
+ template = make_template(payment_term)
+ else:
+ template = frappe.get_doc("Payment Terms Template", pyt_template_name)
+ return template
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_sales_order_link_to_purchase_order.py b/erpnext/patches/v10_0/update_sales_order_link_to_purchase_order.py
new file mode 100644
index 0000000..b4f5838
--- /dev/null
+++ b/erpnext/patches/v10_0/update_sales_order_link_to_purchase_order.py
@@ -0,0 +1,18 @@
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.reload_doc("buying", "doctype", "supplier_quotation_item")
+
+ for doctype in ['Purchase Order','Supplier Quotation']:
+ frappe.db.sql("""
+ Update
+ `tab{doctype} Item`, `tabMaterial Request Item`
+ set
+ `tab{doctype} Item`.sales_order = `tabMaterial Request Item`.sales_order
+ where
+ `tab{doctype} Item`.material_request= `tabMaterial Request Item`.parent
+ and `tab{doctype} Item`.material_request_item = `tabMaterial Request Item`.name
+ and `tabMaterial Request Item`.sales_order is not null""".format(doctype=doctype))
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_translatable_fields.py b/erpnext/patches/v10_0/update_translatable_fields.py
new file mode 100644
index 0000000..9d6bda7
--- /dev/null
+++ b/erpnext/patches/v10_0/update_translatable_fields.py
@@ -0,0 +1,41 @@
+#-*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ '''
+ Enable translatable in these fields
+ - Customer Name
+ - Supplier Name
+ - Contact Name
+ - Item Name/ Description
+ - Address
+ '''
+
+ frappe.reload_doc('core', 'doctype', 'docfield')
+ frappe.reload_doc('custom', 'doctype', 'custom_field')
+
+ enable_for_fields = [
+ ['Customer', 'customer_name'],
+ ['Supplier', 'supplier_name'],
+ ['Contact', 'first_name'],
+ ['Contact', 'last_name'],
+ ['Item', 'item_name'],
+ ['Item', 'description'],
+ ['Address', 'address_line1'],
+ ['Address', 'address_line2'],
+ ]
+
+
+ for f in enable_for_fields:
+ frappe.get_doc({
+ 'doctype': 'Property Setter',
+ 'doc_type': f[0],
+ 'doctype_or_field': 'DocField',
+ 'field_name': f[1],
+ 'property': 'translatable',
+ 'propery_type': 'Check',
+ 'value': 1
+ }).db_insert()
diff --git a/erpnext/patches/v10_0/workflow_leave_application.py b/erpnext/patches/v10_0/workflow_leave_application.py
new file mode 100644
index 0000000..0d33402
--- /dev/null
+++ b/erpnext/patches/v10_0/workflow_leave_application.py
@@ -0,0 +1,68 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ if frappe.db.a_row_exists("Leave Application"):
+ frappe.reload_doc("hr", "doctype", "leave_application")
+ frappe.reload_doc("workflow", "doctype", "workflow")
+ states = {'Approved': 'Success', 'Rejected': 'Danger', 'Open': 'Warning'}
+
+ for state, style in states.items():
+ if not frappe.db.exists("Workflow State", state):
+ frappe.get_doc({
+ 'doctype': 'Workflow State',
+ 'workflow_state_name': state,
+ 'style': style
+ }).insert(ignore_permissions=True)
+
+ for action in ['Approve', 'Reject']:
+ if not frappe.db.exists("Workflow Action", action):
+ frappe.get_doc({
+ 'doctype': 'Workflow Action',
+ 'workflow_action_name': action
+ }).insert(ignore_permissions=True)
+
+ if not frappe.db.exists("Workflow", "Leave Approval"):
+ frappe.get_doc({
+ 'doctype': 'Workflow',
+ 'workflow_name': 'Leave Approval',
+ 'document_type': 'Leave Application',
+ 'is_active': 1,
+ 'workflow_state_field': 'workflow_state',
+ 'states': [{
+ "state": 'Open',
+ "doc_status": 0,
+ "allow_edit": 'Employee'
+ }, {
+ "state": 'Approved',
+ "doc_status": 1,
+ "allow_edit": 'Leave Approver'
+ }, {
+ "state": 'Rejected',
+ "doc_status": 0,
+ "allow_edit": 'Leave Approver'
+ }],
+ 'transitions': [{
+ "state": 'Open',
+ "action": 'Approve',
+ "next_state": 'Approved',
+ "allowed": 'Leave Approver'
+ },
+ {
+ "state": 'Open',
+ "action": 'Reject',
+ "next_state": 'Rejected',
+ "allowed": 'Leave Approver'
+ }]
+ }).insert(ignore_permissions=True)
+
+ if frappe.db.has_column("Leave Application", "status"):
+ frappe.db.sql("""update `tabLeave Application` set workflow_state = status""")
+
+ if frappe.db.has_column("Leave Application", "workflow_state"):
+ frappe.db.sql("""update `tabWorkflow Document State` set doc_status = 0 where parent = "Leave Approval" \
+ and state = "Rejected" and doc_status = 1""")
+ frappe.db.sql("""update `tabLeave Application` set docstatus = 0 where workflow_state = "Rejected" and docstatus = 1""")
diff --git a/erpnext/patches/v4_0/import_country_codes.py b/erpnext/patches/v4_0/import_country_codes.py
index 5e9f3b4..43e23d5 100644
--- a/erpnext/patches/v4_0/import_country_codes.py
+++ b/erpnext/patches/v4_0/import_country_codes.py
@@ -6,8 +6,10 @@
from frappe.geo.country_info import get_all
from frappe.utils.install import import_country_and_currency
+from six import iteritems
+
def execute():
frappe.reload_doc("setup", "doctype", "country")
import_country_and_currency()
- for name, country in get_all().iteritems():
+ for name, country in iteritems(get_all()):
frappe.set_value("Country", name, "code", country.get("code"))
\ No newline at end of file
diff --git a/erpnext/patches/v4_0/validate_v3_patch.py b/erpnext/patches/v4_0/validate_v3_patch.py
index 5f72847..3df39ed 100644
--- a/erpnext/patches/v4_0/validate_v3_patch.py
+++ b/erpnext/patches/v4_0/validate_v3_patch.py
@@ -8,4 +8,4 @@
from frappe.modules.patch_handler import executed
last_v3_patch = 'patches.1401.fix_pos_outstanding'
if not executed(last_v3_patch):
- raise Exception, "site not ready to migrate to version 4"
+ raise Exception("site not ready to migrate to version 4")
diff --git a/erpnext/patches/v4_4/make_email_accounts.py b/erpnext/patches/v4_4/make_email_accounts.py
index 510fe3a..d055fce 100644
--- a/erpnext/patches/v4_4/make_email_accounts.py
+++ b/erpnext/patches/v4_4/make_email_accounts.py
@@ -1,6 +1,8 @@
import frappe
from frappe.model import default_fields
+from six import iteritems
+
def execute():
frappe.reload_doc("email", "doctype", "email_account")
@@ -19,7 +21,7 @@
"use_tls": "use_ssl"
}
- for target_fieldname, source_fieldname in mapping.iteritems():
+ for target_fieldname, source_fieldname in iteritems(mapping):
account.set(target_fieldname, outgoing.get(source_fieldname))
account.enable_outgoing = 1
@@ -42,7 +44,7 @@
"auto_reply_message": "support_autoreply"
}
- for target_fieldname, source_fieldname in mapping.iteritems():
+ for target_fieldname, source_fieldname in iteritems(mapping):
account.set(target_fieldname, support.get(source_fieldname))
account.enable_outgoing = 0
@@ -63,7 +65,7 @@
"use_ssl": "use_ssl",
}
- for target_fieldname, source_fieldname in mapping.iteritems():
+ for target_fieldname, source_fieldname in iteritems(mapping):
account.set(target_fieldname, source.get(source_fieldname))
account.enable_outgoing = 0
diff --git a/erpnext/patches/v5_1/fix_credit_days_based_on.py b/erpnext/patches/v5_1/fix_credit_days_based_on.py
deleted file mode 100644
index 6df19f2..0000000
--- a/erpnext/patches/v5_1/fix_credit_days_based_on.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-
-import frappe
-
-def execute():
- for dt in ("Customer", "Customer Group", "Company"):
- frappe.reload_doctype(dt, force=True)
- frappe.db.sql("""update `tab{0}` set credit_days_based_on='Fixed Days'
- where ifnull(credit_days, 0) > 0""".format(dt))
diff --git a/erpnext/patches/v7_0/repost_bin_qty_and_item_projected_qty.py b/erpnext/patches/v7_0/repost_bin_qty_and_item_projected_qty.py
index 97af20a..5d76304 100644
--- a/erpnext/patches/v7_0/repost_bin_qty_and_item_projected_qty.py
+++ b/erpnext/patches/v7_0/repost_bin_qty_and_item_projected_qty.py
@@ -3,26 +3,13 @@
from __future__ import unicode_literals
import frappe
-from erpnext.stock.doctype.bin.bin import update_item_projected_qty
def execute():
repost_bin_qty()
- repost_item_projected_qty()
def repost_bin_qty():
- for bin in frappe.db.sql(""" select name from `tabBin`
+ for bin in frappe.db.sql(""" select name from `tabBin`
where (actual_qty + ordered_qty + indented_qty + planned_qty- reserved_qty - reserved_qty_for_production) != projected_qty """, as_dict=1):
bin_doc = frappe.get_doc('Bin', bin.name)
bin_doc.set_projected_qty()
bin_doc.db_set("projected_qty", bin_doc.projected_qty, update_modified = False)
-
-def repost_item_projected_qty():
- for data in frappe.db.sql(""" select
- `tabBin`.item_code as item_code,
- sum(`tabBin`.projected_qty) as projected_qty,
- `tabItem`.total_projected_qty as total_projected_qty
- from
- `tabBin`, `tabItem`
- where `tabBin`.item_code = `tabItem`.name
- group by `tabBin`.item_code having projected_qty <> total_projected_qty """, as_dict=1):
- update_item_projected_qty(data.item_code)
diff --git a/erpnext/patches/v7_0/update_status_of_po_so.py b/erpnext/patches/v7_0/update_status_of_po_so.py
index c0b6f59..d630e8f 100644
--- a/erpnext/patches/v7_0/update_status_of_po_so.py
+++ b/erpnext/patches/v7_0/update_status_of_po_so.py
@@ -20,7 +20,10 @@
where parent = `tabPurchase Order`.name), 2),
`tabPurchase Order`.per_billed = ifnull(round((select sum( if(amount > ifnull(billed_amt, 0),
ifnull(billed_amt, 0), amount)) / sum(amount) *100 from `tabPurchase Order Item`
- where parent = `tabPurchase Order`.name), 2), 0)""")
+ where parent = `tabPurchase Order`.name), 2), 0)
+ where
+ net_total > 0
+ """)
def update_so_per_delivered_per_billed():
frappe.db.sql("""
@@ -32,7 +35,10 @@
where parent = `tabSales Order`.name), 2),
`tabSales Order`.per_billed = ifnull(round((select sum( if(amount > ifnull(billed_amt, 0),
ifnull(billed_amt, 0), amount)) / sum(amount) *100 from `tabSales Order Item`
- where parent = `tabSales Order`.name), 2), 0)""")
+ where parent = `tabSales Order`.name), 2), 0)
+ where
+ net_total > 0
+ """)
def update_status():
frappe.db.sql("""
diff --git a/erpnext/patches/v7_1/set_currency_exchange_date.py b/erpnext/patches/v7_1/set_currency_exchange_date.py
index 7d8e4f0..630b7d4 100644
--- a/erpnext/patches/v7_1/set_currency_exchange_date.py
+++ b/erpnext/patches/v7_1/set_currency_exchange_date.py
@@ -5,5 +5,5 @@
frappe.db.sql("""
update `tabCurrency Exchange`
set `date` = '2010-01-01'
- where date is null or date = '' or date = '0000-00-00'
+ where date is null or date = '0000-00-00'
""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/rename_att_date_attendance.py b/erpnext/patches/v7_2/rename_att_date_attendance.py
index f7caf70..b2658ba 100644
--- a/erpnext/patches/v7_2/rename_att_date_attendance.py
+++ b/erpnext/patches/v7_2/rename_att_date_attendance.py
@@ -7,7 +7,7 @@
frappe.reload_doc("hr", "doctype", "attendance")
frappe.db.sql("""update `tabAttendance`
set attendance_date = att_date
- where attendance_date is null or attendance_date = '' or attendance_date = '0000-00-00'""")
+ where attendance_date is null or attendance_date = '0000-00-00'""")
update_reports("Attendance", "att_date", "attendance_date")
update_users_report_view_settings("Attendance", "att_date", "attendance_date")
diff --git a/erpnext/patches/v7_2/update_salary_slips.py b/erpnext/patches/v7_2/update_salary_slips.py
index 22bb1d8..c6bca8e 100644
--- a/erpnext/patches/v7_2/update_salary_slips.py
+++ b/erpnext/patches/v7_2/update_salary_slips.py
@@ -9,8 +9,7 @@
salary_slips = frappe.db.sql("""select month, name, fiscal_year from `tabSalary Slip`
where (month is not null and month != '') and
- (start_date is null or start_date = '') and
- (end_date is null or end_date = '') and docstatus != 2""", as_dict=True)
+ start_date is null and end_date is null and docstatus != 2""", as_dict=True)
for salary_slip in salary_slips:
if not cint(salary_slip.month):
diff --git a/erpnext/patches/v8_1/set_delivery_date_in_so_item.py b/erpnext/patches/v8_1/set_delivery_date_in_so_item.py
index aa5cbc5..2e81571 100644
--- a/erpnext/patches/v8_1/set_delivery_date_in_so_item.py
+++ b/erpnext/patches/v8_1/set_delivery_date_in_so_item.py
@@ -8,7 +8,7 @@
frappe.db.sql("""
update `tabSales Order`
set delivery_date = final_delivery_date
- where (delivery_date is null or delivery_date = '' or delivery_date = '0000-00-00')
+ where (delivery_date is null or delivery_date = '0000-00-00')
and order_type = 'Sales'""")
frappe.db.sql("""
@@ -16,8 +16,6 @@
set so_item.delivery_date = so.delivery_date
where so.name = so_item.parent
and so.order_type = 'Sales'
- and (so_item.delivery_date is null or so_item.delivery_date = ''
- or so_item.delivery_date = '0000-00-00')
- and (so.delivery_date is not null and so.delivery_date != ''
- and so.delivery_date != '0000-00-00')
- """)
+ and (so_item.delivery_date is null or so_item.delivery_date = '0000-00-00')
+ and (so.delivery_date is not null and so.delivery_date != '0000-00-00')
+ """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_10/change_default_customer_credit_days.py b/erpnext/patches/v8_10/change_default_customer_credit_days.py
index 640c8aa..eddafb5 100644
--- a/erpnext/patches/v8_10/change_default_customer_credit_days.py
+++ b/erpnext/patches/v8_10/change_default_customer_credit_days.py
@@ -17,7 +17,8 @@
SELECT DISTINCT `credit_days`, `credit_days_based_on`, `name`
from `tab{0}`
where
- (credit_days_based_on='Fixed Days' and credit_days is not null)
+ ((credit_days_based_on='Fixed Days' or credit_days_based_on is null)
+ and credit_days is not null)
or credit_days_based_on='Last Day of the Next Month'
""".format(doctype))
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 979c4fc..049c943 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -11,6 +11,8 @@
from erpnext.controllers.queries import get_filters_cond
from frappe.desk.reportview import get_match_cond
+from six import iteritems
+
class Project(Document):
def get_feed(self):
return '{0}: {1}'.format(_(self.status), self.project_name)
@@ -257,7 +259,7 @@
dependency_map[task.title] = [ x['subject'] for x in frappe.get_list(
'Task Depends On', {"parent": name}, ['subject'])]
- for key, value in dependency_map.iteritems():
+ for key, value in iteritems(dependency_map):
task_name = frappe.db.get_value('Task', {"subject": key, "project": self.name })
task_doc = frappe.get_doc('Task', task_name)
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index 43f5705..99ee2a2 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -39,7 +39,7 @@
refresh: function(frm) {
if(frm.doc.docstatus==1) {
- if(frm.doc.per_billed < 100){
+ if(frm.doc.per_billed < 100 && frm.doc.total_billable_hours && frm.doc.total_billable_hours > frm.doc.total_billed_hours){
frm.add_custom_button(__("Make Sales Invoice"), function() { frm.trigger("make_invoice") },
"fa fa-file-alt");
}
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 01552a5..3d94b5c 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -156,14 +156,18 @@
(self.production_order, operation_id), as_dict=1)[0]
def update_task_and_project(self):
+ tasks, projects = [], []
+
for data in self.time_logs:
- if data.task:
+ if data.task and data.task not in tasks:
task = frappe.get_doc("Task", data.task)
task.update_time_and_costing()
task.save()
+ tasks.append(data.task)
- elif data.project:
+ elif data.project and data.project not in projects:
frappe.get_doc("Project", data.project).update_project()
+ projects.append(data.project)
def validate_dates(self):
for data in self.time_logs:
@@ -310,16 +314,16 @@
@frappe.whitelist()
def get_timesheet_data(name, project):
+ data = None
if project and project!='':
data = get_projectwise_timesheet_data(project, name)
else:
data = frappe.get_all('Timesheet',
fields = ["(total_billable_amount - total_billed_amount) as billing_amt", "total_billable_hours as billing_hours"], filters = {'name': name})
-
return {
- 'billing_hours': data[0].billing_hours,
- 'billing_amount': data[0].billing_amt,
- 'timesheet_detail': data[0].name if project and project!= '' else None
+ 'billing_hours': data[0].billing_hours if data else None,
+ 'billing_amount': data[0].billing_amt if data else None,
+ 'timesheet_detail': data[0].name if data and project and project!= '' else None
}
@frappe.whitelist()
@@ -327,6 +331,12 @@
target = frappe.new_doc("Sales Invoice")
timesheet = frappe.get_doc('Timesheet', source_name)
+ if not timesheet.total_billable_hours:
+ frappe.throw(_("Invoice can't be made for zero billing hour"))
+
+ if timesheet.total_billable_hours == timesheet.total_billed_hours:
+ frappe.throw(_("Invoice already created for all billing hours"))
+
hours = flt(timesheet.total_billable_hours) - flt(timesheet.total_billed_hours)
billing_amount = flt(timesheet.total_billable_amount) - flt(timesheet.total_billed_amount)
billing_rate = billing_amount / hours
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index 0dd3ed7..21cd289 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -36,7 +36,8 @@
"public/js/utils/item_quick_entry.js",
"public/js/utils/customer_quick_entry.js",
"public/js/education/student_button.html",
- "public/js/education/assessment_result_tool.html"
+ "public/js/education/assessment_result_tool.html",
+ "public/js/hub/hub_factory.js"
],
"js/item-dashboard.min.js": [
"stock/dashboard/item_dashboard.html",
diff --git a/erpnext/public/css/hub.css b/erpnext/public/css/hub.css
index 559c203..5f86cf4 100644
--- a/erpnext/public/css/hub.css
+++ b/erpnext/public/css/hub.css
@@ -1,3 +1,29 @@
+body[data-route^="Hub/"] .freeze .image-view-container .list-row-col {
+ background-color: #fafbfc;
+ color: #fafbfc;
+}
+body[data-route^="Hub/"] .freeze .image-view-container .placeholder-text {
+ color: #fafbfc;
+}
+body[data-route^="Hub/"] .freeze {
+ display: none;
+}
+body[data-route^="Hub/"] .image-view-container {
+ justify-content: space-around;
+}
+.img-wrapper {
+ border: 1px solid #d1d8dd;
+ border-radius: 3px;
+ padding: 12px;
+ overflow: hidden;
+ text-align: center;
+ white-space: nowrap;
+}
+.img-wrapper .helper {
+ height: 100%;
+ display: inline-block;
+ vertical-align: middle;
+}
/* hub */
div[data-page-route="hub"] .page-head {
height: 80px;
diff --git a/erpnext/public/css/pos.css b/erpnext/public/css/pos.css
index e2d301d..613a5ff 100644
--- a/erpnext/public/css/pos.css
+++ b/erpnext/public/css/pos.css
@@ -174,3 +174,6 @@
.rounded-total-value {
font-size: 18px;
}
+.quantity-total {
+ font-size: 18px;
+}
diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css
index 733194a..9ac9aac 100644
--- a/erpnext/public/css/website.css
+++ b/erpnext/public/css/website.css
@@ -182,7 +182,7 @@
display: none;
}
.cart-dropdown-container .checkout-btn {
- padding-top: 25px;
+ padding-bottom: 25px;
}
.cart-dropdown-container .col-name-description {
margin-bottom: 8px;
diff --git a/erpnext/public/js/communication.js b/erpnext/public/js/communication.js
index bb2eaef..e85107e 100644
--- a/erpnext/public/js/communication.js
+++ b/erpnext/public/js/communication.js
@@ -19,17 +19,16 @@
if(!in_list(["Lead", "Opportunity"], frm.doc.reference_doctype)) {
frm.add_custom_button(__("Lead"), () => {
frappe.confirm(__(confirm_msg, [__("Lead")]), () => {
- frm.trigger('make_lead_from_communication');
+ frm.trigger('make_lead_from_communication');
})
- }, "Make");
+ }, __("Make"));
frm.add_custom_button(__("Opportunity"), () => {
frappe.confirm(__(confirm_msg, [__("Opportunity")]), () => {
frm.trigger('make_opportunity_from_communication');
})
- }, "Make");
+ }, __("Make"));
}
- frm.page.set_inner_btn_group_as_primary(__("Make"));
},
make_lead_from_communication: (frm) => {
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index 860c8c1..5baf848 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -133,7 +133,7 @@
cur_frm.cscript.account_head = function(doc, cdt, cdn) {
var d = locals[cdt][cdn];
if(!d.charge_type && d.account_head){
- frappe.msgprint("Please select Charge Type first");
+ frappe.msgprint(__("Please select Charge Type first"));
frappe.model.set_value(cdt, cdn, "account_head", "");
} else if(d.account_head && d.charge_type!=="Actual") {
frappe.call({
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index a9e3ad4..68bb2b8 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -252,10 +252,12 @@
d.qty = d.qty - my_qty;
cur_frm.doc.items[i].stock_qty = my_qty*cur_frm.doc.items[i].conversion_factor;
cur_frm.doc.items[i].qty = my_qty;
-
- frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + cur_frm.doc.items[i].idx + ")");
+
+ frappe.msgprint(__("Assigning {0} to {1} (row {2})",
+ [d.mr_name, d.item_code, cur_frm.doc.items[i].idx]));
+
if (qty > 0) {
- frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
+ frappe.msgprint(__("Splitting {0} units of {1}", [qty, d.item_code]));
var newrow = frappe.model.add_child(cur_frm.doc, cur_frm.doc.items[i].doctype, "items");
item_length++;
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 4847dae..c1b020b 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -653,11 +653,14 @@
var payment_types = $.map(this.frm.doc.payments, function(d) { return d.type; });
if (in_list(payment_types, 'Cash')) {
- this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - this.frm.doc.grand_total +
+ var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
+ var base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
+
+ this.frm.doc.change_amount = flt(this.frm.doc.paid_amount - grand_total +
this.frm.doc.write_off_amount, precision("change_amount"));
this.frm.doc.base_change_amount = flt(this.frm.doc.base_paid_amount -
- this.frm.doc.base_grand_total + this.frm.doc.base_write_off_amount,
+ base_grand_total + this.frm.doc.base_write_off_amount,
precision("base_change_amount"));
}
}
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 757c752..e8c3262 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -458,7 +458,7 @@
}
var party = me.frm.doc[frappe.model.scrub(party_type)];
- if(party) {
+ if(party && me.frm.doc.company) {
return frappe.call({
method: "erpnext.accounts.party.get_party_account",
args: {
@@ -523,7 +523,8 @@
},
callback: function(r, rt) {
if(r.message) {
- me.frm.set_value("due_date", r.message);
+ me.frm.doc.due_date = r.message;
+ refresh_field("due_date");
frappe.ui.form.trigger(me.frm.doc.doctype, "currency");
me.recalculate_terms();
}
@@ -538,8 +539,9 @@
due_date: function() {
// due_date is to be changed, payment terms template and/or payment schedule must
// be removed as due_date is automatically changed based on payment terms
- if (this.frm.doc.due_date) {
- if (this.frm.doc.payment_terms_template || this.frm.doc.payment_schedule.length) {
+ if (this.frm.doc.due_date && !this.frm.updating_party_details && !this.frm.doc.is_pos) {
+ if (this.frm.doc.payment_terms_template ||
+ (this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length)) {
var message1 = "";
var message2 = "";
var final_message = "Please clear the ";
@@ -554,11 +556,9 @@
if (message1.length !== 0) message2 = " and " + message2;
final_message = final_message + message2;
}
-
frappe.msgprint(final_message);
}
-
- }
+ }
},
recalculate_terms: function() {
@@ -648,6 +648,9 @@
}
}).fail(() => this.frm.set_value('shipping_rule', ''));
}
+ else {
+ me.calculate_taxes_and_totals();
+ }
},
set_actual_charges_based_on_currency: function() {
@@ -701,7 +704,7 @@
}
if(!this.in_apply_price_list) {
- this.apply_price_list();
+ this.apply_price_list(null, true);
}
},
@@ -773,7 +776,8 @@
this.frm.toggle_reqd("plc_conversion_rate",
!!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency));
- if(this.frm.doc_currency!==this.frm.doc.currency) {
+ if(this.frm.doc_currency!==this.frm.doc.currency
+ || this.frm.doc_currency!==this.frm.doc.price_list_currency) {
// reset names only when the currency is different
var company_currency = this.get_company_currency();
@@ -1053,7 +1057,13 @@
if(!price_list_rate_changed) me.calculate_taxes_and_totals();
},
- apply_price_list: function(item) {
+ apply_price_list: function(item, reset_plc_conversion) {
+ // We need to reset plc_conversion_rate sometimes because the call to
+ // `erpnext.stock.get_item_details.apply_price_list` is sensitive to its value
+ if (!reset_plc_conversion) {
+ this.frm.set_value("plc_conversion_rate", "");
+ }
+
var me = this;
var args = this._get_args(item);
if (!((args.items && args.items.length) || args.price_list)) {
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 1eeb896..29e3999 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -98,6 +98,16 @@
],
"default": "Monthly",
"reqd": 1
+ },
+ // Note:
+ // If you are modifying this array such that the presentation_currency object
+ // is no longer the last object, please make adjustments in cash_flow.js
+ // accordingly.
+ {
+ "fieldname": "presentation_currency",
+ "label": __("Currency"),
+ "fieldtype": "Select",
+ "options": erpnext.get_presentation_currency_list()
}
]
}
diff --git a/erpnext/public/js/hub/hub_factory.js b/erpnext/public/js/hub/hub_factory.js
new file mode 100644
index 0000000..1578e4d
--- /dev/null
+++ b/erpnext/public/js/hub/hub_factory.js
@@ -0,0 +1,47 @@
+frappe.provide('erpnext.hub.pages');
+
+frappe.views.HubFactory = frappe.views.Factory.extend({
+ make(route) {
+ const page_name = frappe.get_route_str();
+ const page = route[1];
+
+ const assets = {
+ 'List': [
+ '/assets/erpnext/js/hub/hub_page.js',
+ '/assets/erpnext/css/hub.css',
+ ],
+ 'Form': [
+ '/assets/erpnext/js/hub/hub_form.js',
+ '/assets/erpnext/css/hub.css',
+ ]
+ };
+ frappe.model.with_doc('Hub Settings', 'Hub Settings', () => {
+ this.hub_settings = frappe.get_doc('Hub Settings');
+
+ if (!erpnext.hub.pages[page_name]) {
+ if (!route[2]) {
+ frappe.require(assets['List'], () => {
+ erpnext.hub.pages[page_name] = new erpnext.hub[page+'Listing']({
+ parent: this.make_page(true, page_name),
+ hub_settings: this.hub_settings
+ });
+ window.hub_page = erpnext.hub.pages[page_name];
+ });
+ } else {
+ frappe.require(assets['Form'], () => {
+ erpnext.hub.pages[page_name] = new erpnext.hub[page+'Page']({
+ unique_id: route[2],
+ doctype: route[2],
+ parent: this.make_page(true, page_name),
+ hub_settings: this.hub_settings
+ });
+ window.hub_page = erpnext.hub.pages[page_name];
+ });
+ }
+ } else {
+ frappe.container.change_to(page_name);
+ window.hub_page = erpnext.hub.pages[page_name];
+ }
+ });
+ }
+});
diff --git a/erpnext/public/js/hub/hub_form.js b/erpnext/public/js/hub/hub_form.js
new file mode 100644
index 0000000..130a0db
--- /dev/null
+++ b/erpnext/public/js/hub/hub_form.js
@@ -0,0 +1,155 @@
+frappe.provide('erpnext.hub');
+
+erpnext.hub.HubForm = class HubForm extends frappe.views.BaseList {
+ setup_defaults() {
+ super.setup_defaults();
+ this.method = 'erpnext.hub_node.get_details';
+ const route = frappe.get_route();
+ this.page_name = route[2];
+ }
+
+ set_breadcrumbs() {
+ frappe.breadcrumbs.add({
+ label: __('Hub'),
+ route: '#Hub/' + this.doctype,
+ type: 'Custom'
+ });
+ }
+
+ setup_side_bar() {
+ this.sidebar = new frappe.ui.Sidebar({
+ wrapper: this.$page.find('.layout-side-section'),
+ css_class: 'hub-form-sidebar'
+ });
+ }
+
+ setup_filter_area() { }
+
+ setup_sort_selector() { }
+
+ get_args() {
+ return {
+ hub_sync_id: this.unique_id,
+ doctype: 'Hub ' + this.doctype
+ };
+ }
+
+ prepare_data(r) {
+ this.data = r.message;
+ }
+
+ update_data(r) {
+ this.data = r.message;
+ }
+
+ render() {
+ const image_html = this.data[this.image_field_name] ?
+ `<img src="${this.data[this.image_field_name]}">
+ <span class="helper"></span>` :
+ `<div class="standard-image">${frappe.get_abbr(this.page_title)}</div>`;
+
+ this.sidebar.add_item({
+ label: image_html
+ });
+
+ let fields = this.get_field_configs();
+
+ this.form = new frappe.ui.FieldGroup({
+ parent: this.$result,
+ fields
+ });
+
+ this.form.make();
+ this.form.set_values(this.data);
+ }
+
+ toggle_result_area() {
+ this.$result.toggle(this.unique_id);
+ this.$paging_area.toggle(this.data.length > 0);
+ this.$no_result.toggle(this.data.length == 0);
+
+ const show_more = (this.start + this.page_length) <= this.data.length;
+ this.$paging_area.find('.btn-more')
+ .toggle(show_more);
+ }
+};
+
+erpnext.hub.ItemPage = class ItemPage extends erpnext.hub.HubForm{
+ setup_defaults() {
+ super.setup_defaults();
+ this.doctype = 'Item';
+ this.image_field_name = 'image';
+ }
+
+ get_field_configs() {
+ let fields = [];
+ this.fields.map(fieldname => {
+ fields.push({
+ label: toTitle(frappe.model.unscrub(fieldname)),
+ fieldname,
+ fieldtype: 'Data',
+ read_only: 1
+ });
+ });
+
+ let category_field = {
+ label: 'Hub Category',
+ fieldname: 'hub_category',
+ fieldtype: 'Data'
+ }
+
+ if(this.data.company_name === this.hub_settings.company) {
+ this.page.set_primary_action(__('Update'), () => {
+ this.update_on_hub();
+ }, 'octicon octicon-plus');
+ } else {
+ category_field.read_only = 1;
+ }
+
+ fields.unshift(category_field);
+
+ return fields;
+ }
+
+ update_on_hub() {
+ return new Promise((resolve, reject) => {
+ frappe.call({
+ method: 'erpnext.hub_node.update_category',
+ args: { item: this.unique_id, category: this.form.get_value('hub_category') },
+ callback: resolve,
+ freeze: true
+ }).fail(reject);
+ });
+ }
+
+ setup_fields() {
+ this.fields = ['hub_item_code', 'item_name', 'item_code', 'description',
+ 'seller', 'company_name', 'country'];
+ }
+}
+
+erpnext.hub.CompanyPage = class CompanyPage extends erpnext.hub.HubForm{
+ setup_defaults() {
+ super.setup_defaults();
+ this.doctype = 'Company';
+ this.image_field_name = 'company_logo';
+ }
+
+ get_field_configs() {
+ let fields = [];
+ this.fields.map(fieldname => {
+ fields.push({
+ label: toTitle(frappe.model.unscrub(fieldname)),
+ fieldname,
+ fieldtype: 'Data',
+ read_only: 1
+ });
+ });
+
+ return fields;
+ }
+
+ setup_fields() {
+ this.fields = ['company_name', 'description', 'route', 'country', 'seller', 'site_name'];
+ }
+}
diff --git a/erpnext/public/js/hub/hub_page.js b/erpnext/public/js/hub/hub_page.js
new file mode 100644
index 0000000..27986de
--- /dev/null
+++ b/erpnext/public/js/hub/hub_page.js
@@ -0,0 +1,244 @@
+frappe.provide('erpnext.hub');
+
+erpnext.hub.HubListing = class HubListing extends frappe.views.BaseList {
+ setup_defaults() {
+ super.setup_defaults();
+ this.page_title = __('Hub');
+ this.method = 'erpnext.hub_node.get_list';
+
+ const route = frappe.get_route();
+ this.page_name = route[1];
+ }
+
+ setup_fields() {
+ return this.get_meta()
+ .then(r => {
+ this.meta = r.message || this.meta;
+ frappe.model.sync(this.meta);
+ });
+ }
+
+ get_meta() {
+ return new Promise(resolve =>
+ frappe.call('erpnext.hub_node.get_meta', {doctype: this.doctype}, resolve));
+ }
+
+ set_breadcrumbs() { }
+
+ setup_side_bar() {
+ this.sidebar = new frappe.ui.Sidebar({
+ wrapper: this.page.wrapper.find('.layout-side-section'),
+ css_class: 'hub-sidebar'
+ });
+ }
+
+ setup_sort_selector() { }
+
+ setup_view() { }
+
+ get_args() {
+ return {
+ doctype: this.doctype,
+ start: this.start,
+ limit: this.page_length,
+ order_by: this.order_by,
+ fields: this.fields,
+ filters: this.get_filters_for_args()
+ };
+ }
+
+ update_data(r) {
+ const data = r.message;
+
+ if (this.start === 0) {
+ this.data = data;
+ } else {
+ this.data = this.data.concat(data);
+ }
+
+ }
+
+ freeze(toggle) {
+ this.$freeze.toggle(toggle);
+ if (this.$freeze.find('.image-view-container').length) return;
+
+ const html = Array.from(new Array(4)).map(d => this.card_html({
+ name: 'Loading...',
+ item_name: 'Loading...'
+ })).join('');
+
+ this.$freeze.html(`<div class="image-view-container border-top">${html}</div>`);
+ }
+
+ render() {
+ this.render_image_view();
+ }
+
+ render_image_view() {
+ let data = this.data;
+ if (this.start === 0) {
+ this.$result.html('<div class="image-view-container small padding-top">');
+ data = this.data.slice(this.start);
+ }
+
+ var html = data.map(this.card_html.bind(this)).join("");
+ this.$result.find('.image-view-container').append(html);
+ }
+}
+
+erpnext.hub.ItemListing = class ItemListing extends erpnext.hub.HubListing {
+ setup_defaults() {
+ super.setup_defaults();
+ this.doctype = 'Hub Item';
+ this.fields = ['name', 'hub_item_code', 'image', 'item_name', 'item_code', 'company_name'];
+ this.filters = [];
+ this.custom_filter_configs = [
+ {
+ fieldtype: 'Data',
+ label: 'Company',
+ condition: 'like',
+ fieldname: 'company_name',
+ },
+ {
+ fieldtype: 'Link',
+ label: 'Country',
+ options: 'Country',
+ condition: 'like',
+ fieldname: 'country'
+ }
+ ];
+ }
+
+ setup_side_bar() {
+ super.setup_side_bar();
+ this.category_tree = new frappe.ui.Tree({
+ parent: this.sidebar.$sidebar,
+ label: 'All Categories',
+ expandable: true,
+
+ args: {parent: this.current_category},
+ method: 'erpnext.hub_node.get_categories',
+ on_click: (node) => {
+ this.update_category(node.label);
+ }
+ });
+
+ this.sidebar.add_item({
+ label: __('Companies'),
+ on_click: () => frappe.set_route('Hub', 'Company')
+ });
+
+ this.sidebar.add_item({
+ label: this.hub_settings.company,
+ on_click: () => frappe.set_route('Form', 'Company', this.hub_settings.company)
+ }, __("Account"));
+
+ this.sidebar.add_item({
+ label: __("My Orders"),
+ on_click: () => frappe.set_route('List', 'Request for Quotation')
+ }, __("Account"));
+ }
+
+ update_category(label) {
+ this.current_category = (label=='All Categories') ? undefined : label;
+ this.refresh();
+ }
+
+ get_filters_for_args() {
+ let filters = {};
+ this.filter_area.get().forEach(f => {
+ let field = f[1] !== 'name' ? f[1] : 'item_name';
+ filters[field] = [f[2], f[3]];
+ });
+ if(this.current_category) {
+ filters['hub_category'] = this.current_category;
+ }
+ return filters;
+ }
+
+ card_html(item) {
+ item._name = encodeURI(item.name);
+ const encoded_name = item._name;
+ const title = strip_html(item['item_name' || 'item_code']);
+ const company_name = item['company_name'];
+
+ const route = `#Hub/Item/${item.hub_item_code}`;
+
+ const image_html = item.image ?
+ `<img src="${item.image}">
+ <span class="helper"></span>` :
+ `<div class="standard-image">${frappe.get_abbr(title)}</div>`;
+
+ return `
+ <div class="hub-item-wrapper margin-bottom" style="width: 200px;">
+ <a href="${route}">
+ <div class="hub-item-image">
+ <div class="img-wrapper" style="height: 200px; width: 200px">
+ ${ image_html }
+ </div>
+ </div>
+ <div class="hub-item-title">
+ <h5 class="bold">
+ ${ title }
+ </h5>
+
+ </div>
+ </a>
+ <a href="${'#Hub/Company/'+company_name}"><p>${ company_name }</p></a>
+ </div>
+ `;
+ }
+};
+
+erpnext.hub.CompanyListing = class CompanyListing extends erpnext.hub.HubListing {
+ setup_defaults() {
+ super.setup_defaults();
+ this.doctype = 'Hub Company';
+ this.fields = ['company_logo', 'name', 'site_name', 'seller_city', 'seller_description', 'seller', 'country', 'company_name'];
+ this.filters = [];
+ this.custom_filter_configs = [
+ {
+ fieldtype: 'Link',
+ label: 'Country',
+ options: 'Country',
+ condition: 'like',
+ fieldname: 'country'
+ }
+ ];
+ }
+
+ get_filters_for_args() {
+ let filters = {};
+ this.filter_area.get().forEach(f => {
+ let field = f[1] !== 'name' ? f[1] : 'company_name';
+ filters[field] = [f[2], f[3]];
+ });
+ return filters;
+ }
+
+ card_html(company) {
+ company._name = encodeURI(company.name);
+ const route = `#Hub/Company/${company.company_name}`;
+
+ let image_html = company.company_logo ?
+ `<img src="${company.company_logo}"><span class="helper"></span>` :
+ `<div class="standard-image">${frappe.get_abbr(company.company_name)}</div>`;
+
+ return `
+ <div class="hub-item-wrapper margin-bottom" style="width: 200px;">
+ <a href="${route}">
+ <div class="hub-item-image">
+ <div class="img-wrapper" style="height: 200px; width: 200px">
+ ${ image_html }
+ </div>
+ </div>
+ <div class="hub-item-title">
+ <h5 class="bold">
+ ${ company.company_name }
+ </h5>
+ </div>
+ </a>
+ </div>
+ `;
+ }
+};
\ No newline at end of file
diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js
index 77209e0..0d656bc 100644
--- a/erpnext/public/js/payment/payments.js
+++ b/erpnext/public/js/payment/payments.js
@@ -27,8 +27,14 @@
var me = this;
this.dialog.set_primary_action(__("Submit"), function() {
- me.dialog.hide()
- me.submit_invoice()
+ // Allow no ZERO payment
+ $.each(me.frm.doc.payments, function (index, data) {
+ if (data.amount != 0) {
+ me.dialog.hide();
+ me.submit_invoice();
+ return;
+ }
+ });
})
},
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 6fa710d..2652f95 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -84,7 +84,7 @@
slide.get_input("company_abbr").on("change", function () {
if (slide.get_input("company_abbr").val().length > 5) {
- frappe.msgprint("Company Abbreviation cannot have more than 5 characters");
+ frappe.msgprint(__("Company Abbreviation cannot have more than 5 characters"));
slide.get_field("company_abbr").set_value("");
}
});
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 6841354..d50fa19 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -13,6 +13,12 @@
return frappe.boot.sysdefaults.currency;
},
+ get_presentation_currency_list: () => {
+ const docs = frappe.boot.docs;
+ const currency_list = docs.filter(d => d.doctype === ":Currency").map(d => d.name);
+ return currency_list;
+ },
+
toggle_naming_series: function() {
if(cur_frm.fields_dict.naming_series) {
cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index a974b99..0fb8730 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -215,7 +215,7 @@
in_list_view:1,
get_query: function() {
return {
- filters: {item_code: me.item_code },
+ filters: {item: me.item_code },
query: 'erpnext.controllers.queries.get_batch_numbers'
};
},
@@ -314,7 +314,7 @@
fieldtype: 'Link', fieldname: 'serial_no_select', options: 'Serial No',
label: __('Select'),
get_query: function() {
- return { filters: {item_code: me.item_code}};
+ return { filters: {item_code: me.item_code, warehouse: me.warehouse_details.name}};
},
onchange: function(e) {
if(this.in_local_change) return;
diff --git a/erpnext/public/less/hub.less b/erpnext/public/less/hub.less
index 1cae692..66199a4 100644
--- a/erpnext/public/less/hub.less
+++ b/erpnext/public/less/hub.less
@@ -1,5 +1,41 @@
@import "../../../../frappe/frappe/public/less/variables.less";
+body[data-route^="Hub/"] {
+ .freeze .image-view-container {
+ .list-row-col {
+ background-color: @light-bg;
+ color: @light-bg;
+ }
+
+ .placeholder-text {
+ color: @light-bg;
+ }
+ }
+
+ .freeze {
+ display: none;
+ }
+
+ .image-view-container {
+ justify-content: space-around;
+ }
+}
+
+.img-wrapper {
+ border: 1px solid #d1d8dd;
+ border-radius: 3px;
+ padding: 12px;
+ overflow: hidden;
+ text-align: center;
+ white-space: nowrap;
+
+ .helper {
+ height: 100%;
+ display: inline-block;
+ vertical-align: middle;
+ }
+}
+
/* hub */
div[data-page-route="hub"] {
.page-head {
diff --git a/erpnext/public/less/pos.less b/erpnext/public/less/pos.less
index af3008e..b081ed4 100644
--- a/erpnext/public/less/pos.less
+++ b/erpnext/public/less/pos.less
@@ -222,4 +222,8 @@
.rounded-total-value {
font-size: 18px;
+}
+
+.quantity-total {
+ font-size: 18px;
}
\ No newline at end of file
diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less
index 25172a1..14d033c 100644
--- a/erpnext/public/less/website.less
+++ b/erpnext/public/less/website.less
@@ -235,7 +235,7 @@
}
.checkout-btn {
- padding-top:25px;
+ padding-bottom:25px;
}
.col-name-description {
margin-bottom:8px;
diff --git a/erpnext/regional/doctype/gst_settings/gst_settings.json b/erpnext/regional/doctype/gst_settings/gst_settings.json
index ebd0865..98c33ad 100644
--- a/erpnext/regional/doctype/gst_settings/gst_settings.json
+++ b/erpnext/regional/doctype/gst_settings/gst_settings.json
@@ -160,6 +160,38 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "250000",
+ "description": "Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.",
+ "fieldname": "b2c_limit",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "B2C Limit",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
}
],
"has_web_view": 0,
@@ -172,7 +204,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-01-02 15:53:13.489144",
+ "modified": "2018-02-14 08:14:15.375181",
"modified_by": "Administrator",
"module": "Regional",
"name": "GST Settings",
diff --git a/erpnext/regional/doctype/gst_settings/gst_settings.py b/erpnext/regional/doctype/gst_settings/gst_settings.py
index 45c565d..bc956e9 100644
--- a/erpnext/regional/doctype/gst_settings/gst_settings.py
+++ b/erpnext/regional/doctype/gst_settings/gst_settings.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe, os
+from frappe import _
from frappe.utils import get_url, nowdate, date_diff
from frappe.model.document import Document
from frappe.contacts.doctype.contact.contact import get_default_contact
@@ -24,13 +25,13 @@
last_sent = frappe.db.get_single_value('GST Settings', 'gstin_email_sent_on')
if last_sent and date_diff(nowdate(), last_sent) < 3:
- frappe.throw("Please wait 3 days before resending the reminder.")
+ frappe.throw(_("Please wait 3 days before resending the reminder."))
frappe.db.set_value('GST Settings', 'GST Settings', 'gstin_email_sent_on', nowdate())
# enqueue if large number of customers, suppliser
frappe.enqueue('erpnext.regional.doctype.gst_settings.gst_settings.send_gstin_reminder_to_all_parties')
- frappe.msgprint('Email Reminders will be sent to all parties with email contacts')
+ frappe.msgprint(_('Email Reminders will be sent to all parties with email contacts'))
def send_gstin_reminder_to_all_parties():
parties = []
@@ -60,7 +61,7 @@
frappe.has_permission(party_type, throw=True)
email = _send_gstin_reminder(party_type ,party)
if email:
- frappe.msgprint('Reminder to update GSTIN Sent', title='Reminder sent', indicator='green')
+ frappe.msgprint(_('Reminder to update GSTIN Sent'), title='Reminder sent', indicator='green')
def _send_gstin_reminder(party_type, party, default_email_id=None, sent_to=None):
'''Send GST Reminder email'''
@@ -70,7 +71,7 @@
email_id = default_email_id
if not email_id:
- frappe.throw('Email not found in default contact', exc=EmailMissing)
+ frappe.throw(_('Email not found in default contact'), exc=EmailMissing)
if sent_to and email_id in sent_to:
return
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/regional/france/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/regional/france/__init__.py
diff --git a/erpnext/regional/france/setup.py b/erpnext/regional/france/setup.py
new file mode 100644
index 0000000..db6419e
--- /dev/null
+++ b/erpnext/regional/france/setup.py
@@ -0,0 +1,33 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+
+def setup(company=None, patch=True):
+ make_custom_fields()
+ add_custom_roles_for_reports()
+
+def make_custom_fields():
+ custom_fields = {
+ 'Company': [
+ dict(fieldname='siren_number', label='SIREN Number',
+ fieldtype='Data', insert_after='website')
+ ]
+ }
+
+ create_custom_fields(custom_fields)
+
+def add_custom_roles_for_reports():
+ report_name = 'Fichier des Ecritures Comptables [FEC]'
+
+ if not frappe.db.get_value('Custom Role', dict(report=report_name)):
+ frappe.get_doc(dict(
+ doctype='Custom Role',
+ report=report_name,
+ roles= [
+ dict(role='Accounts Manager')
+ ]
+ )).insert()
diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py
index 7143bd3..ac68a92 100644
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -87,23 +87,27 @@
allow_on_submit=1, print_hide=1)
invoice_gst_fields = [
dict(fieldname='gst_section', label='GST Details', fieldtype='Section Break',
- insert_after='select_print_heading', print_hide=1, collapsible=1),
+ insert_after='language', print_hide=1, collapsible=1),
dict(fieldname='invoice_copy', label='Invoice Copy',
fieldtype='Select', insert_after='gst_section', print_hide=1, allow_on_submit=1,
options='Original for Recipient\nDuplicate for Transporter\nDuplicate for Supplier\nTriplicate for Supplier'),
dict(fieldname='reverse_charge', label='Reverse Charge',
fieldtype='Select', insert_after='invoice_copy', print_hide=1,
options='Y\nN', default='N'),
- dict(fieldname='gst_col_break', fieldtype='Column Break', insert_after='reverse_charge'),
dict(fieldname='invoice_type', label='Invoice Type',
- fieldtype='Select', insert_after='reverse_charge', print_hide=1,
+ fieldtype='Select', insert_after='invoice_copy', print_hide=1,
options='Regular\nSEZ\nExport\nDeemed Export', default='Regular'),
dict(fieldname='export_type', label='Export Type',
fieldtype='Select', insert_after='invoice_type', print_hide=1,
depends_on='eval:in_list(["SEZ", "Export", "Deemed Export"], doc.invoice_type)',
options='\nWith Payment of Tax\nWithout Payment of Tax'),
dict(fieldname='ecommerce_gstin', label='E-commerce GSTIN',
- fieldtype='Data', insert_after='export_type', print_hide=1)
+ fieldtype='Data', insert_after='export_type', print_hide=1),
+ dict(fieldname='gst_col_break', fieldtype='Column Break', insert_after='ecommerce_gstin'),
+ dict(fieldname='reason_for_issuing_document', label='Reason For Issuing document',
+ fieldtype='Select', insert_after='gst_col_break', print_hide=1,
+ depends_on='eval:doc.is_return==1',
+ options='\n01-Sales Return\n02-Post Sale Discount\n03-Deficiency in services\n04-Correction in Invoice\n05-Change in POS\n06-Finalization of Provisional assessment\n07-Others')
]
purchase_invoice_gst_fields = [
@@ -112,7 +116,21 @@
options='supplier_address.gstin', print_hide=1),
dict(fieldname='company_gstin', label='Company GSTIN',
fieldtype='Data', insert_after='shipping_address',
- options='shipping_address.gstin', print_hide=1)
+ options='shipping_address.gstin', print_hide=1),
+ dict(fieldname='place_of_supply', label='Place of Supply',
+ fieldtype='Data', insert_after='shipping_address',
+ print_hide=1, read_only=0),
+ dict(fieldname='eligibility_for_itc', label='Eligibility For ITC',
+ fieldtype='Select', insert_after='reason_for_issuing_document', print_hide=1,
+ options='input\ninput service\ncapital goods\nineligible', default="ineligible"),
+ dict(fieldname='itc_integrated_tax', label='Availed ITC Integrated Tax',
+ fieldtype='Data', insert_after='eligibility_for_itc', print_hide=1),
+ dict(fieldname='itc_central_tax', label='Availed ITC Central Tax',
+ fieldtype='Data', insert_after='itc_integrated_tax', print_hide=1),
+ dict(fieldname='itc_state_tax', label='Availed ITC State/UT Tax',
+ fieldtype='Data', insert_after='itc_central_tax', print_hide=1),
+ dict(fieldname='itc_cess_amount', label='Availed ITC Cess',
+ fieldtype='Data', insert_after='itc_state_tax', print_hide=1),
]
sales_invoice_gst_fields = [
@@ -127,7 +145,16 @@
print_hide=1, read_only=0),
dict(fieldname='company_gstin', label='Company GSTIN',
fieldtype='Data', insert_after='company_address',
- options='company_address.gstin', print_hide=1)
+ options='company_address.gstin', print_hide=1),
+ dict(fieldname='port_code', label='Port Code',
+ fieldtype='Data', insert_after='reason_for_issuing_document', print_hide=1,
+ depends_on="eval:doc.invoice_type=='Export' "),
+ dict(fieldname='shipping_bill_number', label=' Shipping Bill Number',
+ fieldtype='Data', insert_after='port_code', print_hide=1,
+ depends_on="eval:doc.invoice_type=='Export' "),
+ dict(fieldname='shipping_bill_date', label='Shipping Bill Date',
+ fieldtype='Date', insert_after='shipping_bill_number', print_hide=1,
+ depends_on="eval:doc.invoice_type=='Export' ")
]
custom_fields = {
@@ -139,8 +166,8 @@
dict(fieldname='gst_state_number', label='GST State Number',
fieldtype='Int', insert_after='gst_state', read_only=1),
],
- 'Purchase Invoice': purchase_invoice_gst_fields + invoice_gst_fields,
- 'Sales Invoice': sales_invoice_gst_fields + invoice_gst_fields,
+ 'Purchase Invoice': invoice_gst_fields + purchase_invoice_gst_fields,
+ 'Sales Invoice': invoice_gst_fields + sales_invoice_gst_fields,
"Delivery Note": sales_invoice_gst_fields,
'Item': [
dict(fieldname='gst_hsn_code', label='HSN/SAC',
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index fb421fb..1b91218 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -64,7 +64,11 @@
def set_place_of_supply(doc, method):
if not frappe.get_meta('Address').has_field('gst_state'): return
- address_name = doc.shipping_address_name or doc.customer_address
+ if doc.doctype == "Sales Invoice":
+ address_name = doc.shipping_address_name or doc.customer_address
+ elif doc.doctype == "Purchase Invoice":
+ address_name = doc.shipping_address or doc.supplier_address
+
if address_name:
address = frappe.db.get_value("Address", address_name, ["gst_state", "gst_state_number"], as_dict=1)
doc.place_of_supply = cstr(address.gst_state_number) + "-" + cstr(address.gst_state)
diff --git a/erpnext/hub_node/doctype/hub_category/__init__.py "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/__init__.py"
similarity index 100%
copy from erpnext/hub_node/doctype/hub_category/__init__.py
copy to "erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/__init__.py"
diff --git "a/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.js" "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.js"
new file mode 100644
index 0000000..41f375c
--- /dev/null
+++ "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.js"
@@ -0,0 +1,124 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Fichier des Ecritures Comptables [FEC]"] = {
+ "filters": [{
+ "fieldname": "company",
+ "label": __("Company"),
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": frappe.defaults.get_user_default("Company"),
+ "reqd": 1
+ },
+ {
+ "fieldname": "fiscal_year",
+ "label": __("Fiscal Year"),
+ "fieldtype": "Link",
+ "options": "Fiscal Year",
+ "default": frappe.defaults.get_user_default("fiscal_year"),
+ "reqd": 1,
+ "on_change": function(query_report) {
+ var fiscal_year = query_report.get_values().fiscal_year;
+ if (!fiscal_year) {
+ return;
+ }
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
+ frappe.query_report_filters_by_name.from_date.set_input(fy.year_start_date);
+ frappe.query_report_filters_by_name.to_date.set_input(fy.year_end_date);
+ query_report.trigger_refresh();
+ });
+ }
+ }
+
+ ],
+
+ onload: function(query_report) {
+ query_report.page.add_inner_button(__("Export"), function() {
+ var fiscal_year = query_report.get_values().fiscal_year;
+ var company = query_report.get_values().company;
+
+ frappe.call({
+ method: "frappe.client.get_value",
+ args: {
+ 'doctype': "Company",
+ 'fieldname': ['siren_number'],
+ 'filters': {
+ 'name': company
+ }
+ },
+ callback: function(data) {
+ var company_data = data.message.siren_number;
+ if (company_data === null || company_data === undefined) {
+ msgprint(__("Please register the SIREN number in the company information file"))
+ } else {
+ frappe.call({
+ method: "frappe.client.get_value",
+ args: {
+ 'doctype': "Fiscal Year",
+ 'fieldname': ['year_end_date'],
+ 'filters': {
+ 'name': fiscal_year
+ }
+ },
+ callback: function(data) {
+ var fy = data.message.year_end_date;
+ var title = company_data + "FEC" + moment(fy).format('YYYYMMDD');
+ var result = $.map(frappe.slickgrid_tools.get_view_data(query_report.columns, query_report.dataView),
+ function(row) {
+ return [row.splice(1)];
+ });
+ downloadify(result, null, title);
+ }
+ });
+
+ }
+ }
+ });
+
+ });
+ }
+}
+
+var downloadify = function(data, roles, title) {
+ if (roles && roles.length && !has_common(roles, roles)) {
+ msgprint(__("Export not allowed. You need {0} role to export.", [frappe.utils.comma_or(roles)]));
+ return;
+ }
+
+ var filename = title + ".csv";
+ var csv_data = to_tab_csv(data);
+ var a = document.createElement('a');
+
+ if ("download" in a) {
+ // Used Blob object, because it can handle large files
+ var blob_object = new Blob([csv_data], {
+ type: 'text/csv;charset=UTF-8'
+ });
+ a.href = URL.createObjectURL(blob_object);
+ a.download = filename;
+
+ } else {
+ // use old method
+ a.href = 'data:attachment/csv,' + encodeURIComponent(csv_data);
+ a.download = filename;
+ a.target = "_blank";
+ }
+
+ document.body.appendChild(a);
+ a.click();
+
+ document.body.removeChild(a);
+};
+
+var to_tab_csv = function(data) {
+ var res = [];
+ $.each(data, function(i, row) {
+ row = $.map(row, function(col) {
+ return typeof(col) === "string" ? ('"' + col.replace(/"/g, '""') + '"') : col;
+ });
+ res.push(row.join("\t"));
+ });
+ return res.join("\n");
+};
diff --git "a/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.json" "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.json"
new file mode 100644
index 0000000..9b48e11
--- /dev/null
+++ "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.json"
@@ -0,0 +1,19 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 0,
+ "creation": "2018-01-10 15:10:16.650129",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2018-01-11 10:27:25.595485",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "Fichier des Ecritures Comptables [FEC]",
+ "owner": "Administrator",
+ "ref_doctype": "GL Entry",
+ "report_name": "Fichier des Ecritures Comptables [FEC]",
+ "report_type": "Script Report",
+ "roles": []
+}
\ No newline at end of file
diff --git "a/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py" "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py"
new file mode 100644
index 0000000..c97111e
--- /dev/null
+++ "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py"
@@ -0,0 +1,177 @@
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import format_datetime
+from frappe import _
+
+def execute(filters=None):
+ account_details = {}
+ for acc in frappe.db.sql("""select name, is_group from tabAccount""", as_dict=1):
+ account_details.setdefault(acc.name, acc)
+
+ validate_filters(filters, account_details)
+
+ filters = set_account_currency(filters)
+
+ columns = get_columns(filters)
+
+ res = get_result(filters)
+
+ return columns, res
+
+
+def validate_filters(filters, account_details):
+ if not filters.get('company'):
+ frappe.throw(_('{0} is mandatory').format(_('Company')))
+
+ if not filters.get('fiscal_year'):
+ frappe.throw(_('{0} is mandatory').format(_('Fiscal Year')))
+
+
+def set_account_currency(filters):
+
+ filters["company_currency"] = frappe.db.get_value("Company", filters.company, "default_currency")
+
+ return filters
+
+
+def get_columns(filters):
+ columns = [
+ _("JournalCode") + "::90", _("JournalLib") + "::90",
+ _("EcritureNum") + ":Dynamic Link:90", _("EcritureDate") + "::90",
+ _("CompteNum") + ":Link/Account:100", _("CompteLib") + ":Link/Account:200",
+ _("CompAuxNum") + "::90", _("CompAuxLib") + "::90",
+ _("PieceRef") + "::90", _("PieceDate") + "::90",
+ _("EcritureLib") + "::90", _("Debit") + "::90", _("Credit") + "::90",
+ _("EcritureLet") + "::90", _("DateLet") +
+ "::90", _("ValidDate") + "::90",
+ _("Montantdevise") + "::90", _("Idevise") + "::90"
+ ]
+
+ return columns
+
+
+def get_result(filters):
+ gl_entries = get_gl_entries(filters)
+
+ result = get_result_as_list(gl_entries, filters)
+
+ return result
+
+
+def get_gl_entries(filters):
+
+ group_by_condition = "group by voucher_type, voucher_no, account" \
+ if filters.get("group_by_voucher") else "group by gl.name"
+
+ gl_entries = frappe.db.sql("""
+ select
+ gl.posting_date as GlPostDate, gl.account, gl.transaction_date,
+ sum(gl.debit) as debit, sum(gl.credit) as credit,
+ sum(gl.debit_in_account_currency) as debitCurr, sum(gl.credit_in_account_currency) as creditCurr,
+ gl.voucher_type, gl.voucher_no, gl.against_voucher_type,
+ gl.against_voucher, gl.account_currency, gl.against,
+ gl.party_type, gl.party, gl.is_opening,
+ inv.name as InvName, inv.posting_date as InvPostDate,
+ pur.name as PurName, inv.posting_date as PurPostDate,
+ jnl.cheque_no as JnlRef, jnl.posting_date as JnlPostDate,
+ pay.name as PayName, pay.posting_date as PayPostDate,
+ cus.customer_name, cus.name as cusName,
+ sup.supplier_name, sup.name as supName
+
+ from `tabGL Entry` gl
+ left join `tabSales Invoice` inv on gl.against_voucher = inv.name
+ left join `tabPurchase Invoice` pur on gl.against_voucher = pur.name
+ left join `tabJournal Entry` jnl on gl.against_voucher = jnl.name
+ left join `tabPayment Entry` pay on gl.against_voucher = pay.name
+ left join `tabCustomer` cus on gl.party = cus.customer_name
+ left join `tabSupplier` sup on gl.party = sup.supplier_name
+ where gl.company=%(company)s and gl.fiscal_year=%(fiscal_year)s
+ {group_by_condition}
+ order by GlPostDate, voucher_no"""
+ .format(group_by_condition=group_by_condition), filters, as_dict=1)
+
+ return gl_entries
+
+
+def get_result_as_list(data, filters):
+ result = []
+
+ company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+ accounts = frappe.get_all("Account", filters={"Company": filters.company}, fields=["name", "account_number"])
+
+ for d in data:
+
+ JournalCode = d.get("voucher_no").split("-")[0]
+
+ EcritureNum = d.get("voucher_no").split("-")[-1]
+
+ EcritureDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")
+
+ account_number = [account.account_number for account in accounts if account.name == d.get("account")]
+ if account_number[0] is not None:
+ CompteNum = account_number[0]
+ else:
+ frappe.throw(_("Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.").format(account.name))
+
+ if d.get("party_type") == "Customer":
+ CompAuxNum = d.get("cusName")
+ CompAuxLib = d.get("customer_name")
+
+ elif d.get("party_type") == "Supplier":
+ CompAuxNum = d.get("supName")
+ CompAuxLib = d.get("supplier_name")
+
+ else:
+ CompAuxNum = ""
+ CompAuxLib = ""
+
+ ValidDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")
+
+ if d.get("is_opening") == "Yes":
+ PieceRef = _("Opening Entry Journal")
+ PieceDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")
+
+ elif d.get("against_voucher_type") == "Sales Invoice":
+ PieceRef = _(d.get("InvName"))
+ PieceDate = format_datetime(d.get("InvPostDate"), "yyyyMMdd")
+
+ elif d.get("against_voucher_type") == "Purchase Invoice":
+ PieceRef = _(d.get("PurName"))
+ PieceDate = format_datetime(d.get("PurPostDate"), "yyyyMMdd")
+
+ elif d.get("against_voucher_type") == "Journal Entry":
+ PieceRef = _(d.get("JnlRef"))
+ PieceDate = format_datetime(d.get("JnlPostDate"), "yyyyMMdd")
+
+ elif d.get("against_voucher_type") == "Payment Entry":
+ PieceRef = _(d.get("PayName"))
+ PieceDate = format_datetime(d.get("PayPostDate"), "yyyyMMdd")
+
+ elif d.get("voucher_type") == "Period Closing Voucher":
+ PieceRef = _("Period Closing Journal")
+ PieceDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")
+
+ else:
+ PieceRef = _("No Reference")
+ PieceDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")
+
+ debit = '{:.2f}'.format(d.get("debit")).replace(".", ",")
+
+ credit = '{:.2f}'.format(d.get("credit")).replace(".", ",")
+
+ Idevise = d.get("account_currency")
+
+ if Idevise != company_currency:
+ Montantdevise = '{:.2f}'.format(d.get("debitCurr")).replace(".", ",") if d.get("debitCurr") != 0 else '{:.2f}'.format(d.get("creditCurr")).replace(".", ",")
+ else:
+ Montantdevise = '{:.2f}'.format(d.get("debit")).replace(".", ",") if d.get("debit") != 0 else '{:.2f}'.format(d.get("credit")).replace(".", ",")
+
+ row = [JournalCode, d.get("voucher_type"), EcritureNum, EcritureDate, CompteNum, d.get("account"), CompAuxNum, CompAuxLib,
+ PieceRef, PieceDate, d.get("voucher_no"), debit, credit, "", "", ValidDate, Montantdevise, Idevise]
+
+ result.append(row)
+
+ return result
diff --git a/erpnext/regional/report/gstr_1/gstr_1.js b/erpnext/regional/report/gstr_1/gstr_1.js
index 9437786..3a63527 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.js
+++ b/erpnext/regional/report/gstr_1/gstr_1.js
@@ -31,7 +31,7 @@
"label": __("Type of Business"),
"fieldtype": "Select",
"reqd": 1,
- "options": ["B2B", "B2C Large", "B2C Small"],
+ "options": ["B2B", "B2C Large", "B2C Small","CDNR", "EXPORT"],
"default": "B2B"
}
]
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index 65b1b89..8dc3bb1 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -4,6 +4,8 @@
from __future__ import unicode_literals
import frappe, json
from frappe import _
+from frappe.utils import flt
+from datetime import date
def execute(filters=None):
return Gstr1Report(filters).run()
@@ -11,66 +13,86 @@
class Gstr1Report(object):
def __init__(self, filters=None):
self.filters = frappe._dict(filters or {})
+ self.columns = []
+ self.data = []
+ self.doctype = "Sales Invoice"
+ self.tax_doctype = "Sales Taxes and Charges"
+ self.select_columns = """
+ name as invoice_number,
+ customer_name,
+ posting_date,
+ base_grand_total,
+ base_rounded_total,
+ customer_gstin,
+ place_of_supply,
+ ecommerce_gstin,
+ reverse_charge,
+ invoice_type,
+ return_against,
+ is_return,
+ invoice_type,
+ export_type,
+ port_code,
+ shipping_bill_number,
+ shipping_bill_date,
+ reason_for_issuing_document
+ """
self.customer_type = "Company" if self.filters.get("type_of_business") == "B2B" else "Individual"
-
+
def run(self):
self.get_columns()
- self.get_data()
- return self.columns, self.data
-
- def get_data(self):
- self.data = []
self.get_gst_accounts()
self.get_invoice_data()
- if not self.invoices: return
+ if self.invoices:
+ self.get_invoice_items()
+ self.get_items_based_on_tax_rate()
+ self.invoice_fields = [d["fieldname"] for d in self.invoice_columns]
+ self.get_data()
- self.get_invoice_items()
- self.get_items_based_on_tax_rate()
- invoice_fields = [d["fieldname"] for d in self.invoice_columns]
+ return self.columns, self.data
-
+ def get_data(self):
for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
invoice_details = self.invoices.get(inv)
for rate, items in items_based_on_rate.items():
- row = []
- for fieldname in invoice_fields:
- if fieldname == "invoice_value":
- row.append(invoice_details.base_rounded_total or invoice_details.base_grand_total)
- else:
- row.append(invoice_details.get(fieldname))
-
- row += [rate,
- sum([net_amount for item_code, net_amount in self.invoice_items.get(inv).items()
- if item_code in items]),
- self.invoice_cess.get(inv)
- ]
-
+ row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
if self.filters.get("type_of_business") == "B2C Small":
row.append("E" if invoice_details.ecommerce_gstin else "OE")
+ if self.filters.get("type_of_business") == "CDNR":
+ row.append("Y" if invoice_details.posting_date <= date(2017, 7, 1) else "N")
+ row.append("C" if invoice_details.return_against else "R")
+
self.data.append(row)
+ def get_row_data_for_invoice(self, invoice, invoice_details, tax_rate, items):
+ row = []
+ for fieldname in self.invoice_fields:
+ if self.filters.get("type_of_business") == "CDNR" and fieldname == "invoice_value":
+ row.append(abs(invoice_details.base_rounded_total) or abs(invoice_details.base_grand_total))
+ elif fieldname == "invoice_value":
+ row.append(invoice_details.base_rounded_total or invoice_details.base_grand_total)
+ else:
+ row.append(invoice_details.get(fieldname))
+
+ taxable_value = sum([abs(net_amount)
+ for item_code, net_amount in self.invoice_items.get(invoice).items() if item_code in items])
+ row += [tax_rate, taxable_value]
+
+ return row, taxable_value
+
def get_invoice_data(self):
self.invoices = frappe._dict()
conditions = self.get_conditions()
-
invoice_data = frappe.db.sql("""
select
- name as invoice_number,
- customer_name,
- posting_date,
- base_grand_total,
- base_rounded_total,
- customer_gstin,
- place_of_supply,
- ecommerce_gstin,
- reverse_charge,
- invoice_type
- from `tabSales Invoice`
- where docstatus = 1 %s
+ {select_columns}
+ from `tab{doctype}`
+ where docstatus = 1 {where_conditions}
order by posting_date desc
- """ % (conditions), self.filters, as_dict=1)
+ """.format(select_columns=self.select_columns, doctype=self.doctype,
+ where_conditions=conditions), self.filters, as_dict=1)
for d in invoice_data:
self.invoices.setdefault(d.invoice_number, d)
@@ -85,48 +107,61 @@
conditions += opts[1]
customers = frappe.get_all("Customer", filters={"customer_type": self.customer_type})
- conditions += " and customer in ('{0}')".format("', '".join([frappe.db.escape(c.name)
- for c in customers]))
+
+ if self.filters.get("type_of_business") == "B2B":
+ conditions += " and invoice_type != 'Export' and is_return != 1 and customer in ('{0}')".\
+ format("', '".join([frappe.db.escape(c.name) for c in customers]))
+
+ if self.filters.get("type_of_business") in ("B2C Large", "B2C Small"):
+ b2c_limit = frappe.db.get_single_value('GSt Settings', 'b2c_limit')
+ if not b2c_limit:
+ frappe.throw(_("Please set B2C Limit in GST Settings."))
if self.filters.get("type_of_business") == "B2C Large":
conditions += """ and SUBSTR(place_of_supply, 1, 2) != SUBSTR(company_gstin, 1, 2)
- and grand_total > 250000"""
+ and grand_total > {0} and is_return != 1 and customer in ('{1}')""".\
+ format(flt(b2c_limit), "', '".join([frappe.db.escape(c.name) for c in customers]))
+
elif self.filters.get("type_of_business") == "B2C Small":
conditions += """ and (
SUBSTR(place_of_supply, 1, 2) = SUBSTR(company_gstin, 1, 2)
- or grand_total <= 250000
- )"""
+ or grand_total <= {0}) and is_return != 1 and customer in ('{1}')""".\
+ format(flt(b2c_limit), "', '".join([frappe.db.escape(c.name) for c in customers]))
+ elif self.filters.get("type_of_business") == "CDNR":
+ conditions += """ and is_return = 1 """
+
+ elif self.filters.get("type_of_business") == "EXPORT":
+ conditions += """ and is_return !=1 and invoice_type = 'Export' """
return conditions
def get_invoice_items(self):
self.invoice_items = frappe._dict()
items = frappe.db.sql("""
select item_code, parent, base_net_amount
- from `tabSales Invoice Item`
+ from `tab%s Item`
where parent in (%s)
- """ % (', '.join(['%s']*len(self.invoices))), tuple(self.invoices), as_dict=1)
+ """ % (self.doctype, ', '.join(['%s']*len(self.invoices))), tuple(self.invoices), as_dict=1)
for d in items:
self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, d.base_net_amount)
def get_items_based_on_tax_rate(self):
- tax_details = frappe.db.sql("""
+ self.tax_details = frappe.db.sql("""
select
parent, account_head, item_wise_tax_detail, base_tax_amount_after_discount_amount
- from `tabSales Taxes and Charges`
+ from `tab%s`
where
- parenttype = 'Sales Invoice' and docstatus = 1
+ parenttype = %s and docstatus = 1
and parent in (%s)
- and tax_amount_after_discount_amount > 0
order by account_head
- """ % (', '.join(['%s']*len(self.invoices.keys()))), tuple(self.invoices.keys()))
+ """ % (self.tax_doctype, '%s', ', '.join(['%s']*len(self.invoices.keys()))),
+ tuple([self.doctype] + self.invoices.keys()))
self.items_based_on_tax_rate = {}
self.invoice_cess = frappe._dict()
unidentified_gst_accounts = []
-
- for parent, account, item_wise_tax_detail, tax_amount in tax_details:
+ for parent, account, item_wise_tax_detail, tax_amount in self.tax_details:
if account in self.gst_accounts.cess_account:
self.invoice_cess.setdefault(parent, tax_amount)
else:
@@ -148,11 +183,10 @@
if cgst_or_sgst:
tax_rate *= 2
- rate_based_dict = self.items_based_on_tax_rate.setdefault(parent, {})\
- .setdefault(tax_rate, [])
+ rate_based_dict = self.items_based_on_tax_rate\
+ .setdefault(parent, {}).setdefault(tax_rate, [])
if item_code not in rate_based_dict:
rate_based_dict.append(item_code)
-
except ValueError:
continue
if unidentified_gst_accounts:
@@ -185,12 +219,6 @@
"label": "Taxable Value",
"fieldtype": "Currency",
"width": 100
- },
- {
- "fieldname": "cess_amount",
- "label": "Cess Amount",
- "fieldtype": "Currency",
- "width": 100
}
]
self.other_columns = []
@@ -200,33 +228,39 @@
{
"fieldname": "customer_gstin",
"label": "GSTIN/UIN of Recipient",
- "fieldtype": "Data"
+ "fieldtype": "Data",
+ "width": 150
},
{
"fieldname": "customer_name",
"label": "Receiver Name",
- "fieldtype": "Data"
+ "fieldtype": "Data",
+ "width":100
},
{
"fieldname": "invoice_number",
"label": "Invoice Number",
"fieldtype": "Link",
- "options": "Sales Invoice"
+ "options": "Sales Invoice",
+ "width":100
},
{
"fieldname": "posting_date",
"label": "Invoice date",
- "fieldtype": "Date"
+ "fieldtype": "Date",
+ "width":80
},
{
"fieldname": "invoice_value",
"label": "Invoice Value",
- "fieldtype": "Currency"
+ "fieldtype": "Currency",
+ "width":100
},
{
"fieldname": "place_of_supply",
"label": "Place of Supply",
- "fieldtype": "Data"
+ "fieldtype": "Data",
+ "width":100
},
{
"fieldname": "reverse_charge",
@@ -241,9 +275,19 @@
{
"fieldname": "ecommerce_gstin",
"label": "E-Commerce GSTIN",
- "fieldtype": "Data"
+ "fieldtype": "Data",
+ "width":120
}
]
+ self.other_columns = [
+ {
+ "fieldname": "cess_amount",
+ "label": "Cess Amount",
+ "fieldtype": "Currency",
+ "width": 100
+ }
+ ]
+
elif self.filters.get("type_of_business") == "B2C Large":
self.invoice_columns = [
{
@@ -278,6 +322,93 @@
"width": 130
}
]
+ self.other_columns = [
+ {
+ "fieldname": "cess_amount",
+ "label": "Cess Amount",
+ "fieldtype": "Currency",
+ "width": 100
+ }
+ ]
+ elif self.filters.get("type_of_business") == "CDNR":
+ self.invoice_columns = [
+ {
+ "fieldname": "customer_gstin",
+ "label": "GSTIN/UIN of Recipient",
+ "fieldtype": "Data",
+ "width": 150
+ },
+ {
+ "fieldname": "customer_name",
+ "label": "Receiver Name",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "return_against",
+ "label": "Invoice/Advance Receipt Number",
+ "fieldtype": "Link",
+ "options": "Sales Invoice",
+ "width": 120
+ },
+ {
+ "fieldname": "posting_date",
+ "label": "Invoice/Advance Receipt date",
+ "fieldtype": "Date",
+ "width": 120
+ },
+ {
+ "fieldname": "invoice_number",
+ "label": "Invoice/Advance Receipt Number",
+ "fieldtype": "Link",
+ "options": "Sales Invoice",
+ "width":120
+ },
+ {
+ "fieldname": "posting_date",
+ "label": "Invoice/Advance Receipt date",
+ "fieldtype": "Date",
+ "width": 120
+ },
+ {
+ "fieldname": "reason_for_issuing_document",
+ "label": "Reason For Issuing document",
+ "fieldtype": "Data",
+ "width": 140
+ },
+ {
+ "fieldname": "place_of_supply",
+ "label": "Place of Supply",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "invoice_value",
+ "label": "Invoice Value",
+ "fieldtype": "Currency",
+ "width": 120
+ }
+ ]
+ self.other_columns = [
+ {
+ "fieldname": "cess_amount",
+ "label": "Cess Amount",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "pre_gst",
+ "label": "PRE GST",
+ "fieldtype": "Data",
+ "width": 80
+ },
+ {
+ "fieldname": "document_type",
+ "label": "Document Type",
+ "fieldtype": "Data",
+ "width": 80
+ }
+ ]
elif self.filters.get("type_of_business") == "B2C Small":
self.invoice_columns = [
{
@@ -295,10 +426,62 @@
]
self.other_columns = [
{
+ "fieldname": "cess_amount",
+ "label": "Cess Amount",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
"fieldname": "type",
"label": "Type",
"fieldtype": "Data",
"width": 50
}
]
- self.columns = self.invoice_columns + self.tax_columns + self.other_columns
\ No newline at end of file
+ elif self.filters.get("type_of_business") == "EXPORT":
+ self.invoice_columns = [
+ {
+ "fieldname": "export_type",
+ "label": "Export Type",
+ "fieldtype": "Data",
+ "width":120
+ },
+ {
+ "fieldname": "invoice_number",
+ "label": "Invoice Number",
+ "fieldtype": "Link",
+ "options": "Sales Invoice",
+ "width":120
+ },
+ {
+ "fieldname": "posting_date",
+ "label": "Invoice date",
+ "fieldtype": "Date",
+ "width": 120
+ },
+ {
+ "fieldname": "invoice_value",
+ "label": "Invoice Value",
+ "fieldtype": "Currency",
+ "width": 120
+ },
+ {
+ "fieldname": "port_code",
+ "label": "Port Code",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "shipping_bill_number",
+ "label": "Shipping Bill Number",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "shipping_bill_date",
+ "label": "Shipping Bill Date",
+ "fieldtype": "Date",
+ "width": 120
+ }
+ ]
+ self.columns = self.invoice_columns + self.tax_columns + self.other_columns
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/regional/report/gstr_2/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/regional/report/gstr_2/__init__.py
diff --git a/erpnext/regional/report/gstr_2/gstr_2.js b/erpnext/regional/report/gstr_2/gstr_2.js
new file mode 100644
index 0000000..5c1ea67
--- /dev/null
+++ b/erpnext/regional/report/gstr_2/gstr_2.js
@@ -0,0 +1,39 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["GSTR-2"] = {
+ "filters": [
+ {
+ "fieldname":"company",
+ "label": __("Company"),
+ "fieldtype": "Link",
+ "options": "Company",
+ "reqd": 1,
+ "default": frappe.defaults.get_user_default("Company")
+ },
+ {
+ "fieldname":"from_date",
+ "label": __("From Date"),
+ "fieldtype": "Date",
+ "reqd": 1,
+ "default": frappe.datetime.add_months(frappe.datetime.get_today(), -3),
+ "width": "80"
+ },
+ {
+ "fieldname":"to_date",
+ "label": __("To Date"),
+ "fieldtype": "Date",
+ "reqd": 1,
+ "default": frappe.datetime.get_today()
+ },
+ {
+ "fieldname":"type_of_business",
+ "label": __("Type of Business"),
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": ["B2B","CDNR"],
+ "default": "B2B"
+ }
+ ]
+}
diff --git a/erpnext/regional/report/gstr_2/gstr_2.json b/erpnext/regional/report/gstr_2/gstr_2.json
new file mode 100644
index 0000000..929ed91
--- /dev/null
+++ b/erpnext/regional/report/gstr_2/gstr_2.json
@@ -0,0 +1,29 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2018-01-29 12:59:55.650445",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2018-01-29 12:59:55.650445",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "GSTR-2",
+ "owner": "Administrator",
+ "ref_doctype": "GL Entry",
+ "report_name": "GSTR-2",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "Accounts User"
+ },
+ {
+ "role": "Accounts Manager"
+ },
+ {
+ "role": "Auditor"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/regional/report/gstr_2/gstr_2.py b/erpnext/regional/report/gstr_2/gstr_2.py
new file mode 100644
index 0000000..679e567
--- /dev/null
+++ b/erpnext/regional/report/gstr_2/gstr_2.py
@@ -0,0 +1,277 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from datetime import date
+from erpnext.regional.report.gstr_1.gstr_1 import Gstr1Report
+
+def execute(filters=None):
+ return Gstr2Report(filters).run()
+
+class Gstr2Report(Gstr1Report):
+ def __init__(self, filters=None):
+ self.filters = frappe._dict(filters or {})
+ self.columns = []
+ self.data = []
+ self.doctype = "Purchase Invoice"
+ self.tax_doctype = "Purchase Taxes and Charges"
+ self.select_columns = """
+ name as invoice_number,
+ supplier_name,
+ posting_date,
+ base_grand_total,
+ base_rounded_total,
+ supplier_gstin,
+ place_of_supply,
+ ecommerce_gstin,
+ reverse_charge,
+ invoice_type,
+ return_against,
+ is_return,
+ invoice_type,
+ export_type,
+ reason_for_issuing_document,
+ eligibility_for_itc,
+ itc_integrated_tax,
+ itc_central_tax,
+ itc_state_tax,
+ itc_cess_amount
+ """
+
+ def get_data(self):
+ self.get_igst_invoices()
+ for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
+ invoice_details = self.invoices.get(inv)
+ for rate, items in items_based_on_rate.items():
+ row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
+ tax_amount = taxable_value * rate / 100
+ if inv in self.igst_invoices:
+ row += [tax_amount, 0, 0]
+ else:
+ row += [0, tax_amount / 2, tax_amount / 2]
+
+ row += [
+ self.invoice_cess.get(inv),
+ invoice_details.get('eligibility_for_itc'),
+ invoice_details.get('itc_integrated_tax'),
+ invoice_details.get('itc_central_tax'),
+ invoice_details.get('itc_state_tax'),
+ invoice_details.get('itc_cess_amount')
+ ]
+ if self.filters.get("type_of_business") == "CDNR":
+ row.append("Y" if invoice_details.posting_date <= date(2017, 7, 1) else "N")
+ row.append("C" if invoice_details.return_against else "R")
+
+ self.data.append(row)
+
+ def get_igst_invoices(self):
+ self.igst_invoices = []
+ for d in self.tax_details:
+ is_igst = True if d[1] in self.gst_accounts.igst_account else False
+ if is_igst and d[0] not in self.igst_invoices:
+ self.igst_invoices.append(d[0])
+ if is_igst:
+ break
+
+ def get_conditions(self):
+ conditions = ""
+
+ for opts in (("company", " and company=%(company)s"),
+ ("from_date", " and posting_date>=%(from_date)s"),
+ ("to_date", " and posting_date<=%(to_date)s")):
+ if self.filters.get(opts[0]):
+ conditions += opts[1]
+
+ if self.filters.get("type_of_business") == "B2B":
+ conditions += "and invoice_type != 'Export' and is_return != 1 "
+
+ elif self.filters.get("type_of_business") == "CDNR":
+ conditions += """ and is_return = 1 """
+
+ return conditions
+
+ def get_columns(self):
+ self.tax_columns = [
+ {
+ "fieldname": "rate",
+ "label": "Rate",
+ "fieldtype": "Int",
+ "width": 60
+ },
+ {
+ "fieldname": "taxable_value",
+ "label": "Taxable Value",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "integrated_tax_paid",
+ "label": "Integrated Tax Paid",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "central_tax_paid",
+ "label": "Central Tax Paid",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "state_tax_paid",
+ "label": "State/UT Tax Paid",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "cess_amount",
+ "label": "Cess Paid",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "eligibility_for_itc",
+ "label": "Eligibility For ITC",
+ "fieldtype": "Data",
+ "width": 100
+ },
+ {
+ "fieldname": "itc_integrated_tax",
+ "label": "Availed ITC Integrated Tax",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "itc_central_tax",
+ "label": "Availed ITC Central Tax",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "itc_state_tax",
+ "label": "Availed ITC State/UT Tax",
+ "fieldtype": "Currency",
+ "width": 100
+ },
+ {
+ "fieldname": "itc_cess_amount",
+ "label": "Availed ITC Cess ",
+ "fieldtype": "Currency",
+ "width": 100
+ }
+ ]
+ self.other_columns = []
+
+ if self.filters.get("type_of_business") == "B2B":
+ self.invoice_columns = [
+ {
+ "fieldname": "supplier_gstin",
+ "label": "GSTIN of Supplier",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "invoice_number",
+ "label": "Invoice Number",
+ "fieldtype": "Link",
+ "options": "Purchase Invoice",
+ "width": 120
+ },
+ {
+ "fieldname": "posting_date",
+ "label": "Invoice date",
+ "fieldtype": "Date",
+ "width": 120
+ },
+ {
+ "fieldname": "invoice_value",
+ "label": "Invoice Value",
+ "fieldtype": "Currency",
+ "width": 120
+ },
+ {
+ "fieldname": "place_of_supply",
+ "label": "Place of Supply",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "reverse_charge",
+ "label": "Reverse Charge",
+ "fieldtype": "Data",
+ "width": 80
+ },
+ {
+ "fieldname": "invoice_type",
+ "label": "Invoice Type",
+ "fieldtype": "Data",
+ "width": 80
+ }
+ ]
+ elif self.filters.get("type_of_business") == "CDNR":
+ self.invoice_columns = [
+ {
+ "fieldname": "supplier_gstin",
+ "label": "GSTIN of Supplier",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "invoice_number",
+ "label": "Note/Refund Voucher Number",
+ "fieldtype": "Link",
+ "options": "Purchase Invoice"
+ },
+ {
+ "fieldname": "posting_date",
+ "label": "Note/Refund Voucher date",
+ "fieldtype": "Date",
+ "width": 120
+ },
+ {
+ "fieldname": "return_against",
+ "label": "Invoice/Advance Payment Voucher Number",
+ "fieldtype": "Link",
+ "options": "Purchase Invoice",
+ "width": 120
+ },
+ {
+ "fieldname": "posting_date",
+ "label": "Invoice/Advance Payment Voucher date",
+ "fieldtype": "Date",
+ "width": 120
+ },
+ {
+ "fieldname": "reason_for_issuing_document",
+ "label": "Reason For Issuing document",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "supply_type",
+ "label": "Supply Type",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname": "invoice_value",
+ "label": "Invoice Value",
+ "fieldtype": "Currency",
+ "width": 120
+ }
+ ]
+ self.other_columns = [
+ {
+ "fieldname": "pre_gst",
+ "label": "PRE GST",
+ "fieldtype": "Data",
+ "width": 50
+ },
+ {
+ "fieldname": "document_type",
+ "label": "Document Type",
+ "fieldtype": "Data",
+ "width": 50
+ }
+ ]
+ self.columns = self.invoice_columns + self.tax_columns + self.other_columns
diff --git a/erpnext/restaurant/doctype/restaurant/restaurant.json b/erpnext/restaurant/doctype/restaurant/restaurant.json
index f4ecba7..8572687 100644
--- a/erpnext/restaurant/doctype/restaurant/restaurant.json
+++ b/erpnext/restaurant/doctype/restaurant/restaurant.json
@@ -4,7 +4,7 @@
"allow_import": 0,
"allow_rename": 0,
"autoname": "prompt",
- "beta": 0,
+ "beta": 1,
"creation": "2017-09-15 12:40:41.546933",
"custom": 0,
"docstatus": 0,
@@ -269,7 +269,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-10-05 17:41:14.422242",
+ "modified": "2017-12-09 12:13:10.185496",
"modified_by": "Administrator",
"module": "Restaurant",
"name": "Restaurant",
diff --git a/erpnext/restaurant/doctype/restaurant_menu/restaurant_menu.json b/erpnext/restaurant/doctype/restaurant_menu/restaurant_menu.json
index 264634b..1b1610d 100644
--- a/erpnext/restaurant/doctype/restaurant_menu/restaurant_menu.json
+++ b/erpnext/restaurant/doctype/restaurant_menu/restaurant_menu.json
@@ -4,7 +4,7 @@
"allow_import": 0,
"allow_rename": 0,
"autoname": "prompt",
- "beta": 0,
+ "beta": 1,
"creation": "2017-09-15 12:48:29.818715",
"custom": 0,
"docstatus": 0,
@@ -207,7 +207,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-09-21 11:04:20.671542",
+ "modified": "2017-12-09 12:13:13.684500",
"modified_by": "Administrator",
"module": "Restaurant",
"name": "Restaurant Menu",
diff --git a/erpnext/restaurant/doctype/restaurant_order_entry/test_restaurant_order_entry.py b/erpnext/restaurant/doctype/restaurant_order_entry/test_restaurant_order_entry.py
deleted file mode 100644
index 59605b1..0000000
--- a/erpnext/restaurant/doctype/restaurant_order_entry/test_restaurant_order_entry.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe, json
-import unittest
-
-from erpnext.restaurant.doctype.restaurant_order_entry.restaurant_order_entry \
- import (sync, make_invoice, item_query_restaurant)
-
-class TestRestaurantOrderEntry(unittest.TestCase):
- def setUp(self):
- # save the menus as Price List is deleted before tests...
- frappe.get_doc('Restaurant Menu', 'Test Restaurant 1 Menu 1').save()
- frappe.get_doc('Restaurant Menu', 'Test Restaurant 1 Menu 2').save()
-
- if not frappe.db.get_value('Restaurant', 'Test Restaurant 1', 'active_menu'):
- restaurant = frappe.get_doc('Restaurant', 'Test Restaurant 1')
- restaurant.active_menu = 'Test Restaurant 1 Menu 1'
- restaurant.save()
-
- def test_update_order(self):
- table = frappe.db.get_value('Restaurant Table', dict(restaurant = 'Test Restaurant 1'))
- invoice = sync(table,
- json.dumps([dict(item='Food Item 1', qty = 10), dict(item='Food Item 2', qty = 2)]))
-
- self.assertEquals(invoice.get('restaurant_table'), table)
- self.assertEquals(invoice.get('items')[0].get('item_code'), 'Food Item 1')
- self.assertEquals(invoice.get('items')[1].get('item_code'), 'Food Item 2')
- self.assertEquals(invoice.get('net_total'), 4600)
-
- return table
-
- def test_billing(self):
- table = self.test_update_order()
- invoice_name = make_invoice(table, '_Test Customer', 'Cash')
-
- sales_invoice = frappe.get_doc('Sales Invoice', invoice_name)
-
- self.assertEquals(sales_invoice.grand_total, 4600)
- self.assertEquals(sales_invoice.items[0].item_code, 'Food Item 1')
- self.assertEquals(sales_invoice.items[1].item_code, 'Food Item 2')
- self.assertEquals(sales_invoice.payments[0].mode_of_payment, 'Cash')
- self.assertEquals(sales_invoice.payments[0].amount, 4600)
-
- def test_item_query(self):
- table = frappe.db.get_value('Restaurant Table', dict(restaurant = 'Test Restaurant 1'))
- result = item_query_restaurant(filters=dict(table=table))
- items = [d[0] for d in result]
- self.assertTrue('Food Item 1' in items)
- self.assertTrue('_Test Item 1' not in items)
diff --git a/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.json b/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.json
index 6a2ffa1..0698758 100644
--- a/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.json
+++ b/erpnext/restaurant/doctype/restaurant_reservation/restaurant_reservation.json
@@ -4,7 +4,7 @@
"allow_import": 0,
"allow_rename": 0,
"autoname": "REST.######",
- "beta": 0,
+ "beta": 1,
"creation": "2017-09-15 13:05:51.063661",
"custom": 0,
"docstatus": 0,
@@ -297,7 +297,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-09-15 14:40:56.759315",
+ "modified": "2017-12-09 12:13:20.027942",
"modified_by": "Administrator",
"module": "Restaurant",
"name": "Restaurant Reservation",
diff --git a/erpnext/restaurant/doctype/restaurant_table/restaurant_table.json b/erpnext/restaurant/doctype/restaurant_table/restaurant_table.json
index da1bcde..5fc6e62 100644
--- a/erpnext/restaurant/doctype/restaurant_table/restaurant_table.json
+++ b/erpnext/restaurant/doctype/restaurant_table/restaurant_table.json
@@ -4,7 +4,7 @@
"allow_import": 0,
"allow_rename": 0,
"autoname": "",
- "beta": 0,
+ "beta": 1,
"creation": "2017-09-15 12:45:24.717355",
"custom": 0,
"docstatus": 0,
@@ -116,7 +116,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-09-15 13:18:05.254106",
+ "modified": "2017-12-09 12:13:24.382345",
"modified_by": "Administrator",
"module": "Restaurant",
"name": "Restaurant Table",
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 9603290..ed8e6c8 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -33,7 +33,38 @@
}
}
})
+ frm.set_query('customer_primary_address', function(doc) {
+ return {
+ query: "erpnext.selling.doctype.customer.customer.get_customer_primary_address",
+ filters: {
+ 'customer': doc.name
+ }
+ }
+ })
},
+ customer_primary_address: function(frm){
+ if(frm.doc.customer_primary_address){
+ frappe.call({
+ method: 'frappe.contacts.doctype.address.address.get_address_display',
+ args: {
+ "address_dict": frm.doc.customer_primary_address
+ },
+ callback: function(r) {
+ frm.set_value("primary_address", r.message);
+ }
+ });
+ }
+ if(!frm.doc.customer_primary_address){
+ frm.set_value("primary_address", "");
+ }
+ },
+ customer_primary_contact: function(frm){
+ if(!frm.doc.customer_primary_contact){
+ frm.set_value("mobile_no", "");
+ frm.set_value("email_id", "");
+ }
+ },
+
refresh: function(frm) {
if(frappe.defaults.get_default("cust_master_name")!="Naming Series") {
frm.toggle_display("naming_series", false);
@@ -43,7 +74,7 @@
frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Customer'}
- frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+ frm.toggle_display(['address_html','contact_html','primary_address_and_contact_detail'], !frm.doc.__islocal);
if(!frm.doc.__islocal) {
frappe.contacts.render_address_and_contact(frm);
@@ -72,4 +103,4 @@
validate: function(frm) {
if(frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
},
-});
+});
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index b618bf3..d43de10 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -725,7 +725,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "primary_contact_detail",
+ "description": "Select, to make the customer searchable with these fields",
+ "fieldname": "primary_address_and_contact_detail",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -734,7 +735,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Primary Contact Detail",
+ "label": "Primary Address and Contact Detail",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -755,6 +756,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "description": "Reselect, if the chosen contact is edited after save",
"fieldname": "customer_primary_contact",
"fieldtype": "Link",
"hidden": 0,
@@ -786,6 +788,68 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "mobile_no",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Mobile No",
+ "length": 0,
+ "no_copy": 0,
+ "options": "customer_primary_contact.mobile_no",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "email_id",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Email Id",
+ "length": 0,
+ "no_copy": 0,
+ "options": "customer_primary_contact.email_id",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_26",
"fieldtype": "Column Break",
"hidden": 0,
@@ -815,8 +879,9 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "mobile_no",
- "fieldtype": "Read Only",
+ "description": "Reselect, if the chosen address is edited after save",
+ "fieldname": "customer_primary_address",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -824,10 +889,10 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Mobile Number",
+ "label": "Customer Primary Address",
"length": 0,
"no_copy": 0,
- "options": "customer_primary_contact.mobile_no",
+ "options": "Address",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -846,7 +911,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "email_id",
+ "default": "",
+ "fieldname": "primary_address",
"fieldtype": "Read Only",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -855,10 +921,10 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Email Id",
+ "label": "Primary Address",
"length": 0,
"no_copy": 0,
- "options": "customer_primary_contact.email_id",
+ "options": "",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -1002,9 +1068,9 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "",
- "fieldname": "payment_terms",
- "fieldtype": "Link",
+ "default": "0",
+ "fieldname": "bypass_credit_limit_check_at_sales_order",
+ "fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -1012,10 +1078,9 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Default Payment Terms Template",
+ "label": "Bypass credit limit check at Sales Order",
"length": 0,
"no_copy": 0,
- "options": "Payment Terms Template",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -1034,9 +1099,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "default": "0",
- "fieldname": "bypass_credit_limit_check_at_sales_order",
- "fieldtype": "Check",
+ "fieldname": "column_break_34",
+ "fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -1044,7 +1108,6 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Bypass credit limit check at Sales Order",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1063,6 +1126,38 @@
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "payment_terms",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Payment Terms Template",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Payment Terms Template",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
"collapsible": 1,
"collapsible_depends_on": "customer_details",
"columns": 0,
@@ -1354,7 +1449,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-13 18:17:19.894331",
+ "modified": "2018-02-09 10:44:35.801716",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
@@ -1545,7 +1640,7 @@
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
- "search_fields": "customer_name,customer_group,territory, mobile_no",
+ "search_fields": "customer_name,customer_group,territory, mobile_no,primary_address",
"show_name_in_global_search": 1,
"sort_order": "ASC",
"title_field": "customer_name",
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index eaa82b3..6f25bf7 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -185,12 +185,14 @@
("%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, start, page_len))
-def check_credit_limit(customer, company):
- customer_outstanding = get_customer_outstanding(customer, company)
+def check_credit_limit(customer, company, ignore_outstanding_sales_order=False, extra_amount=0):
+ customer_outstanding = get_customer_outstanding(customer, company, ignore_outstanding_sales_order)
+ if extra_amount > 0:
+ customer_outstanding += flt(extra_amount)
credit_limit = get_credit_limit(customer, company)
if credit_limit > 0 and flt(customer_outstanding) > credit_limit:
- msgprint(_("Credit limit has been crossed for customer {0} {1}/{2}")
+ msgprint(_("Credit limit has been crossed for customer {0} ({1}/{2})")
.format(customer, customer_outstanding, credit_limit))
# If not authorized person raise exception
@@ -231,7 +233,8 @@
and dn.customer=%s and dn.company=%s
and dn.docstatus = 1 and dn.status not in ('Closed', 'Stopped')
and ifnull(dn_item.against_sales_order, '') = ''
- and ifnull(dn_item.against_sales_invoice, '') = ''""", (customer, company), as_dict=True)
+ and ifnull(dn_item.against_sales_invoice, '') = ''
+ """, (customer, company), as_dict=True)
outstanding_based_on_dn = 0.0
@@ -306,3 +309,15 @@
'customer': customer,
'txt': '%%%s%%' % txt
})
+
+def get_customer_primary_address(doctype, txt, searchfield, start, page_len, filters):
+ customer = frappe.db.escape(filters.get('customer'))
+ return frappe.db.sql("""
+ select `tabAddress`.name from `tabAddress`, `tabDynamic Link`
+ where `tabAddress`.name = `tabDynamic Link`.parent and `tabDynamic Link`.link_name = %(customer)s
+ and `tabDynamic Link`.link_doctype = 'Customer' and `tabAddress`.is_primary_address = 1
+ and `tabAddress`.name like %(txt)s
+ """, {
+ 'customer': customer,
+ 'txt': '%%%s%%' % txt
+ })
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 45546e3..887a9e4 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -17,6 +17,8 @@
test_dependencies = ['Payment Term', 'Payment Terms Template']
test_records = frappe.get_test_records('Customer')
+from six import iteritems
+
class TestCustomer(unittest.TestCase):
def setUp(self):
if not frappe.get_value('Item', '_Test Item'):
@@ -51,7 +53,7 @@
details = get_party_details("_Test Customer")
- for key, value in to_check.iteritems():
+ for key, value in iteritems(to_check):
self.assertEquals(value, details.get(key))
def test_rename(self):
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index a6133c8..a9eb7db 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -13,6 +13,10 @@
'Project': 'Project'
}
frm.add_fetch('customer', 'tax_id', 'tax_id');
+
+ // formatter for material request item
+ frm.set_indicator_formatter('item_code',
+ function(doc) { return (doc.stock_qty<=doc.delivered_qty) ? "green" : "orange" })
},
onload: function(frm) {
erpnext.queries.setup_queries(frm, "Warehouse", function() {
@@ -28,10 +32,6 @@
}
});
- // formatter for material request item
- frm.set_indicator_formatter('item_code',
- function(doc) { return (doc.stock_qty<=doc.delivered_qty) ? "green" : "orange" })
-
erpnext.queries.setup_warehouse_query(frm);
},
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 7c23687..f302c1c 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -3529,8 +3529,8 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-19 14:51:52.710612",
- "modified_by": "nabinhait@gmail.com",
+ "modified": "2018-01-12 15:56:12.483019",
+ "modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
"owner": "Administrator",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 1c3354c..36d0c39 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -476,18 +476,10 @@
@frappe.whitelist()
def make_delivery_note(source_name, target_doc=None):
def set_missing_values(source, target):
- if source.po_no:
- if target.po_no:
- target_po_no = target.po_no.split(", ")
- target_po_no.append(source.po_no)
- target.po_no = ", ".join(list(set(target_po_no))) if len(target_po_no) > 1 else target_po_no[0]
- else:
- target.po_no = source.po_no
-
- # Since the credit limit check is bypassed at sales order level,
- # we need to check it at delivery note
- if cint(frappe.db.get_value("Customer", source.customer, "bypass_credit_limit_check_at_sales_order")):
- check_credit_limit(source.customer, source.company)
+ so = [d.against_sales_order for d in target.items]
+ if so:
+ po_no_list = frappe.get_all('Sales Order', 'po_no', filters = {'name': ('in', so)})
+ target.po_no = ', '.join(d.po_no for d in po_no_list if d.po_no)
target.ignore_pricing_rule = 1
target.run_method("set_missing_values")
@@ -553,10 +545,6 @@
target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals")
- # Since the credit limit check is bypassed at sales order level, we need to check it at sales invoice
- if cint(frappe.db.get_value("Customer", source.customer, "bypass_credit_limit_check_at_sales_order")):
- check_credit_limit(source.customer, source.company)
-
# set company address
target.update(get_company_address(target.company))
if target.company_address:
@@ -567,10 +555,12 @@
target.base_amount = target.amount * flt(source_parent.conversion_rate)
target.qty = target.amount / flt(source.rate) if (source.rate and source.billed_amt) else source.qty
- item = frappe.db.get_value("Item", target.item_code, ["item_group", "selling_cost_center"], as_dict=1)
- target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center") \
- or item.selling_cost_center \
- or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
+ if source_parent.project:
+ target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center")
+ if not target.cost_center and target.item_code:
+ item = frappe.db.get_value("Item", target.item_code, ["item_group", "selling_cost_center"], as_dict=1)
+ target.cost_center = item.selling_cost_center \
+ or frappe.db.get_value("Item Group", item.item_group, "default_cost_center")
doclist = get_mapped_doc("Sales Order", source_name, {
"Sales Order": {
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index f829961..5e5c50d 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -5,7 +5,6 @@
from frappe.utils import flt, add_days
import frappe.permissions
import unittest
-from erpnext.stock.doctype.item.test_item import get_total_projected_qty
from erpnext.selling.doctype.sales_order.sales_order \
import make_material_request, make_delivery_note, make_sales_invoice, WarehouseRequired
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@@ -155,17 +154,9 @@
dn = create_dn_against_so(so.name, 15)
self.assertEqual(get_reserved_qty(), existing_reserved_qty)
- total_projected_qty = get_total_projected_qty('_Test Item')
- item_doc_before_cancel = frappe.get_doc('Item', '_Test Item')
- self.assertEqual(total_projected_qty, item_doc_before_cancel.total_projected_qty)
-
dn.cancel()
self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
- total_projected_qty = get_total_projected_qty('_Test Item')
- item_doc_after_cancel = frappe.get_doc('Item', '_Test Item')
- self.assertEqual(total_projected_qty, item_doc_after_cancel.total_projected_qty)
-
def test_reserved_qty_for_over_delivery_via_sales_invoice(self):
make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100)
@@ -183,10 +174,6 @@
si.insert()
si.submit()
- total_projected_qty = get_total_projected_qty('_Test Item')
- item_doc = frappe.get_doc('Item', '_Test Item')
- self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
-
self.assertEqual(get_reserved_qty(), existing_reserved_qty)
so.load_from_db()
@@ -195,9 +182,6 @@
si.cancel()
self.assertEqual(get_reserved_qty(), existing_reserved_qty + 10)
- total_projected_qty = get_total_projected_qty('_Test Item')
- item_doc = frappe.get_doc('Item', '_Test Item')
- self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
so.load_from_db()
self.assertEqual(so.get("items")[0].delivered_qty, 0)
@@ -229,10 +213,6 @@
self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2)
- total_projected_qty = get_total_projected_qty('_Test Item')
- item_doc = frappe.get_doc('Item', '_Test Item')
- self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
-
# unclose so
so.load_from_db()
so.update_status('Draft')
@@ -269,10 +249,6 @@
dn = create_dn_against_so(so.name, 15)
- total_projected_qty = get_total_projected_qty('_Test Item')
- item_doc = frappe.get_doc('Item', '_Test Item')
- self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
-
self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"),
existing_reserved_qty_item2)
@@ -495,13 +471,6 @@
self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
- def test_total_projected_qty_against_sales_order(self):
- so = make_sales_order(item = '_Test Item')
- total_projected_qty = get_total_projected_qty('_Test Item')
-
- item_doc = frappe.get_doc('Item', '_Test Item')
- self.assertEqual(total_projected_qty, item_doc.total_projected_qty)
-
def test_reserved_qty_for_closing_so(self):
bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
fields=["reserved_qty"])
@@ -567,12 +536,12 @@
"item_list": [{
"item_code": "_Test FG Item",
"qty": 10,
- "rate":100
+ "rate":100
},
{
"item_code": "_Test FG Item",
"qty": 20,
- "rate":200
+ "rate":200
}]
})
@@ -589,7 +558,7 @@
})
so_item_name[item.get("sales_order_item")]= item.get("pending_qty")
make_production_orders(json.dumps({"items":po_items}), so.name, so.company)
-
+
# Check if Production Orders were raised
for item in so_item_name:
po_qty = frappe.db.sql("select sum(qty) from `tabProduction Order` where sales_order=%s and sales_order_item=%s", (so.name, item))
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index 0876228..72250c2 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -15,6 +15,7 @@
window.cur_pos = wrapper.pos;
} else {
// offline
+ frappe.flags.is_offline = true;
frappe.set_route('pos');
}
});
@@ -24,6 +25,10 @@
if (wrapper.pos) {
cur_frm = wrapper.pos.frm;
}
+
+ if (frappe.flags.is_offline) {
+ frappe.set_route('pos');
+ }
}
erpnext.pos.PointOfSale = class PointOfSale {
@@ -50,7 +55,6 @@
this.set_online_status();
},
() => this.setup_company(),
-
() => this.make_new_invoice(),
() => {
frappe.dom.unfreeze();
@@ -111,6 +115,7 @@
},
on_select_change: () => {
this.cart.numpad.set_inactive();
+ this.set_form_action();
},
get_item_details: (item_code) => {
return this.items.get(item_code);
@@ -180,6 +185,7 @@
.then(() => {
// update cart
this.update_cart_data(item);
+ this.set_form_action();
});
}
return;
@@ -244,6 +250,7 @@
this.cart.add_item(item);
this.cart.update_taxes_and_totals();
this.cart.update_grand_total();
+ this.cart.update_qty_total();
frappe.dom.unfreeze();
}
@@ -278,13 +285,17 @@
}
submit_sales_invoice() {
-
+ var is_saved = 0;
+ if(!this.frm.doc.__islocal){
+ is_saved = 1;
+ }
frappe.confirm(__("Permanently Submit {0}?", [this.frm.doc.name]), () => {
frappe.call({
method: 'erpnext.selling.page.point_of_sale.point_of_sale.submit_invoice',
freeze: true,
args: {
- doc: this.frm.doc
+ doc: this.frm.doc,
+ is_saved: is_saved
}
}).then(r => {
if(r.message) {
@@ -463,6 +474,8 @@
if (r.message) {
this.frm.meta.default_print_format = r.message.print_format || 'POS Invoice';
+ this.frm.allow_edit_rate = r.message.allow_edit_rate;
+ this.frm.allow_edit_discount = r.message.allow_edit_discount;
}
}
@@ -499,19 +512,26 @@
}
set_form_action() {
- if(this.frm.doc.docstatus !== 1) return;
+ if(this.frm.doc.docstatus == 1 || (this.frm.doc.allow_print_before_pay == 1&&this.frm.doc.items.length>0)){
+ this.page.set_secondary_action(__("Print"), async() => {
+ if(this.frm.doc.docstatus != 1 ){
+ await this.frm.save();
+ }
+ this.frm.print_preview.printit(true);
+ });
+ }
+ if(this.frm.doc.items.length == 0){
+ this.page.clear_secondary_action();
+ }
- this.page.set_secondary_action(__("Print"), () => {
- this.frm.print_preview.printit(true);
- });
-
- this.page.set_primary_action(__("New"), () => {
- this.make_new_invoice();
- });
-
- this.page.add_menu_item(__("Email"), () => {
- this.frm.email_doc();
- });
+ if (this.frm.doc.docstatus == 1) {
+ this.page.set_primary_action(__("New"), () => {
+ this.make_new_invoice();
+ });
+ this.page.add_menu_item(__("Email"), () => {
+ this.frm.email_doc();
+ });
+ }
}
};
@@ -552,12 +572,15 @@
<div class="taxes-and-totals">
${this.get_taxes_and_totals()}
</div>
- <div class="discount-amount">
- ${this.get_discount_amount()}
- </div>
+ <div class="discount-amount">`+
+ (!this.frm.allow_edit_discount ? `` : `${this.get_discount_amount()}`)+
+ `</div>
<div class="grand-total">
${this.get_grand_total()}
</div>
+ <div class="quantity-total">
+ ${this.get_item_qty_total()}
+ </div>
</div>
</div>
<div class="number-pad-container">
@@ -569,6 +592,7 @@
this.$taxes_and_totals = this.wrapper.find('.taxes-and-totals');
this.$discount_amount = this.wrapper.find('.discount-amount');
this.$grand_total = this.wrapper.find('.grand-total');
+ this.$qty_total = this.wrapper.find('.quantity-total');
this.toggle_taxes_and_totals(false);
this.$grand_total.on('click', () => {
@@ -583,6 +607,7 @@
this.numpad && this.numpad.reset_value();
this.customer_field.set_value("");
+ this.$discount_amount.find('input:text').val('');
this.wrapper.find('.grand-total-value').text(
format_currency(this.frm.doc.grand_total, this.frm.currency));
this.wrapper.find('.rounded-total-value').text(
@@ -602,6 +627,11 @@
return total;
}
+ get_item_qty_total() {
+ let total = this.get_total_template('Total Qty', 'quantity-total');
+ return total;
+ }
+
get_total_template(label, class_name) {
return `
<div class="list-item">
@@ -689,6 +719,17 @@
);
}
+ update_qty_total() {
+ var total_item_qty = 0;
+ $.each(this.frm.doc["items"] || [], function (i, d) {
+ if (d.qty > 0) {
+ total_item_qty += d.qty;
+ }
+ });
+ this.$qty_total.find('.quantity-total').text(total_item_qty)
+ this.frm.set_value("pos_total_qty",total_item_qty);
+ }
+
make_customer_field() {
this.customer_field = frappe.ui.form.make_control({
df: {
@@ -713,6 +754,17 @@
this.customer_field.set_value(this.frm.doc.customer);
}
+ disable_numpad_control() {
+ let disabled_btns = [];
+ if(!this.frm.allow_edit_rate) {
+ disabled_btns.push('Rate');
+ }
+ if(!this.frm.allow_edit_discount) {
+ disabled_btns.push('Disc');
+ }
+ return disabled_btns;
+ }
+
make_numpad() {
this.numpad = new NumberPad({
button_array: [
@@ -727,6 +779,7 @@
disable_highlight: ['Qty', 'Disc', 'Rate', 'Pay'],
reset_btns: ['Qty', 'Disc', 'Rate', 'Pay'],
del_btn: 'Del',
+ disable_btns: this.disable_numpad_control(),
wrapper: this.wrapper.find('.number-pad-container'),
onclick: (btn_value) => {
// on click
@@ -748,11 +801,19 @@
return;
}
- const item_code = this.selected_item.attr('data-item-code');
- const field = this.selected_item.active_field;
- const value = this.numpad.get_value();
+ if (this.selected_item.active_field == 'discount_percentage' && this.numpad.get_value() > cint(100)) {
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Discount amount cannot be greater than 100%')
+ });
+ this.numpad.reset_value();
+ } else {
+ const item_code = this.selected_item.attr('data-item-code');
+ const field = this.selected_item.active_field;
+ const value = this.numpad.get_value();
- this.events.on_field_change(item_code, field, value);
+ this.events.on_field_change(item_code, field, value);
+ }
}
this.events.on_numpad(btn_value);
@@ -1257,7 +1318,7 @@
constructor({
wrapper, onclick, button_array,
add_class={}, disable_highlight=[],
- reset_btns=[], del_btn='',
+ reset_btns=[], del_btn='', disable_btns
}) {
this.wrapper = wrapper;
this.onclick = onclick;
@@ -1266,6 +1327,7 @@
this.disable_highlight = disable_highlight;
this.reset_btns = reset_btns;
this.del_btn = del_btn;
+ this.disable_btns = disable_btns || [];
this.make_dom();
this.bind_events();
this.value = '';
@@ -1296,6 +1358,16 @@
}
this.set_class();
+
+ if(this.disable_btns) {
+ this.disable_btns.forEach((btn) => {
+ const $btn = this.get_btn(btn);
+ $btn.prop("disabled", true)
+ $btn.hover(() => {
+ $btn.css('cursor','not-allowed');
+ })
+ })
+ }
}
set_class() {
@@ -1557,4 +1629,4 @@
this.dialog.set_value("paid_amount", this.frm.doc.paid_amount);
this.dialog.set_value("outstanding_amount", this.frm.doc.outstanding_amount);
}
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
index d98a017..bbfb5ad 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -4,8 +4,11 @@
from __future__ import unicode_literals
import frappe, json
from frappe.utils.nestedset import get_root_of
+from frappe.utils import cint
from erpnext.accounts.doctype.pos_profile.pos_profile import get_item_groups
+from six import string_types
+
@frappe.whitelist()
def get_items(start, page_length, price_list, item_group, search_value="", pos_profile=None):
serial_no = ""
@@ -28,7 +31,7 @@
batch_no, item_code = batch_no_data
if not serial_no and not batch_no:
- barcode_data = frappe.db.get_value('Item', {'barcode': search_value}, ['name', 'barcode'])
+ barcode_data = frappe.db.get_value('Item Barcode', {'barcode': search_value}, ['parent', 'barcode'])
if barcode_data:
item_code, barcode = barcode_data
@@ -88,11 +91,15 @@
return '%%%s%%'%(frappe.db.escape(item_code)), condition
@frappe.whitelist()
-def submit_invoice(doc):
- if isinstance(doc, basestring):
+def submit_invoice(doc,is_saved):
+ if isinstance(doc, string_types):
args = json.loads(doc)
- doc = frappe.new_doc('Sales Invoice')
+ if(cint(is_saved) == 1):
+ doc = frappe.get_doc('Sales Invoice',args["name"])
+ else:
+ doc = frappe.new_doc('Sales Invoice')
+
doc.update(args)
doc.run_method("set_missing_values")
doc.run_method("calculate_taxes_and_totals")
@@ -123,4 +130,4 @@
return frappe.db.sql(""" select distinct name from `tabItem Group`
where {condition} and (name like %(txt)s) limit {start}, {page_len}"""
.format(condition = cond, start=start, page_len= page_len),
- {'txt': '%%%s%%' % txt})
+ {'txt': '%%%s%%' % txt})
\ No newline at end of file
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 3d174b7..aa5b3ba 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -118,6 +118,7 @@
selling_price_list: function() {
this.apply_price_list();
+ this.set_dynamic_labels();
},
price_list_rate: function(doc, cdt, cdn) {
@@ -340,7 +341,8 @@
conversion_factor: function(doc, cdt, cdn, dont_fetch_price_list_rate) {
this._super(doc, cdt, cdn, dont_fetch_price_list_rate);
- if(frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
+ if(frappe.meta.get_docfield(cdt, "stock_qty", cdn) &&
+ in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
this.set_batch_number(cdt, cdn);
}
},
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 44757ab..84e0a20 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -92,7 +92,7 @@
},
function(data) {
if(data.company_name !== frm.doc.name) {
- frappe.msgprint("Company name not same");
+ frappe.msgprint(__("Company name not same"));
return;
}
frappe.call({
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 9824c70..31e1859 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1,2209 +1,2209 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:company_name",
- "beta": 0,
- "creation": "2013-04-10 08:35:39",
- "custom": 0,
- "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:company_name",
+ "beta": 0,
+ "creation": "2013-04-10 08:35:39",
+ "custom": 0,
+ "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "company_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Company",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "company_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Company",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "company_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "abbr",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Abbr",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "abbr",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "abbr",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Abbr",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "abbr",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
- "fieldname": "change_abbr",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Change Abbreviation",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
+ "fieldname": "change_abbr",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Change Abbreviation",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cb0",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "cb0",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "domain",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Domain",
- "length": 0,
- "no_copy": 0,
- "options": "Domain",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "domain",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Domain",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Domain",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "sales_settings",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Sales",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_monthly_history",
- "fieldtype": "Small Text",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Monthly History",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "sales_monthly_history",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Sales Monthly History",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "monthly_sales_target",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Monthly Sales Target",
- "length": 0,
- "no_copy": 0,
- "options": "default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "monthly_sales_target",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Monthly Sales Target",
+ "length": 0,
+ "no_copy": 0,
+ "options": "default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_goals",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_goals",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "total_monthly_sales",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Total Monthly Sales",
- "length": 0,
- "no_copy": 1,
- "options": "default_currency",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "total_monthly_sales",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Total Monthly Sales",
+ "length": 0,
+ "no_copy": 1,
+ "options": "default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "charts_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Values",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "charts_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Values",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_letter_head",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Letter Head",
- "length": 0,
- "no_copy": 0,
- "options": "Letter Head",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_letter_head",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Letter Head",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Letter Head",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_holiday_list",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Holiday List",
- "length": 0,
- "no_copy": 0,
- "options": "Holiday List",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_holiday_list",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Holiday List",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Holiday List",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_terms",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Terms",
- "length": 0,
- "no_copy": 0,
- "options": "Terms and Conditions",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_terms",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Terms",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Terms and Conditions",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_currency",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Currency",
- "length": 0,
- "no_copy": 0,
- "options": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_currency",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Currency",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_10",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_10",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "country",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Country",
- "length": 0,
- "no_copy": 0,
- "options": "Country",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "country",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Country",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Country",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "create_chart_of_accounts_based_on",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Create Chart Of Accounts Based On",
- "length": 0,
- "no_copy": 0,
- "options": "\nStandard Template\nExisting Company",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "create_chart_of_accounts_based_on",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Create Chart Of Accounts Based On",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nStandard Template\nExisting Company",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
- "fieldname": "chart_of_accounts",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Chart Of Accounts Template",
- "length": 0,
- "no_copy": 1,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
+ "fieldname": "chart_of_accounts",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Chart Of Accounts Template",
+ "length": 0,
+ "no_copy": 1,
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
- "fieldname": "existing_company",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Existing Company ",
- "length": 0,
- "no_copy": 1,
- "options": "Company",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "tax_id",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Tax ID",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Accounts Settings",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
+ "fieldname": "existing_company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Existing Company ",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Company",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_bank_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Bank Account",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "default_bank_account",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "tax_id",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Tax ID",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_cash_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Cash Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_settings",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Accounts Settings",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_receivable_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Receivable Account",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "receivables_group",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_bank_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Bank Account",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "default_bank_account",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "round_off_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Round Off Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_cash_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Cash Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "write_off_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Write Off Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_receivable_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Receivable Account",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "receivables_group",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "exchange_gain_loss_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Exchange Gain / Loss Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "round_off_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Round Off Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "write_off_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Write Off Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "exchange_gain_loss_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Exchange Gain / Loss Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_payable_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Payable Account",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "payables_group",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_payable_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Payable Account",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "payables_group",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_employee_advance_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Employee Advance Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_employee_advance_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Employee Advance Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Cost of Goods Sold Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Cost of Goods Sold Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_income_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Income Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_income_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Income Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_payroll_payable_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Payroll Payable Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_payroll_payable_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Payroll Payable Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "round_off_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Round Off Cost Center",
- "length": 0,
- "no_copy": 0,
- "options": "Cost Center",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "round_off_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Round Off Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_22",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_22",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Cost Center",
- "length": 0,
- "no_copy": 1,
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Cost Center",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "credit_limit",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Credit Limit",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "credit_limit",
- "oldfieldtype": "Currency",
- "options": "default_currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_26",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "credit_limit",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Credit Limit",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "credit_limit",
+ "oldfieldtype": "Currency",
+ "options": "default_currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "credit_days_based_on",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Credit Days Based On",
- "length": 0,
- "no_copy": 0,
- "options": "\nFixed Days\nLast Day of the Next Month",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "payment_terms",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Payment Terms Template",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Payment Terms Template",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')",
- "fieldname": "credit_days",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Credit Days",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "credit_days",
- "oldfieldtype": "Int",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "auto_accounting_for_stock_settings",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Stock Settings",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "auto_accounting_for_stock_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Stock Settings",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "enable_perpetual_inventory",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Enable Perpetual Inventory",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "fieldname": "enable_perpetual_inventory",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Enable Perpetual Inventory",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "default_inventory_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Inventory Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_inventory_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Inventory Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "stock_adjustment_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Stock Adjustment Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "stock_adjustment_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Stock Adjustment Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_32",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_32",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "stock_received_but_not_billed",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Stock Received But Not Billed",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "stock_received_but_not_billed",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Stock Received But Not Billed",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "expenses_included_in_valuation",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Expenses Included In Valuation",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "expenses_included_in_valuation",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Expenses Included In Valuation",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "fixed_asset_depreciation_settings",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Fixed Asset Depreciation Settings",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "fixed_asset_depreciation_settings",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Fixed Asset Depreciation Settings",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "accumulated_depreciation_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Accumulated Depreciation Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "accumulated_depreciation_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Accumulated Depreciation Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "depreciation_expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Depreciation Expense Account",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "depreciation_expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Depreciation Expense Account",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "series_for_depreciation_entry",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Series for Asset Depreciation Entry (Journal Entry)",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "series_for_depreciation_entry",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Series for Asset Depreciation Entry (Journal Entry)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_40",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_40",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "disposal_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Gain/Loss Account on Asset Disposal",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Account",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "disposal_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Gain/Loss Account on Asset Disposal",
- "length": 0,
- "no_copy": 1,
- "options": "Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "depreciation_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Asset Depreciation Cost Center",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "depreciation_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Asset Depreciation Cost Center",
- "length": 0,
- "no_copy": 1,
- "options": "Cost Center",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "For reference only.",
+ "fieldname": "company_info",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Company Info",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "For reference only.",
- "fieldname": "company_info",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Company Info",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "address_html",
+ "fieldtype": "HTML",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "address_html",
- "fieldtype": "HTML",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "phone_no",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Phone No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "phone_no",
- "oldfieldtype": "Data",
- "options": "Phone",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "phone_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Phone No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "phone_no",
+ "oldfieldtype": "Data",
+ "options": "Phone",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "fax",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Fax",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "fax",
- "oldfieldtype": "Data",
- "options": "Phone",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "fax",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Fax",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "fax",
+ "oldfieldtype": "Data",
+ "options": "Phone",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "email",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Email",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "email",
- "oldfieldtype": "Data",
- "options": "Email",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "email",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Email",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "email",
+ "oldfieldtype": "Data",
+ "options": "Email",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "website",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "website",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "website",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "website",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "registration_info",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "registration_info",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Company registration numbers for your reference. Tax numbers etc.",
- "fieldname": "registration_details",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Registration Details",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "registration_details",
- "oldfieldtype": "Code",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Company registration numbers for your reference. Tax numbers etc.",
+ "fieldname": "registration_details",
+ "fieldtype": "Code",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Registration Details",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "registration_details",
+ "oldfieldtype": "Code",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "delete_company_transactions",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Delete Company Transactions",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "delete_company_transactions",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Delete Company Transactions",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company_logo",
+ "fieldtype": "Attach Image",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Company Logo",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-building",
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2017-12-07 18:40:24.646920",
- "modified_by": "Administrator",
- "module": "Setup",
- "name": "Company",
- "owner": "Administrator",
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-building",
+ "idx": 1,
+ "image_field": "company_logo",
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "menu_index": 0,
+ "modified": "2018-02-14 15:54:26.776363",
+ "modified_by": "achilles@erpnext.com",
+ "module": "Setup",
+ "name": "Company",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 0,
- "role": "Accounts User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Accounts User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Employee",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Employee",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Sales User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Sales User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Purchase User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Purchase User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Stock User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Stock User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Projects User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Projects User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 1,
- "sort_order": "ASC",
- "track_changes": 1,
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 1,
+ "sort_order": "ASC",
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index ac7c830..8812d8e 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -34,6 +34,7 @@
self.validate_currency()
self.validate_coa_input()
self.validate_perpetual_inventory()
+ self.check_country_change()
def validate_abbr(self):
if not self.abbr:
@@ -80,9 +81,12 @@
if not frappe.db.sql("""select name from tabAccount
where company=%s and docstatus<2 limit 1""", self.name):
if not frappe.local.flags.ignore_chart_of_accounts:
+ frappe.flags.country_change = True
self.create_default_accounts()
self.create_default_warehouses()
- install_country_fixtures(self.name)
+
+ if frappe.flags.country_change:
+ install_country_fixtures(self.name)
if not frappe.db.get_value("Cost Center", {"is_group": 0, "company": self.name}):
self.create_default_cost_center()
@@ -147,6 +151,13 @@
frappe.msgprint(_("Set default inventory account for perpetual inventory"),
alert=True, indicator='orange')
+ def check_country_change(self):
+ frappe.flags.country_change = False
+
+ if not self.get('__islocal') and \
+ self.country != frappe.db.get_value('Company', self.name, 'country'):
+ frappe.flags.country_change = True
+
def set_default_accounts(self):
self._set_default_account("default_cash_account", "Cash")
self._set_default_account("default_bank_account", "Bank")
@@ -162,8 +173,14 @@
self._set_default_account("default_expense_account", "Cost of Goods Sold")
if not self.default_income_account:
- self.db_set("default_income_account", frappe.db.get_value("Account",
- {"account_name": _("Sales"), "company": self.name}))
+ income_account = frappe.db.get_value("Account",
+ {"account_name": _("Sales"), "company": self.name, "is_group": 0})
+
+ if not income_account:
+ income_account = frappe.db.get_value("Account",
+ {"account_name": _("Sales Account"), "company": self.name})
+
+ self.db_set("default_income_account", income_account)
if not self.default_payable_account:
self.db_set("default_payable_account", self.default_payable_account)
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 316f11b..062a49a 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -162,12 +162,14 @@
"unique": 0
},
{
+ "allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "credit_days_based_on",
- "fieldtype": "Select",
+ "depends_on": "",
+ "fieldname": "payment_terms",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -175,10 +177,10 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Credit Days Based On",
+ "label": "Default Payment Terms Template",
"length": 0,
"no_copy": 0,
- "options": "\nFixed Days\nLast Day of the Next Month",
+ "options": "Payment Terms Template",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -196,35 +198,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "eval:doc.credit_days_based_on=='Fixed Days'",
- "fieldname": "credit_days",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Credit Days",
- "length": 0,
- "no_copy": 0,
- "permlevel": 1,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "credit_limit",
"fieldtype": "Currency",
"hidden": 0,
@@ -411,7 +384,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-02-20 13:25:31.549874",
+ "modified": "2018-01-29 13:25:31.549874",
"modified_by": "Administrator",
"module": "Setup",
"name": "Customer Group",
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 39172d7..14a478d 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -9,6 +9,7 @@
from frappe.website.website_generator import WebsiteGenerator
from frappe.website.render import clear_cache
from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
+from erpnext.utilities.product import get_qty_in_stock
class ItemGroup(NestedSet, WebsiteGenerator):
@@ -83,7 +84,8 @@
# base query
query = """select I.name, I.item_name, I.item_code, I.route, I.image, I.website_image, I.thumbnail, I.item_group,
I.description, I.web_long_description as website_description, I.is_stock_item,
- case when (S.actual_qty - S.reserved_qty) > 0 then 1 else 0 end as in_stock
+ case when (S.actual_qty - S.reserved_qty) > 0 then 1 else 0 end as in_stock, I.website_warehouse,
+ I.has_batch_no
from `tabItem` I
left join tabBin S on I.item_code = S.item_code and I.website_warehouse = S.warehouse
where I.show_in_website = 1
@@ -104,8 +106,26 @@
data = frappe.db.sql(query, {"product_group": product_group,"search": search, "today": nowdate()}, as_dict=1)
+ data = adjust_qty_for_expired_items(data)
+
return [get_item_for_list_in_html(r) for r in data]
+
+def adjust_qty_for_expired_items(data):
+ adjusted_data = []
+
+ for item in data:
+ if item.get('has_batch_no') and item.get('website_warehouse'):
+ stock_qty_dict = get_qty_in_stock(
+ item.get('name'), 'website_warehouse', item.get('website_warehouse'))
+ qty = stock_qty_dict.stock_qty[0][0]
+ item['in_stock'] = 1 if qty else 0
+ adjusted_data.append(item)
+
+ return adjusted_data
+
+
+
def get_child_groups(item_group_name):
item_group = frappe.get_doc("Item Group", item_group_name)
return frappe.db.sql("""select name
diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
index 4534584..6455be0 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -27,7 +27,7 @@
try:
options = self.get_options(d)
except frappe.DoesNotExistError:
- frappe.msgprint('Unable to find DocType {0}'.format(d))
+ frappe.msgprint(_('Unable to find DocType {0}').format(d))
#frappe.pass_does_not_exist_error()
continue
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
index 85cf4dd..a2152a6 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
@@ -7,6 +7,8 @@
from frappe.model.document import Document
from frappe.utils.jinja import validate_template
+from six import string_types
+
class TermsandConditions(Document):
def validate(self):
if self.terms:
@@ -14,7 +16,7 @@
@frappe.whitelist()
def get_terms_and_conditions(template_name, doc):
- if isinstance(doc, basestring):
+ if isinstance(doc, string_types):
doc = json.loads(doc)
terms_and_conditions = frappe.get_doc("Terms and Conditions", template_name)
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index dce3c28..2aa4d5e 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -216,6 +216,7 @@
{'doctype': "Party Type", "party_type": "Supplier"},
{'doctype': "Party Type", "party_type": "Employee"},
{'doctype': "Party Type", "party_type": "Member"},
+ {'doctype': "Party Type", "party_type": "Shareholder"},
{'doctype': "Opportunity Type", "name": "Hub"},
{'doctype': "Opportunity Type", "name": _("Sales")},
@@ -246,6 +247,11 @@
{'doctype': 'Assessment Group', 'assessment_group_name': _('All Assessment Groups'),
'is_group': 1, 'parent_assessment_group': ''},
+ # Share Management
+ {"doctype": "Share Type", "title": _("Equity")},
+ {"doctype": "Share Type", "title": _("Preference")},
+
+
]
from erpnext.setup.setup_wizard.data.industry_type import get_industry_types
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 2c5f7e8..d6491a8 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -5,7 +5,7 @@
import frappe
from frappe import _
-from operations import install_fixtures, taxes_setup, defaults_setup, company_setup, sample_data
+from .operations import install_fixtures, taxes_setup, defaults_setup, company_setup, sample_data
def get_setup_stages(args=None):
if frappe.db.sql("select name from tabCompany"):
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 5fcc3a2..8d9bba3 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -128,7 +128,7 @@
doc.update(r)
try:
doc.insert(ignore_permissions=True)
- except frappe.DuplicateEntryError, e:
+ except frappe.DuplicateEntryError as e:
# pass DuplicateEntryError and continue
if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
# make sure DuplicateEntryError is for the exact same doc and not a related doc
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index c3deaf2..254d7b7 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -65,10 +65,13 @@
from erpnext.selling.doctype.quotation.quotation import _make_sales_order
sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True))
for item in sales_order.get("items"):
- item.reserved_warehouse = frappe.db.get_value("Item", item.item_code, "website_warehouse") or None
- item_stock = get_qty_in_stock(item.item_code, "website_warehouse")
- if item.qty > item_stock.stock_qty[0][0]:
- throw(_("Only {0} in stock for item {1}").format(item_stock.stock_qty[0][0], item.item_code))
+ item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item",
+ item.item_code, ["website_warehouse", "is_stock_item"]) or None, None
+
+ if is_stock_item:
+ item_stock = get_qty_in_stock(item.item_code, "website_warehouse")
+ if item.qty > item_stock.stock_qty[0][0]:
+ throw(_("Only {0} in stock for item {1}").format(item_stock.stock_qty[0][0], item.item_code))
sales_order.flags.ignore_permissions = True
sales_order.insert()
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index eb06f27..690ccf0 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -11,7 +11,6 @@
"Warranty Claim": {"status": "Open"},
"Task": {"status": ("in", ("Open", "Overdue"))},
"Project": {"status": "Open"},
- "Item": {"total_projected_qty": ("<", 0)},
"Lead": {"status": "Open"},
"Contact": {"status": "Open"},
"Opportunity": {"status": "Open"},
@@ -30,7 +29,7 @@
"docstatus": ("<", 2)
},
"Payment Entry": {"docstatus": 0},
- "Leave Application": {"status": "Open"},
+ "Leave Application": {"docstatus": 0},
"Expense Claim": {"approval_status": "Draft"},
"Job Applicant": {"status": "Open"},
"Delivery Note": {
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 23820d3..2748436 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -75,7 +75,7 @@
this.content.find('.more').addClass('hidden');
}
- // If not any stock in any warehouses provide a message to end user
+ // If not any stock in any warehouses provide a message to end user
if (context.data.length > 0) {
$(frappe.render_template('item_dashboard_list', context)).appendTo(this.result);
} else {
@@ -86,6 +86,7 @@
get_item_dashboard_data: function(data, max_count, show_item) {
if(!max_count) max_count = 0;
if(!data) data = [];
+
data.forEach(function(d) {
d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production;
d.pending_qty = 0;
@@ -97,9 +98,16 @@
max_count = Math.max(d.actual_or_pending, d.actual_qty,
d.total_reserved, max_count);
});
+
+ var can_write = 0;
+ if(frappe.boot.user.can_write.indexOf("Stock Entry")>=0){
+ can_write = 1;
+ }
+
return {
data: data,
max_count: max_count,
+ can_write:can_write,
show_item: show_item || false
}
}
@@ -187,4 +195,4 @@
frappe.set_route('Form', doc.doctype, doc.name);
})
});
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/dashboard/item_dashboard_list.html b/erpnext/stock/dashboard/item_dashboard_list.html
index 63f2480..e0b3431 100644
--- a/erpnext/stock/dashboard/item_dashboard_list.html
+++ b/erpnext/stock/dashboard/item_dashboard_list.html
@@ -39,6 +39,7 @@
</span>
</span>
</div>
+ {% if can_write %}
<div class="col-sm-2 text-right" style="margin-top: 8px;">
{% if d.actual_qty %}
<button class="btn btn-default btn-xs btn-move"
@@ -52,6 +53,7 @@
data-item="{{ d.item_code }}"
data-rate="{{ d.valuation_rate }}">{{ __("Add") }}</a>
</div>
+ {% endif %}
</div>
</div>
{% endfor %}
diff --git a/erpnext/stock/doctype/batch/batch.js b/erpnext/stock/doctype/batch/batch.js
index 12aa0bd..e2ea7f9 100644
--- a/erpnext/stock/doctype/batch/batch.js
+++ b/erpnext/stock/doctype/batch/batch.js
@@ -25,9 +25,17 @@
}
},
item: (frm) => {
- frappe.db.get_value('Item', {name: frm.doc.item}, 'has_expiry_date', (r) => {
- frm.toggle_reqd('expiry_date', r.has_expiry_date);
- });
+ // frappe.db.get_value('Item', {name: frm.doc.item}, 'has_expiry_date', (r) => {
+ // frm.toggle_reqd('expiry_date', r.has_expiry_date);
+ // });
+ frappe.db.get_value('Item', {name: frm.doc.item}, ['shelf_life_in_days', 'has_expiry_date'], (r) => {
+ if (r.has_expiry_date && r.shelf_life_in_days) {
+ // Calculate expiry date based on shelf_life_in_days
+ frm.set_value('expiry_date', frappe.datetime.add_days(frm.doc.manufacturing_date, r.shelf_life_in_days));
+ }else if(r.has_expiry_date){
+ frm.toggle_reqd('expiry_date', r.has_expiry_date);
+ }
+ })
},
make_dashboard: (frm) => {
if(!frm.is_new()) {
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index f60798b..cc1aac5 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -1,493 +1,494 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "",
- "beta": 0,
- "creation": "2013-03-05 14:50:38",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "",
+ "beta": 0,
+ "creation": "2013-03-05 14:50:38",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.__islocal",
- "fieldname": "batch_id",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Batch ID",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "batch_id",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.__islocal",
+ "fieldname": "batch_id",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Batch ID",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "batch_id",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "item",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Item",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item",
- "oldfieldtype": "Link",
- "options": "Item",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "item",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Item",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item",
+ "oldfieldtype": "Link",
+ "options": "Item",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "image",
- "fieldtype": "Attach Image",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "image",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "image",
+ "fieldtype": "Attach Image",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "image",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.parent_batch",
- "fieldname": "parent_batch",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Parent Batch",
- "length": 0,
- "no_copy": 0,
- "options": "Batch",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.parent_batch",
+ "fieldname": "parent_batch",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Parent Batch",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Batch",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "manufacturing_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Manufacturing Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "Today",
+ "fieldname": "manufacturing_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturing Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "expiry_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Expiry Date",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "expiry_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "expiry_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Expiry Date",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "expiry_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "source",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Source",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "source",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Source",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "supplier",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Supplier",
- "length": 0,
- "no_copy": 0,
- "options": "Supplier",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supplier",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Supplier",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_9",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_9",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "reference_doctype",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Source Document Type",
- "length": 0,
- "no_copy": 0,
- "options": "DocType",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "reference_doctype",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Source Document Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "DocType",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "reference_name",
- "fieldtype": "Dynamic Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Source Document Name",
- "length": 0,
- "no_copy": 0,
- "options": "reference_doctype",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "reference_name",
+ "fieldtype": "Dynamic Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Source Document Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "reference_doctype",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_7",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_7",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "description",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Batch Description",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "description",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Batch Description",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "description",
+ "oldfieldtype": "Small Text",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "300px"
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-archive",
- "idx": 1,
- "image_field": "image",
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 5,
- "modified": "2018-01-08 21:55:54.306693",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Batch",
- "owner": "harshada@webnotestech.com",
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-archive",
+ "idx": 1,
+ "image_field": "image",
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 5,
+ "modified": "2018-01-23 17:41:06.862477",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Batch",
+ "owner": "harshada@webnotestech.com",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Item Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Item Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
"write": 1
}
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_order": "DESC",
- "title_field": "item",
- "track_changes": 0,
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_order": "DESC",
+ "title_field": "item",
+ "track_changes": 0,
"track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 42e2cef..5b4f4b5 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -5,24 +5,20 @@
import frappe
from frappe import _
from frappe.model.document import Document
-from frappe.model.naming import make_autoname
+from frappe.model.naming import make_autoname, revert_series_if_last
from frappe.utils import flt, cint
+from frappe.utils.jinja import render_template
+from frappe.utils.data import add_days
-
-class UnableToSelectBatchError(frappe.ValidationError): pass
-
-
-def get_name_from_naming_series():
- naming_series_prefix = frappe.db.get_single_value('Stock Settings', 'naming_series_prefix')
- if not naming_series_prefix:
- naming_series_prefix = 'BATCH-'
-
- name = make_autoname(naming_series_prefix + '.#####')
-
- return name
+class UnableToSelectBatchError(frappe.ValidationError):
+ pass
def get_name_from_hash():
+ """
+ Get a name for a Batch by generating a unique hash.
+ :return: The hash that was generated.
+ """
temp = None
while not temp:
temp = frappe.generate_hash()[:7].upper()
@@ -32,14 +28,67 @@
return temp
+def batch_uses_naming_series():
+ """
+ Verify if the Batch is to be named using a naming series
+ :return: bool
+ """
+ use_naming_series = cint(frappe.db.get_single_value('Stock Settings', 'use_naming_series'))
+ return bool(use_naming_series)
+
+
+def _get_batch_prefix():
+ """
+ Get the naming series prefix set in Stock Settings.
+
+ It does not do any sanity checks so make sure to use it after checking if the Batch
+ is set to use naming series.
+ :return: The naming series.
+ """
+ naming_series_prefix = frappe.db.get_single_value('Stock Settings', 'naming_series_prefix')
+ if not naming_series_prefix:
+ naming_series_prefix = 'BATCH-'
+
+ return naming_series_prefix
+
+
+def _make_naming_series_key(prefix):
+ """
+ Make naming series key for a Batch.
+
+ Naming series key is in the format [prefix].[#####]
+ :param prefix: Naming series prefix gotten from Stock Settings
+ :return: The derived key. If no prefix is given, an empty string is returned
+ """
+ if not unicode(prefix):
+ return ''
+ else:
+ return prefix.upper() + '.#####'
+
+
+def get_batch_naming_series():
+ """
+ Get naming series key for a Batch.
+
+ Naming series key is in the format [prefix].[#####]
+ :return: The naming series or empty string if not available
+ """
+ series = ''
+ if batch_uses_naming_series():
+ prefix = _get_batch_prefix()
+ key = _make_naming_series_key(prefix)
+ series = key
+
+ return series
+
+
class Batch(Document):
def autoname(self):
"""Generate random ID for batch if not specified"""
if not self.batch_id:
if frappe.db.get_value('Item', self.item, 'create_new_batch'):
- use_naming_series = frappe.db.get_single_value('Stock Settings', 'use_naming_series')
- if use_naming_series:
- self.batch_id = get_name_from_naming_series()
+ if batch_uses_naming_series():
+ self.batch_id = self.get_name_from_naming_series()
else:
self.batch_id = get_name_from_hash()
else:
@@ -50,13 +99,39 @@
def onload(self):
self.image = frappe.db.get_value('Item', self.item, 'image')
+ def after_delete(self):
+ revert_series_if_last(get_batch_naming_series(), self.name)
+
def validate(self):
self.item_has_batch_enabled()
def item_has_batch_enabled(self):
- if frappe.db.get_value("Item",self.item,"has_batch_no") == 0:
+ if frappe.db.get_value("Item", self.item, "has_batch_no") == 0:
frappe.throw(_("The selected item cannot have Batch"))
+ def before_save(self):
+ has_expiry_date, shelf_life_in_days = frappe.db.get_value('Item', self.item, ['has_expiry_date', 'shelf_life_in_days'])
+ if not self.expiry_date and has_expiry_date and shelf_life_in_days:
+ self.expiry_date = add_days(self.manufacturing_date, shelf_life_in_days)
+
+ if has_expiry_date and not self.expiry_date:
+ frappe.throw(_('Expiry date is mandatory for selected item'))
+ frappe.msgprint(_('Set items shelf life in days, to set expiry based on manufacturing_date plus self life'))
+
+ def get_name_from_naming_series(self):
+ """
+ Get a name generated for a Batch from the Batch's naming series.
+ :return: The string that was generated.
+ """
+ naming_series_prefix = _get_batch_prefix()
+ # validate_template(naming_series_prefix)
+ naming_series_prefix = render_template(str(naming_series_prefix), self.__dict__)
+ key = _make_naming_series_key(naming_series_prefix)
+ name = make_autoname(key)
+
+ return name
+
+
@frappe.whitelist()
def get_batch_qty(batch_no=None, warehouse=None, item_code=None):
"""Returns batch actual qty if warehouse is passed,
@@ -67,7 +142,7 @@
:param batch_no: Optional - give qty for this batch no
:param warehouse: Optional - give qty for this warehouse
:param item_code: Optional - give qty for this item"""
- frappe.has_permission('Batch', throw=True)
+
out = 0
if batch_no and warehouse:
out = float(frappe.db.sql("""select sum(actual_qty)
@@ -89,16 +164,18 @@
return out
+
@frappe.whitelist()
def get_batches_by_oldest(item_code, warehouse):
"""Returns the oldest batch and qty for the given item_code and warehouse"""
- batches = get_batch_qty(item_code = item_code, warehouse = warehouse)
+ batches = get_batch_qty(item_code=item_code, warehouse=warehouse)
batches_dates = [[batch, frappe.get_value('Batch', batch.batch_no, 'expiry_date')] for batch in batches]
batches_dates.sort(key=lambda tup: tup[1])
return batches_dates
+
@frappe.whitelist()
-def split_batch(batch_no, item_code, warehouse, qty, new_batch_id = None):
+def split_batch(batch_no, item_code, warehouse, qty, new_batch_id=None):
"""Split the batch into a new batch"""
batch = frappe.get_doc(dict(doctype='Batch', item=item_code, batch_id=new_batch_id)).insert()
stock_entry = frappe.get_doc(dict(
@@ -106,16 +183,16 @@
purpose='Repack',
items=[
dict(
- item_code = item_code,
- qty = float(qty or 0),
- s_warehouse = warehouse,
- batch_no = batch_no
+ item_code=item_code,
+ qty=float(qty or 0),
+ s_warehouse=warehouse,
+ batch_no=batch_no
),
dict(
- item_code = item_code,
- qty = float(qty or 0),
- t_warehouse = warehouse,
- batch_no = batch.name
+ item_code=item_code,
+ qty=float(qty or 0),
+ t_warehouse=warehouse,
+ batch_no=batch.name
),
]
))
@@ -124,7 +201,8 @@
return batch.name
-def set_batch_nos(doc, warehouse_field, throw = False):
+
+def set_batch_nos(doc, warehouse_field, throw=False):
"""Automatically select `batch_no` for outgoing items in item table"""
for d in doc.items:
qty = d.get('stock_qty') or d.get('transfer_qty') or d.get('qty') or 0
@@ -135,8 +213,10 @@
d.batch_no = get_batch_no(d.item_code, warehouse, qty, throw)
else:
batch_qty = get_batch_qty(batch_no=d.batch_no, warehouse=warehouse)
- if flt(batch_qty) < flt(qty):
- frappe.throw(_("Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches").format(d.idx, d.batch_no, batch_qty, d.qty))
+ if flt(batch_qty, d.precision("qty")) < flt(qty, d.precision("qty")):
+ frappe.throw(_("Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches").format(d.idx, d.batch_no, batch_qty, qty))
+
+
@frappe.whitelist()
def get_batch_no(item_code, warehouse, qty=1, throw=False):
diff --git a/erpnext/stock/doctype/batch/batch_list.js b/erpnext/stock/doctype/batch/batch_list.js
index 2138fa1..7ee81aa 100644
--- a/erpnext/stock/doctype/batch/batch_list.js
+++ b/erpnext/stock/doctype/batch/batch_list.js
@@ -1,7 +1,7 @@
frappe.listview_settings['Batch'] = {
add_fields: ["item", "expiry_date"],
get_indicator: function(doc) {
- if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) {
+ if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date, frappe.datetime.nowdate()) <= 0) {
return [__("Expired"), "red", "expiry_date,>=,Today"]
} else if(doc.expiry_date) {
return [__("Not Expired"), "green", "expiry_date,<,Today"]
diff --git a/erpnext/stock/doctype/batch/test_batch.py b/erpnext/stock/doctype/batch/test_batch.py
index a327b2d..9538781 100644
--- a/erpnext/stock/doctype/batch/test_batch.py
+++ b/erpnext/stock/doctype/batch/test_batch.py
@@ -7,6 +7,8 @@
import unittest
from erpnext.stock.doctype.batch.batch import get_batch_qty, UnableToSelectBatchError, get_batch_no
+from frappe.utils import cint
+
class TestBatch(unittest.TestCase):
@@ -21,7 +23,7 @@
def make_batch_item(cls, item_name):
from erpnext.stock.doctype.item.test_item import make_item
if not frappe.db.exists(item_name):
- make_item(item_name, dict(has_batch_no = 1, create_new_batch = 1))
+ return make_item(item_name, dict(has_batch_no = 1, create_new_batch = 1))
def test_purchase_receipt(self, batch_qty = 100):
'''Test automated batch creation from Purchase Receipt'''
@@ -192,3 +194,37 @@
]
)).insert()
stock_entry.submit()
+
+ def test_batch_name_with_naming_series(self):
+ stock_settings = frappe.get_single('Stock Settings')
+ use_naming_series = cint(stock_settings.use_naming_series)
+
+ if not use_naming_series:
+ frappe.set_value('Stock Settings', 'Stock Settings', 'use_naming_series', 1)
+
+ batch = self.make_new_batch('_Test Stock Item For Batch Test1')
+ batch_name = batch.name
+
+ self.assertTrue(batch_name.startswith('BATCH-'))
+
+ batch.delete()
+ batch = self.make_new_batch('_Test Stock Item For Batch Test2')
+
+ self.assertEqual(batch_name, batch.name)
+
+ # reset Stock Settings
+ if not use_naming_series:
+ frappe.set_value('Stock Settings', 'Stock Settings', 'use_naming_series', 0)
+
+ def make_new_batch(self, item_name, batch_id=None, do_not_insert=0):
+ batch = frappe.new_doc('Batch')
+ item = self.make_batch_item(item_name)
+ batch.item = item.name
+
+ if batch_id:
+ batch.batch_id = batch_id
+
+ if not do_not_insert:
+ batch.insert()
+
+ return batch
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index fd34423..430d9fb 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -15,9 +15,6 @@
self.validate_mandatory()
self.set_projected_qty()
- def on_update(self):
- update_item_projected_qty(self.item_code)
-
def validate_mandatory(self):
qf = ['actual_qty', 'reserved_qty', 'ordered_qty', 'indented_qty']
for f in qf:
@@ -130,11 +127,5 @@
self.set_projected_qty()
self.db_set('projected_qty', self.projected_qty)
-def update_item_projected_qty(item_code):
- '''Set total_projected_qty in Item as sum of projected qty in all warehouses'''
- frappe.db.sql('''update tabItem set
- total_projected_qty = ifnull((select sum(projected_qty) from tabBin where item_code=%s), 0)
- where name=%s''', (item_code, item_code))
-
def on_doctype_update():
frappe.db.add_index("Bin", ["item_code", "warehouse"])
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index b81154e..0463941 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -404,73 +404,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "po_no",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer's Purchase Order No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "po_no",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "print_width": "100px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "100px"
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.po_no",
- "fieldname": "po_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer's Purchase Order Date",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "po_date",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "print_width": "100px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "100px"
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "is_return",
"fieldtype": "Check",
"hidden": 0,
@@ -532,6 +465,133 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
+ "collapsible_depends_on": "po_no",
+ "columns": 0,
+ "fieldname": "customer_po_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer PO Details",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "po_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer's Purchase Order No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "po_no",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "print_width": "100px",
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "100px"
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_17",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.po_no",
+ "fieldname": "po_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer's Purchase Order Date",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "po_date",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "print_width": "100px",
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "100px"
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
"columns": 0,
"depends_on": "customer",
"fieldname": "contact_info",
@@ -3730,7 +3790,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2018-01-11 14:40:21.152015",
+ "modified": "2018-01-12 15:27:44.471335",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index dd00398..65f384f 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -235,13 +235,22 @@
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
+ extra_amount = 0
validate_against_credit_limit = False
- for d in self.get("items"):
- if not (d.against_sales_order or d.against_sales_invoice):
- validate_against_credit_limit = True
- break
+ bypass_credit_limit_check_at_sales_order = cint(frappe.db.get_value("Customer", self.customer,
+ "bypass_credit_limit_check_at_sales_order"))
+ if bypass_credit_limit_check_at_sales_order:
+ validate_against_credit_limit = True
+ extra_amount = self.base_grand_total
+ else:
+ for d in self.get("items"):
+ if not (d.against_sales_order or d.against_sales_invoice):
+ validate_against_credit_limit = True
+ break
+
if validate_against_credit_limit:
- check_credit_limit(self.customer, self.company)
+ check_credit_limit(self.customer, self.company,
+ bypass_credit_limit_check_at_sales_order, extra_amount)
def validate_packed_qty(self):
"""
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index b5de330..7599cd2 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -87,8 +87,7 @@
def get_delivery_notes(customer):
return frappe.db.get_all("Delivery Note", filters={
'customer': customer,
- 'docstatus': 1,
- 'status': ('!=', 'Completed')
+ 'docstatus': 1
})
@frappe.whitelist()
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index a362c51..ea705cb 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -106,6 +106,13 @@
frappe.set_route("Form", "Item Variant Settings");
}, __("View"));
}
+
+ const stock_exists = (frm.doc.__onload
+ && frm.doc.__onload.stock_exists) ? 1 : 0;
+
+ ['is_stock_item', 'has_serial_no', 'has_batch_no'].forEach((fieldname) => {
+ frm.set_df_property(fieldname, 'read_only', stock_exists);
+ });
},
validate: function(frm){
@@ -310,11 +317,6 @@
show_multiple_variants_dialog: function(frm) {
var me = this;
- if(me.multiple_variant_dialog) {
- me.multiple_variant_dialog.show();
- return;
- }
-
let promises = [];
let attr_val_fields = {};
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 68b0da6..04f9df3 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,27 +1,713 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:item_code",
- "beta": 0,
- "creation": "2013-05-03 10:45:46",
- "custom": 0,
- "default_print_format": "",
- "description": "A Product or a Service that is bought, sold or kept in stock.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:item_code",
+ "beta": 0,
+ "creation": "2013-05-03 10:45:46",
+ "custom": 0,
+ "default_print_format": "",
+ "description": "A Product or a Service that is bought, sold or kept in stock.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "name_and_description_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-flag",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Series",
+ "length": 0,
+ "no_copy": 0,
+ "options": "ITEM-",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 1,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "item_code",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Code",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "variant_of",
+ "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
+ "fieldname": "variant_of",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Variant Of",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 1,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Name",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_name",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 1,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "barcode",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Barcode",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Item Group",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_group",
+ "oldfieldtype": "Link",
+ "options": "Item Group",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "is_item_from_hub",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Item from Hub",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Unit of Measure",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Link",
+ "options": "UOM",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "disabled",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Disabled",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "description": "",
+ "fieldname": "is_stock_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Maintain Stock",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "is_stock_item",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
+ "fieldname": "opening_stock",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Opening Stock",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "valuation_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Valuation Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.__islocal",
+ "fieldname": "standard_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Standard Selling Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "is_fixed_asset",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Fixed Asset",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 1,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_fixed_asset",
+ "fieldname": "asset_category",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Asset Category",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Asset Category",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "description": "",
+ "fieldname": "tolerance",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Allow over delivery or receipt upto this percent",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "tolerance",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "image",
+ "fieldtype": "Attach Image",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Image",
+ "length": 0,
+ "no_copy": 0,
+ "options": "image",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "section_break_11",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Description",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "brand",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Brand",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "brand",
+ "oldfieldtype": "Link",
+ "options": "Brand",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "description",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Description",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "description",
+ "oldfieldtype": "Text",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "name_and_description_section",
+ "fieldname": "sb_barcodes",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -30,382 +716,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-flag",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Series",
- "length": 0,
- "no_copy": 0,
- "options": "ITEM-",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "item_code",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Item Code",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_code",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "variant_of",
- "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
- "fieldname": "variant_of",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 1,
- "label": "Variant Of",
- "length": 0,
- "no_copy": 0,
- "options": "Item",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "item_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Item Name",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_name",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "barcode",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Barcode",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "item_group",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Item Group",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_group",
- "oldfieldtype": "Link",
- "options": "Item Group",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "is_item_from_hub",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Is Item from Hub",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Unit of Measure",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "stock_uom",
- "oldfieldtype": "Link",
- "options": "UOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "disabled",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Disabled",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "description": "",
- "fieldname": "is_stock_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Maintain Stock",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "is_stock_item",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
- "fieldname": "opening_stock",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Opening Stock",
+ "label": "Barcodes",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -426,9 +737,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "valuation_rate",
- "fieldtype": "Currency",
+ "fieldname": "barcodes",
+ "fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -436,9 +746,10 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Valuation Rate",
+ "label": "Barcodes",
"length": 0,
"no_copy": 0,
+ "options": "Item Barcode",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -452,3213 +763,2963 @@
"unique": 0
},
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.__islocal",
- "fieldname": "standard_rate",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Standard Selling Rate",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "is_stock_item",
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "inventory",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inventory",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-truck",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "is_fixed_asset",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Is Fixed Asset",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "default_warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "default_warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_fixed_asset",
- "fieldname": "asset_category",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Asset Category",
- "length": 0,
- "no_copy": 0,
- "options": "Asset Category",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "shelf_life_in_days",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Shelf Life In Days",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.__islocal",
- "description": "",
- "fieldname": "tolerance",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Allow over delivery or receipt upto this percent",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "tolerance",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "2099-12-31",
+ "depends_on": "is_stock_item",
+ "fieldname": "end_of_life",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "End of Life",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "end_of_life",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "image",
- "fieldtype": "Attach Image",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Image",
- "length": 0,
- "no_copy": 0,
- "options": "image",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "Purchase",
+ "fieldname": "default_material_request_type",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Material Request Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "section_break_11",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "brand",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Brand",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "brand",
- "oldfieldtype": "Link",
- "options": "Brand",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "description",
- "oldfieldtype": "Text",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "is_stock_item",
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "inventory",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Inventory",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-truck",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "default_warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Warehouse",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "default_warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "shelf_life_in_days",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Shelf Life In Days",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "2099-12-31",
- "depends_on": "is_stock_item",
- "fieldname": "end_of_life",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "End of Life",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "end_of_life",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Purchase",
- "fieldname": "default_material_request_type",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Material Request Type",
- "length": 0,
- "no_copy": 0,
- "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "valuation_method",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Valuation Method",
- "length": 0,
- "no_copy": 0,
- "options": "\nFIFO\nMoving Average",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "valuation_method",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Valuation Method",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nFIFO\nMoving Average",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 1,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "warranty_period",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Warranty Period (in days)",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "warranty_period",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "warranty_period",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Warranty Period (in days)",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "warranty_period",
+ "oldfieldtype": "Data",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "weight_per_unit",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Weight Per Unit",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "weight_per_unit",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Weight Per Unit",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "weight_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Weight UOM",
- "length": 0,
- "no_copy": 0,
- "options": "UOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "weight_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Weight UOM",
+ "length": 0,
+ "no_copy": 0,
+ "options": "UOM",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "reorder_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Auto re-order",
- "length": 0,
- "no_copy": 0,
- "options": "fa fa-rss",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "reorder_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Auto re-order",
+ "length": 0,
+ "no_copy": 0,
+ "options": "fa fa-rss",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Will also apply for variants unless overrridden",
- "fieldname": "reorder_levels",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Reorder level based on Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Item Reorder",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Will also apply for variants unless overrridden",
+ "fieldname": "reorder_levels",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Reorder level based on Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Reorder",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "",
- "fieldname": "unit_of_measure_conversion",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Units of Measure",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "unit_of_measure_conversion",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Units of Measure",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Will also apply for variants",
- "fieldname": "uoms",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "UOMs",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "uom_conversion_details",
- "oldfieldtype": "Table",
- "options": "UOM Conversion Detail",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Will also apply for variants",
+ "fieldname": "uoms",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "UOMs",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "uom_conversion_details",
+ "oldfieldtype": "Table",
+ "options": "UOM Conversion Detail",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no",
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "serial_nos_and_batches",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Serial Nos and Batches",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no",
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "serial_nos_and_batches",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Serial Nos and Batches",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "has_batch_no",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Has Batch No",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "has_batch_no",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "has_batch_no",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Batch No",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "has_batch_no",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "has_batch_no",
- "description": "",
- "fieldname": "create_new_batch",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Automatically Create New Batch",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "has_batch_no",
+ "description": "",
+ "fieldname": "create_new_batch",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Automatically Create New Batch",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "has_batch_no",
- "fieldname": "has_expiry_date",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Has Expiry Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "has_batch_no",
+ "fieldname": "has_expiry_date",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Expiry Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "has_batch_no",
- "fieldname": "retain_sample",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Retain Sample",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "has_batch_no",
+ "fieldname": "retain_sample",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Retain Sample",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: (doc.retain_sample && doc.has_batch_no)",
- "description": "Maximum sample quantity that can be retained",
- "fieldname": "sample_quantity",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Max Sample Quantity",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: (doc.retain_sample && doc.has_batch_no)",
+ "description": "Maximum sample quantity that can be retained",
+ "fieldname": "sample_quantity",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Max Sample Quantity",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_37",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_37",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "depends_on": "eval:doc.is_stock_item",
- "description": "",
- "fieldname": "has_serial_no",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Has Serial No",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "has_serial_no",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "depends_on": "eval:doc.is_stock_item",
+ "description": "",
+ "fieldname": "has_serial_no",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Serial No",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "has_serial_no",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "has_serial_no",
- "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
- "fieldname": "serial_no_series",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Serial Number Series",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "has_serial_no",
+ "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
+ "fieldname": "serial_no_series",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Serial Number Series",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "attributes",
- "columns": 0,
- "depends_on": "",
- "fieldname": "variants_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Variants",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "attributes",
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "variants_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Variants",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "depends_on": "eval:!doc.variant_of",
- "description": "If this item has variants, then it cannot be selected in sales orders etc.",
- "fieldname": "has_variants",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Has Variants",
- "length": 0,
- "no_copy": 1,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "depends_on": "eval:!doc.variant_of",
+ "description": "If this item has variants, then it cannot be selected in sales orders etc.",
+ "fieldname": "has_variants",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Variants",
+ "length": 0,
+ "no_copy": 1,
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Item Attribute",
- "depends_on": "has_variants",
- "fieldname": "variant_based_on",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Variant Based On",
- "length": 0,
- "no_copy": 0,
- "options": "Item Attribute\nManufacturer",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 1,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "Item Attribute",
+ "depends_on": "has_variants",
+ "fieldname": "variant_based_on",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Variant Based On",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Attribute\nManufacturer",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 1,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(doc.has_variants || doc.variant_of) && doc.variant_based_on==='Item Attribute'",
- "fieldname": "attributes",
- "fieldtype": "Table",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Attributes",
- "length": 0,
- "no_copy": 1,
- "options": "Item Variant Attribute",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.has_variants || doc.variant_of) && doc.variant_based_on==='Item Attribute'",
+ "fieldname": "attributes",
+ "fieldtype": "Table",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Attributes",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Item Variant Attribute",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "purchase_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Purchase Details",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-shopping-cart",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "purchase_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Purchase Details",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-shopping-cart",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "fieldname": "is_purchase_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Is Purchase Item",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "is_purchase_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Purchase Item",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "purchase_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Purchase Unit of Measure",
- "length": 0,
- "no_copy": 0,
- "options": "UOM",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "purchase_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Purchase Unit of Measure",
+ "length": 0,
+ "no_copy": 0,
+ "options": "UOM",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0.00",
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "min_order_qty",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Minimum Order Qty",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "min_order_qty",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0.00",
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "min_order_qty",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Minimum Order Qty",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "min_order_qty",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "safety_stock",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Safety Stock",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "safety_stock",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Safety Stock",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "purchase_details_cb",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "purchase_details_cb",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Average time taken by the supplier to deliver",
- "fieldname": "lead_time_days",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Lead Time in days",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "lead_time_days",
- "oldfieldtype": "Int",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Average time taken by the supplier to deliver",
+ "fieldname": "lead_time_days",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Lead Time in days",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "lead_time_days",
+ "oldfieldtype": "Int",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "buying_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Buying Cost Center",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "cost_center",
- "oldfieldtype": "Link",
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "buying_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Buying Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "cost_center",
+ "oldfieldtype": "Link",
+ "options": "Cost Center",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Expense Account",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "purchase_account",
- "oldfieldtype": "Link",
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Expense Account",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "purchase_account",
+ "oldfieldtype": "Link",
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "last_purchase_rate",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Last Purchase Rate",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "last_purchase_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "last_purchase_rate",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Last Purchase Rate",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "last_purchase_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "",
- "fieldname": "supplier_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Supplier Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "supplier_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supplier Details",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "default_supplier",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Supplier",
- "length": 0,
- "no_copy": 0,
- "options": "Supplier",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "default_supplier",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Supplier",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Supplier",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "delivered_by_supplier",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Delivered by Supplier (Drop Ship)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "delivered_by_supplier",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Delivered by Supplier (Drop Ship)",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "manufacturer",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Manufacturer",
- "length": 0,
- "no_copy": 0,
- "options": "Manufacturer",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "manufacturer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturer",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Manufacturer",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "manufacturer_part_no",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Manufacturer Part Number",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "manufacturer_part_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturer Part Number",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Item Code for Suppliers",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Code for Suppliers",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "supplier_items",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Supplier Items",
- "length": 0,
- "no_copy": 0,
- "options": "Item Supplier",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "supplier_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supplier Items",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Supplier",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "foreign_trade_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Foreign Trade Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "foreign_trade_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Foreign Trade Details",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "country_of_origin",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Country of Origin",
- "length": 0,
- "no_copy": 0,
- "options": "Country",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "country_of_origin",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Country of Origin",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Country",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_59",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_59",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "customs_tariff_number",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customs Tariff Number",
- "length": 0,
- "no_copy": 0,
- "options": "Customs Tariff Number",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "customs_tariff_number",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customs Tariff Number",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Customs Tariff Number",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "sales_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Details",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-tag",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "sales_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Sales Details",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-tag",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "fieldname": "is_sales_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Is Sales Item",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "is_sales_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Sales Item",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sales_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Sales Unit of Measure",
- "length": 0,
- "no_copy": 0,
- "options": "UOM",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "sales_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Sales Unit of Measure",
+ "length": 0,
+ "no_copy": 0,
+ "options": "UOM",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "income_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Income Account",
- "length": 0,
- "no_copy": 0,
- "options": "Account",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "income_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Income Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Account",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "selling_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Selling Cost Center",
- "length": 0,
- "no_copy": 0,
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "selling_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Selling Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Cost Center",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Item Codes",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Item Codes",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "customer_items",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Items",
- "length": 0,
- "no_copy": 0,
- "options": "Item Customer Detail",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "customer_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Items",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Customer Detail",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "max_discount",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Max Discount (%)",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "max_discount",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "max_discount",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Max Discount (%)",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "max_discount",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "item_tax_section_break",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Item Tax",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-money",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "item_tax_section_break",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Tax",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-money",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Will also apply for variants",
- "fieldname": "taxes",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Taxes",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_tax",
- "oldfieldtype": "Table",
- "options": "Item Tax",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Will also apply for variants",
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Taxes",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_tax",
+ "oldfieldtype": "Table",
+ "options": "Item Tax",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "inspection_criteria",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Inspection Criteria",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-search",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "inspection_criteria",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Criteria",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-search",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "fieldname": "inspection_required_before_purchase",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Inspection Required before Purchase",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "inspection_required",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "fieldname": "inspection_required_before_purchase",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Required before Purchase",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "inspection_required",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "inspection_required_before_delivery",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Inspection Required before Delivery",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "inspection_required_before_delivery",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Required before Delivery",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
- "description": "Will also apply to variants",
- "fieldname": "quality_parameters",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Quality Parameters",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_specification_details",
- "oldfieldtype": "Table",
- "options": "Item Quality Inspection Parameter",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
+ "description": "Will also apply to variants",
+ "fieldname": "quality_parameters",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Quality Parameters",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_specification_details",
+ "oldfieldtype": "Table",
+ "options": "Item Quality Inspection Parameter",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "manufacturing",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Manufacturing",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-cogs",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "manufacturing",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturing",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-cogs",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "default_bom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default BOM",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "default_bom",
- "oldfieldtype": "Link",
- "options": "BOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "default_bom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default BOM",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "default_bom",
+ "oldfieldtype": "Link",
+ "options": "BOM",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "description": "If subcontracted to a vendor",
- "fieldname": "is_sub_contracted_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Supply Raw Materials for Purchase",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "is_sub_contracted_item",
- "oldfieldtype": "Select",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "description": "If subcontracted to a vendor",
+ "fieldname": "is_sub_contracted_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supply Raw Materials for Purchase",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "is_sub_contracted_item",
+ "oldfieldtype": "Select",
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_74",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_74",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "customer_code",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Customer Code",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "customer_code",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Code",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "website_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website",
- "length": 0,
- "no_copy": 0,
- "options": "fa fa-globe",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "website_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website",
+ "length": 0,
+ "no_copy": 0,
+ "options": "fa fa-globe",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:!doc.variant_of",
- "fieldname": "show_in_website",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Show in Website",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.variant_of",
+ "fieldname": "show_in_website",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Show in Website",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "variant_of",
- "fieldname": "show_variant_in_website",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Show in Website (Variant)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "variant_of",
+ "fieldname": "show_variant_in_website",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Show in Website (Variant)",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "fieldname": "route",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Route",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "fieldname": "route",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Route",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "description": "Items with higher weightage will be shown higher",
- "fieldname": "weightage",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Weightage",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "description": "Items with higher weightage will be shown higher",
+ "fieldname": "weightage",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Weightage",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 1,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "description": "Show a slideshow at the top of the page",
- "fieldname": "slideshow",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Slideshow",
- "length": 0,
- "no_copy": 0,
- "options": "Website Slideshow",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "description": "Show a slideshow at the top of the page",
+ "fieldname": "slideshow",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Slideshow",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Website Slideshow",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "description": "Item Image (if not slideshow)",
- "fieldname": "website_image",
- "fieldtype": "Attach",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Image",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "description": "Item Image (if not slideshow)",
+ "fieldname": "website_image",
+ "fieldtype": "Attach",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Image",
+ "length": 0,
+ "no_copy": 0,
+ "options": "",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "thumbnail",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Thumbnail",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "thumbnail",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Thumbnail",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cb72",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "cb72",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
- "fieldname": "website_warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Warehouse",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
+ "fieldname": "website_warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Warehouse",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "description": "List this Item in multiple groups on the website.",
- "fieldname": "website_item_groups",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Item Groups",
- "length": 0,
- "no_copy": 0,
- "options": "Website Item Group",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "description": "List this Item in multiple groups on the website.",
+ "fieldname": "website_item_groups",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Item Groups",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Website Item Group",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "website_specifications",
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "fieldname": "sb72",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Specifications",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "website_specifications",
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "fieldname": "sb72",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Specifications",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "fieldname": "copy_from_item_group",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Copy From Item Group",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "fieldname": "copy_from_item_group",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Copy From Item Group",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "fieldname": "website_specifications",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Specifications",
- "length": 0,
- "no_copy": 0,
- "options": "Item Website Specification",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "fieldname": "website_specifications",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Specifications",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Website Specification",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
- "fieldname": "web_long_description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Website Description",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+ "fieldname": "web_long_description",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Description",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "total_projected_qty",
- "fieldtype": "Float",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Total Projected Qty",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "total_projected_qty",
+ "fieldtype": "Float",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Total Projected Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(!doc.is_item_from_hub)",
- "fieldname": "hub_publishing_sb",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Hub Publishing Details",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(!doc.is_item_from_hub)",
+ "fieldname": "hub_publishing_sb",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Hub Publishing Details",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "description": "Publish Item to hub.erpnext.com",
- "fieldname": "publish_in_hub",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Publish in Hub",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "description": "Publish Item to hub.erpnext.com",
+ "fieldname": "publish_in_hub",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Publish in Hub",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "hub_category_to_publish",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Hub Category to Publish",
- "length": 0,
- "no_copy": 0,
- "options": "Hub Category",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "hub_category_to_publish",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Hub Category to Publish",
+ "length": 0,
+ "no_copy": 0,
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.",
- "fieldname": "hub_warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Hub Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Warehouse",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.",
+ "fieldname": "hub_warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Hub Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Warehouse",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fieldname": "synced_with_hub",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Synced With Hub",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "fieldname": "synced_with_hub",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Synced With Hub",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-tag",
- "idx": 2,
- "image_field": "image",
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 1,
- "modified": "2018-01-08 21:53:55.895525",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Item",
- "owner": "Administrator",
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-tag",
+ "idx": 2,
+ "image_field": "image",
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 1,
+ "modified": "2018-02-12 15:42:23.303090",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Item Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Item Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock Manager",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Sales User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Sales User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Purchase User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Purchase User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Maintenance User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Maintenance User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Accounts User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Accounts User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Manufacturing User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Manufacturing User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
}
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "item_name,description,item_group,customer_code",
- "show_name_in_global_search": 1,
- "sort_field": "idx desc, modified desc",
- "sort_order": "DESC",
- "title_field": "item_name",
- "track_changes": 1,
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "item_name,description,item_group,customer_code",
+ "show_name_in_global_search": 1,
+ "sort_field": "idx desc, modified desc",
+ "sort_order": "DESC",
+ "title_field": "item_name",
+ "track_changes": 1,
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index df90ad9..9758b93 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -2,30 +2,40 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-import frappe
-import erpnext
-import json
-import itertools
-from frappe import msgprint, _
-from frappe.utils import (cstr, flt, cint, getdate, now_datetime, formatdate,
- strip, get_timestamp, random_string)
-from frappe.utils.html_utils import clean_html
-from frappe.website.website_generator import WebsiteGenerator
-from erpnext.setup.doctype.item_group.item_group import invalidate_cache_for, get_parent_item_groups
-from frappe.website.render import clear_cache
-from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
-from erpnext.controllers.item_variant import (get_variant, copy_attributes_to_variant,
- make_variant_item_code, validate_item_variant_attributes, ItemVariantExistsError)
-class DuplicateReorderRows(frappe.ValidationError): pass
-class StockExistsForTemplate(frappe.ValidationError): pass
+import itertools
+import json
+import erpnext
+import frappe
+from erpnext.controllers.item_variant import (ItemVariantExistsError,
+ copy_attributes_to_variant, get_variant, make_variant_item_code, validate_item_variant_attributes)
+from erpnext.setup.doctype.item_group.item_group import (get_parent_item_groups, invalidate_cache_for)
+from frappe import _, msgprint
+from frappe.utils import (cint, cstr, flt, formatdate, get_timestamp, getdate,
+ now_datetime, random_string, strip)
+from frappe.utils.html_utils import clean_html
+from frappe.website.doctype.website_slideshow.website_slideshow import \
+ get_slideshow
+from frappe.website.render import clear_cache
+from frappe.website.website_generator import WebsiteGenerator
+
+from six import iteritems
+
+
+class DuplicateReorderRows(frappe.ValidationError):
+ pass
+
+
+class StockExistsForTemplate(frappe.ValidationError):
+ pass
+
class Item(WebsiteGenerator):
website = frappe._dict(
- page_title_field = "item_name",
- condition_field = "show_in_website",
- template = "templates/generators/item.html",
- no_cache = 1
+ page_title_field="item_name",
+ condition_field="show_in_website",
+ template="templates/generators/item.html",
+ no_cache=1
)
def onload(self):
@@ -37,14 +47,14 @@
self.set_onload("asset_exists", True if asset else False)
def autoname(self):
- if frappe.db.get_default("item_naming_by")=="Naming Series":
+ if frappe.db.get_default("item_naming_by") == "Naming Series":
if self.variant_of:
if not self.item_code:
template_item_name = frappe.db.get_value("Item", self.variant_of, "item_name")
self.item_code = make_variant_item_code(self.variant_of, template_item_name, self)
else:
from frappe.model.naming import make_autoname
- self.item_code = make_autoname(self.naming_series+'.#####')
+ self.item_code = make_autoname(self.naming_series + '.#####')
elif not self.item_code:
msgprint(_("Item Code is mandatory because Item is not automatically numbered"), raise_exception=1)
@@ -102,8 +112,8 @@
if not self.get("__islocal"):
self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")
self.old_website_item_groups = frappe.db.sql_list("""select item_group
- from `tabWebsite Item Group`
- where parentfield='website_item_groups' and parenttype='Item' and parent=%s""", self.name)
+ from `tabWebsite Item Group`
+ where parentfield='website_item_groups' and parenttype='Item' and parent=%s""", self.name)
def on_update(self):
invalidate_cache_for_item(self)
@@ -121,7 +131,7 @@
'''Add a new price'''
if not price_list:
price_list = (frappe.db.get_single_value('Selling Settings', 'selling_price_list')
- or frappe.db.get_value('Price List', _('Standard Selling')))
+ or frappe.db.get_value('Price List', _('Standard Selling')))
if price_list:
item_price = frappe.get_doc({
"doctype": "Item Price",
@@ -147,19 +157,19 @@
# default warehouse, or Stores
default_warehouse = (self.default_warehouse
- or frappe.db.get_single_value('Stock Settings', 'default_warehouse')
- or frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')}))
+ or frappe.db.get_single_value('Stock Settings', 'default_warehouse')
+ or frappe.db.get_value('Warehouse', {'warehouse_name': _('Stores')}))
if default_warehouse:
stock_entry = make_stock_entry(item_code=self.name, target=default_warehouse,
- qty=self.opening_stock, rate=self.valuation_rate)
+ qty=self.opening_stock, rate=self.valuation_rate)
stock_entry.add_comment("Comment", _("Opening Stock"))
def make_route(self):
if not self.route:
return cstr(frappe.db.get_value('Item Group', self.item_group,
- 'route')) + '/' + self.scrub((self.item_name if self.item_name else self.item_code) + '-' + random_string(5))
+ 'route')) + '/' + self.scrub((self.item_name if self.item_name else self.item_code) + '-' + random_string(5))
def validate_website_image(self):
"""Validate if the website image is a public file"""
@@ -176,14 +186,13 @@
"file_url": self.website_image
}, fields=["name", "is_private"], order_by="is_private asc", limit_page_length=1)
-
if file_doc:
file_doc = file_doc[0]
if not file_doc:
if not auto_set_website_image:
frappe.msgprint(_("Website Image {0} attached to Item {1} cannot be found")
- .format(self.website_image, self.name))
+ .format(self.website_image, self.name))
self.website_image = None
@@ -219,7 +228,8 @@
self.website_image = None
except requests.exceptions.SSLError:
- frappe.msgprint(_("Warning: Invalid SSL certificate on attachment {0}").format(self.website_image))
+ frappe.msgprint(
+ _("Warning: Invalid SSL certificate on attachment {0}").format(self.website_image))
self.website_image = None
# for CSV import
@@ -259,12 +269,13 @@
def validate_retain_sample(self):
if self.retain_sample and not frappe.db.get_single_value('Stock Settings', 'sample_retention_warehouse'):
- frappe.throw(_("Please select Sample Retention Warehouse in Stock Settings first"));
+ frappe.throw(_("Please select Sample Retention Warehouse in Stock Settings first"))
if self.retain_sample and not self.has_batch_no:
- frappe.throw(_(" {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item").format(self.item_code))
+ frappe.throw(_(" {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item").format(
+ self.item_code))
def get_context(self, context):
- context.show_search=True
+ context.show_search = True
context.search_link = '/product_search'
context.parents = get_parent_item_groups(self.item_group)
@@ -282,8 +293,8 @@
# load variants
# also used in set_attribute_context
context.variants = frappe.get_all("Item",
- filters={"variant_of": self.name, "show_variant_in_website": 1},
- order_by="name asc")
+ filters={"variant_of": self.name, "show_variant_in_website": 1},
+ order_by="name asc")
variant = frappe.form_dict.variant
if not variant and context.variants:
@@ -294,7 +305,7 @@
context.variant = frappe.get_doc("Item", variant)
for fieldname in ("website_image", "web_long_description", "description",
- "website_specifications"):
+ "website_specifications"):
if context.variant.get(fieldname):
value = context.variant.get(fieldname)
if isinstance(value, list):
@@ -317,14 +328,14 @@
# load attributes
for v in context.variants:
v.attributes = frappe.get_all("Item Variant Attribute",
- fields=["attribute", "attribute_value"], filters={"parent": v.name})
+ fields=["attribute", "attribute_value"], filters={"parent": v.name})
for attr in v.attributes:
values = attribute_values_available.setdefault(attr.attribute, [])
if attr.attribute_value not in values:
values.append(attr.attribute_value)
- if v.name==context.variant.name:
+ if v.name == context.variant.name:
context.selected_attributes[attr.attribute] = attr.attribute_value
# filter attributes, order based on attribute table
@@ -338,7 +349,7 @@
else:
# get list of values defined (for sequence)
for attr_value in frappe.db.get_all("Item Attribute Value",
- fields=["attribute_value"], filters={"parent": attr.attribute}, order_by="idx asc"):
+ fields=["attribute_value"], filters={"parent": attr.attribute}, order_by="idx asc"):
if attr_value.attribute_value in attribute_values_available.get(attr.attribute, []):
values.append(attr_value.attribute_value)
@@ -373,7 +384,7 @@
return True
for i, attr in enumerate(self.attributes):
- if i==0:
+ if i == 0:
continue
combination_source = []
@@ -414,7 +425,7 @@
for d in template.get("reorder_levels"):
n = {}
for k in ("warehouse", "warehouse_reorder_level",
- "warehouse_reorder_qty", "material_request_type"):
+ "warehouse_reorder_qty", "material_request_type"):
n[k] = d.get(k)
self.append("reorder_levels", n)
@@ -422,12 +433,14 @@
check_list = []
for d in self.get('uoms'):
if cstr(d.uom) in check_list:
- frappe.throw(_("Unit of Measure {0} has been entered more than once in Conversion Factor Table").format(d.uom))
+ frappe.throw(
+ _("Unit of Measure {0} has been entered more than once in Conversion Factor Table").format(d.uom))
else:
check_list.append(cstr(d.uom))
if d.uom and cstr(d.uom) == cstr(self.stock_uom) and flt(d.conversion_factor) != 1:
- frappe.throw(_("Conversion factor for default Unit of Measure must be 1 in row {0}").format(d.idx))
+ frappe.throw(
+ _("Conversion factor for default Unit of Measure must be 1 in row {0}").format(d.idx))
def validate_item_type(self):
if self.has_serial_no == 1 and self.is_stock_item == 0:
@@ -436,29 +449,30 @@
if self.has_serial_no == 0 and self.serial_no_series:
self.serial_no_series = None
-
def check_for_active_boms(self):
if self.default_bom:
bom_item = frappe.db.get_value("BOM", self.default_bom, "item")
if bom_item not in (self.name, self.variant_of):
- frappe.throw(_("Default BOM ({0}) must be active for this item or its template").format(bom_item))
+ frappe.throw(
+ _("Default BOM ({0}) must be active for this item or its template").format(bom_item))
def fill_customer_code(self):
""" Append all the customer codes and insert into "customer_code" field of item table """
- cust_code=[]
+ cust_code = []
for d in self.get('customer_items'):
cust_code.append(d.ref_code)
- self.customer_code=','.join(cust_code)
+ self.customer_code = ','.join(cust_code)
def check_item_tax(self):
"""Check whether Tax Rate is not entered twice for same Tax Type"""
- check_list=[]
+ check_list = []
for d in self.get('taxes'):
if d.tax_type:
account_type = frappe.db.get_value("Account", d.tax_type, "account_type")
if account_type not in ['Tax', 'Chargeable', 'Income Account', 'Expense Account']:
- frappe.throw(_("Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable").format(d.idx))
+ frappe.throw(
+ _("Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable").format(d.idx))
else:
if d.tax_type in check_list:
frappe.throw(_("{0} entered twice in Item Tax").format(d.tax_type))
@@ -466,12 +480,20 @@
check_list.append(d.tax_type)
def validate_barcode(self):
- if self.barcode:
- duplicate = frappe.db.sql("""select name from tabItem where barcode = %s
- and name != %s""", (self.barcode, self.name))
- if duplicate:
- frappe.throw(_("Barcode {0} already used in Item {1}").format(self.barcode, duplicate[0][0]))
+ from stdnum import ean
+ if len(self.barcodes) > 0:
+ for item_barcode in self.barcodes:
+ if item_barcode.barcode:
+ duplicate = frappe.db.sql(
+ """select parent from `tabItem Barcode` where barcode = %s and parent != %s""", (item_barcode.barcode, self.name))
+ if duplicate:
+ frappe.throw(_("Barcode {0} already used in Item {1}").format(
+ item_barcode.barcode, duplicate[0][0]))
+ if item_barcode.barcode_type:
+ if not ean.is_valid(item_barcode.barcode):
+ frappe.throw(_("Barcode {0} is not a valid {1} code").format(
+ item_barcode.barcode, item_barcode.barcode_type))
def validate_warehouse_for_reorder(self):
'''Validate Reorder level table for duplicate and conditional mandatory'''
@@ -483,7 +505,7 @@
warehouse += [d.get("warehouse")]
else:
frappe.throw(_("Row {0}: An Reorder entry already exists for this warehouse {1}")
- .format(d.idx, d.warehouse), DuplicateReorderRows)
+ .format(d.idx, d.warehouse), DuplicateReorderRows)
if d.warehouse_reorder_level and not d.warehouse_reorder_qty:
frappe.throw(_("Row #{0}: Please set reorder quantity").format(d.idx))
@@ -497,12 +519,13 @@
def validate_name_with_item_group(self):
# causes problem with tree build
if frappe.db.exists("Item Group", self.name):
- frappe.throw(_("An Item Group exists with same name, please change the item name or rename the item group"))
+ frappe.throw(
+ _("An Item Group exists with same name, please change the item name or rename the item group"))
def update_item_price(self):
frappe.db.sql("""update `tabItem Price` set item_name=%s,
item_description=%s, modified=NOW() where item_code=%s""",
- (self.item_name, self.description, self.name))
+ (self.item_name, self.description, self.name))
def on_trash(self):
super(Item, self).on_trash()
@@ -512,7 +535,7 @@
frappe.delete_doc("Item", variant_of.name)
def before_rename(self, old_name, new_name, merge=False):
- if self.item_name==old_name:
+ if self.item_name == old_name:
frappe.db.set_value("Item", old_name, "item_name", new_name)
if merge:
@@ -524,7 +547,7 @@
new_properties = [cstr(d) for d in frappe.db.get_value("Item", new_name, field_list)]
if new_properties != [cstr(self.get(fld)) for fld in field_list]:
frappe.throw(_("To merge, following properties must be same for both items")
- + ": \n" + ", ".join([self.meta.get_label(fld) for fld in field_list]))
+ + ": \n" + ", ".join([self.meta.get_label(fld) for fld in field_list]))
def after_rename(self, old_name, new_name, merge):
if self.route:
@@ -547,7 +570,7 @@
item_wise_tax_detail.pop(old_name)
frappe.db.set_value(dt, d.name, "item_wise_tax_detail",
- json.dumps(item_wise_tax_detail), update_modified=False)
+ json.dumps(item_wise_tax_detail), update_modified=False)
def set_last_purchase_rate(self, new_name):
last_purchase_rate = get_last_purchase_details(new_name).get("base_rate", 0)
@@ -575,13 +598,14 @@
self.set("website_specifications", [])
if self.item_group:
for label, desc in frappe.db.get_values("Item Website Specification",
- {"parent": self.item_group}, ["label", "description"]):
- row = self.append("website_specifications")
- row.label = label
- row.description = desc
+ {"parent": self.item_group}, ["label", "description"]):
+ row = self.append("website_specifications")
+ row.label = label
+ row.description = desc
def update_bom_item_desc(self):
- if self.is_new(): return
+ if self.is_new():
+ return
if self.db_get('description') != self.description:
frappe.db.sql("""
@@ -620,11 +644,11 @@
def update_variants(self):
if self.flags.dont_update_variants or \
- frappe.db.get_single_value('Item Variant Settings', 'do_not_update_variants'):
+ frappe.db.get_single_value('Item Variant Settings', 'do_not_update_variants'):
return
if self.has_variants:
updated = []
- variants = frappe.db.get_all("Item", fields=["item_code"], filters={"variant_of": self.name })
+ variants = frappe.db.get_all("Item", fields=["item_code"], filters={"variant_of": self.name})
for d in variants:
variant = frappe.get_doc("Item", d)
copy_attributes_to_variant(self, variant)
@@ -641,39 +665,41 @@
def validate_stock_exists_for_template_item(self):
if self.stock_ledger_created() and self._doc_before_save:
if (self._doc_before_save.has_variants != self.has_variants
- or self._doc_before_save.variant_of != self.variant_of):
+ or self._doc_before_save.variant_of != self.variant_of):
frappe.throw(_("Cannot change Variant properties after stock transction. You will have to make a new Item to do this.").format(self.name),
- StockExistsForTemplate)
+ StockExistsForTemplate)
if self.has_variants or self.variant_of:
if not self.is_child_table_same('attributes'):
- frappe.throw(_('Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item'))
+ frappe.throw(
+ _('Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item'))
def validate_uom(self):
if not self.get("__islocal"):
check_stock_uom_with_bin(self.name, self.stock_uom)
if self.has_variants:
- for d in frappe.db.get_all("Item", filters= {"variant_of": self.name}):
+ for d in frappe.db.get_all("Item", filters={"variant_of": self.name}):
check_stock_uom_with_bin(d.name, self.stock_uom)
if self.variant_of:
template_uom = frappe.db.get_value("Item", self.variant_of, "stock_uom")
if template_uom != self.stock_uom:
frappe.throw(_("Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'")
- .format(self.stock_uom, template_uom))
+ .format(self.stock_uom, template_uom))
def validate_attributes(self):
- if (self.has_variants or self.variant_of) and self.variant_based_on=='Item Attribute':
+ if (self.has_variants or self.variant_of) and self.variant_based_on == 'Item Attribute':
attributes = []
if not self.attributes:
frappe.throw(_("Attribute table is mandatory"))
for d in self.attributes:
if d.attribute in attributes:
- frappe.throw(_("Attribute {0} selected multiple times in Attributes Table".format(d.attribute)))
+ frappe.throw(
+ _("Attribute {0} selected multiple times in Attributes Table".format(d.attribute)))
else:
attributes.append(d.attribute)
def validate_variant_attributes(self):
- if self.variant_of and self.variant_based_on=='Item Attribute':
+ if self.variant_of and self.variant_based_on == 'Item Attribute':
args = {}
for d in self.attributes:
if not d.attribute_value:
@@ -683,10 +709,11 @@
variant = get_variant(self.variant_of, args, self.name)
if variant:
frappe.throw(_("Item variant {0} exists with same attributes")
- .format(variant), ItemVariantExistsError)
+ .format(variant), ItemVariantExistsError)
validate_item_variant_attributes(self, args)
+
def get_timeline_data(doctype, name):
'''returns timeline data based on stock ledger entry'''
out = {}
@@ -695,23 +722,25 @@
and posting_date > date_sub(curdate(), interval 1 year)
group by posting_date''', name))
- for date, count in items.iteritems():
+ for date, count in iteritems(items):
timestamp = get_timestamp(date)
- out.update({ timestamp: count })
+ out.update({timestamp: count})
return out
+
def validate_end_of_life(item_code, end_of_life=None, disabled=None, verbose=1):
if (not end_of_life) or (disabled is None):
end_of_life, disabled = frappe.db.get_value("Item", item_code, ["end_of_life", "disabled"])
- if end_of_life and end_of_life!="0000-00-00" and getdate(end_of_life) <= now_datetime().date():
+ if end_of_life and end_of_life != "0000-00-00" and getdate(end_of_life) <= now_datetime().date():
msg = _("Item {0} has reached its end of life on {1}").format(item_code, formatdate(end_of_life))
_msgprint(msg, verbose)
if disabled:
_msgprint(_("Item {0} is disabled").format(item_code), verbose)
+
def validate_is_stock_item(item_code, is_stock_item=None, verbose=1):
if not is_stock_item:
is_stock_item = frappe.db.get_value("Item", item_code, "is_stock_item")
@@ -721,6 +750,7 @@
_msgprint(msg, verbose)
+
def validate_cancelled_item(item_code, docstatus=None, verbose=1):
if docstatus is None:
docstatus = frappe.db.get_value("Item", item_code, "docstatus")
@@ -729,6 +759,7 @@
msg = _("Item {0} is cancelled").format(item_code)
_msgprint(msg, verbose)
+
def _msgprint(msg, verbose):
if verbose:
msgprint(msg, raise_exception=True)
@@ -760,19 +791,19 @@
order by pr.posting_date desc, pr.posting_time desc, pr.name desc
limit 1""", (item_code, cstr(doc_name)), as_dict=1)
- purchase_order_date = getdate(last_purchase_order and last_purchase_order[0].transaction_date \
- or "1900-01-01")
- purchase_receipt_date = getdate(last_purchase_receipt and \
- last_purchase_receipt[0].posting_date or "1900-01-01")
+ purchase_order_date = getdate(last_purchase_order and last_purchase_order[0].transaction_date
+ or "1900-01-01")
+ purchase_receipt_date = getdate(last_purchase_receipt and
+ last_purchase_receipt[0].posting_date or "1900-01-01")
if (purchase_order_date > purchase_receipt_date) or \
- (last_purchase_order and not last_purchase_receipt):
+ (last_purchase_order and not last_purchase_receipt):
# use purchase order
last_purchase = last_purchase_order[0]
purchase_date = purchase_order_date
elif (purchase_receipt_date > purchase_order_date) or \
- (last_purchase_receipt and not last_purchase_order):
+ (last_purchase_receipt and not last_purchase_order):
# use purchase receipt
last_purchase = last_purchase_receipt[0]
purchase_date = purchase_receipt_date
@@ -797,11 +828,12 @@
return out
+
def invalidate_cache_for_item(doc):
invalidate_cache_for(doc, doc.item_group)
website_item_groups = list(set((doc.get("old_website_item_groups") or [])
- + [d.item_group for d in doc.get({"doctype":"Website Item Group"}) if d.item_group]))
+ + [d.item_group for d in doc.get({"doctype": "Website Item Group"}) if d.item_group]))
for item_group in website_item_groups:
invalidate_cache_for(doc, item_group)
@@ -809,13 +841,14 @@
if doc.get("old_item_group") and doc.get("old_item_group") != doc.item_group:
invalidate_cache_for(doc, doc.old_item_group)
+
def check_stock_uom_with_bin(item, stock_uom):
if stock_uom == frappe.db.get_value("Item", item, "stock_uom"):
return
- matched=True
+ matched = True
ref_uom = frappe.db.get_value("Stock Ledger Entry",
- {"item_code": item}, "stock_uom")
+ {"item_code": item}, "stock_uom")
if ref_uom:
if cstr(ref_uom) != cstr(stock_uom):
@@ -823,13 +856,14 @@
else:
bin_list = frappe.db.sql("select * from tabBin where item_code=%s", item, as_dict=1)
for bin in bin_list:
- if (bin.reserved_qty > 0 or bin.ordered_qty > 0 or bin.indented_qty > 0 \
- or bin.planned_qty > 0) and cstr(bin.stock_uom) != cstr(stock_uom):
- matched = False
- break
+ if (bin.reserved_qty > 0 or bin.ordered_qty > 0 or bin.indented_qty > 0
+ or bin.planned_qty > 0) and cstr(bin.stock_uom) != cstr(stock_uom):
+ matched = False
+ break
if matched and bin_list:
frappe.db.sql("""update tabBin set stock_uom=%s where item_code=%s""", (stock_uom, item))
if not matched:
- frappe.throw(_("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.").format(item))
+ frappe.throw(
+ _("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.").format(item))
diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js
index db53ae9..534b341 100644
--- a/erpnext/stock/doctype/item/item_list.js
+++ b/erpnext/stock/doctype/item/item_list.js
@@ -1,6 +1,6 @@
frappe.listview_settings['Item'] = {
add_fields: ["item_name", "stock_uom", "item_group", "image", "variant_of",
- "has_variants", "end_of_life", "disabled", "total_projected_qty"],
+ "has_variants", "end_of_life", "disabled"],
filters: [["disabled", "=", "0"]],
get_indicator: function(doc) {
@@ -8,8 +8,6 @@
return [__("Disabled"), "grey", "disabled,=,Yes"];
} else if (doc.end_of_life && doc.end_of_life < frappe.datetime.get_today()) {
return [__("Expired"), "grey", "end_of_life,<,Today"];
- } else if(doc.total_projected_qty < 0) {
- return [__("Shortage"), "red", "total_projected_qty,<,0"];
} else if (doc.has_variants) {
return [__("Template"), "orange", "has_variants,=,Yes"];
} else if (doc.variant_of) {
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index d065b09..8a436fd 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -14,6 +14,8 @@
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.get_item_details import get_item_details
+from six import iteritems
+
test_ignore = ["BOM"]
test_dependencies = ["Warehouse"]
@@ -80,7 +82,6 @@
}
make_test_objects("Item Price")
- print(frappe.get_all("Item Price"))
details = get_item_details({
"item_code": "_Test Item",
@@ -98,7 +99,7 @@
"ignore_pricing_rule": 1
})
- for key, value in to_check.iteritems():
+ for key, value in iteritems(to_check):
self.assertEquals(value, details.get(key))
def test_item_attribute_change_after_variant(self):
@@ -129,7 +130,7 @@
def test_copy_fields_from_template_to_variants(self):
frappe.delete_doc_if_exists("Item", "_Test Variant Item-XL", force=1)
-
+
fields = [{'field_name': 'item_group'}, {'field_name': 'is_stock_item'}]
allow_fields = [d.get('field_name') for d in fields]
set_item_variant_settings(fields)
@@ -293,12 +294,6 @@
variant.item_name = "_Test Variant Item-S"
variant.save()
-def get_total_projected_qty(item):
- total_qty = frappe.db.sql(""" select sum(projected_qty) as projected_qty from tabBin
- where item_code = %(item)s""", {'item': item}, as_dict=1)
-
- return total_qty[0].projected_qty if total_qty else 0.0
-
test_records = frappe.get_test_records('Item')
def create_item(item_code, is_stock_item=None):
diff --git a/erpnext/hub_node/page/__init__.py b/erpnext/stock/doctype/item_barcode/__init__.py
similarity index 100%
copy from erpnext/hub_node/page/__init__.py
copy to erpnext/stock/doctype/item_barcode/__init__.py
diff --git a/erpnext/stock/doctype/item_barcode/item_barcode.json b/erpnext/stock/doctype/item_barcode/item_barcode.json
new file mode 100644
index 0000000..c8a3a89
--- /dev/null
+++ b/erpnext/stock/doctype/item_barcode/item_barcode.json
@@ -0,0 +1,103 @@
+{
+ "allow_copy": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "field:barcode",
+ "beta": 0,
+ "creation": "2017-12-09 18:54:50.562438",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "barcode",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Barcode",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 1
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "barcode_type",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Barcode Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nEAN\nUPC-A",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2017-12-10 20:55:23.814039",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Barcode",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hub_node/doctype/hub_category/hub_category.py b/erpnext/stock/doctype/item_barcode/item_barcode.py
similarity index 70%
copy from erpnext/hub_node/doctype/hub_category/hub_category.py
copy to erpnext/stock/doctype/item_barcode/item_barcode.py
index 5d19082..e85f93b 100644
--- a/erpnext/hub_node/doctype/hub_category/hub_category.py
+++ b/erpnext/stock/doctype/item_barcode/item_barcode.py
@@ -3,9 +3,9 @@
# For license information, please see license.txt
from __future__ import unicode_literals
-import frappe
-from frappe.utils.nestedset import NestedSet
+
from frappe.model.document import Document
-class HubCategory(NestedSet):
- pass
+
+class ItemBarcode(Document):
+ pass
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index ed0597c..709c2c7 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -12,6 +12,10 @@
'Supplier Quotation': 'Supplier Quotation',
'Production Order': 'Production Order'
}
+
+ // formatter for material request item
+ frm.set_indicator_formatter('item_code',
+ function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange" })
},
onload: function(frm) {
// add item, if previous view was item
@@ -19,11 +23,6 @@
//set schedule_date
set_schedule_date(frm);
-
- // formatter for material request item
- frm.set_indicator_formatter('item_code',
- function(doc) { return (doc.qty<=doc.ordered_qty) ? "green" : "orange" }),
-
frm.fields_dict["items"].grid.get_field("warehouse").get_query = function(doc, cdt, cdn){
return{
filters: {'company': doc.company}
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index da310aa..3287441 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -15,6 +15,8 @@
from erpnext.manufacturing.doctype.production_order.production_order import get_item_details
from erpnext.buying.utils import check_for_closed_status, validate_for_items
+from six import string_types
+
form_grid_templates = {
"items": "templates/form_grid/material_request_grid.html"
}
@@ -65,7 +67,7 @@
self.status = "Draft"
from erpnext.controllers.status_updater import validate_status
- validate_status(self.status,
+ validate_status(self.status,
["Draft", "Submitted", "Stopped", "Cancelled", "Pending",
"Partially Ordered", "Ordered", "Issued", "Transferred"])
@@ -240,7 +242,8 @@
["name", "material_request_item"],
["parent", "material_request"],
["uom", "stock_uom"],
- ["uom", "uom"]
+ ["uom", "uom"],
+ ["sales_order", "sales_order"]
],
"postprocess": update_item,
"condition": lambda doc: doc.ordered_qty < doc.stock_qty
@@ -274,7 +277,7 @@
@frappe.whitelist()
def make_purchase_order_based_on_supplier(source_name, target_doc=None):
if target_doc:
- if isinstance(target_doc, basestring):
+ if isinstance(target_doc, string_types):
import json
target_doc = frappe.get_doc(json.loads(target_doc))
target_doc.set("items", [])
@@ -344,7 +347,8 @@
"doctype": "Supplier Quotation Item",
"field_map": {
"name": "material_request_item",
- "parent": "material_request"
+ "parent": "material_request",
+ "sales_order": "sales_order"
}
}
}, target_doc, postprocess)
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 4c5031d..9093946 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -72,6 +72,7 @@
mr_item.item_code = item.item_code;
mr_item.item_name = item.item_name;
mr_item.uom = item.uom;
+ mr_item.conversion_factor = item.conversion_factor;
mr_item.item_group = item.item_group;
mr_item.description = item.description;
mr_item.image = item.image;
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 42ef79b..9bccfad 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -14,6 +14,8 @@
from erpnext.stock.utils import get_bin
import json
+from six import string_types
+
class IncorrectValuationRateError(frappe.ValidationError): pass
class DuplicateEntryForProductionOrderError(frappe.ValidationError): pass
class OperationsNotCompleteError(frappe.ValidationError): pass
@@ -275,14 +277,15 @@
self.set_actual_qty()
self.calculate_rate_and_amount()
- def calculate_rate_and_amount(self, force=False, update_finished_item_rate=True):
+ def calculate_rate_and_amount(self, force=False,
+ update_finished_item_rate=True, raise_error_if_no_rate=True):
self.set_basic_rate(force, update_finished_item_rate)
self.distribute_additional_costs()
self.update_valuation_rate()
self.set_total_incoming_outgoing_value()
self.set_total_amount()
- def set_basic_rate(self, force=False, update_finished_item_rate=True):
+ def set_basic_rate(self, force=False, update_finished_item_rate=True, raise_error_if_no_rate=True):
"""get stock and incoming rate on posting date"""
raw_material_cost = 0.0
scrap_material_cost = 0.0
@@ -294,8 +297,8 @@
# get basic rate
if not d.bom_no:
- if not flt(d.basic_rate) or d.s_warehouse or force:
- basic_rate = flt(get_incoming_rate(args), self.precision("basic_rate", d))
+ if (not flt(d.basic_rate) and not d.allow_zero_valuation_rate) or d.s_warehouse or force:
+ basic_rate = flt(get_incoming_rate(args, raise_error_if_no_rate), self.precision("basic_rate", d))
if basic_rate > 0:
d.basic_rate = basic_rate
@@ -305,8 +308,10 @@
# get scrap items basic rate
if d.bom_no:
- if not flt(d.basic_rate) and getattr(self, "pro_doc", frappe._dict()).scrap_warehouse == d.t_warehouse:
- basic_rate = flt(get_incoming_rate(args), self.precision("basic_rate", d))
+ if not flt(d.basic_rate) and not d.allow_zero_valuation_rate and \
+ getattr(self, "pro_doc", frappe._dict()).scrap_warehouse == d.t_warehouse:
+ basic_rate = flt(get_incoming_rate(args, raise_error_if_no_rate),
+ self.precision("basic_rate", d))
if basic_rate > 0:
d.basic_rate = basic_rate
d.basic_amount = flt(flt(d.transfer_qty) * flt(d.basic_rate), d.precision("basic_amount"))
@@ -600,7 +605,8 @@
if self.pro_doc and not self.pro_doc.skip_transfer:
item["from_warehouse"] = self.pro_doc.wip_warehouse
#Get Reserve Warehouse from PO
- item["from_warehouse"] = item_wh.get(item.item_code) if self.purchase_order and self.purpose=="Subcontract" else ""
+ if self.purchase_order and self.purpose=="Subcontract":
+ item["from_warehouse"] = item_wh.get(item.item_code)
item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else ""
self.add_to_stock_entry_detail(item_dict)
@@ -622,7 +628,7 @@
self.load_items_from_bom()
self.set_actual_qty()
- self.calculate_rate_and_amount()
+ self.calculate_rate_and_amount(raise_error_if_no_rate=False)
def set_production_order_details(self):
if not getattr(self, "pro_doc", None):
@@ -867,7 +873,7 @@
@frappe.whitelist()
def move_sample_to_retention_warehouse(company, items):
- if isinstance(items, basestring):
+ if isinstance(items, string_types):
items = json.loads(items)
retention_warehouse = frappe.db.get_single_value('Stock Settings', 'sample_retention_warehouse')
stock_entry = frappe.new_doc("Stock Entry")
@@ -975,7 +981,7 @@
@frappe.whitelist()
def get_warehouse_details(args):
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
args = frappe._dict(args)
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
index 29e3eb1..8bf2610 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
@@ -4,6 +4,8 @@
import frappe, erpnext
from frappe.utils import cint, flt
+from six import string_types
+
@frappe.whitelist()
def make_stock_entry(**args):
'''Helper function to make a Stock Entry
@@ -49,7 +51,7 @@
if args.item_code:
args.item = args.item_code
- if isinstance(args.qty, basestring):
+ if isinstance(args.qty, string_types):
if '.' in args.qty:
args.qty = flt(args.qty)
else:
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index b590822..2da9f35 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -17,9 +17,11 @@
from erpnext.accounts.doctype.account.test_account import get_inventory_account
from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse
+from six import iteritems
+
def get_sle(**args):
condition, values = "", []
- for key, value in args.iteritems():
+ for key, value in iteritems(args):
condition += " and " if condition else " where "
condition += "`{0}`=%s".format(key)
values.append(value)
@@ -557,12 +559,13 @@
production_order.submit()
make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=50, basic_rate=100)
+ make_stock_entry(item_code="_Test Item 2", target="_Test Warehouse - _TC", qty=50, basic_rate=20)
stock_entry = _make_stock_entry(production_order.name, "Manufacture", 1)
rm_cost = 0
for d in stock_entry.get("items"):
- if d.s_warehouse:
+ if d.item_code != "_Test FG Item 2":
rm_cost += flt(d.amount)
fg_cost = filter(lambda x: x.item_code=="_Test FG Item 2", stock_entry.get("items"))[0].amount
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index 89ece33..23a18f4 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -25,7 +25,7 @@
frappe.msgprint (_("`Freeze Stocks Older Than` should be smaller than %d days.") %stock_frozen_limit)
# show/hide barcode field
- frappe.make_property_setter({'fieldname': 'barcode', 'property': 'hidden',
+ frappe.make_property_setter({'fieldname': 'barcodes', 'property': 'hidden',
'value': 0 if self.show_barcode_field else 1})
self.cant_change_valuation_method()
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 95544c1..b6307a4 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -150,7 +150,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Disabled",
"length": 0,
@@ -699,7 +699,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-08-21 02:12:33.652689",
+ "modified": "2018-01-23 16:45:45.546649",
"modified_by": "Administrator",
"module": "Stock",
"name": "Warehouse",
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index a7638b4..35d76a5 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -10,7 +10,9 @@
from erpnext.setup.utils import get_exchange_rate
from frappe.model.meta import get_field_precision
from erpnext.stock.doctype.batch.batch import get_batch_no
+from erpnext import get_company_currency
+from six import string_types, iteritems
@frappe.whitelist()
def get_item_details(args):
@@ -69,7 +71,7 @@
out.update(get_bin_details(args.item_code, out.warehouse))
# update args with out, if key or value not exists
- for key, value in out.iteritems():
+ for key, value in iteritems(out):
if args.get(key) is None:
args[key] = value
@@ -100,7 +102,7 @@
return out
def process_args(args):
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
args = frappe._dict(args)
@@ -120,7 +122,7 @@
@frappe.whitelist()
def get_item_code(barcode=None, serial_no=None):
if barcode:
- item_code = frappe.db.get_value("Item", {"barcode": barcode})
+ item_code = frappe.db.get_value("Item Barcode", {"barcode": barcode}, fieldname=["parent"])
if not item_code:
frappe.throw(_("No Item with Barcode {0}").format(barcode))
elif serial_no:
@@ -273,7 +275,7 @@
if not out[d[1]] or (company and args.company != company):
out[d[1]] = frappe.db.get_value("Company", args.company, d[2]) if d[2] else None
- for fieldname in ("item_name", "item_group", "barcode", "brand", "stock_uom"):
+ for fieldname in ("item_name", "item_group", "barcodes", "brand", "stock_uom"):
out[fieldname] = item.get(fieldname)
return out
@@ -590,11 +592,12 @@
price_list_currency = get_price_list_currency(args.price_list)
price_list_uom_dependant = get_price_list_uom_dependant(args.price_list)
plc_conversion_rate = args.plc_conversion_rate
+ company_currency = get_company_currency(args.company)
if (not plc_conversion_rate) or (price_list_currency and args.price_list_currency \
and price_list_currency != args.price_list_currency):
# cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate
- plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency,
+ plc_conversion_rate = get_exchange_rate(price_list_currency, company_currency,
args.transaction_date) or plc_conversion_rate
return frappe._dict({
@@ -640,7 +643,7 @@
@frappe.whitelist()
def get_serial_no(args, serial_nos=None):
serial_no = None
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
args = frappe._dict(args)
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index 456b434..1578bb6 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -85,18 +85,22 @@
from tabBin where item_code in ({0})
and (warehouse != "" and warehouse is not null)"""\
.format(", ".join(["%s"] * len(items_to_consider))), items_to_consider):
-
- item_warehouse_projected_qty.setdefault(item_code, {})[warehouse] = flt(projected_qty)
-
+
+ if item_code not in item_warehouse_projected_qty:
+ item_warehouse_projected_qty.setdefault(item_code, {})
+
+ if warehouse not in item_warehouse_projected_qty.get(item_code):
+ item_warehouse_projected_qty[item_code][warehouse] = flt(projected_qty)
+
warehouse_doc = frappe.get_doc("Warehouse", warehouse)
-
+
while warehouse_doc.parent_warehouse:
if not item_warehouse_projected_qty.get(item_code, {}).get(warehouse_doc.parent_warehouse):
item_warehouse_projected_qty.setdefault(item_code, {})[warehouse_doc.parent_warehouse] = flt(projected_qty)
else:
item_warehouse_projected_qty[item_code][warehouse_doc.parent_warehouse] += flt(projected_qty)
warehouse_doc = frappe.get_doc("Warehouse", warehouse_doc.parent_warehouse)
-
+
return item_warehouse_projected_qty
def create_material_request(material_requests):
diff --git a/erpnext/stock/report/bom_search/bom_search.py b/erpnext/stock/report/bom_search/bom_search.py
index 828ae16..e3955c9 100644
--- a/erpnext/stock/report/bom_search/bom_search.py
+++ b/erpnext/stock/report/bom_search/bom_search.py
@@ -4,6 +4,8 @@
from __future__ import unicode_literals
import frappe, json
+from six import iteritems
+
def execute(filters=None):
data = []
parents = {
@@ -18,9 +20,9 @@
for d in frappe.get_all(doctype, fields=["parent", "item_code"]):
all_boms.setdefault(d.parent, []).append(d.item_code)
- for parent, items in all_boms.iteritems():
+ for parent, items in iteritems(all_boms):
valid = True
- for key, item in filters.iteritems():
+ for key, item in iteritems(filters):
if key != "search_sub_assemblies":
if item and item not in items:
valid = False
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.py b/erpnext/stock/report/item_price_stock/item_price_stock.py
index 9ee7d05..ed010cd 100644
--- a/erpnext/stock/report/item_price_stock/item_price_stock.py
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.py
@@ -66,7 +66,6 @@
return item_price_qty_data
def get_item_price_qty_data(filters):
- item_dicts = []
conditions = ""
if filters.get("item_code"):
conditions += "where a.item_code=%(item_code)s"
@@ -78,11 +77,10 @@
{conditions}"""
.format(conditions=conditions), filters, as_dict=1)
- price_list_names = ",".join(['"' + frappe.db.escape(item['price_list_name']) + '"'
- for item in item_results])
+ price_list_names = list(set([frappe.db.escape(item.price_list_name) for item in item_results]))
- buying_price_map = get_buying_price_map(price_list_names)
- selling_price_map = get_selling_price_map(price_list_names)
+ buying_price_map = get_price_map(price_list_names, buying=1)
+ selling_price_map = get_price_map(price_list_names, selling=1)
result = []
if item_results:
@@ -109,40 +107,31 @@
return result
-def get_buying_price_map(price_list_names):
- buying_price = frappe.db.sql("""
+def get_price_map(price_list_names, buying=0, selling=0):
+ price_map = {}
+
+ if not price_list_names:
+ return price_map
+
+ rate_key = "Buying Rate" if buying else "Selling Rate"
+ price_list_key = "Buying Price List" if buying else "Selling Price List"
+ price_list_condition = " and buying=1" if buying else " and selling=1"
+
+ pricing_details = frappe.db.sql("""
select
name,price_list,price_list_rate
from
`tabItem Price`
where
- name in ({price_list_names}) and buying=1
- """.format(price_list_names=price_list_names), as_dict=1)
+ name in ({price_list_names}) {price_list_condition}
+ """.format(price_list_names=', '.join(['%s']*len(price_list_names)),
+ price_list_condition=price_list_condition), price_list_names, as_dict=1)
- buying_price_map = {}
- for d in buying_price:
+ for d in pricing_details:
name = d["name"]
- buying_price_map[name] = {
- "Buying Price List" :d["price_list"],
- "Buying Rate" :d["price_list_rate"]
+ price_map[name] = {
+ price_list_key :d["price_list"],
+ rate_key :d["price_list_rate"]
}
- return buying_price_map
-def get_selling_price_map(price_list_names):
- selling_price = frappe.db.sql("""
- select
- name,price_list,price_list_rate
- from
- `tabItem Price`
- where
- name in ({price_list_names}) and selling=1
- """.format(price_list_names=price_list_names), as_dict=1)
-
- selling_price_map = {}
- for d in selling_price:
- name = d["name"]
- selling_price_map[name] = {
- "Selling Price List" :d["price_list"],
- "Selling Rate" :d["price_list_rate"]
- }
- return selling_price_map
\ No newline at end of file
+ return price_map
diff --git a/erpnext/stock/report/item_variant_details/item_variant_details.py b/erpnext/stock/report/item_variant_details/item_variant_details.py
index 67b6b5f..f1488f8 100644
--- a/erpnext/stock/report/item_variant_details/item_variant_details.py
+++ b/erpnext/stock/report/item_variant_details/item_variant_details.py
@@ -17,7 +17,7 @@
variant_results = frappe.db.sql("""select name from `tabItem`
where variant_of = %s""", item, as_dict=1)
- variants = ",".join(['"' + variant['name'] + '"' for variant in variant_results])
+ variants = ",".join(['"' + frappe.db.escape(variant['name']) + '"' for variant in variant_results])
order_count_map = get_open_sales_orders_map(variants)
stock_details_map = get_stock_details_map(variants)
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 2948119..a529891 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -6,6 +6,8 @@
from frappe import _
from frappe.utils import flt, cint, getdate
+from six import iteritems
+
def execute(filters=None):
if not filters: filters = {}
@@ -208,7 +210,7 @@
if filters.get('show_variant_attributes', 0) == 1:
variant_values = get_variant_values_for(item_details.keys())
- item_details = {k: v.update(variant_values.get(k, {})) for k, v in item_details.iteritems()}
+ item_details = {k: v.update(variant_values.get(k, {})) for k, v in iteritems(item_details)}
return item_details
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 8377f59..e436132 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -106,11 +106,10 @@
from erpnext.stock.stock_ledger import get_previous_sle
last_entry = get_previous_sle({
"item_code": filters.item_code,
- "warehouse": get_warehouse_condition(filters.warehouse),
+ "warehouse_condition": get_warehouse_condition(filters.warehouse),
"posting_date": filters.from_date,
"posting_time": "00:00:00"
})
-
row = [""]*len(columns)
row[1] = _("'Opening'")
for i, v in ((9, 'qty_after_transaction'), (11, 'valuation_rate'), (12, 'stock_value')):
@@ -122,7 +121,7 @@
warehouse_details = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"], as_dict=1)
if warehouse_details:
return " exists (select name from `tabWarehouse` wh \
- where wh.lft >= %s and wh.rgt <= %s and sle.warehouse = wh.name)"%(warehouse_details.lft,
+ where wh.lft >= %s and wh.rgt <= %s and warehouse = wh.name)"%(warehouse_details.lft,
warehouse_details.rgt)
return ''
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 647c9fa..4d4435e 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -8,6 +8,8 @@
from erpnext.stock.utils import get_valuation_method
import json
+from six import iteritems
+
# future reposting
class NegativeStockError(frappe.ValidationError): pass
@@ -87,7 +89,7 @@
"allow_negative_stock"))
self.args = args
- for key, value in args.iteritems():
+ for key, value in iteritems(args):
setattr(self, key, value)
self.previous_sle = self.get_sle_before_datetime()
@@ -407,7 +409,12 @@
def get_stock_ledger_entries(previous_sle, operator=None, order="desc", limit=None, for_update=False, debug=False):
"""get stock ledger entries filtered by specific posting datetime conditions"""
- conditions = "timestamp(posting_date, posting_time) {0} timestamp(%(posting_date)s, %(posting_time)s)".format(operator)
+ conditions = " and timestamp(posting_date, posting_time) {0} timestamp(%(posting_date)s, %(posting_time)s)".format(operator)
+ if previous_sle.get("warehouse"):
+ conditions += " and warehouse = %(warehouse)s"
+ elif previous_sle.get("warehouse_condition"):
+ conditions += " and " + previous_sle.get("warehouse_condition")
+
if not previous_sle.get("posting_date"):
previous_sle["posting_date"] = "1900-01-01"
if not previous_sle.get("posting_time"):
@@ -418,9 +425,8 @@
return frappe.db.sql("""select *, timestamp(posting_date, posting_time) as "timestamp" from `tabStock Ledger Entry`
where item_code = %%(item_code)s
- and warehouse = %%(warehouse)s
and ifnull(is_cancelled, 'No')='No'
- and %(conditions)s
+ %(conditions)s
order by timestamp(posting_date, posting_time) %(order)s, name %(order)s
%(limit)s %(for_update)s""" % {
"conditions": conditions,
@@ -430,7 +436,7 @@
}, previous_sle, as_dict=1, debug=debug)
def get_valuation_rate(item_code, warehouse, voucher_type, voucher_no,
- allow_zero_rate=False, currency=None, company=None):
+ allow_zero_rate=False, currency=None, company=None, raise_error_if_no_rate=True):
# Get valuation rate from last sle for the same item and warehouse
if not company:
company = erpnext.get_default_company()
@@ -465,7 +471,7 @@
dict(item_code=item_code, buying=1, currency=currency),
'price_list_rate')
- if not allow_zero_rate and not valuation_rate \
+ if not allow_zero_rate and not valuation_rate and raise_error_if_no_rate \
and cint(erpnext.is_perpetual_inventory_enabled(company)):
frappe.local.message_log = []
frappe.throw(_("Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry").format(item_code, voucher_type, voucher_no))
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 9b2fcb7..6f8b2c9 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -7,6 +7,8 @@
import json
from frappe.utils import flt, cstr, nowdate, nowtime
+from six import string_types
+
class InvalidWarehouseCompany(frappe.ValidationError): pass
def get_stock_value_on(warehouse=None, posting_date=None, item_code=None):
@@ -123,10 +125,10 @@
frappe.msgprint(_("Item {0} ignored since it is not a stock item").format(args.get("item_code")))
@frappe.whitelist()
-def get_incoming_rate(args):
+def get_incoming_rate(args, raise_error_if_no_rate=True):
"""Get Incoming Rate based on valuation method"""
from erpnext.stock.stock_ledger import get_previous_sle, get_valuation_rate
- if isinstance(args, basestring):
+ if isinstance(args, string_types):
args = json.loads(args)
in_rate = 0
@@ -146,7 +148,8 @@
voucher_no = args.get('voucher_no') or args.get('name')
in_rate = get_valuation_rate(args.get('item_code'), args.get('warehouse'),
args.get('voucher_type'), voucher_no, args.get('allow_zero_valuation'),
- currency=erpnext.get_company_currency(args.get('company')), company=args.get('company'))
+ currency=erpnext.get_company_currency(args.get('company')), company=args.get('company'),
+ raise_error_if_no_rate=True)
return in_rate
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index 2369a8a..ac8eb8d 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js
@@ -26,8 +26,7 @@
if(!cur_frm.doc.__islocal &&
(cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
cur_frm.add_custom_button(__('Maintenance Visit'),
- this.make_maintenance_visit, __("Make"))
- cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+ this.make_maintenance_visit);
}
},
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index de54493..6fec94e 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -57,6 +57,21 @@
<div class="item-stock" itemprop="availability"></div>
</div>
<div class="item-cart hide">
+ <div id="item-spinner">
+ <span style="display: inline-block">
+ <div class="input-group number-spinner">
+ <span class="input-group-btn">
+ <button class="btn btn-default cart-btn" data-dir="dwn">
+ –</button>
+ </span>
+ <input class="form-control text-right cart-qty" value="1">
+ <span class="input-group-btn">
+ <button class="btn btn-default cart-btn" data-dir="up" style="margin-left:-2px;">
+ +</button>
+ </span>
+ </div>
+ </span>
+ </div>
<div id="item-add-to-cart">
<button class="btn btn-primary btn-sm">
{{ _("Add to Cart") }}</button>
diff --git a/erpnext/templates/includes/cart/cart_dropdown.html b/erpnext/templates/includes/cart/cart_dropdown.html
index de29b56..38ad183 100644
--- a/erpnext/templates/includes/cart/cart_dropdown.html
+++ b/erpnext/templates/includes/cart/cart_dropdown.html
@@ -1,6 +1,11 @@
<div class="cart-dropdown-container">
<div id="cart-error" class="alert alert-danger"
style="display: none;"></div>
+ <div class="row checkout-btn">
+ <div class="col-sm-12 col-xs-12">
+ <a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
+ </div>
+ </div>
<div class="row cart-items-dropdown cart-item-header text-muted">
<div class="col-sm-6 col-xs-6 h6 text-uppercase">
{{ _("Item") }}
@@ -11,11 +16,10 @@
</div>
{% if doc.items %}
- <div class="cart-items-dropdown">
- {% include "templates/includes/cart/cart_items_dropdown.html" %}
- </div>
- <div class="checkout-btn">
- <a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
+ <div class="row cart-items-dropdown">
+ <div class="col-sm-12 col-xs-12">
+ {% include "templates/includes/cart/cart_items_dropdown.html" %}
+ </div>
</div>
{% else %}
<p>{{ _("Cart is Empty") }}</p>
diff --git a/erpnext/templates/includes/order/order_macros.html b/erpnext/templates/includes/order/order_macros.html
index e77b8b4..c2dff8c 100644
--- a/erpnext/templates/includes/order/order_macros.html
+++ b/erpnext/templates/includes/order/order_macros.html
@@ -22,7 +22,7 @@
</div>
</div>
<div class="col-xs-8 col-sm-8">
- {{ d.item_code|truncate(25) }}
+ {{ d.item_name|truncate(25) }}
<div class="input-group number-spinner">
<span class="input-group-btn">
<button class="btn btn-default cart-btn" data-dir="dwn">
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
index 9f9d6ac..722283e 100644
--- a/erpnext/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -15,7 +15,7 @@
$(".item-cart").toggleClass("hide", (!!!r.message.price || !!!r.message.in_stock));
if(r.message && r.message.price) {
$(".item-price")
- .html(r.message.price.formatted_price + " {{ _("per") }} " + r.message.uom);
+ .html(r.message.price.formatted_price + " / " + r.message.uom);
if(r.message.in_stock==0) {
$(".item-stock").html("<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>");
@@ -44,7 +44,7 @@
erpnext.shopping_cart.update_cart({
item_code: get_item_code(),
- qty: 1,
+ qty: $("#item-spinner .cart-qty").val(),
callback: function(r) {
if(!r.exc) {
toggle_update_cart(1);
@@ -55,6 +55,25 @@
});
});
+ $("#item-spinner").on('click', '.number-spinner button', function () {
+ var btn = $(this),
+ input = btn.closest('.number-spinner').find('input'),
+ oldValue = input.val().trim(),
+ newVal = 0;
+
+ if (btn.attr('data-dir') == 'up') {
+ newVal = parseInt(oldValue) + 1;
+ } else if (btn.attr('data-dir') == 'dwn') {
+ if (parseInt(oldValue) > 1) {
+ newVal = parseInt(oldValue) - 1;
+ }
+ else {
+ newVal = parseInt(oldValue);
+ }
+ }
+ input.val(newVal);
+ });
+
$("[itemscope] .item-view-attribute .form-control").on("change", function() {
try {
var item_code = encodeURIComponent(get_item_code());
@@ -86,6 +105,7 @@
$("#item-update-cart")
.toggle(qty ? true : false)
.find("input").val(qty);
+ $("#item-spinner").toggle(qty ? false : true);
}
function get_item_code() {
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index 69e6e7d..bb1c6dd 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorteer volgens prys
,Delay Days,Vertragingsdae
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Diensuitgawes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} is reeds in verkoopsfaktuur verwys: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} is reeds in verkoopsfaktuur verwys: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,faktuur
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Maak Retensie Voorraad Inskrywing
DocType: Purchase Invoice Item,Item Weight Details,Item Gewig Besonderhede
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Verwysing: {0}, Item Kode: {1} en Kliënt: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Opening vir 'n werk.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM is nie gespesifiseer vir subkontrakterende item {0} by ry {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM is nie gespesifiseer vir subkontrakterende item {0} by ry {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultaat ingedien
DocType: Item Attribute,Increment,inkrement
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tydsverloop
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nie toegelaat vir {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Kry items van
DocType: Price List,Price Not UOM Dependant,Prys Nie UOM Afhanklik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Voorraad kan nie opgedateer word teen afleweringsnota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Voorraad kan nie opgedateer word teen afleweringsnota {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Geen items gelys nie
DocType: Asset Repair,Error Description,Fout Beskrywing
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,kruideniersware
DocType: Quality Inspection Reading,Reading 1,Lees 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pensioenfondse
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Volgende Depresiasie Datum kan nie voor Aankoopdatum wees nie
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Volgende Depresiasie Datum kan nie voor Aankoopdatum wees nie
DocType: Crop,Perennial,meerjarige
DocType: Consultation,Consultation Date,Konsultasiedatum
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produklys en ontdekking vir ERPNext-gebruikers
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",bv. "Laerskool" of "Universiteit"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Voorraadverslae
DocType: Warehouse,Warehouse Detail,Warehouse Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is gekruis vir kliënt {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is gekruis vir kliënt {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Die Termyn Einddatum kan nie later wees as die Jaar Einde van die akademiese jaar waartoe die term gekoppel is nie (Akademiese Jaar ()). Korrigeer asseblief die datums en probeer weer.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Is Vaste Bate" kan nie afgeskakel word nie, aangesien Bate-rekord teen die item bestaan"
DocType: Delivery Trip,Departure Time,Vertrektyd
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Kry spesifikasiebesonderhede
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Templates van verskaffer standpunte.
DocType: Lead,Interested,belangstellende
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,opening
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,opening
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Van {0} tot {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Kon nie belasting opstel nie
DocType: Item,Copy From Item Group,Kopieer vanaf itemgroep
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Aflosdatum moet groter wees as Datum van aansluiting
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Blare per jaar
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ry {0}: Kontroleer asseblief 'Is vooruit' teen rekening {1} indien dit 'n voorskot is.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Pakhuis {0} behoort nie aan maatskappy nie {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Pakhuis {0} behoort nie aan maatskappy nie {1}
DocType: Email Digest,Profit & Loss,Wins en verlies
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,liter
DocType: Task,Total Costing Amount (via Time Sheet),Totale kosteberekening (via tydblad)
@@ -455,6 +455,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dit is gebaseer op transaksies teen hierdie maatskappy. Sien die tydlyn hieronder vir besonderhede
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Stel per e-pos in kennis van die skepping van outomatiese materiaalversoek
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,bestand
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi Geld
DocType: Opening Invoice Creation Tool,Invoice Type,Faktuur Tipe
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Afleweringsnota
@@ -526,7 +527,6 @@
DocType: Employee,Widowed,weduwee
DocType: Request for Quotation,Request for Quotation,Versoek vir kwotasie
DocType: Healthcare Settings,Require Lab Test Approval,Vereis laboratoriumtoetsgoedkeuring
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Item Kode> Itemgroep> Handelsmerk
DocType: Salary Slip Timesheet,Working Hours,Werksure
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Totaal Uitstaande
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Verander die begin- / huidige volgordenommer van 'n bestaande reeks.
@@ -555,7 +555,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Voer asseblief Koste Sentrum in
DocType: Drug Prescription,Dosage,dosis
DocType: Journal Entry Account,Sales Order,Verkoopsbestelling
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Gem. Verkoopprys
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Gem. Verkoopprys
DocType: Assessment Plan,Examiner Name,Naam van eksaminator
DocType: Lab Test Template,No Result,Geen resultaat
DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
@@ -602,6 +602,7 @@
DocType: Payroll Entry,Select Payroll Period,Kies Payroll Periode
DocType: Purchase Invoice,Unpaid,onbetaalde
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Voorbehou vir verkoop
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Installeer asseblief die Naam van Werknemers in Menslike Hulpbronne> MH-instellings
DocType: Packing Slip,From Package No.,Uit pakketnr.
DocType: Item Attribute,To Range,Om te bereik
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriteite en deposito's
@@ -626,11 +627,11 @@
DocType: Training Event,Workshop,werkswinkel
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Waarsku aankoop bestellings
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lys 'n paar van jou kliënte. Hulle kan organisasies of individue wees.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Genoeg Onderdele om te Bou
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genoeg Onderdele om te Bou
DocType: POS Profile User,POS Profile User,POS Profiel gebruiker
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte inkomste
DocType: Patient Appointment,Date TIme,Datum Tyd
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan nie filter op grond van rekening, indien gegroepeer volgens rekening nie"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Kan nie filter op grond van rekening, indien gegroepeer volgens rekening nie"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administratiewe Beampte
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Opstel van maatskappy en belasting
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Kies asseblief Kursus
@@ -640,7 +641,7 @@
DocType: Stock Entry Detail,Difference Account,Verskilrekening
DocType: Purchase Invoice,Supplier GSTIN,Verskaffer GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan nie die taak toemaak nie aangesien die afhanklike taak {0} nie gesluit is nie.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vul asseblief die pakhuis in vir watter materiaalversoek opgeneem sal word
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Vul asseblief die pakhuis in vir watter materiaalversoek opgeneem sal word
DocType: Production Order,Additional Operating Cost,Bykomende bedryfskoste
DocType: Lab Test Template,Lab Routine,Lab Roetine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,skoonheidsmiddels
@@ -806,7 +807,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Verhouding met Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Bestuurder
DocType: Payment Entry,Payment From / To,Betaling Van / Tot
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuwe kredietlimiet is minder as die huidige uitstaande bedrag vir die kliënt. Kredietlimiet moet ten minste {0} wees
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuwe kredietlimiet is minder as die huidige uitstaande bedrag vir die kliënt. Kredietlimiet moet ten minste {0} wees
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Stel asseblief rekening in pakhuis {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Gebaseer op' en 'Groepeer' kan nie dieselfde wees nie
DocType: Sales Person,Sales Person Targets,Verkope persoon teikens
@@ -940,7 +941,7 @@
DocType: Budget,Budget Against,Begroting teen
DocType: Employee,Cell Number,Selfoonnommer
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Daar is geen werknemer vir die gegewe kriteria nie. Kontroleer dat Salarisstrokies nie reeds geskep is nie.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Outomatiese Materiaal Versoeke Genereer
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Outomatiese Materiaal Versoeke Genereer
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,verloor
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,U kan nie huidige voucher insleutel in die kolom "Teen Journal Entry 'nie
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Gereserveer vir vervaardiging
@@ -948,7 +949,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energie
DocType: Opportunity,Opportunity From,Geleentheid Van
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Maandelikse salarisverklaring.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ry {0}: {1} Serial nommers benodig vir item {2}. U het {3} verskaf.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ry {0}: {1} Serial nommers benodig vir item {2}. U het {3} verskaf.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Kies asseblief 'n tabel
DocType: BOM,Website Specifications,Webwerf spesifikasies
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} is 'n ongeldige e-posadres in 'Ontvangers'
@@ -1015,7 +1016,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Aanhaling gevra
DocType: Vital Signs,Heart Rate / Pulse,Hartslag / Pols
DocType: Company,Default Bank Account,Verstekbankrekening
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Om te filter gebaseer op Party, kies Party Type eerste"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Om te filter gebaseer op Party, kies Party Type eerste"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Op Voorraad Voorraad' kan nie nagegaan word nie omdat items nie afgelewer word via {0}
DocType: Vehicle,Acquisition Date,Verkrygingsdatum
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1039,7 +1040,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Laai jou briefkop op (Hou dit webvriendelik as 900px by 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Rekening {2} kan nie 'n Groep wees nie
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Itemreeks {idx}: {doctype} {docname} bestaan nie in die boks '{doctype}' tabel nie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Rooster {0} is reeds voltooi of gekanselleer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Rooster {0} is reeds voltooi of gekanselleer
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Geen take nie
DocType: Item Variant Settings,Copy Fields to Variant,Kopieer velde na variant
DocType: Asset,Opening Accumulated Depreciation,Opening Opgehoopte Waardevermindering
@@ -1151,9 +1152,10 @@
DocType: Production Order,Plan material for sub-assemblies,Beplan materiaal vir sub-gemeentes
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Verkope Vennote en Territory
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} moet aktief wees
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Sluiting (Opening + Totaal)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Sluiting (Opening + Totaal)
DocType: Journal Entry,Depreciation Entry,Waardevermindering Inskrywing
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Kies asseblief die dokument tipe eerste
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Druk in rekeninggeld
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Kanselleer materiaalbesoeke {0} voordat u hierdie onderhoudsbesoek kanselleer
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standaard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Reeksnommer {0} behoort nie aan item {1} nie
@@ -1179,7 +1181,7 @@
DocType: Supplier,Default Payable Accounts,Verstekbetaalbare rekeninge
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Werknemer {0} is nie aktief of bestaan nie
DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Gee asb. Bate-kategorie in Item {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Gee asb. Bate-kategorie in Item {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Itemvarianante {0} opgedateer
DocType: Quality Inspection Reading,Reading 6,Lees 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1231,6 +1233,7 @@
,Company Name,maatskappynaam
DocType: SMS Center,Total Message(s),Totale boodskap (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Kies Item vir Oordrag
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series vir {0} via Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Bykomende kortingspersentasie
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Bekyk 'n lys van al die hulpvideo's
DocType: Agriculture Analysis Criteria,Soil Texture,Grondstruktuur
@@ -1258,7 +1261,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Webwerf Item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Laai jou briefhoof en logo op. (jy kan dit later wysig).
DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Volgende Depresiasie Datum word ingeskryf as vervaldatum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Volgende Depresiasie Datum word ingeskryf as vervaldatum
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,wit
DocType: SMS Center,All Lead (Open),Alle Lood (Oop)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ry {0}: Aantal nie beskikbaar vir {4} in pakhuis {1} by die plasing van die inskrywing ({2} {3})
@@ -1274,7 +1277,7 @@
DocType: Lead,Next Contact Date,Volgende kontak datum
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Opening Aantal
DocType: Healthcare Settings,Appointment Reminder,Aanstelling Herinnering
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Voer asseblief die rekening vir Veranderingsbedrag in
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Voer asseblief die rekening vir Veranderingsbedrag in
DocType: Program Enrollment Tool Student,Student Batch Name,Studentejoernaal
DocType: Consultation,Doctor,dokter
DocType: Holiday List,Holiday List Name,Vakansie Lys Naam
@@ -1290,6 +1293,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Verlof toekenningsgereedskap
DocType: Item,Hub Category to Publish,Hub Kategorie om te publiseer
DocType: Leave Block List,Leave Block List Dates,Los blokkie lys datums
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup> Numbering Series
DocType: Sales Invoice,Billing Address GSTIN,Rekeningadres GSTIN
DocType: Assessment Plan,Evaluate,evalueer
DocType: Workstation,Net Hour Rate,Netto Uurtarief
@@ -1323,7 +1327,7 @@
DocType: Purchase Receipt,PREC-RET-,Prec-RET-
DocType: POS Profile,Sales Invoice Payment,Verkope faktuur betaling
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerde pakhuis in verkoopsbestelling / voltooide goedere pakhuis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Verkoopbedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Verkoopbedrag
DocType: Repayment Schedule,Interest Amount,Rente Bedrag
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,U is die koste-erkenning vir hierdie rekord. Dateer asseblief die 'Status' op en stoor
DocType: Serial No,Creation Document No,Skeppingsdokument nr
@@ -1414,7 +1418,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Openingsrekeningkundige balans
,GST Sales Register,GST Sales Register
DocType: Sales Invoice Advance,Sales Invoice Advance,Verkope Faktuur Vooruit
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Niks om te versoek nie
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Niks om te versoek nie
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Kies jou domeine
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Nog 'n begroting rekord '{0}' bestaan reeds teen {1} '{2}' vir fiskale jaar {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Velds sal eers oor kopieë gekopieer word.
@@ -1424,11 +1428,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit sal aangeheg word aan die itemkode van die variant. As u afkorting byvoorbeeld "SM" is en die itemkode "T-SHIRT" is, sal die itemkode van die variant "T-SHIRT-SM" wees."
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netto betaal (in woorde) sal sigbaar wees sodra jy die Salary Slip stoor.
DocType: Purchase Invoice,Is Return,Is Terug
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,versigtigheid
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,versigtigheid
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Terug / Debiet Nota
DocType: Price List Country,Price List Country,Pryslys Land
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} geldige reeksnommers vir item {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} geldige reeksnommers vir item {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Kode kan nie vir Serienommer verander word nie.
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Gesprekfaktor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Voer asseblief die Kode in om groepsnommer te kry
@@ -1532,7 +1536,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Verkoopsbestelling {0} is nie geldig nie
DocType: Supplier Scorecard,Warn for new Request for Quotations,Waarsku vir nuwe versoek vir kwotasies
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Aankooporders help om jou aankope te beplan en op te volg
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Jammer, maatskappye kan nie saamgevoeg word nie"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Jammer, maatskappye kan nie saamgevoeg word nie"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Voorskrifte
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Die totale uitgawe / oordraghoeveelheid {0} in materiaalversoek {1} \ kan nie groter wees as versoekte hoeveelheid {2} vir item {3}
@@ -1570,7 +1574,6 @@
DocType: Warehouse,Warehouse Contact Info,Warehouse Kontak Info
DocType: Payment Entry,Write Off Difference Amount,Skryf af Verskilbedrag
DocType: Volunteer,Volunteer Name,Vrywilliger Naam
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Installeer asseblief die Instrukteur Naming Stelsel in Onderwys> Onderwys instellings
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Werknemer e-pos nie gevind nie, vandaar e-pos nie gestuur nie"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Versending reël nie van toepassing op land {0}
DocType: Item,Foreign Trade Details,Buitelandse Handel Besonderhede
@@ -1582,7 +1585,7 @@
DocType: Student Group Student,Group Roll Number,Groeprolnommer
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",Vir {0} kan slegs kredietrekeninge gekoppel word teen 'n ander debietinskrywing
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taakgewigte moet wees: 1. Pas asseblief die gewigte van alle projektaakse dienooreenkomstig aan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Afleweringsnotasie {0} is nie ingedien nie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Afleweringsnotasie {0} is nie ingedien nie
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Item {0} moet 'n Subkontrakteerde Item wees
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitaal Uitrustings
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prysreël word eers gekies gebaseer op 'Apply On' -veld, wat Item, Itemgroep of Handelsnaam kan wees."
@@ -1607,7 +1610,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Kinderopslag bestaan vir hierdie pakhuis. U kan hierdie pakhuis nie uitvee nie.
DocType: Item,Website Item Groups,Webtuiste Item Groepe
DocType: Purchase Invoice,Total (Company Currency),Totaal (Maatskappy Geld)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serienommer {0} het meer as een keer ingeskryf
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serienommer {0} het meer as een keer ingeskryf
DocType: Journal Entry,Journal Entry,Joernaalinskrywing
DocType: Expense Claim Advance,Unclaimed amount,Onopgeëiste bedrag
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} items aan die gang
@@ -1703,7 +1706,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasie-logboek.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Versoek vir kwotasie is gedeaktiveer om toegang te verkry tot die portaal, vir meer tjekpoortinstellings."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Verskaffer Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Koopbedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Koopbedrag
DocType: Sales Invoice,Shipping Address Name,Posadres
DocType: Material Request,Terms and Conditions Content,Terme en voorwaardes Inhoud
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Daar was foute om Kursusskedule te skep
@@ -1965,7 +1968,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dit is gebaseer op logs teen hierdie Voertuig. Sien die tydlyn hieronder vir besonderhede
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Teen Verskafferfaktuur {0} gedateer {1}
DocType: Customer,Default Price List,Standaard pryslys
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Bate Beweging rekord {0} geskep
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Bate Beweging rekord {0} geskep
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,U kan nie fiskale jaar {0} uitvee nie. Fiskale jaar {0} word as verstek in Globale instellings gestel
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Daar bestaan reeds 'n kliënt met dieselfde naam
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dit sal salarisstrokies indien en toevallingsjoernaalinskrywing skep. Wil jy voortgaan?
@@ -1979,6 +1982,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,pryse
DocType: Quotation,Term Details,Termyn Besonderhede
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kan nie meer as {0} studente vir hierdie studente groep inskryf nie.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Totaal (Sonder Belasting)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} moet groter as 0 wees
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Voorraad beskikbaar
@@ -1997,7 +2001,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Ontkoppel betaling met kansellasie van faktuur
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Huidige Odometer lees ingevoer moet groter wees as die aanvanklike voertuig odometer {0}
DocType: Restaurant Reservation,No Show,Geen vertoning
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series vir {0} via Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Poslys Land
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Verlof en Bywoning
DocType: Maintenance Visit,Partially Completed,Gedeeltelik voltooi
@@ -2088,7 +2091,7 @@
DocType: Student Group Instructor,Student Group Instructor,Studentegroepinstrukteur
DocType: Grant Application,Assessment Mark (Out of 10),Assesseringspunt (uit 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Main
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Stel voorvoegsel vir nommering van reekse op u transaksies
DocType: Employee Attendance Tool,Employees HTML,Werknemers HTML
@@ -2136,7 +2139,7 @@
DocType: Course,Course Abbreviation,Kursus Afkorting
DocType: Student Leave Application,Student Leave Application,Studenteverlof Aansoek
DocType: Item,Will also apply for variants,Sal ook aansoek doen vir variante
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Bate kan nie gekanselleer word nie, want dit is reeds {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Bate kan nie gekanselleer word nie, want dit is reeds {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Werknemer {0} op Halwe dag op {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Totale werksure moet nie groter wees nie as maksimum werksure {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,op
@@ -2320,9 +2323,10 @@
DocType: Task,Actual End Date (via Time Sheet),Werklike Einddatum (via Tydblad)
DocType: Soil Texture,Soil Type,Grondsoort
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Bedrag {0} {1} teen {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nuwe boodskap
,Quotation Trends,Aanhalingstendense
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Itemgroep nie genoem in itemmeester vir item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debiet Vir rekening moet 'n Ontvangbare rekening wees
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debiet Vir rekening moet 'n Ontvangbare rekening wees
DocType: Shipping Rule,Shipping Amount,Posgeld
DocType: Supplier Scorecard Period,Period Score,Periode telling
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Voeg kliënte by
@@ -2333,7 +2337,7 @@
,Vehicle Expenses,Voertuiguitgawes
DocType: Serial No,Invoice Details,Faktuur besonderhede
DocType: Grant Application,Show on Website,Wys op die webwerf
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Verwagte waarde na nuttige lewensduur moet groter as of gelyk wees aan {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Verwagte waarde na nuttige lewensduur moet groter as of gelyk wees aan {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Begin aan
DocType: Hub Category,Hub Category,Hub Kategorie
DocType: Purchase Invoice,SEZ,Sez
@@ -2364,7 +2368,7 @@
DocType: Patient,B Positive,B Positief
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ry # {0}: Hoeveelheid moet 1 wees, aangesien item 'n vaste bate is. Gebruik asseblief aparte ry vir veelvuldige aantal."
DocType: Leave Block List Allow,Leave Block List Allow,Laat blokblokkering toe
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr kan nie leeg of spasie wees nie
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr kan nie leeg of spasie wees nie
DocType: Patient Medical Record,Patient Medical Record,Pasiënt Mediese Rekord
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Groep na Nie-Groep
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2414,6 +2418,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Kan nie 'n RFQ vir geen kwotasie opstel nie
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Totale aftrekking
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Kies 'n rekening om in rekeningmunt te druk
,Production Analytics,Produksie Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dit is gebaseer op transaksies teen hierdie pasiënt. Sien die tydlyn hieronder vir besonderhede
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Koste opgedateer
@@ -2468,7 +2473,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Kies Maatskappy ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Los leeg indien oorweeg vir alle departemente
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Soorte indiensneming (permanent, kontrak, intern ens.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} is verpligtend vir item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} is verpligtend vir item {1}
DocType: Payroll Entry,Fortnightly,tweeweeklikse
DocType: Currency Exchange,From Currency,Van Geld
DocType: Vital Signs,Weight (In Kilogram),Gewig (In Kilogram)
@@ -2544,7 +2549,7 @@
DocType: Student,Guardians,voogde
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Pryse sal nie getoon word indien Pryslys nie vasgestel is nie
DocType: Stock Entry,Total Incoming Value,Totale Inkomende Waarde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debiet na is nodig
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debiet na is nodig
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tydskrifte help om tred te hou met tyd, koste en faktuur vir aktiwiteite wat deur u span gedoen is"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Aankooppryslys
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templates van verskaffers telkaart veranderlikes.
@@ -2644,7 +2649,7 @@
DocType: Company,For Reference Only.,Slegs vir verwysing.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Geneesheer {0} nie beskikbaar op {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Kies lotnommer
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ongeldige {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Ongeldige {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Verwysings Inv
@@ -2681,8 +2686,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiseer die bedrywighede, bedryfskoste en gee 'n unieke operasie nee vir u bedrywighede."
DocType: Water Analysis,Origin,oorsprong
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Hierdie dokument is oor limiet deur {0} {1} vir item {4}. Maak jy 'n ander {3} teen dieselfde {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Stel asseblief herhaaldelik na die stoor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Kies verander bedrag rekening
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Stel asseblief herhaaldelik na die stoor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Kies verander bedrag rekening
DocType: Purchase Invoice,Price List Currency,Pryslys Geld
DocType: Naming Series,User must always select,Gebruiker moet altyd kies
DocType: Stock Settings,Allow Negative Stock,Laat negatiewe voorraad toe
@@ -2738,7 +2743,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Waarsku vir nuwe aankoopbestellings
DocType: Quality Inspection Reading,Reading 9,Lees 9
DocType: Supplier,Is Frozen,Is bevrore
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Groepknooppakhuis mag nie vir transaksies kies nie
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Groepknooppakhuis mag nie vir transaksies kies nie
DocType: Buying Settings,Buying Settings,Koop instellings
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nommer vir 'n afgeronde goeie item
DocType: Upload Attendance,Attendance To Date,Bywoning tot datum
@@ -2752,6 +2757,7 @@
DocType: Grant Application,Organization,organisasie
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Student Groep Naam
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Wys ontplofte aansig
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Fooie skep
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Maak asseblief seker dat u regtig alle transaksies vir hierdie maatskappy wil verwyder. Jou meesterdata sal bly soos dit is. Hierdie handeling kan nie ongedaan gemaak word nie.
DocType: Room,Room Number,Kamer nommer
@@ -2762,7 +2768,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Maak belasting sjabloon
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Gebruikers Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Grondstowwe kan nie leeg wees nie.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Kon nie voorraad opdateer nie, faktuur bevat druppelversending item."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Kon nie voorraad opdateer nie, faktuur bevat druppelversending item."
DocType: Lab Test Sample,Lab Test Sample,Lab Test Voorbeeld
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Vinnige Blaar Inskrywing
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,U kan nie koers verander as BOM enige item genoem het nie
@@ -2833,7 +2839,7 @@
DocType: Membership,USD,dollar
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak faktuur
DocType: Selling Settings,Auto close Opportunity after 15 days,Vakansie sluit geleentheid na 15 dae
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Aankoopbestellings word nie toegelaat vir {0} weens 'n telkaart wat staan van {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Aankoopbestellings word nie toegelaat vir {0} weens 'n telkaart wat staan van {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Eindejaar
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwotasie / Lood%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Kontrak Einddatum moet groter wees as Datum van aansluiting
@@ -2924,7 +2930,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Bo
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ry # {0}: Tydskrifinskrywings {1} het nie rekening {2} of alreeds teen 'n ander geskenkbewys aangepas nie
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteria Gewig
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Verskaffer> Verskaffer Tipe
DocType: Buying Settings,Default Buying Price List,Verstek kooppryslys
DocType: Payroll Entry,Salary Slip Based on Timesheet,Salarisstrokie gebaseer op tydsopgawe
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Koopkoers
@@ -3012,7 +3017,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Volg Leiers volgens Nywerheidstipe.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Gaan na Letterheads
DocType: Item Supplier,Item Supplier,Item Verskaffer
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Voer asseblief die kode in om groepsnommer te kry
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Voer asseblief die kode in om groepsnommer te kry
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Kies asseblief 'n waarde vir {0} kwotasie_ tot {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresse.
DocType: Company,Stock Settings,Voorraadinstellings
@@ -3188,6 +3193,7 @@
DocType: Company,Default Inventory Account,Verstek voorraad rekening
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ry {0}: Voltooide hoeveelheid moet groter as nul wees.
DocType: Antibiotic,Antibiotic Name,Antibiotiese Naam
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Item Kode> Itemgroep> Handelsmerk
DocType: Purchase Invoice,Apply Additional Discount On,Pas bykomende afslag aan
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Kies Tipe ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,'N Skakel na al die grondeenhede waarin die Gewas groei
@@ -3381,6 +3387,7 @@
DocType: Supplier,Credit Limit,Krediet limiet
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Gem. Verkooppryslys
DocType: Production Plan Sales Order,Salse Order Date,Salse Besteldatum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Verskaffer> Verskaffer Tipe
DocType: Salary Component,Salary Component,Salaris Komponent
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Betalingsinskrywings {0} is nie gekoppel nie
DocType: GL Entry,Voucher No,Voucher Nr
@@ -3450,7 +3457,7 @@
DocType: Production Planning Tool,Create Material Requests,Skep Materiaal Versoeke
DocType: Employee Education,School/University,Skool / Universiteit
DocType: Payment Request,Reference Details,Verwysingsbesonderhede
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwagte Waarde Na Nuttige Lewe moet minder wees as Bruto Aankoopprys
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwagte Waarde Na Nuttige Lewe moet minder wees as Bruto Aankoopprys
DocType: Sales Invoice Item,Available Qty at Warehouse,Beskikbare hoeveelheid by pakhuis
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Gefactureerde bedrag
DocType: Asset,Double Declining Balance,Dubbele dalende saldo
@@ -3462,7 +3469,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Kry opdaterings
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Rekening {2} behoort nie aan Maatskappy {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Kies ten minste een waarde uit elk van die eienskappe.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materiaalversoek {0} word gekanselleer of gestop
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materiaalversoek {0} word gekanselleer of gestop
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Verlofbestuur
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Groep per rekening
DocType: Sales Order,Fully Delivered,Volledig afgelewer
@@ -3472,14 +3479,13 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verskilrekening moet 'n Bate / Aanspreeklikheidsrekening wees, aangesien hierdie Voorraadversoening 'n Openingsinskrywing is"
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Gaan na Programme
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ry {0} # Toegewysde hoeveelheid {1} kan nie groter wees as onopgeëiste bedrag nie {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup> Numbering Series
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Aankoopordernommer benodig vir item {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Produksie bestelling nie geskep nie
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Vanaf datum' moet na 'tot datum' wees
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan nie status verander as student {0} is gekoppel aan studenteprogram nie {1}
DocType: Asset,Fully Depreciated,Ten volle gedepresieer
,Stock Projected Qty,Voorraad Geprojekteerde Aantal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Kliënt {0} behoort nie aan projek nie {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Kliënt {0} behoort nie aan projek nie {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Gemerkte Bywoning HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Aanhalings is voorstelle, bod wat jy aan jou kliënte gestuur het"
DocType: Sales Order,Customer's Purchase Order,Kliënt se Aankoopbestelling
@@ -3563,7 +3569,7 @@
DocType: Stock Settings,Item Naming By,Item Naming By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},'N Ander periode sluitingsinskrywing {0} is gemaak na {1}
DocType: Production Order,Material Transferred for Manufacturing,Materiaal oorgedra vir Vervaardiging
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Rekening {0} bestaan nie
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Rekening {0} bestaan nie
DocType: Project,Project Type,Projek Type
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Kinderopdrag bestaan vir hierdie taak. U kan hierdie taak nie uitvee nie.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Die teiken hoeveelheid of teikenwaarde is verpligtend.
@@ -3664,11 +3670,11 @@
DocType: Company,Asset Depreciation Cost Center,Bate Waardevermindering Koste Sentrum
DocType: Sales Order Item,Sales Order Date,Verkoopsvolgorde
DocType: Sales Invoice Item,Delivered Qty,Aflewerings Aantal
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Totale Excl. belasting
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Indien gekontroleer, sal al die kinders van elke produksie-item in die Materiaalversoeke ingesluit word."
DocType: Assessment Plan,Assessment Plan,Assesseringsplan
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Kliënt {0} is geskep.
DocType: Stock Settings,Limit Percent,Limiet persentasie
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Installeer asseblief die Instrukteur Naming Stelsel in Onderwys> Onderwys instellings
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Tans is geen voorraad beskikbaar in enige pakhuis nie
,Payment Period Based On Invoice Date,Betalingsperiode gebaseer op faktuurdatum
DocType: Sample Collection,No. of print,Aantal drukwerk
@@ -3684,12 +3690,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Debiteure ({0})
DocType: Pricing Rule,Margin,marge
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuwe kliënte
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruto wins%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto wins%
DocType: Appraisal Goal,Weightage (%),Gewig (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Verander POS-profiel
DocType: Bank Reconciliation Detail,Clearance Date,Opruimingsdatum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Assesseringsverslag
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto aankoopbedrag is verpligtend
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruto aankoopbedrag is verpligtend
DocType: Lead,Address Desc,Adres Beskrywing
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party is verpligtend
DocType: Journal Entry,JV-,JV-
@@ -3721,7 +3727,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Staande Naam
DocType: Stock Entry,Customer or Supplier Details,Kliënt- of Verskafferbesonderhede
DocType: Employee Loan Application,Required by Date,Vereis volgens datum
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Sluitingsaldo (Dr - Cr)
DocType: Lead,Lead Owner,Leier Eienaar
DocType: Bin,Requested Quantity,Gevraagde Hoeveelheid
DocType: Patient,Marital Status,Huwelikstatus
@@ -3735,7 +3740,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Veelvuldige Varianten
DocType: Sales Invoice,Against Income Account,Teen Inkomsterekening
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% afgelewer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde hoeveelheid {1} kan nie minder wees as die minimum bestelhoeveelheid {2} (gedefinieer in Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde hoeveelheid {1} kan nie minder wees as die minimum bestelhoeveelheid {2} (gedefinieer in Item).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelikse Verspreidingspersentasie
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Log in as 'n ander gebruiker.
DocType: Territory,Territory Targets,Territoriese teikens
@@ -3983,7 +3988,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Geen werknemers vir die genoemde kriteria
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Geen items met die materiaal om te vervaardig
DocType: Restaurant,Default Customer,Verstekkliënt
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Installeer asseblief die Naam van Werknemers in Menslike Hulpbronne> MH-instellings
DocType: Assessment Plan,Supervisor Name,Toesighouer Naam
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Moenie bevestig of aanstelling geskep is vir dieselfde dag nie
DocType: Program Enrollment Course,Program Enrollment Course,Programinskrywing Kursus
@@ -4101,7 +4105,7 @@
DocType: BOM,Website Description,Webwerf beskrywing
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto verandering in ekwiteit
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,nuutste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Kanselleer eers Aankoopfaktuur {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Kanselleer eers Aankoopfaktuur {0}
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pos adres moet uniek wees, bestaan reeds vir {0}"
DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Kwitansie
@@ -4118,7 +4122,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kontantvloeistaat
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lening Bedrag kan nie Maksimum Lening Bedrag van {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lisensie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Verwyder asseblief hierdie faktuur {0} uit C-vorm {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Verwyder asseblief hierdie faktuur {0} uit C-vorm {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kies asseblief Carry Forward as u ook die vorige fiskale jaar se balans wil insluit, verlaat na hierdie fiskale jaar"
DocType: GL Entry,Against Voucher Type,Teen Voucher Tipe
DocType: Physician,Phone (R),Telefoon (R)
@@ -4130,7 +4134,7 @@
DocType: Patient,B Negative,B Negatief
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Onderhoudstatus moet gekanselleer of voltooi word om in te dien
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Rekening {0} behoort nie aan maatskappy {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Reeksnommers in ry {0} stem nie ooreen met Afleweringsnota nie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Reeksnommers in ry {0} stem nie ooreen met Afleweringsnota nie
DocType: Student,Guardian Details,Besonderhede van die voog
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Merk Bywoning vir meervoudige werknemers
@@ -4172,7 +4176,7 @@
DocType: Stock Entry Detail,Basic Amount,Basiese Bedrag
DocType: Training Event,Exam,eksamen
DocType: Complaint,Complaint,klagte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Pakhuis benodig vir voorraad Item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Pakhuis benodig vir voorraad Item {0}
DocType: Leave Allocation,Unused leaves,Ongebruikte blare
DocType: Patient,Alcohol Past Use,Alkohol Gebruik
DocType: Fertilizer Content,Fertilizer Content,Kunsmis Inhoud
@@ -4296,6 +4300,7 @@
DocType: Salary Detail,Formula,formule
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serie #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Verkooprekening
DocType: Purchase Invoice Item,Total Weight,Totale Gewig
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Kommissie op verkope
DocType: Offer Letter Term,Value / Description,Waarde / beskrywing
@@ -4452,7 +4457,7 @@
DocType: Customer,From Lead,Van Lood
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Bestellings vrygestel vir produksie.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Kies fiskale jaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS-profiel wat nodig is om POS-inskrywing te maak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS-profiel wat nodig is om POS-inskrywing te maak
DocType: Program Enrollment Tool,Enroll Students,Teken studente in
DocType: Lab Test,Approved Date,Goedgekeurde Datum
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaardverkope
@@ -4528,7 +4533,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produksie-item
,Employee Information,Werknemersinligting
DocType: Stock Entry Detail,Additional Cost,Addisionele koste
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Kan nie filter gebaseer op Voucher No, indien gegroepeer deur Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Kan nie filter gebaseer op Voucher No, indien gegroepeer deur Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Maak Verskaffer Kwotasie
DocType: Quality Inspection,Incoming,inkomende
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standaard belasting sjablonen vir verkope en aankoop word gemaak.
@@ -4545,7 +4550,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Nota: {0}
,Delivery Note Trends,Delivery Notendendense
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Hierdie week se opsomming
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Op voorraad Aantal
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Op voorraad Aantal
DocType: Delivery Trip,Calculate Estimated Arrival Times,Bereken die beraamde aankomstye
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Rekening: {0} kan slegs deur voorraadtransaksies opgedateer word
DocType: Student Group Creation Tool,Get Courses,Kry kursusse
@@ -4561,7 +4566,7 @@
DocType: Material Request,% Ordered,% Bestel
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Vir Kursusgebaseerde Studentegroep, sal die kursus vir elke student van die ingeskrewe Kursusse in Programinskrywing bekragtig word."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,stukwerk
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Gem. Koopkoers
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Gem. Koopkoers
DocType: Task,Actual Time (in Hours),Werklike tyd (in ure)
DocType: Employee,History In Company,Geskiedenis In Maatskappy
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nuwe boodskap van {sender}
@@ -4609,7 +4614,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ry {0}: Geld van die BOM # {1} moet gelyk wees aan die gekose geldeenheid {2}
DocType: Journal Entry Account,Exchange Rate,Wisselkoers
DocType: Patient,Additional information regarding the patient,Bykomende inligting rakende die pasiënt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Verkoopsbestelling {0} is nie ingedien nie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Verkoopsbestelling {0} is nie ingedien nie
DocType: Homepage,Tag Line,Tag Line
DocType: Fee Component,Fee Component,Fooi-komponent
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Vloot bestuur
@@ -4821,7 +4826,7 @@
DocType: Employee Education,Employee Education,Werknemersonderwys
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplikaat-itemgroep wat in die itemgroeptabel gevind word
DocType: Land Unit,Parent Land Unit,Ouergrondseenheid
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Dit is nodig om Itembesonderhede te gaan haal.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Dit is nodig om Itembesonderhede te gaan haal.
DocType: Fertilizer,Fertilizer Name,Kunsmis Naam
DocType: Salary Slip,Net Pay,Netto salaris
DocType: Account,Account,rekening
@@ -4900,7 +4905,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Kliëntegroep word vereis in POS-profiel
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Werknemersrekords.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Stel asseblief die volgende depresiasie datum in
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Stel asseblief die volgende depresiasie datum in
DocType: HR Settings,Payroll Settings,Loonstaatinstellings
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Pas nie-gekoppelde fakture en betalings.
DocType: POS Settings,POS Settings,Posinstellings
@@ -5067,7 +5072,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Verjaardag Herinnering vir {0}
DocType: Asset Maintenance Task,Last Completion Date,Laaste Voltooiingsdatum
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dae sedert Laaste bestelling
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debiet Vir rekening moet 'n balansstaatrekening wees
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debiet Vir rekening moet 'n balansstaatrekening wees
DocType: Buying Settings,Naming Series,Naming Series
DocType: Leave Block List,Leave Block List Name,Verlaat bloklys naam
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versekering Aanvangsdatum moet minder wees as Versekerings-einddatum
@@ -5193,6 +5198,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Kry betalinginskrywings
DocType: Quotation Item,Against Docname,Teen Docname
DocType: SMS Center,All Employee (Active),Alle werknemer (aktief)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kliënt> Kliëntegroep> Territorium
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bekyk nou
DocType: BOM,Raw Material Cost,Grondstofkoste
DocType: Item Reorder,Re-Order Level,Herbestellingsvlak
@@ -5291,7 +5297,6 @@
DocType: Room,Seating Capacity,Sitplekvermoë
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Lab toetsgroepe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kliënt> Kliëntegroep> Territorium
DocType: Project,Total Expense Claim (via Expense Claims),Totale koste-eis (via koste-eise)
DocType: GST Settings,GST Summary,GST Opsomming
DocType: Assessment Result,Total Score,Totale telling
@@ -5304,7 +5309,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Volgende kursusskedules is geskep
DocType: Journal Entry,Total Debit,Totale Debiet
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standaard voltooide goedere pakhuis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Verkoopspersoon
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Verkoopspersoon
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Begroting en Koste Sentrum
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Veelvuldige verstekmodus van betaling is nie toegelaat nie
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,vir die
@@ -5477,7 +5482,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Oorweeg Belasting of Heffing vir
DocType: Driver,Driving License Category,Bestuurslisensie Kategorie
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werklike hoeveelheid is verpligtend
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} het tans 'n {1} Verskaffer Scorecard, en aankope bestellings aan hierdie verskaffer moet met omsigtigheid uitgereik word."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} het tans 'n {1} Verskaffer Scorecard, en aankope bestellings aan hierdie verskaffer moet met omsigtigheid uitgereik word."
DocType: Asset Maintenance Team,Asset Maintenance Team,Bate Onderhoudspan
DocType: Employee Loan,Loan Type,Lening Tipe
DocType: Scheduling Tool,Scheduling Tool,Skeduleringsinstrument
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index 02c0882..8b0a056 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,በ ዋጋ ለይ
,Delay Days,የዘገየ
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,የአገልግሎት የወጪ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,የዋጋ ዝርዝር
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,የመቆየትን ክምችት ይያዙ
DocType: Purchase Invoice Item,Item Weight Details,የንጥል ክብደት ዝርዝሮች
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ማጣቀሻ: {0}, የእቃ ኮድ: {1} እና የደንበኞች: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,ኪግ
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,የሥራ ዕድል።
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},በንጥል {1} ውስጥ የንጥል ግዢን {0} በተመለከተ ቦም አልተገለጸም
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},በንጥል {1} ውስጥ የንጥል ግዢን {0} በተመለከተ ቦም አልተገለጸም
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ውጤት ተገዝቷል
DocType: Item Attribute,Increment,ጨምር
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,የጊዜ ወሰን
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},አይፈቀድም {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,ከ ንጥሎችን ያግኙ
DocType: Price List,Price Not UOM Dependant,የዋጋ ተመን UOM ጥገኛ አይደለም
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},የምርት {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,የተዘረዘሩት ምንም ንጥሎች የሉም
DocType: Asset Repair,Error Description,የስህተት መግለጫ
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,ግሮሰሪ
DocType: Quality Inspection Reading,Reading 1,1 ማንበብ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,የጡረታ ፈንድ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ቀጣይ የእርጅና ቀን ግዢ ቀን በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,ቀጣይ የእርጅና ቀን ግዢ ቀን በፊት ሊሆን አይችልም
DocType: Crop,Perennial,የብዙ ዓመት
DocType: Consultation,Consultation Date,የምክክር ቀን
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,የምርት ዝርዝር እና ግኝት ለ ERPNext ተጠቃሚዎች
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",ለምሳሌ "አንደኛ ደረጃ ትምህርት ቤት" ወይም "ዩኒቨርሲቲ"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,የክምችት ሪፖርቶች
DocType: Warehouse,Warehouse Detail,የመጋዘን ዝርዝር
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,የሚለው ቃል መጨረሻ ቀን በኋላ የሚለው ቃል ጋር የተያያዘ ነው ይህም ወደ የትምህርት ዓመት ዓመት መጨረሻ ቀን በላይ መሆን አይችልም (የትምህርት ዓመት {}). ቀናት ለማረም እና እንደገና ይሞክሩ.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",የንብረት ዘገባ ንጥል ላይ አለ እንደ ካልተደረገበት ሊሆን አይችልም "ቋሚ ንብረት ነው"
DocType: Delivery Trip,Departure Time,የመነሻ ሰዓት
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,መስፈርቶች ዝርዝሮችን አግኝ
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,የአቅራቢዎች የጊዜ ሰሌዳዎች.
DocType: Lead,Interested,ለመወዳደር የምትፈልጉ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,ቀዳዳ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,ቀዳዳ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},ከ {0} ወደ {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,ግብሮችን ማቀናበር አልተሳካም
DocType: Item,Copy From Item Group,ንጥል ቡድን ከ ቅዳ
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,ቀን የሚያስታግሱ በመቀላቀል ቀን የበለጠ መሆን አለበት
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,ዓመት በአንድ ማምለኩን
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ረድፍ {0}: ያረጋግጡ መለያ ላይ 'Advance ነው' {1} ይህን የቅድሚያ ግቤት ከሆነ.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},{0} የመጋዘን ኩባንያ የእርሱ ወገን አይደለም {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},{0} የመጋዘን ኩባንያ የእርሱ ወገን አይደለም {1}
DocType: Email Digest,Profit & Loss,ትርፍ እና ኪሳራ
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),(ጊዜ ሉህ በኩል) ጠቅላላ ዋጋና መጠን
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ይህ በኩባንያው ግዥዎች ላይ የተመሠረተ ነው. ለዝርዝሮች ከታች ያለውን የጊዜ መስመር ይመልከቱ
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ራስ-ሰር የቁስ ጥያቄ መፍጠር ላይ በኢሜይል አሳውቅ
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,መቋቋም የሚችል
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,ምክክር
DocType: Journal Entry,Multi Currency,ባለብዙ ምንዛሬ
DocType: Opening Invoice Creation Tool,Invoice Type,የደረሰኝ አይነት
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,የመላኪያ ማስታወሻ
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,የሞተባት
DocType: Request for Quotation,Request for Quotation,ትዕምርተ ጥያቄ
DocType: Healthcare Settings,Require Lab Test Approval,የቤተሙከራ ፍቃድ ማፅደቅ ጠይቅ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,የእንጥል ኮድ> የንጥል ቡድን> ግሩፕ
DocType: Salary Slip Timesheet,Working Hours,የስራ ሰዓት
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,ድምር ውጤት
DocType: Naming Series,Change the starting / current sequence number of an existing series.,አንድ ነባር ተከታታይ ጀምሮ / የአሁኑ ቅደም ተከተል ቁጥር ለውጥ.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ወጪ ማዕከል ያስገቡ
DocType: Drug Prescription,Dosage,የመመገቢያ
DocType: Journal Entry Account,Sales Order,የሽያጭ ትዕዛዝ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,አማካኝ. መሸጥ ደረጃ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,አማካኝ. መሸጥ ደረጃ
DocType: Assessment Plan,Examiner Name,መርማሪ ስም
DocType: Lab Test Template,No Result,ምንም ውጤት
DocType: Purchase Invoice Item,Quantity and Rate,ብዛት እና ደረጃ ይስጡ
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,የደመወዝ ክፍያ ክፍለ ይምረጡ
DocType: Purchase Invoice,Unpaid,ያለክፍያ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,ለሽያጭ የተያዘ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,እባክዎ የሰራተኛ ስም ማስቀመጫ ሲስተም በሰብል ሪሶርስ> HR ቅንጅቶች ያዘጋጁ
DocType: Packing Slip,From Package No.,ጥቅል ቁጥር ከ
DocType: Item Attribute,To Range,ወደ ክልል
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ዋስትና እና ተቀማጭ
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,መሥሪያ
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,የግዢ ትዕዛዞችን ያስጠንቅቁ
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,የእርስዎ ደንበኞች መካከል ጥቂቶቹን ዘርዝር. እነዚህ ድርጅቶች ወይም ግለሰቦች ሊሆን ይችላል.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,በቂ ክፍሎች መመሥረት የሚቻለው
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,በቂ ክፍሎች መመሥረት የሚቻለው
DocType: POS Profile User,POS Profile User,POS የመገለጫ ተጠቃሚ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ቀጥታ ገቢ
DocType: Patient Appointment,Date TIme,ቀን እቅድ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","መለያ ተመድበው ከሆነ, መለያ ላይ የተመሠረተ ማጣሪያ አይቻልም"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","መለያ ተመድበው ከሆነ, መለያ ላይ የተመሠረተ ማጣሪያ አይቻልም"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,አስተዳደር ክፍል ኃላፊ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ኩባንያዎችን እና ግብሮችን ማቀናበር
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,ኮርስ ይምረጡ
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,ልዩነት መለያ
DocType: Purchase Invoice,Supplier GSTIN,አቅራቢ GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,በሥሯ ተግባር {0} ዝግ አይደለም የቅርብ ተግባር አይችሉም.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
DocType: Production Order,Additional Operating Cost,ተጨማሪ ስርዓተ ወጪ
DocType: Lab Test Template,Lab Routine,ላብራቶሪ መደበኛ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,መዋቢያዎች
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 ጋር በተያያዘ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,አስተዳዳሪ
DocType: Payment Entry,Payment From / To,/ ከ ወደ ክፍያ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},አዲስ የክሬዲት ገደብ ለደንበኛው ከአሁኑ የላቀ መጠን ያነሰ ነው. የክሬዲት ገደብ ላይ ቢያንስ መሆን አለበት {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},አዲስ የክሬዲት ገደብ ለደንበኛው ከአሁኑ የላቀ መጠን ያነሰ ነው. የክሬዲት ገደብ ላይ ቢያንስ መሆን አለበት {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},እባክዎ በ Warehouse {0} ውስጥ መለያ ያዘጋጁ
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,እና 'የቡድን በ' 'ላይ የተመሠረተ »ጋር ተመሳሳይ መሆን አይችልም
DocType: Sales Person,Sales Person Targets,የሽያጭ ሰው ዒላማዎች
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,ባች ስም
DocType: Fee Validity,Max number of visit,ከፍተኛ የጎብኝ ቁጥር
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ተፈጥሯል:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ይመዝገቡ
DocType: GST Settings,GST Settings,GST ቅንብሮች
DocType: Selling Settings,Customer Naming By,በ የደንበኛ አሰያየም
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,በጀት ላይ
DocType: Employee,Cell Number,የእጅ ስልክ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ለተሰጠው መስፈርት ምንም ሰራተኛ የለም. የደመወዝ ወረቀት አስቀድመው አልተፈጠሩም.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,ራስ-ቁሳዊ ጥያቄዎች የመነጩ
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ራስ-ቁሳዊ ጥያቄዎች የመነጩ
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ጠፍቷል
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,አንተ አምድ 'ጆርናል የሚመዘገብ ላይ »ውስጥ የአሁኑ ቫውቸር ሊገባ አይችልም
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,የአምራች ተይዟል
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ኃይል
DocType: Opportunity,Opportunity From,ከ አጋጣሚ
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ወርሃዊ ደመወዝ መግለጫ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ረድፍ {0}: {1} የቁጥር ቁጥሮች ለ Item {2} ያስፈልጋሉ. {3} ሰጥተሃል.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ረድፍ {0}: {1} የቁጥር ቁጥሮች ለ Item {2} ያስፈልጋሉ. {3} ሰጥተሃል.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,እባክህ ሰንጠረዥ ምረጥ
DocType: BOM,Website Specifications,የድር ጣቢያ ዝርዝር
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} በ 'ተቀባዮች' ውስጥ ልክ ያልሆነ የኢሜይል አድራሻ ነው.
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ጥቅስ ተጠይቋል
DocType: Vital Signs,Heart Rate / Pulse,የልብ ምት / የልብ ምት
DocType: Company,Default Bank Account,ነባሪ የባንክ ሂሳብ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",የድግስ ላይ የተመሠረተ ለማጣራት ይምረጡ ፓርቲ በመጀመሪያ ይተይቡ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",የድግስ ላይ የተመሠረተ ለማጣራት ይምረጡ ፓርቲ በመጀመሪያ ይተይቡ
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},ንጥሎች በኩል ነፃ አይደለም; ምክንያቱም 'ያዘምኑ Stock' ሊረጋገጥ አልቻለም {0}
DocType: Vehicle,Acquisition Date,ማግኛ ቀን
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,ቁጥሮች
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),የፊደል ራስዎን ይስቀሉ (900 ፒክስል በ 100 ፒክስል በድር ተስማሚ ያድርጉ)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: መለያ {2} አንድ ቡድን ሊሆን አይችልም
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ንጥል ረድፍ {idx}: {doctype} {DOCNAME} ከላይ ውስጥ የለም '{doctype} »ሰንጠረዥ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} አስቀድሞ የተጠናቀቁ ወይም ተሰርዟል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} አስቀድሞ የተጠናቀቁ ወይም ተሰርዟል
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ምንም ተግባራት
DocType: Item Variant Settings,Copy Fields to Variant,መስኮችን ወደ ስሪቶች ገልብጥ
DocType: Asset,Opening Accumulated Depreciation,ክምችት መቀነስ በመክፈት ላይ
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,ንዑስ-አብያተ ክርስቲያናት ለ እቅድ ቁሳዊ
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,የሽያጭ አጋሮች እና ግዛት
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} ገባሪ መሆን አለበት
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),መዝጊያ (መከፈቻ + ጠቅላላ)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),መዝጊያ (መከፈቻ + ጠቅላላ)
DocType: Journal Entry,Depreciation Entry,የእርጅና Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,በመጀመሪያ ስለ ሰነዱ አይነት ይምረጡ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,በመለያው ምንዛሪ ያትሙ
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ይህ ጥገና ይጎብኙ በመሰረዝ በፊት ይቅር ቁሳዊ ጥገናዎች {0}
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 ደረጃ
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},ተከታታይ አይ {0} ንጥል የእርሱ ወገን አይደለም {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,ነባሪ ተከፋይ መለያዎች
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ተቀጣሪ ንቁ አይደለም ወይም የለም
DocType: Fee Structure,Components,ክፍሎች
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
DocType: Quality Inspection Reading,Reading 6,6 ማንበብ
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,የድርጅት ስም
DocType: SMS Center,Total Message(s),ጠቅላላ መልዕክት (ዎች)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,ሰደዳ ይምረጡ ንጥል
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,እባክዎን በቅንብር> ቅንጅቶች> የስምሪት ስሞች በኩል በ {0} ስም ማዕቀብ ያዘጋጁ
DocType: Purchase Invoice,Additional Discount Percentage,ተጨማሪ የቅናሽ መቶኛ
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ሁሉም እርዳታ ቪዲዮዎች ዝርዝር ይመልከቱ
DocType: Agriculture Analysis Criteria,Soil Texture,የአፈር ዓይነት
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM የድር ጣቢያ ንጥል
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,የእርስዎን ደብዳቤ ራስ እና አርማ ይስቀሉ. (ቆይተው አርትዕ ማድረግ ይችላሉ).
DocType: Timesheet Detail,Bill,ቢል
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ቀጣይ የእርጅና ቀን ባለፈው ቀን እንደ ገባ ነው
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ቀጣይ የእርጅና ቀን ባለፈው ቀን እንደ ገባ ነው
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ነጭ
DocType: SMS Center,All Lead (Open),ሁሉም ቀዳሚ (ክፈት)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ረድፍ {0}: ለ ብዛት አይገኝም {4} መጋዘን ውስጥ {1} መግቢያ ጊዜ መለጠፍ (በ {2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,ቀጣይ የእውቂያ ቀን
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,ብዛት በመክፈት ላይ
DocType: Healthcare Settings,Appointment Reminder,የቀጠሮ ማስታወሻ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
DocType: Program Enrollment Tool Student,Student Batch Name,የተማሪ የቡድን ስም
DocType: Consultation,Doctor,ዶክተር
DocType: Holiday List,Holiday List Name,የበዓል ዝርዝር ስም
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ምደባዎች መሣሪያ ውጣ
DocType: Item,Hub Category to Publish,Hub ምድብ ወደ ህትመት
DocType: Leave Block List,Leave Block List Dates,አግድ ዝርዝር ቀኖች ውጣ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያስተካክሉ> በማስተካከል ተከታታይ ቁጥር
DocType: Sales Invoice,Billing Address GSTIN,የክፍያ አድራሻ GSTIN
DocType: Assessment Plan,Evaluate,ገምግም
DocType: Workstation,Net Hour Rate,የተጣራ ሰዓት ተመን
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,የሽያጭ ደረሰኝ ክፍያ
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,የሽያጭ ትዕዛዝ / ያለቀለት ዕቃዎች መጋዘን ውስጥ የተያዘ መጋዘን
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,ሽያጭ መጠን
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ሽያጭ መጠን
DocType: Repayment Schedule,Interest Amount,የወለድ መጠን
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,ይህን መዝገብ ኪሳራውን አጽዳቂ ናቸው. የ «ሁኔታ» እና አስቀምጥ አዘምን እባክዎ
DocType: Serial No,Creation Document No,ፍጥረት ሰነድ የለም
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,የመክፈቻ ዲግሪ ቀሪ
,GST Sales Register,GST የሽያጭ መመዝገቢያ
DocType: Sales Invoice Advance,Sales Invoice Advance,የሽያጭ ደረሰኝ የቅድሚያ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ምንም ነገር መጠየቅ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,ምንም ነገር መጠየቅ
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,ጎራዎችዎን ይምረጡ
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ሌላው የበጀት መዝገብ «{0}» አስቀድሞ ላይ አለ {1} «{2}» በጀት ዓመት ለ {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,መስኮች በሚፈጠሩበት ጊዜ ብቻ ይገለበጣሉ.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ይህ ተለዋጭ ያለውን ንጥል ኮድ ተጨምሯል ይሆናል. የእርስዎ በምህፃረ ቃል "SM" ነው; ለምሳሌ ያህል, ንጥል ኮድ "ቲሸርት", "ቲሸርት-SM" ይሆናል ተለዋጭ ያለውን ንጥል ኮድ ነው"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,የ የቀጣሪ ለማዳን አንዴ (ቃላት) የተጣራ ክፍያ የሚታይ ይሆናል.
DocType: Purchase Invoice,Is Return,መመለሻ ነው
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,ጥንቃቄ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,ጥንቃቄ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,ተመለስ / ዴቢት ማስታወሻ
DocType: Price List Country,Price List Country,የዋጋ ዝርዝር አገር
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} ንጥል ትክክለኛ ተከታታይ ቁጥሮች {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} ንጥል ትክክለኛ ተከታታይ ቁጥሮች {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ንጥል ኮድ መለያ ቁጥር ሊቀየር አይችልም
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM ልወጣ መንስኤ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ባች ቁጥር ለማግኘት ንጥል ኮድ ያስገቡ
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,የሽያጭ ትዕዛዝ {0} ልክ ያልሆነ ነው
DocType: Supplier Scorecard,Warn for new Request for Quotations,ለማብራሪያዎች አዲስ ጥያቄ አስጠንቅቅ
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,የግዢ ትዕዛዞች ዕቅድ ለማገዝ እና ግዢዎች ላይ መከታተል
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,የሙከራ ምርመራዎች ትዕዛዝ
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",ሐሳብ ጥያቄ ውስጥ ጠቅላላ እትም / ማስተላለፍ ብዛት {0} {1} \ ንጥል ለ የተጠየቀው ብዛት {2} በላይ ሊሆን አይችልም {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,መጋዘን የእውቂያ መረጃ
DocType: Payment Entry,Write Off Difference Amount,ለችግሮችህ መጠን ጠፍቷል ይጻፉ
DocType: Volunteer,Volunteer Name,የበጎ ፈቃደኝነት ስም
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,እባክዎ የመምህርውን ስም ስርዓትን በስርዓት> የትምህርት ቅንብሮች ያዋቅሩ
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: የሰራተኛ ኢሜይል አልተገኘም: ከዚህ አልተላከም ኢሜይል
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},የመላኪያ ደንቡ ለአገር አይተገበርም {0}
DocType: Item,Foreign Trade Details,የውጭ ንግድ ዝርዝሮች
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,የቡድን ጥቅል ቁጥር
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0}: ብቻ የክሬዲት መለያዎች ሌላ ዴቢት ግቤት ላይ የተገናኘ ሊሆን ይችላል
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ሁሉ ተግባር ክብደት ጠቅላላ 1. መሰረት በሁሉም የፕሮጀክቱ ተግባራት ክብደት ለማስተካከል እባክዎ መሆን አለበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,ንጥል {0} አንድ ንዑስ-ኮንትራት ንጥል መሆን አለበት
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,የካፒታል ዕቃዎች
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","የዋጋ ደ መጀመሪያ ላይ በመመስረት ነው ንጥል, ንጥል ቡድን ወይም የምርት ስም ሊሆን ይችላል, ይህም መስክ ላይ ተግብር. '"
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,የልጅ መጋዘን ይህን መጋዘን የለም. ይህን መጋዘን መሰረዝ አይችሉም.
DocType: Item,Website Item Groups,የድር ጣቢያ ንጥል ቡድኖች
DocType: Purchase Invoice,Total (Company Currency),ጠቅላላ (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,{0} መለያ ቁጥር ከአንድ ጊዜ በላይ ገባ
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,{0} መለያ ቁጥር ከአንድ ጊዜ በላይ ገባ
DocType: Journal Entry,Journal Entry,ጆርናል የሚመዘገብ መረጃ
DocType: Expense Claim Advance,Unclaimed amount,የይገባኛል ጥያቄ ያልተነሳበት መጠን
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,በሂደት ላይ {0} ንጥሎች
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,ኮሙኒኬሽን መዝገብ.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","ትዕምርተ ጥያቄ ተጨማሪ ቼክ መተላለፊያውን ቅንብሮች, ፖርታል ከ ለመድረስ ተሰናክሏል."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,የአምራች ውጤት መሥሪያ ካርታ ተለዋዋጭ ነጥብ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,የግዢ መጠን
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,የግዢ መጠን
DocType: Sales Invoice,Shipping Address Name,የሚላክበት አድራሻ ስም
DocType: Material Request,Terms and Conditions Content,ውል እና ሁኔታዎች ይዘት
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,የጊዜ ሰሌዳን የሚፈጥሩ ስህተቶች ነበሩ
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ይሄ በዚህ ተሽከርካሪ ላይ መዝገቦች ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},አቅራቢው ላይ የደረሰኝ {0} የተዘጋጀው {1}
DocType: Customer,Default Price List,ነባሪ ዋጋ ዝርዝር
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,አንተ መሰረዝ አይችሉም በጀት ዓመት {0}. በጀት ዓመት {0} አቀፍ ቅንብሮች ውስጥ እንደ ነባሪ ተዘጋጅቷል
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,ተመሳሳይ ስም ያለው ደንበኛ አስቀድሞ አለ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ይህ የደመወዝ ወረቀቶችን ያቀርባል እና የአስፈፃሚ ጆርጅ ኢንተርስን ይፍጠሩ. መቀጠል ይፈልጋሉ?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,የዋጋ
DocType: Quotation,Term Details,የሚለው ቃል ዝርዝሮች
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ይህ ተማሪ ቡድን {0} ተማሪዎች በላይ መመዝገብ አይችልም.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),ጠቅላላ (ያለ ግብር)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,በእርሳስ ቆጠራ
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 የበለጠ መሆን አለበት
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,ክምችት ይገኛል
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,የደረሰኝ ስረዛ ላይ ክፍያ አታገናኝ
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ገባ የአሁኑ Odometer ንባብ የመጀመሪያ የተሽከርካሪ Odometer የበለጠ መሆን አለበት {0}
DocType: Restaurant Reservation,No Show,አልመጣም
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,እባክዎን በቅንብር> ቅንጅቶች> የስምሪት ስሞች በኩል በ {0} ስም ማዕቀብ ያዘጋጁ
DocType: Shipping Rule Country,Shipping Rule Country,መላኪያ ደንብ አገር
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ውጣ እና ክትትል
DocType: Maintenance Visit,Partially Completed,በከፊል የተጠናቀቁ
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,የተማሪ ቡድን አስተማሪ
DocType: Grant Application,Assessment Mark (Out of 10),የምክክር ማርክ (ከ 10 ውስጥ)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ተንቀሳቃሽ አይ
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ዋና
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,ዋና
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ተለዋጭ
DocType: Naming Series,Set prefix for numbering series on your transactions,በእርስዎ ግብይቶች ላይ ተከታታይ ቁጥር አዘጋጅ ቅድመ ቅጥያ
DocType: Employee Attendance Tool,Employees HTML,ተቀጣሪዎች ኤችቲኤምኤል
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,የኮርስ ምህፃረ ቃል
DocType: Student Leave Application,Student Leave Application,የተማሪ ፈቃድ ማመልከቻ
DocType: Item,Will also apply for variants,በተጨማሪም ተለዋጮች ማመልከት ይሆን
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ላይ ግማሽ ቀን ላይ ሠራተኛ {0} {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ጠቅላላ የሥራ ሰዓቶች ከፍተኛ የሥራ ሰዓት በላይ መሆን የለበትም {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ላይ
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),ትክክለኛው መጨረሻ ቀን (ሰዓት ሉህ በኩል)
DocType: Soil Texture,Soil Type,የአፈር አይነት
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,አዲስ መልዕክት
,Quotation Trends,በትዕምርተ ጥቅስ አዝማሚያዎች
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ንጥል ቡድን ንጥል ንጥል ጌታ ውስጥ የተጠቀሰው አይደለም {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
DocType: Shipping Rule,Shipping Amount,መላኪያ መጠን
DocType: Supplier Scorecard Period,Period Score,የዘፈን ነጥብ
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ደንበኞች ያክሉ
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,የተሽከርካሪ ወጪ
DocType: Serial No,Invoice Details,የደረሰኝ ዝርዝሮች
DocType: Grant Application,Show on Website,በድረገፅ አሳይ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ጀምር
DocType: Hub Category,Hub Category,Hub ምድብ
DocType: Purchase Invoice,SEZ,SEZ
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,ቢ አዎንታዊ
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
DocType: Leave Block List Allow,Leave Block List Allow,አግድ ዝርዝር ፍቀድ ይነሱ
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
DocType: Patient Medical Record,Patient Medical Record,ታካሚ የሕክምና መዝገብ
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,ያልሆኑ ቡድን ቡድን
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ስፖርት
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,የተቀበሉት አር.ኤም.ፒ. ወደ "ምንም" የለም
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,ጠቅላላ ተቀናሽ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,በመለያው ምንዛሬ ለማተም አንድ መለያ ይምረጡ
,Production Analytics,የምርት ትንታኔ
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ይህ በ E ዚህ ህመምተኛ ላይ የተደረጉ ግብይቶች ላይ የተመሠረተ ነው. ለዝርዝሮች ከታች ያለውን የጊዜ መስመር ይመልከቱ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ወጪ ዘምኗል
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ኩባንያ ይምረጡ ...
DocType: Leave Control Panel,Leave blank if considered for all departments,ሁሉም ክፍሎች እየታሰቡ ከሆነ ባዶውን ይተው
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","የሥራ ዓይነቶች (ቋሚ, ውል, እሥረኛ ወዘተ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
DocType: Payroll Entry,Fortnightly,በየሁለት ሳምንቱ
DocType: Currency Exchange,From Currency,ምንዛሬ ከ
DocType: Vital Signs,Weight (In Kilogram),ክብደት (በኪልግራም)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,አሳዳጊዎች
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,የዋጋ ዝርዝር ካልተዋቀረ ዋጋዎች አይታይም
DocType: Stock Entry,Total Incoming Value,ጠቅላላ ገቢ ዋጋ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ዴት ወደ ያስፈልጋል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ዴት ወደ ያስፈልጋል
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets በእርስዎ ቡድን እንዳደረገ activites ጊዜ, ወጪ እና የማስከፈያ እንዲከታተሉ ለመርዳት"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,የግዢ ዋጋ ዝርዝር
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,የአቅራቢዎች የውጤት መለኪያዎች አብነቶች.
@@ -2654,7 +2659,7 @@
DocType: Company,For Reference Only.,ማጣቀሻ ያህል ብቻ.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},ሀኪም {0} በ {1} ላይ አይገኝም
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,ምረጥ የጅምላ አይ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ልክ ያልሆነ {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},ልክ ያልሆነ {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,የማጣቀሻ ማመልከቻ
@@ -2691,8 +2696,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","የ ክወናዎች, የክወና ወጪ ይጥቀሱ እና ቀዶ ሕክምና ምንም ልዩ ክወና መስጠት."
DocType: Water Analysis,Origin,መነሻ
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ይህ ሰነድ በ ገደብ በላይ ነው {0} {1} ንጥል {4}. እናንተ እያደረግን ነው በዚያው ላይ ሌላ {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
DocType: Purchase Invoice,Price List Currency,የዋጋ ዝርዝር ምንዛሬ
DocType: Naming Series,User must always select,ተጠቃሚው ሁልጊዜ መምረጥ አለብዎ
DocType: Stock Settings,Allow Negative Stock,አሉታዊ የአክሲዮን ፍቀድ
@@ -2748,7 +2753,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,ለአዲስ የግዢ ትዕዛዞች ያስጠንቅቁ
DocType: Quality Inspection Reading,Reading 9,9 ማንበብ
DocType: Supplier,Is Frozen,የቆመ ነው?
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,የቡድን መስቀለኛ መንገድ መጋዘን ግብይቶች ለ ለመምረጥ አይፈቀድም
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,የቡድን መስቀለኛ መንገድ መጋዘን ግብይቶች ለ ለመምረጥ አይፈቀድም
DocType: Buying Settings,Buying Settings,ሊገዙ ቅንብሮች
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,አንድ ያለቀለት ጥሩ ንጥል ለ BOM ቁ
DocType: Upload Attendance,Attendance To Date,ቀን ወደ በስብሰባው
@@ -2762,6 +2767,7 @@
DocType: Grant Application,Organization,ድርጅት
DocType: BOM Update Tool,BOM Update Tool,የ BOM ማሻሻያ መሳሪያ
DocType: SG Creation Tool Course,Student Group Name,የተማሪ የቡድን ስም
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,የተበተለ እይታ አሳይ
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ክፍያዎች በመፍጠር
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,በእርግጥ ይህ ኩባንያ ሁሉንም ግብይቶችን መሰረዝ ይፈልጋሉ እርግጠኛ ይሁኑ. ነው እንደ ዋና ውሂብ ይቆያል. ይህ እርምጃ ሊቀለበስ አይችልም.
DocType: Room,Room Number,የክፍል ቁጥር
@@ -2772,7 +2778,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,የግብር አብነት ስራ
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,የተጠቃሚ መድረክ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
DocType: Lab Test Sample,Lab Test Sample,የቤተ ሙከራ የሙከራ ናሙና
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ማንኛውም ንጥል agianst የተጠቀሰው ከሆነ መጠን መቀየር አይችሉም
@@ -2843,7 +2849,7 @@
DocType: Membership,USD,ዩኤስዶላር
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,የገንዘብ መጠየቂያ ደረሰኝ አድርግ
DocType: Selling Settings,Auto close Opportunity after 15 days,15 ቀናት በኋላ ራስ የቅርብ አጋጣሚ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,የግዢ ትዕዛዞች በ {1} ውጤት መስጫ ነጥብ ምክንያት ለ {0} አይፈቀዱም.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,የግዢ ትዕዛዞች በ {1} ውጤት መስጫ ነጥብ ምክንያት ለ {0} አይፈቀዱም.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,የመጨረሻ ዓመት
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / በእርሳስ%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,ውሌ መጨረሻ ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
@@ -2934,7 +2940,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-በላይ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,የረድፍ # {0}: ጆርናል የሚመዘገብ {1} መለያ የለውም {2} ወይም አስቀድሞ በሌላ ቫውቸር ጋር ይዛመዳሉ
DocType: Supplier Scorecard Criteria,Criteria Weight,መስፈርት ክብደት
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,አቅራቢ> አቅራቢ አይነት
DocType: Buying Settings,Default Buying Price List,ነባሪ መግዛትና ዋጋ ዝርዝር
DocType: Payroll Entry,Salary Slip Based on Timesheet,Timesheet ላይ የተመሠረተ የቀጣሪ
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,የግዢ ዋጋ
@@ -3022,7 +3027,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,የትራክ ኢንዱስትሪ ዓይነት ይመራል.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,ወደ ፊደል ወረቀቶች ሂድ
DocType: Item Supplier,Item Supplier,ንጥል አቅራቢ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ሁሉም አድራሻዎች.
DocType: Company,Stock Settings,የክምችት ቅንብሮች
@@ -3199,6 +3204,7 @@
DocType: Company,Default Inventory Account,ነባሪ ቆጠራ መለያ
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ረድፍ {0}: ተጠናቋል ብዛት ከዜሮ በላይ መሆን አለበት.
DocType: Antibiotic,Antibiotic Name,የአንቲባዮቲክ ስም
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,የእንጥል ኮድ> የንጥል ቡድን> ግሩፕ
DocType: Purchase Invoice,Apply Additional Discount On,ተጨማሪ የቅናሽ ላይ ተግብር
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,ዓይነት ምረጥ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ሰብላቱ እያደገ ላለው ለሁሉም የመሬት አሃዶች አገናኝ
@@ -3392,6 +3398,7 @@
DocType: Supplier,Credit Limit,የብድር ገደብ
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,አማካ. የዋጋ ዝርዝር ዋጋ
DocType: Production Plan Sales Order,Salse Order Date,Salse ትዕዛዝ ቀን
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,አቅራቢ> አቅራቢ አይነት
DocType: Salary Component,Salary Component,ደመወዝ ክፍለ አካል
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,የክፍያ ምዝግቦችን {0}-un ጋር የተገናኘ ነው
DocType: GL Entry,Voucher No,ቫውቸር ምንም
@@ -3400,7 +3407,7 @@
DocType: Leave Allocation,Leave Allocation,ምደባዎች ውጣ
DocType: Payment Request,Recipient Message And Payment Details,የተቀባይ መልዕክት እና የክፍያ ዝርዝሮች
DocType: Training Event,Trainer Email,አሰልጣኝ ኢሜይል
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,የተፈጠረ ቁሳዊ ጥያቄዎች {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,የተፈጠረ ቁሳዊ ጥያቄዎች {0}
DocType: Restaurant Reservation,No of People,የሰዎች ቁጥር
DocType: Production Planning Tool,Include sub-contracted raw materials,ንዑስ-ኮንትራት ጥሬ ዕቃዎች አካትት
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ውሎች ወይም ውል አብነት.
@@ -3464,7 +3471,7 @@
DocType: Production Planning Tool,Create Material Requests,ቁሳዊ ጥያቄዎች ፍጠር
DocType: Employee Education,School/University,ትምህርት ቤት / ዩኒቨርስቲ
DocType: Payment Request,Reference Details,የማጣቀሻ ዝርዝሮች
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ጠቃሚ ሕይወት በኋላ የሚጠበቀው ዋጋ ጠቅላላ የግዢ መጠን ያነሰ መሆን አለበት
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ጠቃሚ ሕይወት በኋላ የሚጠበቀው ዋጋ ጠቅላላ የግዢ መጠን ያነሰ መሆን አለበት
DocType: Sales Invoice Item,Available Qty at Warehouse,መጋዘን ላይ ይገኛል ብዛት
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,የሚከፈል መጠን
DocType: Asset,Double Declining Balance,ድርብ ካልተቀበሉት ቀሪ
@@ -3476,7 +3483,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ዝማኔዎች አግኝ
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: መለያ {2} ኩባንያ የእርሱ ወገን አይደለም {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,ከእያንዳንዱ ባህርያት ቢያንስ አንድ እሴት ይምረጡ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,ቁሳዊ ጥያቄ {0} ተሰርዟል ወይም አቁሟል ነው
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,ቁሳዊ ጥያቄ {0} ተሰርዟል ወይም አቁሟል ነው
apps/erpnext/erpnext/config/hr.py +310,Leave Management,አስተዳደር ውጣ
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,መለያ ቡድን
DocType: Sales Order,Fully Delivered,ሙሉ በሙሉ ደርሷል
@@ -3487,14 +3494,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},በመገኘቱ መጠን የብድር መጠን መብለጥ አይችልም {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,ወደ ፕሮግራሞች ሂድ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ረድፍ {0} # የተመደበ መጠን {1} ከቀረበበት የይገባኛል መጠን በላይ ሊሆን አይችልም {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያስተካክሉ> በማስተካከል ተከታታይ ቁጥር
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ንጥል ያስፈልጋል ትዕዛዝ ቁጥር ይግዙ {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,የምርት ትዕዛዝ አልተፈጠረም
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','ቀን ጀምሮ' በኋላ 'እስከ ቀን' መሆን አለበት
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ተማሪ ሁኔታ መለወጥ አይቻልም {0} የተማሪ ማመልከቻ ጋር የተያያዘ ነው {1}
DocType: Asset,Fully Depreciated,ሙሉ በሙሉ የቀነሰበት
,Stock Projected Qty,የክምችት ብዛት የታቀደበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,ምልክት ተደርጎበታል ክትትል ኤችቲኤምኤል
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ጥቅሶች, የእርስዎ ደንበኞች ልከዋል ተጫራቾች ሀሳቦች ናቸው"
DocType: Sales Order,Customer's Purchase Order,ደንበኛ የግዢ ትዕዛዝ
@@ -3578,7 +3584,7 @@
DocType: Stock Settings,Item Naming By,ንጥል በ መሰየምን
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ሌላው ክፍለ ጊዜ መዝጊያ Entry {0} በኋላ ተደርጓል {1}
DocType: Production Order,Material Transferred for Manufacturing,ቁሳዊ ማኑፋክቸሪንግ ለ ተላልፈዋል
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,መለያ {0} ነው አይደለም አለ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,መለያ {0} ነው አይደለም አለ
DocType: Project,Project Type,የፕሮጀክት አይነት
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ለዚህ ተግባር ስራ አስኪያጅ ስራ ተገኝቷል. ይህን ተግባር መሰረዝ አይችሉም.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ወይ ዒላማ ብዛት ወይም የዒላማ መጠን የግዴታ ነው.
@@ -3680,11 +3686,11 @@
DocType: Company,Asset Depreciation Cost Center,የንብረት ዋጋ መቀነስ ወጪ ማዕከል
DocType: Sales Order Item,Sales Order Date,የሽያጭ ትዕዛዝ ቀን
DocType: Sales Invoice Item,Delivered Qty,ደርሷል ብዛት
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,አጠቃላይ ድምር ግብር
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","ከተመረጠ, እያንዳንዱ ምርት ንጥል ልጆች ሁሉ የቁሳዊ ጥያቄዎች ውስጥ ይካተታል."
DocType: Assessment Plan,Assessment Plan,ግምገማ ዕቅድ
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,ደንበኛ {0} ተፈጥሯል.
DocType: Stock Settings,Limit Percent,ገድብ መቶኛ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,እባክዎ የመምህርውን ስም ስርዓትን በስርዓት> የትምህርት ቅንብሮች ያዋቅሩ
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,በአሁኑ ጊዜ በማንኛውም መጋዘን ውስጥ ምንም አክሲዮስ የለም
,Payment Period Based On Invoice Date,ደረሰኝ ቀን ላይ የተመሠረተ የክፍያ ክፍለ ጊዜ
DocType: Sample Collection,No. of print,የህትመት ብዛት
@@ -3700,12 +3706,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),ተበዳሪዎች ({0})
DocType: Pricing Rule,Margin,ህዳግ
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,አዲስ ደንበኞች
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,አጠቃላይ ትርፍ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,አጠቃላይ ትርፍ%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS የመልዕክት መለወጥ
DocType: Bank Reconciliation Detail,Clearance Date,መልቀቂያ ቀን
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,የግምገማ ሪፖርት
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,አጠቃላይ የግዢ መጠን የግዴታ ነው
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,አጠቃላይ የግዢ መጠን የግዴታ ነው
DocType: Lead,Address Desc,DESC አድራሻ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,ፓርቲ የግዴታ ነው
DocType: Journal Entry,JV-,JV-
@@ -3737,7 +3743,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,ቋሚ ስም
DocType: Stock Entry,Customer or Supplier Details,የደንበኛ ወይም አቅራቢ ዝርዝሮች
DocType: Employee Loan Application,Required by Date,ቀን በሚጠይቀው
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),የዝቅተኛ ሂሳብ (ዶክተር - ክ)
DocType: Lead,Lead Owner,በእርሳስ ባለቤት
DocType: Bin,Requested Quantity,ጠይቀዋል ብዛት
DocType: Patient,Marital Status,የጋብቻ ሁኔታ
@@ -3751,7 +3756,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,በርካታ ስሪቶች
DocType: Sales Invoice,Against Income Account,የገቢ መለያ ላይ
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ደርሷል
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ንጥል {0}: የዕቃው ብዛት {1} ዝቅተኛ ትዕዛዝ ብዛት {2} (ንጥል ፍቺ) ይልቅ ያነሰ ሊሆን አይችልም.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ንጥል {0}: የዕቃው ብዛት {1} ዝቅተኛ ትዕዛዝ ብዛት {2} (ንጥል ፍቺ) ይልቅ ያነሰ ሊሆን አይችልም.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ወርሃዊ ስርጭት መቶኛ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,እባክህ እንደ ሌላ ተጠቃሚ ግባ.
DocType: Territory,Territory Targets,ግዛት ዒላማዎች
@@ -3850,7 +3855,7 @@
DocType: Serial No,Out of AMC,AMC ውጪ
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,የጥገና ጉብኝት አድርግ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
DocType: Company,Default Cash Account,ነባሪ በጥሬ ገንዘብ መለያ
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ኩባንያ (አይደለም የደንበኛ ወይም አቅራቢው) ጌታው.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ይህ የዚህ ተማሪ በስብሰባው ላይ የተመሠረተ ነው
@@ -4000,7 +4005,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ለተጠቀሱት መስፈርቶች ምንም ሰራተኞች የሉም
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
DocType: Restaurant,Default Customer,ነባሪ ደንበኛ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,እባክዎ የሰራተኛ ስም ማስቀመጫ ሲስተም በሰብል ሪሶርስ> HR ቅንጅቶች ያዘጋጁ
DocType: Assessment Plan,Supervisor Name,ሱፐርቫይዘር ስም
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ቀጠሮው ለተመሳሳይ ቀን መደረግ እንዳለበት አረጋግጡ
DocType: Program Enrollment Course,Program Enrollment Course,ፕሮግራም ምዝገባ ኮርስ
@@ -4118,7 +4122,7 @@
DocType: BOM,Website Description,የድር ጣቢያ መግለጫ
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ፍትህ ውስጥ የተጣራ ለውጥ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,እጅግ በጣም አዲስ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","የኢሜይል አድራሻ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
DocType: Serial No,AMC Expiry Date,AMC የሚቃጠልበት ቀን
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,ደረሰኝ
@@ -4135,7 +4139,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ፈቃድ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,እናንተ ደግሞ ካለፈው በጀት ዓመት ሚዛን በዚህ የበጀት ዓመት ወደ ቅጠሎች ማካተት የሚፈልጉ ከሆነ ወደፊት አኗኗራችሁ እባክዎ ይምረጡ
DocType: GL Entry,Against Voucher Type,ቫውቸር አይነት ላይ
DocType: Physician,Phone (R),ስልክ (አር)
@@ -4147,7 +4151,7 @@
DocType: Patient,B Negative,ቢ አሉታዊ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,የጥገና ሁኔታን ለመሰረዝ ወይም ለመጠናቀቅ የተሞላ መሆን አለበት
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},መለያ {0} ነው ኩባንያ ንብረት አይደለም {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,{0} ረድፍ ላይ መለያ ቁጥር አሰጣጥ ማስታወሻ ጋር አይዛመድም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,{0} ረድፍ ላይ መለያ ቁጥር አሰጣጥ ማስታወሻ ጋር አይዛመድም
DocType: Student,Guardian Details,አሳዳጊ ዝርዝሮች
DocType: C-Form,C-Form,ሲ-ቅጽ
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,በርካታ ሠራተኞች ምልክት ክትትል
@@ -4189,7 +4193,7 @@
DocType: Stock Entry Detail,Basic Amount,መሰረታዊ መጠን
DocType: Training Event,Exam,ፈተና
DocType: Complaint,Complaint,ቅሬታ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
DocType: Leave Allocation,Unused leaves,ያልዋለ ቅጠሎች
DocType: Patient,Alcohol Past Use,አልኮል ጊዜ ያለፈበት አጠቃቀም
DocType: Fertilizer Content,Fertilizer Content,የማዳበሪያ ይዘት
@@ -4313,6 +4317,7 @@
DocType: Salary Detail,Formula,ፎርሙላ
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,ተከታታይ #
DocType: Lab Test Template,Lab Test Template,የሙከራ መለኪያ አብነት
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,የሽያጭ መለያ
DocType: Purchase Invoice Item,Total Weight,ጠቅላላ ክብደት
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,የሽያጭ ላይ ኮሚሽን
DocType: Offer Letter Term,Value / Description,እሴት / መግለጫ
@@ -4469,7 +4474,7 @@
DocType: Customer,From Lead,ሊድ ከ
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ትዕዛዞች ምርት ከእስር.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,በጀት ዓመት ይምረጡ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
DocType: Program Enrollment Tool,Enroll Students,ተማሪዎች ይመዝገቡ
DocType: Lab Test,Approved Date,የተፈቀደበት ቀን
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,መደበኛ ሽያጭ
@@ -4545,7 +4550,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,የምርት ንጥል
,Employee Information,የሰራተኛ መረጃ
DocType: Stock Entry Detail,Additional Cost,ተጨማሪ ወጪ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ቫውቸር ምንም ላይ የተመሠረተ ማጣሪያ አይችሉም, ቫውቸር በ ተመድበው ከሆነ"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","ቫውቸር ምንም ላይ የተመሠረተ ማጣሪያ አይችሉም, ቫውቸር በ ተመድበው ከሆነ"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,አቅራቢው ትዕምርተ አድርግ
DocType: Quality Inspection,Incoming,ገቢ
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,ለሽያጭ እና ለግዢ ነባሪ የግብር አብነቶች ተፈጥረዋል.
@@ -4562,7 +4567,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},ማስታወሻ: {0}
,Delivery Note Trends,የመላኪያ ማስታወሻ በመታየት ላይ ያሉ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ይህ ሳምንት ማጠቃለያ
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,የክምችት ብዛት ውስጥ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,የክምችት ብዛት ውስጥ
DocType: Delivery Trip,Calculate Estimated Arrival Times,የተገመተ የመድረስ ጊዜዎችን አስሉ
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,መለያ: {0} ብቻ የአክሲዮን ግብይቶች በኩል መዘመን ይችላሉ
DocType: Student Group Creation Tool,Get Courses,ኮርሶች ያግኙ
@@ -4578,7 +4583,7 @@
DocType: Material Request,% Ordered,% የዕቃው መረጃ
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","የትምህርት የተመሠረተ የተማሪዎች ቡድን, የቀየረ ፕሮግራም ምዝገባ ውስጥ የተመዘገቡ ኮርሶች ጀምሮ ለእያንዳንዱ ተማሪ ሊረጋገጥ ይሆናል."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ጭማቂዎች
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,አማካኝ. ሊገዙ ተመን
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,አማካኝ. ሊገዙ ተመን
DocType: Task,Actual Time (in Hours),(ሰዓቶች ውስጥ) ትክክለኛ ሰዓት
DocType: Employee,History In Company,ኩባንያ ውስጥ ታሪክ
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},አዲስ መልዕክት ከ {ላኪ}
@@ -4626,7 +4631,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ረድፍ {0}: ወደ BOM # ምንዛሬ {1} በተመረጠው ምንዛሬ እኩል መሆን አለበት {2}
DocType: Journal Entry Account,Exchange Rate,የመለወጫ ተመን
DocType: Patient,Additional information regarding the patient,በሽተኛውን በተመለከተ ተጨማሪ መረጃ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
DocType: Homepage,Tag Line,መለያ መስመር
DocType: Fee Component,Fee Component,የክፍያ ክፍለ አካል
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,መርከቦች አስተዳደር
@@ -4838,7 +4843,7 @@
DocType: Employee Education,Employee Education,የሰራተኛ ትምህርት
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ንጥል ቡድን ሠንጠረዥ ውስጥ አልተገኘም አባዛ ንጥል ቡድን
DocType: Land Unit,Parent Land Unit,ወላጅ መሬት መለኪያ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
DocType: Fertilizer,Fertilizer Name,የማዳበሪያ ስም
DocType: Salary Slip,Net Pay,የተጣራ ክፍያ
DocType: Account,Account,ሒሳብ
@@ -4917,7 +4922,7 @@
DocType: Item Customer Detail,Ref Code,ማጣቀሻ ኮድ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,የቡድን ቡድን በ POS ዝርዝር ውስጥ ያስፈልጋል
apps/erpnext/erpnext/config/hr.py +12,Employee records.,የሰራተኛ መዝገቦች.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,ቀጣይ የእርጅና ቀን ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,ቀጣይ የእርጅና ቀን ማዘጋጀት እባክዎ
DocType: HR Settings,Payroll Settings,ከደመወዝ ክፍያ ቅንብሮች
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,ያልሆኑ የተገናኘ ደረሰኞች እና ክፍያዎች አዛምድ.
DocType: POS Settings,POS Settings,የ POS ቅንብሮች
@@ -5084,7 +5089,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},ለ የልደት አስታዋሽ {0}
DocType: Asset Maintenance Task,Last Completion Date,መጨረሻ የተጠናቀቀበት ቀን
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,የመጨረሻ ትዕዛዝ ጀምሮ ቀናት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
DocType: Buying Settings,Naming Series,መሰየምን ተከታታይ
DocType: Leave Block List,Leave Block List Name,አግድ ዝርዝር ስም ውጣ
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ኢንሹራንስ የመጀመሪያ ቀን መድን የመጨረሻ ቀን ያነሰ መሆን አለበት
@@ -5210,6 +5215,7 @@
DocType: Bank Reconciliation,Get Payment Entries,የክፍያ ምዝግቦችን ያግኙ
DocType: Quotation Item,Against Docname,DOCNAME ላይ
DocType: SMS Center,All Employee (Active),ሁሉም ሰራተኛ (ንቁ)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ደንበኛ> የሽያጭ ቡድን> ግዛት
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,አሁን ይመልከቱ
DocType: BOM,Raw Material Cost,ጥሬ የቁሳዊ ወጪ
DocType: Item Reorder,Re-Order Level,ዳግም-ትዕዛዝ ደረጃ
@@ -5308,7 +5314,6 @@
DocType: Room,Seating Capacity,መቀመጫ አቅም
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,ቤተ ሙከራ የሙከራ ቡድኖች
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ደንበኛ> የሽያጭ ቡድን> ግዛት
DocType: Project,Total Expense Claim (via Expense Claims),ጠቅላላ የወጪ የይገባኛል ጥያቄ (የወጪ የይገባኛል በኩል)
DocType: GST Settings,GST Summary,GST ማጠቃለያ
DocType: Assessment Result,Total Score,አጠቃላይ ነጥብ
@@ -5321,7 +5326,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,የኮርስ መርሃግብሮች መከተል ተፈጠረ
DocType: Journal Entry,Total Debit,ጠቅላላ ዴቢት
DocType: Manufacturing Settings,Default Finished Goods Warehouse,ነባሪ ጨርሷል ዕቃዎች መጋዘን
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,የሽያጭ ሰው
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,የሽያጭ ሰው
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,በጀት እና ወጪ ማዕከል
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ባለብዙ ነባሪ የክፍያ ስልት አይፈቀድም
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ለ
@@ -5494,7 +5499,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,ለ ታክስ ወይም ክፍያ ተመልከት
DocType: Driver,Driving License Category,የመንጃ ፍቃድ ምድብ
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ትክክለኛው ብዛት የግዴታ ነው
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} በአሁኑ ጊዜ {1} የአቅጣጫ ጠቋሚ የመቁጠሪያ መለያ ደረጃ አለው, እና ለእዚህ አቅራቢ ግዢ ትዕዛዞች በጥንቃቄ ማስቀመጥ አለበት."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} በአሁኑ ጊዜ {1} የአቅጣጫ ጠቋሚ የመቁጠሪያ መለያ ደረጃ አለው, እና ለእዚህ አቅራቢ ግዢ ትዕዛዞች በጥንቃቄ ማስቀመጥ አለበት."
DocType: Asset Maintenance Team,Asset Maintenance Team,የንብረት ጥገና ቡድን
DocType: Employee Loan,Loan Type,የብድር አይነት
DocType: Scheduling Tool,Scheduling Tool,ዕቅድ ማውጫ መሣሪያ
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index e18bd8e..dd1ff5e 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,فرز حسب السعر
,Delay Days,تأخير أيام
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,نفقات الصيانة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,فاتورة
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,جعل الاحتفاظ دخول الأسهم
DocType: Purchase Invoice Item,Item Weight Details,وزن السلعة التفاصيل
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",المرجع: {0}، رمز العنصر: {1} والعميل: {2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,كجم
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,إعلان عن وظيفة شاغرة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},لم يتم تحديد بوم للتعاقد من الباطن البند {0} في الصف {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},لم يتم تحديد بوم للتعاقد من الباطن البند {0} في الصف {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} النتيجة المقدمة
DocType: Item Attribute,Increment,الزيادة
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,الفترة الزمنية
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},غير مسموح به {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,الحصول على البنود من
DocType: Price List,Price Not UOM Dependant,السعر لا تعتمد على أوم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},المنتج {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,لم يتم إدراج أية عناصر
DocType: Asset Repair,Error Description,وصف خاطئ
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,بقالة
DocType: Quality Inspection Reading,Reading 1,قراءة 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,صناديق التقاعد
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,تاريخ الاستهلاك التالي لا يمكن أن يكون قبل تاريخ الشراء
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,تاريخ الاستهلاك التالي لا يمكن أن يكون قبل تاريخ الشراء
DocType: Crop,Perennial,الدائمة
DocType: Consultation,Consultation Date,تاريخ التشاور
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,قائمة المنتجات واكتشاف المستخدمين إربينكست
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","مثلا ""المدرسة الابتدائية"" أو ""الجامعة"""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,تقارير المخزون
DocType: Warehouse,Warehouse Detail,تفاصيل المستودع
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},تم تجاوز الحد المسموح به للدين للزبون {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},تم تجاوز الحد المسموح به للدين للزبون {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاريخ نهاية المدة لا يمكن أن يكون في وقت لاحق من تاريخ نهاية السنة للعام الدراسي الذي يرتبط مصطلح (السنة الأكاديمية {}). يرجى تصحيح التواريخ وحاول مرة أخرى.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""اصل ثابت"" لا يمكن أن يكون غير محدد، حيث يوجد سجل أصول مقابل البند"
DocType: Delivery Trip,Departure Time,وقت المغادرة
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,الحصول على تفاصيل المواصفات
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,قوالب ترتيب الموردين.
DocType: Lead,Interested,مهتم
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,افتتاحي
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,افتتاحي
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},من {0} إلى {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,أخفق إعداد الضرائب
DocType: Item,Copy From Item Group,نسخة من المجموعة السلعة
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,تاريخ ترك العمل يجب أن يكون بعد تاريخ الالتحاق بالعمل
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,الأجزات في السنة
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"الصف {0}: يرجى اختيار ""دفعة مقدمة"" مقابل الحساب {1} إذا كان هذا الادخال دفعة مقدمة."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
DocType: Email Digest,Profit & Loss,الخسارة و الأرباح
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,لتر
DocType: Task,Total Costing Amount (via Time Sheet),إجمالي حساب التكاليف المبلغ (عبر ورقة الوقت)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,يستند ذلك إلى معامالت ضد هذه الشركة. انظر الجدول الزمني أدناه للحصول على التفاصيل
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,إبلاغ عن طريق البريد الإلكتروني على خلق مادة التلقائي طلب
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,مقاومة
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,متعدد العملات
DocType: Opening Invoice Creation Tool,Invoice Type,نوع الفاتورة
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,اشعار تسليم
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,ارمل
DocType: Request for Quotation,Request for Quotation,طلب للحصول على الاقتباس
DocType: Healthcare Settings,Require Lab Test Approval,يلزم الموافقة على اختبار المختبر
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,رمز البند> مجموعة المنتجات> العلامة التجارية
DocType: Salary Slip Timesheet,Working Hours,ساعات العمل
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,إجمالي المعلقة
DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغيير رقم تسلسل بدء / الحالي من سلسلة الموجودة.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,الرجاء إدخال مركز التكلفة
DocType: Drug Prescription,Dosage,جرعة
DocType: Journal Entry Account,Sales Order,طلبات العملاء
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,متوسط سعر المبيعات
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,متوسط سعر المبيعات
DocType: Assessment Plan,Examiner Name,اسم الممتحن
DocType: Lab Test Template,No Result,لا نتيجة
DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,تحديد فترة دفع الرواتب
DocType: Purchase Invoice,Unpaid,غير مدفوع
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,محفوظة للبيع
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,الرجاء الإعداد نظام تسمية الموظف في الموارد البشرية> إعدادات الموارد البشرية
DocType: Packing Slip,From Package No.,من رقم حزمة
DocType: Item Attribute,To Range,تتراوح
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,الأوراق المالية و الودائع
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,ورشة عمل
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,تحذير أوامر الشراء
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,أدرج بعض من زبائنك. ويمكن أن تكون منظمات أو أفراد.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,يكفي لبناء أجزاء
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,يكفي لبناء أجزاء
DocType: POS Profile User,POS Profile User,نقاط البيع الشخصية الملف الشخصي
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,دخل مباشر
DocType: Patient Appointment,Date TIme,تاريخ التاريخ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",لا يمكن الفلتره علي اساس (الحساب)، إذا تم وضعه في مجموعة على اساس (حساب)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",لا يمكن الفلتره علي اساس (الحساب)، إذا تم وضعه في مجموعة على اساس (حساب)
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,موظف إداري
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,إنشاء الشركة والضرائب
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,الرجاء تحديد الدورة التدريبية
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,حساب الفرق
DocType: Purchase Invoice,Supplier GSTIN,مورد غستين
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,لا يمكن إغلاق المهمة لان المهمة التابعة لها {0} غير مغلقة.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,الرجاء إدخال المخزن الذي سيتم رفع طلب المواد اليه
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,الرجاء إدخال المخزن الذي سيتم رفع طلب المواد اليه
DocType: Production Order,Additional Operating Cost,تكاليف تشغيل اضافية
DocType: Lab Test Template,Lab Routine,مختبر الروتينية
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,مستحضرات التجميل
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,العلاقة مع ولي الامر 2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مدير
DocType: Payment Entry,Payment From / To,الدفع من / إلى
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد المسموح به للدين الجديد أقل من المبلغ الحالي المستحق على الزبون. يجب أن يكون الحد المسموح به للدين على الأقل {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد المسموح به للدين الجديد أقل من المبلغ الحالي المستحق على الزبون. يجب أن يكون الحد المسموح به للدين على الأقل {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},يرجى تعيين الحساب في مستودع {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'على أساس' و 'المجموعة حسب' لا يمكن أن يكونا نفس الشيء
DocType: Sales Person,Sales Person Targets,اهداف رجل المبيعات
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,اسم الدفعة
DocType: Fee Validity,Max number of visit,الحد الأقصى لعدد الزيارات
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,الجدول الزمني الانشاء:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},يرجى تعيين حساب النقد أو الحساب المصرفيالافتراضي لطريقة الدفع {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},يرجى تعيين حساب النقد أو الحساب المصرفيالافتراضي لطريقة الدفع {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,سجل
DocType: GST Settings,GST Settings,إعدادات غست
DocType: Selling Settings,Customer Naming By,تسمية العملاء بواسطة
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,الميزانية مقابل
DocType: Employee,Cell Number,رقم الهاتف
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ليس هناك موظف لمعايير معينة. تحقق من عدم إنشاء قسائم الراتب.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,إنشاء طلب مواد تلقائي
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,إنشاء طلب مواد تلقائي
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,مفقود
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,لا يمكنك إدخال مستند الصرف الحالي المقابل للإدخال بدفتر اليومية في العمود
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,محفوظة لتصنيع
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,طاقة
DocType: Opportunity,Opportunity From,فرصة من
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بيان الراتب الشهري.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,الصف {0}: {1} الأرقام التسلسلية المطلوبة للبند {2}. لقد قدمت {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,الصف {0}: {1} الأرقام التسلسلية المطلوبة للبند {2}. لقد قدمت {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,يرجى تحديد جدول
DocType: BOM,Website Specifications,موقع المواصفات
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} هو عنوان بريد إلكتروني غير صالح في "المستلمين"
@@ -1042,7 +1043,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,طلب اقتباس
DocType: Vital Signs,Heart Rate / Pulse,معدل ضربات القلب / نبض
DocType: Company,Default Bank Account,حساب مصرفي افتراضي
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"الأوراق المالية التحديث" لا يمكن التحقق من أنه لم يتم تسليم المواد عن طريق {0}
DocType: Vehicle,Acquisition Date,تاريخ شراء المركبة
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1066,7 +1067,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),حمل رأس الرسالة (حافظ على سهولة استخدام الويب ك 900 بكسل × 100 بكسل)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: الحساب {2} لا يمكن أن يكون مجموعة
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,البند الصف {IDX}: {DOCTYPE} {} DOCNAME لا وجود له في أعلاه '{DOCTYPE} المائدة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,لايوجد مهام
DocType: Item Variant Settings,Copy Fields to Variant,نسخ الحقول إلى متغير
DocType: Asset,Opening Accumulated Depreciation,الاستهلاك التراكمي الافتتاحي
@@ -1178,9 +1179,10 @@
DocType: Production Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,المناديب و المناطق
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,قائمة المواد {0} يجب أن تكون نشطة
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),الإغلاق (الافتتاح + الإجمالي)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),الإغلاق (الافتتاح + الإجمالي)
DocType: Journal Entry,Depreciation Entry,انخفاض الدخول
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,يرجى تحديد نوع الوثيقة أولاً
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,الطباعة بعملة الحساب
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,إلغاء المواد الخاصة بالزيارة {0} قبل إلغاء زيارة الصيانة هذه
DocType: Crop Cycle,ISO 8016 standard,إسو 8016 القياسية
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},رقم المسلسل {0} لا ينتمي إلى البند {1}
@@ -1206,7 +1208,7 @@
DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,الموظف {0} غير نشط أو غير موجود
DocType: Fee Structure,Components,مكونات
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},الرجاء إدخال فئة الأصول في البند {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},الرجاء إدخال فئة الأصول في البند {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,تم تحديث متغيرات البند {0}
DocType: Quality Inspection Reading,Reading 6,قراءة 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1258,6 +1260,7 @@
,Company Name,اسم الشركة
DocType: SMS Center,Total Message(s),مجموع الرسائل ( ق )
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,يرجى تعيين سلسلة التسمية ل {0} عبر الإعداد> إعدادات> تسمية السلسلة
DocType: Purchase Invoice,Additional Discount Percentage,نسبة خصم إضافي
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,عرض قائمة من جميع ملفات الفيديو مساعدة
DocType: Agriculture Analysis Criteria,Soil Texture,قوام التربة
@@ -1285,7 +1288,7 @@
DocType: BOM Website Item,BOM Website Item,بند الموقع الالكتروني بقائمة المواد
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
DocType: Timesheet Detail,Bill,فاتورة
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,تم إدخال تاريخ الاستهلاك التالي بتاريخ سابق
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,تم إدخال تاريخ الاستهلاك التالي بتاريخ سابق
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,أبيض
DocType: SMS Center,All Lead (Open),جميع الزبائن المحتملين (مفتوح)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: الكمية لا تتوفر لل{4} في مستودع {1} في بالإرسال وقت دخول ({2} {3})
@@ -1301,7 +1304,7 @@
DocType: Lead,Next Contact Date,تاريخ جهة الاتصال التالية
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,الكمية الافتتاحية
DocType: Healthcare Settings,Appointment Reminder,تذكير التعيين
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير القيمة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير القيمة
DocType: Program Enrollment Tool Student,Student Batch Name,طالب اسم دفعة
DocType: Consultation,Doctor,طبيب
DocType: Holiday List,Holiday List Name,اسم قائمة العطلات
@@ -1317,6 +1320,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,أداة تخصيص الإجازة
DocType: Item,Hub Category to Publish,فئة المحور للنشر
DocType: Leave Block List,Leave Block List Dates,التواريخ الممنوع اخذ اجازة فيها
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد> سلسلة الترقيم
DocType: Sales Invoice,Billing Address GSTIN,عنوان إرسال الفواتير غستين
DocType: Assessment Plan,Evaluate,تقييم
DocType: Workstation,Net Hour Rate,صافي سعر الساعة
@@ -1350,7 +1354,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,فاتورة مبيعات الدفع
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,مستودع محجوزة في ترتيب المبيعات / السلع تامة الصنع في معرض النماذج
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,كمية البيع
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,كمية البيع
DocType: Repayment Schedule,Interest Amount,مبلغ الفائدة
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,أنت الموافق المصروفات لهذا السجل.الرجاء تحديث الحالة و حفظ البيانات
DocType: Serial No,Creation Document No,إنشاء وثيقة لا
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,فتح ميزان المحاسبة
,GST Sales Register,غست مبيعات التسجيل
DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,لا شيء للطلب
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,لا شيء للطلب
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,حدد النطاقات الخاصة بك
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,سيتم نسخ الحقول فقط في وقت الإنشاء.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","سيتم إلحاق هذا إلى بند رمز للمتغير. على سبيل المثال، إذا اختصار الخاص بك هو ""SM""، ورمز البند هو ""T-SHIRT""، رمز العنصر المتغير سيكون ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,صافي الأجر (بالحروف) تكون مرئية بمجرد حفظ كشف راتب.
DocType: Purchase Invoice,Is Return,هو العائد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,الحذر
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,الحذر
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,ارجاع / اشعار مدين
DocType: Price List Country,Price List Country,قائمة الأسعار البلد
DocType: Item,UOMs,وحدات القياس
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} أرقام تسلسلية صالحة للبند {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} أرقام تسلسلية صالحة للبند {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,لا يمكن تغيير رمز السلعة للرقم التسلسلي
DocType: Purchase Invoice Item,UOM Conversion Factor,عامل تحويل وحدة القياس
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,الرجاء إدخال كود البند للحصول على رقم باتش
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,اوامر البيع {0} غير صالحه
DocType: Supplier Scorecard,Warn for new Request for Quotations,تحذير لطلب جديد للاقتباسات
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,أوامر الشراء تساعدك على تخطيط ومتابعة مشترياتك
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,وصفات اختبار المختبر
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",إجمالي كمية العدد / نقل {0} في المواد طلب {1} \ لا يمكن أن يكون أكبر من الكمية المطلوبة {2} لالبند {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,معلومات اتصال المستودع
DocType: Payment Entry,Write Off Difference Amount,شطب الفرق المبلغ
DocType: Volunteer,Volunteer Name,اسم المتطوعين
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,يرجى إعداد نظام تسمية المعلم في التعليم> إعدادات التعليم
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: البريد الإلكتروني للموظف غير موجود، وبالتالي لن يتم إرسال البريد الإلكتروني
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},قاعدة الشحن لا تنطبق على البلد {0}
DocType: Item,Foreign Trade Details,الخارجية تفاصيل تجارة
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,رقم لفة المجموعة
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حساب الدائن يمكن ربطه مقابل قيد مدين أخر
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,يجب أن يكون مجموع كل الأوزان مهمة 1. الرجاء ضبط أوزان جميع المهام المشروع وفقا لذلك
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,اشعار تسليم {0} لم يتم تقديمها
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,اشعار تسليم {0} لم يتم تقديمها
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,المعدات الكبيرة
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",خاصية قاعدة التسعير يمكن تطبيقها على بند، فئة بنود او علامة التجارية.
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,يوجد مستودع الطفل لهذا المستودع. لا يمكنك حذف هذا المستودع.
DocType: Item,Website Item Groups,مجموعات الأصناف للموقع
DocType: Purchase Invoice,Total (Company Currency),مجموع (شركة العملات)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,الرقم التسلسلي {0} دخلت أكثر من مرة
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,الرقم التسلسلي {0} دخلت أكثر من مرة
DocType: Journal Entry,Journal Entry,قيد يومية
DocType: Expense Claim Advance,Unclaimed amount,المبلغ غير المطالب به
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} العنصر قيد الأستخدام
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,سجل التواصل.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",تم تعطيل الوصول إلى طلب عرض الاسعار من خلال البوابة الالكترونية، للمزيد تحقق من إعدادات البوابة الالكترونية.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,سجل الأداء بطاقة الأداء المتغير
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,قيمة الشراء
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,قيمة الشراء
DocType: Sales Invoice,Shipping Address Name,الشحن العنوان الاسم
DocType: Material Request,Terms and Conditions Content,محتويات الشروط والأحكام
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,حدثت أخطاء أثناء إنشاء جدول الدورات التدريبية
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,وذلك بناء على السجلات مقابل هذه المركبة. للمزيد انظر التسلسل الزمني أدناه
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,سجل حركة الأصول {0} تم إنشاؤه
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,سجل حركة الأصول {0} تم إنشاؤه
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,لا يمكنك حذف السنة المالية {0}. تم تحديد السنة المالية {0} كأفتراضي في الإعدادات الشاملة
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,يوجد عميل يحمل الاسم نفسه من قبل
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,سيؤدي هذا إلى تقديم قسائم الراتب وإنشاء الدخول إلى دفتر الأستحقاق. هل تريد المتابعة؟
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,التسعير
DocType: Quotation,Term Details,تفاصيل الشروط
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,لا يمكن تسجيل أكثر من {0} طلاب لمجموعة الطلاب هذه.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),الإجمالي (بدون ضريبة)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,عدد الرصاص
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} يجب أن يكون أكبر من 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,مخزون متاح
@@ -2026,7 +2030,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,إلغاء ربط الدفع على إلغاء الفاتورة
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ينبغي أن تكون القراءة الحالية لعداد المسافات اكبر من القراءة السابقة لعداد المسافات للمركبة {0}
DocType: Restaurant Reservation,No Show,لا إظهار
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,يرجى تعيين سلسلة التسمية ل {0} عبر الإعداد> إعدادات> تسمية السلسلة
DocType: Shipping Rule Country,Shipping Rule Country,بلد قاعدة الشحن
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,الاجازات و الحضور
DocType: Maintenance Visit,Partially Completed,أنجزت جزئيا
@@ -2118,7 +2121,7 @@
DocType: Student Group Instructor,Student Group Instructor,مجموعة الطالب
DocType: Grant Application,Assessment Mark (Out of 10),علامة التقييم (من أصل 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 رقم الجوال
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,رئيسي
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,رئيسي
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,مختلف
DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
DocType: Employee Attendance Tool,Employees HTML,الموظفين HTML
@@ -2166,7 +2169,7 @@
DocType: Course,Course Abbreviation,اختصار المقرر التعليمي
DocType: Student Leave Application,Student Leave Application,طالب ترك التطبيق
DocType: Item,Will also apply for variants,سوف تطبق أيضا على المتغيرات
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، لانها بالفعل {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، لانها بالفعل {0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},الموظف {0} لديه اجازة نصف يوم في {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},عدد ساعات العمل الكلي يجب ألا يكون أكثر من العدد الأقصى لساعات العمل {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,في
@@ -2350,9 +2353,10 @@
DocType: Task,Actual End Date (via Time Sheet),تاريخ الإنتهاء الفعلي (عبر ورقة الوقت)
DocType: Soil Texture,Soil Type,نوع التربة
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},مبلغ {0} {1} مقابل {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,رسالة جديدة
,Quotation Trends,مؤشرات المناقصة
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},فئة البند غير مذكورة في ماستر البند لهذا البند {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,مدين لحساب يجب أن يكون حساب مدين
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,مدين لحساب يجب أن يكون حساب مدين
DocType: Shipping Rule,Shipping Amount,مبلغ الشحن
DocType: Supplier Scorecard Period,Period Score,فترة النتيجة
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,إضافة العملاء
@@ -2363,7 +2367,7 @@
,Vehicle Expenses,مصاريف السيارة
DocType: Serial No,Invoice Details,تفاصيل الفاتورة
DocType: Grant Application,Show on Website,عرض على الموقع
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},{0} العمر الافتراضي النافع المتوقع يجب أن يكون أكبر من أو يساوي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},{0} العمر الافتراضي النافع المتوقع يجب أن يكون أكبر من أو يساوي
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ابدأ
DocType: Hub Category,Hub Category,فئة المحور
DocType: Purchase Invoice,SEZ,SEZ
@@ -2394,7 +2398,7 @@
DocType: Patient,B Positive,B إيجابي
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن تكون الكمية 1، حيث أن البند هو اصول ثابتة. الرجاء استخدام صف منفصل لكمية متعددة.
DocType: Leave Block List Allow,Leave Block List Allow,تفعيل قائمة الإجازات المحظورة
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,الاسم المختصر لا يمكن أن يكون فارغاً او بها فضاء
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,الاسم المختصر لا يمكن أن يكون فارغاً او بها فضاء
DocType: Patient Medical Record,Patient Medical Record,السجل الطبي للمريض
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,(من تصنيف (مجموعة) إلى تصنيف (غير المجموعة
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,الرياضة
@@ -2444,6 +2448,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,لا يمكن تعيين رفق وردت إلى أي اقتباس
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,مجموع الخصم
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,حدد حسابا للطباعة بعملة الحساب
,Production Analytics,تحليلات إنتاج
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ويستند هذا إلى المعاملات ضد هذا المريض. انظر الجدول الزمني أدناه للحصول على التفاصيل
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,تم تحديث التكلفة
@@ -2498,7 +2503,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,حدد الشركة ...
DocType: Leave Control Panel,Leave blank if considered for all departments,اتركها فارغه اذا كنت تريد تطبيقها لجميع الأقسام
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",أنواع التوظيف (دائم أو عقد او متدرب الخ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} إلزامي للبند {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} إلزامي للبند {1}
DocType: Payroll Entry,Fortnightly,مرة كل اسبوعين
DocType: Currency Exchange,From Currency,من العملة
DocType: Vital Signs,Weight (In Kilogram),الوزن (بالكيلوجرام)
@@ -2574,7 +2579,7 @@
DocType: Student,Guardians,أولياء الأمور
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,لن تظهر الأسعار إذا لم يتم تعيين قائمة الأسعار
DocType: Stock Entry,Total Incoming Value,إجمالي القيمة الواردة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,مدين الي مطلوب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,مدين الي مطلوب
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قائمة أسعار الشراء
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,نماذج من متغيرات بطاقة الأداء المورد.
@@ -2675,7 +2680,7 @@
DocType: Company,For Reference Only.,للإشارة او المرجعية فقط.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},طبيب {0} غير متوفر على {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,حدد الدفعة رقم
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},غير صالح {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},غير صالح {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,ريفيرانس إنف
@@ -2712,8 +2717,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
DocType: Water Analysis,Origin,الأصل
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,هذه الوثيقة هي على حد كتبها {0} {1} لمادة {4}. وجعل لكم آخر {3} ضد نفسه {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,يرجى تحديد (تكرار) بعد الحفظ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,حساب كمية حدد التغيير
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,يرجى تحديد (تكرار) بعد الحفظ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,حساب كمية حدد التغيير
DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
DocType: Stock Settings,Allow Negative Stock,السماح بالقيم السالبة للمخزون
@@ -2769,7 +2774,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,تحذير لأوامر الشراء الجديدة
DocType: Quality Inspection Reading,Reading 9,قراءة 9
DocType: Supplier,Is Frozen,مجمدة
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,لا يسمح مستودع عقدة مجموعة لتحديد للمعاملات
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,لا يسمح مستودع عقدة مجموعة لتحديد للمعاملات
DocType: Buying Settings,Buying Settings,إعدادات الشراء
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,رقم فاتورة الموارد لغرض جيد
DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
@@ -2783,6 +2788,7 @@
DocType: Grant Application,Organization,منظمة
DocType: BOM Update Tool,BOM Update Tool,أداة تحديث بوم
DocType: SG Creation Tool Course,Student Group Name,اسم المجموعة الطلابية
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,عرض عرض انفجرت
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,إنشاء الرسوم
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,يرجى التأكد من أنك تريد حقا حذف جميع المعاملات لهذه الشركة. ستبقى بياناتك الرئيسية (الماستر) كما هيا. لا يمكن التراجع عن هذا الإجراء.
DocType: Room,Room Number,رقم القاعة
@@ -2793,7 +2799,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,جعل قالب الضرائب
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,المنتدى المستعمل
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,لا يمكن ترك المواد الخام فارغة.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، الفاتورة تحتوي علي بند مبعد الشحن.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، الفاتورة تحتوي علي بند مبعد الشحن.
DocType: Lab Test Sample,Lab Test Sample,عينة اختبار المختبر
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,قيد دفتر يومية سريع
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير السعر اذا قائمة المواد جعلت مقابل أي بند
@@ -2864,7 +2870,7 @@
DocType: Membership,USD,دولار أمريكي
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,جعل الفاتورة
DocType: Selling Settings,Auto close Opportunity after 15 days,السيارات فرصة قريبة بعد 15 يوما
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,لا يسمح بأوامر الشراء {0} بسبب وضع بطاقة النقاط {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,لا يسمح بأوامر الشراء {0} بسبب وضع بطاقة النقاط {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,نهاية السنة
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,مناقصة / زبون محتمل٪
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ انتهاء العقد بعد تاريخ الالتحاق بالعمل
@@ -2976,7 +2982,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 و أكثر
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,الصف # {0}: قيد دفتر اليومية {1} لا يملك حساب {2} أو قد تطابق بالفعل مع ايصال أخرى
DocType: Supplier Scorecard Criteria,Criteria Weight,معايير الوزن
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,المورد> المورد نوع
DocType: Buying Settings,Default Buying Price List,قائمة اسعار الشراء الافتراضية
DocType: Payroll Entry,Salary Slip Based on Timesheet,كشف الرواتب بناء على سجل التوقيت
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,معدل شراء
@@ -3064,7 +3069,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,المسار يؤدي حسب نوع الصناعة .
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,انتقل إلى الرسائل
DocType: Item Supplier,Item Supplier,البند مزود
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,الرجاء إدخال كود البند للحصول على رقم الدفعة
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,الرجاء إدخال كود البند للحصول على رقم الدفعة
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},يرجى اختيار قيمة ل {0} عرض مسعر إلى {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,جميع العناوين.
DocType: Company,Stock Settings,إعدادات المخزون
@@ -3253,6 +3258,7 @@
DocType: Company,Default Inventory Account,حساب المخزون الافتراضي
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,الصف {0}: يجب أن تكون الكمية المكتملة أكبر من الصفر.
DocType: Antibiotic,Antibiotic Name,اسم المضادات الحيوية
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,رمز البند> مجموعة المنتجات> العلامة التجارية
DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,اختر صنف...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,رابط لكل الوحدات البرية التي تنمو فيها المحاصيل
@@ -3446,6 +3452,7 @@
DocType: Supplier,Credit Limit,الحد الائتماني
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,متوسط سعر قائمة أسعار البيع
DocType: Production Plan Sales Order,Salse Order Date,Salse ترتيب التاريخ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,المورد> المورد نوع
DocType: Salary Component,Salary Component,مكون الراتب
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,تدوين مدفوعات {0} غير مترابطة
DocType: GL Entry,Voucher No,رقم السند
@@ -3454,7 +3461,7 @@
DocType: Leave Allocation,Leave Allocation,تخصيص إجازة
DocType: Payment Request,Recipient Message And Payment Details,مستلم رسالة وتفاصيل الدفع
DocType: Training Event,Trainer Email,بريد المدرب الإلكتروني
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,تم إنشاء طلبات المواد {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,تم إنشاء طلبات المواد {0}
DocType: Restaurant Reservation,No of People,أي من الناس
DocType: Production Planning Tool,Include sub-contracted raw materials,وتشمل المواد الخام مع مقاولين من الباطن
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,قالب الشروط أو العقد.
@@ -3518,7 +3525,7 @@
DocType: Production Planning Tool,Create Material Requests,إنشاء طلبات المواد
DocType: Employee Education,School/University,مدرسة / جامعة
DocType: Payment Request,Reference Details,إشارة تفاصيل
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,القيمة المتوقعة بعد العمر الافتراضي النافع يجب أن تكون أقل من إجمالي مبلغ الشراء
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,القيمة المتوقعة بعد العمر الافتراضي النافع يجب أن تكون أقل من إجمالي مبلغ الشراء
DocType: Sales Invoice Item,Available Qty at Warehouse,الكمية المتاحة في مستودع
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,القيمة المقدم فاتورة بها
DocType: Asset,Double Declining Balance,استهلاك تناقصي مزدوج
@@ -3530,7 +3537,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,الحصول على التحديثات
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: الحساب {2} لا ينتمي إلى الشركة {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,حدد قيمة واحدة على الأقل من كل سمة.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقيفه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقيفه
apps/erpnext/erpnext/config/hr.py +310,Leave Management,إدارة تصاريح الخروج
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,مجموعة بواسطة حساب
DocType: Sales Order,Fully Delivered,سلمت بالكامل
@@ -3541,14 +3548,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},المبلغ الصروف لا يمكن أن يكون أكبر من المبلغ المخصص للقرض {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,انتقل إلى البرامج
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},الصف {0} # المبلغ المخصص {1} لا يمكن أن يكون أكبر من المبلغ غير المطالب به {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد> سلسلة الترقيم
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},مطلوب رقم امر الشراء للصنف {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,لم يتم إنشاء امر الانتاج
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},لا يمكن تغيير الحالة لان الطالب {0} مترابط مع استمارة الطالب {1}
DocType: Asset,Fully Depreciated,استهلكت بالكامل
,Stock Projected Qty,كمية المخزون المتوقعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},الزبونى {0} لا ينتمي إلى المشروع {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},الزبونى {0} لا ينتمي إلى المشروع {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,حضور مسجل HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",عروض المسعره هي المقترحات، و المناقصات التي تم إرسالها للزبائن
DocType: Sales Order,Customer's Purchase Order,طلب شراء الزبون
@@ -3632,7 +3638,7 @@
DocType: Stock Settings,Item Naming By,تسمية السلعة بواسطة
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},قيد إقفال فترة أخرى {0} تم إنشائها بعد {1}
DocType: Production Order,Material Transferred for Manufacturing,المواد المنقولة لغرض التصنيع
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,الحساب {0} غير موجود
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,الحساب {0} غير موجود
DocType: Project,Project Type,نوع المشروع
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,مهمة الطفل موجودة لهذه المهمة. لا يمكنك حذف هذه المهمة.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,الكمية المستهدفة أو المبلغ المستهدف إلزامي
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,مركز تكلفة إستهلاك الأصول
DocType: Sales Order Item,Sales Order Date,تاريخ اوامر البيع
DocType: Sales Invoice Item,Delivered Qty,الكمية المستلمة
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,المجموع باستثناء. ضريبة
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",إذا تحققت، سيتم تضمين جميع الأطفال من كل عنصر الإنتاج في الطلبات المادية.
DocType: Assessment Plan,Assessment Plan,خطة التقييم
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,تم إنشاء العميل {0}.
DocType: Stock Settings,Limit Percent,الحد في المئة
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,يرجى إعداد نظام تسمية المعلم في التعليم> إعدادات التعليم
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,حاليا لا يوجد مخزون متاح في أي مستودع
,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
DocType: Sample Collection,No. of print,رقم الطباعة
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),المدينين ({0})
DocType: Pricing Rule,Margin,هامش
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,الزبائن الجدد
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,الربح الإجمالي٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,الربح الإجمالي٪
DocType: Appraisal Goal,Weightage (%),الوزن(٪)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,تغيير الملف الشخصي بوس
DocType: Bank Reconciliation Detail,Clearance Date,تاريخ الاستحقاق
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,تقرير التقييم
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,إجمالي مبلغ الشراء إلزامي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,إجمالي مبلغ الشراء إلزامي
DocType: Lead,Address Desc,معالجة التفاصيل
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,الطرف المعني إلزامي
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,اسم الدائمة
DocType: Stock Entry,Customer or Supplier Details,العملاء أو الموردين بيانات
DocType: Employee Loan Application,Required by Date,مطلوب حسب التاريخ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),الرصيد الختامي (در - كر)
DocType: Lead,Lead Owner,مسئول مبادرة البيع
DocType: Bin,Requested Quantity,الكمية المطلوبة
DocType: Patient,Marital Status,الحالة الإجتماعية
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,متغيرات متعددة
DocType: Sales Invoice,Against Income Account,مقابل حساب الدخل
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تم التسليم
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,البند {0} الكمية المطلوبة {1} لا يمكن أن تكون أقل من الحد الأدنى للطلب {2} (المحددة في البند).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,البند {0} الكمية المطلوبة {1} لا يمكن أن تكون أقل من الحد الأدنى للطلب {2} (المحددة في البند).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,الشهرية توزيع النسبة المئوية
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,الرجاء تسجيل الدخول كمستخدم آخر.
DocType: Territory,Territory Targets,الاقاليم المستهدفة
@@ -3904,7 +3909,7 @@
DocType: Serial No,Out of AMC,من AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد الاستهلاكات المستنفده مسبقا لا يمكن أن يكون أكبر من إجمالي عدد الاستهلاكات خلال العمر الافتراضي النافع
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,إنشاء زيارة صيانة
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال بالمستخدم الذي لديه دور مدير المبيعات الماستر {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال بالمستخدم الذي لديه دور مدير المبيعات الماستر {0}
DocType: Company,Default Cash Account,حساب النقدية الافتراضي
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ماستر الشركة (ليس زبون أو مورد).
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ويستند هذا على حضور هذا الطالب
@@ -4054,7 +4059,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,لا يوجد موظفون للمعايير المذكورة
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,لا توجد بنود في قائمة المواد للتصنيع
DocType: Restaurant,Default Customer,العميل الافتراضي
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,الرجاء الإعداد نظام تسمية الموظف في الموارد البشرية> إعدادات الموارد البشرية
DocType: Assessment Plan,Supervisor Name,اسم المشرف
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,لا تؤكد إذا تم إنشاء التعيين لنفس اليوم
DocType: Program Enrollment Course,Program Enrollment Course,دورة التسجيل في البرنامج
@@ -4172,7 +4176,7 @@
DocType: BOM,Website Description,وصف الموقع
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,صافي التغير في حقوق الملكية
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,الأحدث
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,يرجى إلغاء فاتورة المشتريات {0} أولاً
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,يرجى إلغاء فاتورة المشتريات {0} أولاً
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",يجب أن يكون عنوان البريد الإلكتروني فريد من نوعه، موجود بالفعل ل{0}
DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,إيصال
@@ -4189,7 +4193,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,بيان التدفقات النقدية
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},لا يمكن أن تتجاوز قيمة القرض الحد الأقصى المحدد للقروض {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,رخصة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,الرجاء تحديد المضي قدما إذا كنت تريد ان تتضمن اجازات السنة السابقة
DocType: GL Entry,Against Voucher Type,مقابل إيصال نوع
DocType: Physician,Phone (R),الهاتف (R)
@@ -4201,7 +4205,7 @@
DocType: Patient,B Negative,B سلبي
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,يجب إلغاء حالة الصيانة أو إكمالها لإرسالها
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,لا تتطابق الأرقام التسلسلية في الصف {0} مع ملاحظة التسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,لا تتطابق الأرقام التسلسلية في الصف {0} مع ملاحظة التسليم
DocType: Student,Guardian Details,تفاصيل ولي الأمر
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,وضع علامة الحضور لعدة موظفين
@@ -4243,7 +4247,7 @@
DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
DocType: Training Event,Exam,امتحان
DocType: Complaint,Complaint,شكوى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
DocType: Leave Allocation,Unused leaves,إجازات غير مستخدمة
DocType: Patient,Alcohol Past Use,الكحول الماضي استخدام
DocType: Fertilizer Content,Fertilizer Content,محتوى الأسمدة
@@ -4367,6 +4371,7 @@
DocType: Salary Detail,Formula,صيغة
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,المسلسل #
DocType: Lab Test Template,Lab Test Template,قالب اختبار المختبر
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,حساب مبيعات
DocType: Purchase Invoice Item,Total Weight,الوزن الكلي
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,عمولة على المبيعات
DocType: Offer Letter Term,Value / Description,القيمة / الوصف
@@ -4523,7 +4528,7 @@
DocType: Customer,From Lead,من الزبون المحتمل
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,أوامر أصدرت للإنتاج.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,اختر السنة المالية ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,ملف نقطة البيع مطلوب للقيام بإدخال خاص بنقطة البيع
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,ملف نقطة البيع مطلوب للقيام بإدخال خاص بنقطة البيع
DocType: Program Enrollment Tool,Enroll Students,تسجيل الطلاب
DocType: Lab Test,Approved Date,تاريخ الموافقة
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,البيع القياسية
@@ -4599,7 +4604,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,بند انتاج
,Employee Information,معلومات الموظف
DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,إنشاء عرض مسعر خاص بالمورد
DocType: Quality Inspection,Incoming,الوارد
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,يتم إنشاء قوالب الضرائب الافتراضية للمبيعات والشراء.
@@ -4616,7 +4621,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},ملاحظة : {0}
,Delivery Note Trends,ملاحظة اتجاهات التسليم
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ملخص هذا الأسبوع
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,في سوق الأسهم الكمية
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,في سوق الأسهم الكمية
DocType: Delivery Trip,Calculate Estimated Arrival Times,حساب أوقات الوصول المقدرة
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,الحساب: {0} لا يمكن تحديثه إلا من خلال معاملات المخزون
DocType: Student Group Creation Tool,Get Courses,الحصول على دورات
@@ -4632,7 +4637,7 @@
DocType: Material Request,% Ordered,٪ تم طلبها
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",بالنسبة للطلاب مجموعة مقرها دورة، سيتم التحقق من صحة الدورة لكل طالب من الدورات المسجلة في التسجيل البرنامج.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,الأجرة المدفوعة لكمية العمل المنجز
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,متوسط سعر شراء
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,متوسط سعر شراء
DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
DocType: Employee,History In Company,الحركة التاريخيه في الشركة
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},رسالة جديدة من {سيندر}
@@ -4680,7 +4685,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},الصف {0}: عملة قائمة المواد يجب أن تكون# {1} يجب ان تكون مساوية للعملة المحددة {2}
DocType: Journal Entry Account,Exchange Rate,سعر الصرف
DocType: Patient,Additional information regarding the patient,معلومات إضافية عن المريض
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
DocType: Homepage,Tag Line,شعار
DocType: Fee Component,Fee Component,مكون رسوم
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,إدارة أسطول المركبات
@@ -4892,7 +4897,7 @@
DocType: Employee Education,Employee Education,المستوى التعليمي للموظف
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,تم العثور على فئة بنود مكررة في جدول فئات البنود
DocType: Land Unit,Parent Land Unit,وحدة أراضي الوالدين
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,هناك حاجة لجلب تفاصيل البند.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,هناك حاجة لجلب تفاصيل البند.
DocType: Fertilizer,Fertilizer Name,اسم السماد
DocType: Salary Slip,Net Pay,صافي الراتب
DocType: Account,Account,حساب
@@ -4971,7 +4976,7 @@
DocType: Item Customer Detail,Ref Code,الرمز المرجعي
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,مطلوب مجموعة العملاء في الملف الشخصي نقاط البيع
apps/erpnext/erpnext/config/hr.py +12,Employee records.,سجلات الموظفين
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,يرجى تعيين تاريخ استهلاك التالي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,يرجى تعيين تاريخ استهلاك التالي
DocType: HR Settings,Payroll Settings,إعدادات دفع الرواتب
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,مطابقة الفواتيرالغير مترابطة والمدفوعات.
DocType: POS Settings,POS Settings,إعدادات نقاط البيع
@@ -5138,7 +5143,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},التذكير بعيد ميلاد {0}
DocType: Asset Maintenance Task,Last Completion Date,تاريخ الانتهاء الأخير
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,الأيام منذ آخر طلب
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,مدين لحساب يجب أن يكون حساب قائمة المركز المالي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,مدين لحساب يجب أن يكون حساب قائمة المركز المالي
DocType: Buying Settings,Naming Series,التسمية التسلسلية
DocType: Leave Block List,Leave Block List Name,اسم قائمة الإجازات المحظورة
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,يجب أن يكون تاريخ بداية التأمين قبل تاريخ نهاية التأمين
@@ -5265,6 +5270,7 @@
DocType: Bank Reconciliation,Get Payment Entries,الحصول على مدخلات الدفع
DocType: Quotation Item,Against Docname,مقابل المستند
DocType: SMS Center,All Employee (Active),جميع الموظفين (نشط)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,العميل> مجموعة العملاء> الإقليم
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,عرض الآن
DocType: BOM,Raw Material Cost,تكلفة المواد الخام
DocType: Item Reorder,Re-Order Level,إعادة ترتيب مستوى
@@ -5363,7 +5369,6 @@
DocType: Room,Seating Capacity,عدد المقاعد
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,مجموعات اختبار المختبر
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,العميل> مجموعة العملاء> الإقليم
DocType: Project,Total Expense Claim (via Expense Claims),مجموع المطالبة المصاريف (عبر مطالبات النفقات)
DocType: GST Settings,GST Summary,ملخص غست
DocType: Assessment Result,Total Score,مجموع النقاط
@@ -5376,7 +5381,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,تم إنشاء الجداول الزمنية التالية
DocType: Journal Entry,Total Debit,مجموع الخصم
DocType: Manufacturing Settings,Default Finished Goods Warehouse,المخزن الافتراضي للبضائع التامة الصنع
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,رجل المبيعات
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,رجل المبيعات
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,الميزانيه و مركز التكلفة
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,لا يسمح بوضع الدفع الافتراضي المتعدد
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ل
@@ -5549,7 +5554,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,النظر في ضريبة أو رسم ل
DocType: Driver,Driving License Category,رخصة قيادة الفئة
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,الكمية الفعلية هي إلزامية
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} لديها حاليا {1} بطاقة أداء بطاقة الموردين، ويجب إصدار أوامر الشراء إلى هذا المورد بحذر.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} لديها حاليا {1} بطاقة أداء بطاقة الموردين، ويجب إصدار أوامر الشراء إلى هذا المورد بحذر.
DocType: Asset Maintenance Team,Asset Maintenance Team,فريق صيانة الأصول
DocType: Employee Loan,Loan Type,نوع القرض
DocType: Scheduling Tool,Scheduling Tool,أداة الجدولة
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index c2a53ae..dc267ec 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Сортирай по цена
,Delay Days,Забавни дни
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Фактура
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Направете вписване за запазване на запасите
DocType: Purchase Invoice Item,Item Weight Details,Елемент за теглото на елемента
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Референция: {0}, кода на елемента: {1} и клиента: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Кг
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Откриване на работа.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM не е посочена за подизпълнение елемент {0} на ред {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM не е посочена за подизпълнение елемент {0} на ред {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Резултатът е изпратен
DocType: Item Attribute,Increment,Увеличение
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Период от време
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Не е разрешен за {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Вземете елементи от
DocType: Price List,Price Not UOM Dependant,Цената не е зависима от UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Няма изброени елементи
DocType: Asset Repair,Error Description,Описание на грешката
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Хранителни стоки
DocType: Quality Inspection Reading,Reading 1,Четене 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Пенсионни фондове
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следваща дата на амортизация не може да бъде преди датата на покупка
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Следваща дата на амортизация не може да бъде преди датата на покупка
DocType: Crop,Perennial,целогодишен
DocType: Consultation,Consultation Date,Дата на консултацията
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Списък на продуктите и откриване за ERPNext потребители
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",например "Основно училище" или "университет"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Сток Доклади
DocType: Warehouse,Warehouse Detail,Скалд - Детайли
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е бил надхвърлен за клиенти {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е бил надхвърлен за клиенти {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term крайна дата не може да бъде по-късно от края на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Е фиксиран актив"" не може да бъде размаркирано, докато съществува запис за елемента"
DocType: Delivery Trip,Departure Time,Час на отпътуване
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Вземи детайлите на спецификацията
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Шаблони за класиране на доставчиците.
DocType: Lead,Interested,Заинтересован
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Начален
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Начален
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},От {0} до {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Неуспешно настройване на данъци
DocType: Item,Copy From Item Group,Копирай от група позиция
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Отпуск на година
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Моля, проверете "е Advance" срещу Account {1}, ако това е предварително влизане."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Склад {0} не принадлежи на фирмата {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Склад {0} не принадлежи на фирмата {1}
DocType: Email Digest,Profit & Loss,Печалба & загуба
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Литър
DocType: Task,Total Costing Amount (via Time Sheet),Общо Остойностяване сума (чрез Time Sheet)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Това се основава на транзакции срещу тази компания. За подробности вижте хронологията по-долу
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Изпращайте по имейл за създаване на автоматично искане за материали
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,устойчив
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Много валути
DocType: Opening Invoice Creation Tool,Invoice Type,Вид фактура
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Складова разписка
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Овдовял
DocType: Request for Quotation,Request for Quotation,Запитване за оферта
DocType: Healthcare Settings,Require Lab Test Approval,Изисква се одобрение от лабораторни тестове
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Код на елемента> Група на елементите> Марка
DocType: Salary Slip Timesheet,Working Hours,Работно Време
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Общо неизпълнени
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промяна на изходния / текущия номер за последователност на съществуваща серия.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Моля, въведете Cost Center"
DocType: Drug Prescription,Dosage,дозиране
DocType: Journal Entry Account,Sales Order,Поръчка за продажба
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Ср. Курс продава
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Ср. Курс продава
DocType: Assessment Plan,Examiner Name,Наименование на ревизора
DocType: Lab Test Template,No Result,Няма резултати
DocType: Purchase Invoice Item,Quantity and Rate,Брой и процент
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Изберете ТРЗ Период
DocType: Purchase Invoice,Unpaid,Неплатен
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Запазено за продажба
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси> Настройки за персонала"
DocType: Packing Slip,From Package No.,От Пакет номер
DocType: Item Attribute,To Range,До диапазон
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценни книжа и депозити
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,цех
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреждавайте поръчки за покупка
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Изброите някои от вашите клиенти. Те могат да бъдат организации или индивидуални лица.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Достатъчно Части за изграждане
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Достатъчно Части за изграждане
DocType: POS Profile User,POS Profile User,Потребителски потребителски профил на POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Преки приходи
DocType: Patient Appointment,Date TIme,Време за среща
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не може да се филтрира по сметка, ако е групирано по сметка"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Не може да се филтрира по сметка, ако е групирано по сметка"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Административният директор
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Създаване на дружество и данъци
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Моля, изберете Курс"
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Разлика Акаунт
DocType: Purchase Invoice,Supplier GSTIN,Доставчик GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Не може да се затвори задача, тъй като зависим задача {0} не е затворена."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
DocType: Production Order,Additional Operating Cost,Допълнителна експлоатационни разходи
DocType: Lab Test Template,Lab Routine,Рутинна лаборатория
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Козметика
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Връзка с Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Мениджър
DocType: Payment Entry,Payment From / To,Плащане от / към
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е по-малко от сегашната изключително количество за клиента. Кредитен лимит трябва да бъде поне {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е по-малко от сегашната изключително количество за клиента. Кредитен лимит трябва да бъде поне {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Моля, задайте профил в Склад {0}"
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Въз основа на"" и ""Групиране По"" не могат да бъдат еднакви"
DocType: Sales Person,Sales Person Targets,Търговец - Цели
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Партида Име
DocType: Fee Validity,Max number of visit,Максимален брой посещения
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,График създаден:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране в брой или по банкова сметка за начин на плащане {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране в брой или по банкова сметка за начин на плащане {0}"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Записване
DocType: GST Settings,GST Settings,Настройки за GST
DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Бюджет срещу
DocType: Employee,Cell Number,Клетка номер
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дадените критерии няма служител. Проверете дали заплатите не са вече създадени.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Материал Исканията Генерирани
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Материал Исканията Генерирани
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Загубен
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер "Срещу вестник Entry" колона
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Запазено за производство
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Енергия
DocType: Opportunity,Opportunity From,Възможност - От
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечно извлечение заплата.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Ред {0}: {1} Серийни номера, изисквани за елемент {2}. Предоставихте {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Ред {0}: {1} Серийни номера, изисквани за елемент {2}. Предоставихте {3}."
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Моля, изберете таблица"
DocType: BOM,Website Specifications,Сайт Спецификации
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} е невалиден имейл адрес в полето "Получатели"
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Заявката е поискана
DocType: Vital Signs,Heart Rate / Pulse,Сърдечна честота / импулс
DocType: Company,Default Bank Account,Банкова сметка по подразб.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Обнови Наличност"" не може да е маркирана, защото артикулите, не са доставени чрез {0}"
DocType: Vehicle,Acquisition Date,Дата на придобиване
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Качете писмото си с главата (поддържайте го удобно като 900px на 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Сметка {2} не може да бъде група
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка Row {IDX}: {DOCTYPE} {DOCNAME} не съществува в по-горе "{DOCTYPE}" на маса
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,График {0} вече е завършен или анулиран
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,График {0} вече е завършен или анулиран
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Няма задачи
DocType: Item Variant Settings,Copy Fields to Variant,Копиране на полетата до вариант
DocType: Asset,Opening Accumulated Depreciation,Начална начислената амортизация
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,План материал за частите
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Търговски дистрибутори и територия
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} трябва да бъде активен
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Затваряне (отваряне + общо)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Затваряне (отваряне + общо)
DocType: Journal Entry,Depreciation Entry,Амортизация - Запис
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Моля, изберете вида на документа първо"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Отпечатване във валута на профила
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменете Материал Посещения {0} преди да анулирате тази поддръжка посещение
DocType: Crop Cycle,ISO 8016 standard,Стандарт ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Сериен № {0} не принадлежи на позиция {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,По подразбиране Платими сметки
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
DocType: Fee Structure,Components,Компоненти
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Позиция Варианти {0} актуализиран
DocType: Quality Inspection Reading,Reading 6,Четене 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,Име на фирмата
DocType: SMS Center,Total Message(s),Общо съобщения
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Изберете артикул за прехвърляне
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Моля, задайте Naming Series за {0} чрез Setup> Settings> Naming Series"
DocType: Purchase Invoice,Additional Discount Percentage,Допълнителна отстъпка Процент
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Вижте списък на всички помощни видеоклипове
DocType: Agriculture Analysis Criteria,Soil Texture,Течност на почвата
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website позиция
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Качете ваш дизайн за заглавно писмо и лого. (Можете да ги редактирате по-късно).
DocType: Timesheet Detail,Bill,Фактура
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следваща дата на амортизация е въведена като минала дата
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Следваща дата на амортизация е въведена като минала дата
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Бял
DocType: SMS Center,All Lead (Open),All Lead (Open)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Кол не е на разположение за {4} в склад {1} при публикуване време на влизането ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,Следваща дата за контакт
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Начално Количество
DocType: Healthcare Settings,Appointment Reminder,Напомняне за назначаване
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
DocType: Program Enrollment Tool Student,Student Batch Name,Student Batch Име
DocType: Consultation,Doctor,Лекар
DocType: Holiday List,Holiday List Name,Име на списък на празниците
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Инструмент за разпределение на остъствията
DocType: Item,Hub Category to Publish,Категория хъб за публикуване
DocType: Leave Block List,Leave Block List Dates,Оставете Block Списък Дати
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Моля, настроите серийна номерация за участие чрез настройка> Серия за номериране"
DocType: Sales Invoice,Billing Address GSTIN,Адрес за фактуриране GSTIN
DocType: Assessment Plan,Evaluate,Оценява
DocType: Workstation,Net Hour Rate,Net Hour Курсове
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Фактурата за продажба - Плащане
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Включено Warehouse в продажбите Поръчка / готова продукция Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Продажба Сума
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продажба Сума
DocType: Repayment Schedule,Interest Amount,Сума на лихва
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте за сметка одобряващ за този запис. Моля Актуализирайте "Състояние" и спести
DocType: Serial No,Creation Document No,Създаване документ №
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Начален баланс
,GST Sales Register,Търговски регистър на GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Фактурата за продажба - Аванс
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Няма нищо за заявка
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Няма нищо за заявка
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Изберете вашите домейни
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Друг рекорд Бюджет "{0}" вече съществува срещу {1} {2} "за фискалната година {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Полетата ще бъдат копирани само по време на създаването.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Това ще бъде приложена към Кодекса Точка на варианта. Например, ако вашият съкращението е "SM", а кодът на елемент е "ТЕНИСКА", кодът позиция на варианта ще бъде "ТЕНИСКА-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (словом) ще бъде видим след като спаси квитанцията за заплата.
DocType: Purchase Invoice,Is Return,Дали Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Внимание
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Внимание
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Връщане / дебитно известие
DocType: Price List Country,Price List Country,Ценоразпис - Държава
DocType: Item,UOMs,Мерни единици
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} валидни серийни номера за Артикул {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} валидни серийни номера за Артикул {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Код не може да се променя за сериен номер
DocType: Purchase Invoice Item,UOM Conversion Factor,Мерна единица - фактор на превръщане
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Моля, въведете Код, за да получите Batch Номер"
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Поръчка за продажба {0} не е валидна
DocType: Supplier Scorecard,Warn for new Request for Quotations,Предупреждавайте за нова заявка за оферти
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Поръчки помогнат да планирате и проследяване на вашите покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Предписания за лабораторни тестове
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Общото количество на емисията / Transfer {0} в Подемно-Искане {1} \ не може да бъде по-голяма от поискани количества {2} за т {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Склад - Информация за контакт
DocType: Payment Entry,Write Off Difference Amount,Сметка за разлики от отписване
DocType: Volunteer,Volunteer Name,Име на доброволците
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Моля, настройте инструмента за назначаване на инструктори в образованието> Настройки за обучение"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Имейлът на служителя не е намерен, следователно не е изпратен имейл"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правилото за доставка не е приложимо за държавата {0}
DocType: Item,Foreign Trade Details,Външна търговия - Детайли
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Номер на ролката в групата
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Общо за всички работни тежести трябва да бъде 1. Моля, коригира теглото на всички задачи по проекта съответно"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Позиция {0} трябва да бъде позиция за подизпълнители
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капиталови Активи
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ценообразуване правило е първият избран на базата на "Нанесете върху" област, която може да бъде т, т Group или търговска марка."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Подчинен склад съществува за този склад. Не можете да изтриете този склад.
DocType: Item,Website Item Groups,Website стокови групи
DocType: Purchase Invoice,Total (Company Currency),Общо (фирмена валута)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Сериен номер {0} влезли повече от веднъж
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Сериен номер {0} влезли повече от веднъж
DocType: Journal Entry,Journal Entry,Вестник Влизане
DocType: Expense Claim Advance,Unclaimed amount,Непоискана сума
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} артикула са в производство
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникации - журнал.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запитване за оферта е забранено да достъп от портал, за повече настройки за проверка портал."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Профил за проследяване на проследяващия доставчик
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Сума на покупките
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Сума на покупките
DocType: Sales Invoice,Shipping Address Name,Адрес за доставка Име
DocType: Material Request,Terms and Conditions Content,Правила и условия - съдържание
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Имаше грешки при създаването на График на курса
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Това се основава на трупи срещу това превозно средство. Вижте график по-долу за повече подробности
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
DocType: Customer,Default Price List,Ценоразпис по подразбиране
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,запис Движение Asset {0} е създаден
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,запис Движение Asset {0} е създаден
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вие не можете да изтривате фискална година {0}. Фискална година {0} е зададена по подразбиране в Global Settings
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Клиент със същото име вече съществува
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Това ще изпрати Скача за заплати и ще създаде вписване в счетоводния дневник. Искаш ли да продължиш?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Ценообразуване
DocType: Quotation,Term Details,Условия - Детайли
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не може да се запишат повече от {0} студенти за този студентска група.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Общо (без данъци)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водещ брой
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} трябва да е по-голяма от 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Наличен наличност
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Прекратяване на връзката с плащане при анулиране на фактура
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Current показание на километража влязъл трябва да бъде по-голяма от първоначалната Vehicle километража {0}
DocType: Restaurant Reservation,No Show,Няма показване
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Моля, задайте Naming Series за {0} чрез Setup> Settings> Naming Series"
DocType: Shipping Rule Country,Shipping Rule Country,Доставка Правило Country
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Оставете и Присъствие
DocType: Maintenance Visit,Partially Completed,Частично завършени
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,Инструктор на група студенти
DocType: Grant Application,Assessment Mark (Out of 10),Маркер за оценка (от 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Не
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Основен
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Основен
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Вариант
DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
DocType: Employee Attendance Tool,Employees HTML,Служители HTML
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,Курс - Съкращение
DocType: Student Leave Application,Student Leave Application,Student оставите приложението
DocType: Item,Will also apply for variants,Ще се прилага и за варианти
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Служител {0} на половин ден на {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Общо работно време не трябва да са по-големи от работното време макс {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),Действително Крайна дата (чрез Time Sheet)
DocType: Soil Texture,Soil Type,Тип на почвата
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Ново съобщение
,Quotation Trends,Оферта Тенденции
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е сметка за вземания
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е сметка за вземания
DocType: Shipping Rule,Shipping Amount,Доставка Сума
DocType: Supplier Scorecard Period,Period Score,Период Резултат
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Добавете клиенти
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,Камион Разходи
DocType: Serial No,Invoice Details,Данни за фактурите
DocType: Grant Application,Show on Website,Показване на уебсайта
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Започнете
DocType: Hub Category,Hub Category,Категория хъб
DocType: Purchase Invoice,SEZ,СИЗ
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,B Положителен
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
DocType: Patient Medical Record,Patient Medical Record,Медицински запис на пациента
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Група към не-група
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Спортове
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Не може да се зададе получена RFQ в Без котировка
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Общо Приспадане
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Изберете профил, който да печата във валута на профила"
,Production Analytics,Производство - Анализи
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Това се основава на транзакции срещу този пациент. За подробности вижте графиката по-долу
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Разходите са обновени
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изберете компания ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставете празно, ако важи за всички отдели"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
DocType: Payroll Entry,Fortnightly,всеки две седмици
DocType: Currency Exchange,From Currency,От валута
DocType: Vital Signs,Weight (In Kilogram),Тегло (в килограми)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Цените няма да се показват, ако ценова листа не е настроено"
DocType: Stock Entry,Total Incoming Value,Общо Incoming Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Дебит сметка се изисква
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Дебит сметка се изисква
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Графици, за да следите на времето, разходите и таксуването по дейности, извършени от вашия екип"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Ценоразпис
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони на променливите на таблицата с резултатите от доставчика.
@@ -2654,7 +2659,7 @@
DocType: Company,For Reference Only.,Само за справка.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Лекарят {0} не е налице на {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Изберете партида №
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невалиден {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Невалиден {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Референтен инв
@@ -2691,8 +2696,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
DocType: Water Analysis,Origin,произход
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Този документ е над ограничението от {0} {1} за елемент {4}. Възможно ли е да направи друг {3} срещу същите {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,количество сметка Select промяна
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,количество сметка Select промяна
DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
DocType: Naming Series,User must always select,Потребителят трябва винаги да избере
DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
@@ -2748,7 +2753,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Предупреждавайте за нови Поръчки за покупка
DocType: Quality Inspection Reading,Reading 9,Четене 9
DocType: Supplier,Is Frozen,Е замразен
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Група възел склад не е позволено да изберете за сделки
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Група възел склад не е позволено да изберете за сделки
DocType: Buying Settings,Buying Settings,Настройки за Купуване
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Номер. за позиция на завършен продукт
DocType: Upload Attendance,Attendance To Date,Присъствие към днешна дата
@@ -2762,6 +2767,7 @@
DocType: Grant Application,Organization,организация
DocType: BOM Update Tool,BOM Update Tool,Инструмент за актуализиране на буквите
DocType: SG Creation Tool Course,Student Group Name,Наименование Student Group
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Показване на разгънатия изглед
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Създаване на такси
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
DocType: Room,Room Number,Номер на стая
@@ -2772,7 +2778,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Направете данъчен шаблон
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,потребителски форум
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Суровини - не могат да бъдат празни.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
DocType: Lab Test Sample,Lab Test Sample,Лабораторна проба за изпитване
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick вестник Влизане
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
@@ -2843,7 +2849,7 @@
DocType: Membership,USD,щатски долар
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Направи Invoice
DocType: Selling Settings,Auto close Opportunity after 15 days,Автоматично затваряне на възможността в 15-дневен срок
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Поръчките за покупка не се допускат за {0} поради стойността на {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Поръчките за покупка не се допускат за {0} поради стойността на {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Край Година
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Цитат / Водещ%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
@@ -2935,7 +2941,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Над 90 -
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row {0}: вестник Влизане {1} Няма профил {2} или вече съчетани срещу друг ваучер
DocType: Supplier Scorecard Criteria,Criteria Weight,Критерии Тегло
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Доставчик> Тип доставчик
DocType: Buying Settings,Default Buying Price List,Ценови лист за закупуване по подразбиране
DocType: Payroll Entry,Salary Slip Based on Timesheet,Заплата Slip Въз основа на график
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Процент на покупка
@@ -3023,7 +3028,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Изводи от Industry Type.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Отидете на Letterheads
DocType: Item Supplier,Item Supplier,Позиция - Доставчик
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всички адреси.
DocType: Company,Stock Settings,Сток Settings
@@ -3200,6 +3205,7 @@
DocType: Company,Default Inventory Account,Сметка по подразбиране за инвентаризация
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Завършен во трябва да е по-голяма от нула.
DocType: Antibiotic,Antibiotic Name,Името на антибиотика
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Код на елемента> Група на елементите> Марка
DocType: Purchase Invoice,Apply Additional Discount On,Нанесете Допълнителна отстъпка от
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Изберете Тип ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Връзка към всички земни единици, в които расте Растението"
@@ -3393,6 +3399,7 @@
DocType: Supplier,Credit Limit,Кредитен лимит
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Ср. Тарифа за цените на продажбите
DocType: Production Plan Sales Order,Salse Order Date,Поръчка за продажба - Дата
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Доставчик> Тип доставчик
DocType: Salary Component,Salary Component,Заплата Компонент
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Плащане Entries {0} са не-свързани
DocType: GL Entry,Voucher No,Ваучер №
@@ -3401,7 +3408,7 @@
DocType: Leave Allocation,Leave Allocation,Оставете Разпределение
DocType: Payment Request,Recipient Message And Payment Details,Получател на съобщението и данни за плащане
DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Заявки за материал {0} създадени
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Заявки за материал {0} създадени
DocType: Restaurant Reservation,No of People,Брой хора
DocType: Production Planning Tool,Include sub-contracted raw materials,Включи възложени на подизпълнители суровини
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Шаблон за условия или договор.
@@ -3465,7 +3472,7 @@
DocType: Production Planning Tool,Create Material Requests,Създаване на искане за материали
DocType: Employee Education,School/University,Училище / Университет
DocType: Payment Request,Reference Details,Референтен Детайли
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очакваната стойност След полезния живот трябва да бъде по-малко от Gross Сума на покупката
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Очакваната стойност След полезния живот трябва да бъде по-малко от Gross Сума на покупката
DocType: Sales Invoice Item,Available Qty at Warehouse,В наличност Количество в склада
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Фактурирана Сума
DocType: Asset,Double Declining Balance,Двоен неснижаем остатък
@@ -3477,7 +3484,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получаване на актуализации
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Сметка {2} не принадлежи на компания {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Изберете поне една стойност от всеки от атрибутите.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Искане за материал {0} е отменен или спрян
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Искане за материал {0} е отменен или спрян
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Управление на отсътствията
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Групирай по Сметка
DocType: Sales Order,Fully Delivered,Напълно Доставени
@@ -3488,14 +3495,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Платената сума не може да бъде по-голяма от кредит сума {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Отидете на Програми
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Ред {0} # Разпределената сума {1} не може да бъде по-голяма от сумата, която не е поискана {2}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Моля, настроите серийна номерация за участие чрез настройка> Серия за номериране"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Производствената поръчка не е създадена
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""От дата"" трябва да е преди ""До дата"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Не може да се промени статута си на студент {0} е свързан с прилагането студент {1}
DocType: Asset,Fully Depreciated,напълно амортизирани
,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проекта {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Маркирано като присъствие HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Оферта са предложения, оферти, изпратени до клиентите"
DocType: Sales Order,Customer's Purchase Order,Поръчка на Клиента
@@ -3579,7 +3585,7 @@
DocType: Stock Settings,Item Naming By,"Позиция наименуването им,"
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Друг период Закриване Влизане {0} е направено след {1}
DocType: Production Order,Material Transferred for Manufacturing,"Материал, прехвърлен за производство"
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Сметка {0} не съществува
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Сметка {0} не съществува
DocType: Project,Project Type,Тип на проекта
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Детската задача съществува за тази задача. Не можете да изтриете тази задача.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Или целта Количество или целева сума е задължително.
@@ -3681,11 +3687,11 @@
DocType: Company,Asset Depreciation Cost Center,Център за амортизация на разходите Асет
DocType: Sales Order Item,Sales Order Date,Поръчка за продажба - Дата
DocType: Sales Invoice Item,Delivered Qty,Доставено Количество
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Общо Изкл. данък
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ако има отметка, всички деца на всяка производствена позиция ще се включат в материала искания."
DocType: Assessment Plan,Assessment Plan,План за оценка
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Клиент {0} е създаден.
DocType: Stock Settings,Limit Percent,Процент лимит
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Моля, настройте инструмента за назначаване на инструктори в образованието> Настройки за обучение"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Понастоящем няма налични запаси в нито един склад
,Payment Period Based On Invoice Date,Заплащане Период на базата на датата на фактурата
DocType: Sample Collection,No. of print,Брой разпечатки
@@ -3701,12 +3707,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Длъжници ({0})
DocType: Pricing Rule,Margin,марж
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови клиенти
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Брутна Печалба %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Брутна Печалба %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Промяна на POS профила
DocType: Bank Reconciliation Detail,Clearance Date,Клирънсът Дата
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Доклад за оценка
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Брутна Сума на покупката е задължителна
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Брутна Сума на покупката е задължителна
DocType: Lead,Address Desc,Адрес Описание
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Компания е задължителна
DocType: Journal Entry,JV-,JV-
@@ -3738,7 +3744,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Постоянно име
DocType: Stock Entry,Customer or Supplier Details,Клиент или доставчик - Детайли
DocType: Employee Loan Application,Required by Date,Изисвани до дата
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Заключителен баланс (Dr-Cr)
DocType: Lead,Lead Owner,Потенциален клиент - собственик
DocType: Bin,Requested Quantity,заявеното количество
DocType: Patient,Marital Status,Семейно Положение
@@ -3752,7 +3757,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Няколко варианта
DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Доставени
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Поръчано Количество {1} не може да бъде по-малък от минималния Количество цел {2} (дефинирана в точка).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Поръчано Количество {1} не може да бъде по-малък от минималния Количество цел {2} (дефинирана в точка).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечено процентно разпределение
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,"Моля, влезте като друг потребител."
DocType: Territory,Territory Targets,Територия Цели
@@ -3851,7 +3856,7 @@
DocType: Serial No,Out of AMC,Няма AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Създаване на Посещение за поддръжка
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
DocType: Company,Default Cash Account,Каса - сметка по подразбиране
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Това се основава на присъствието на този Student
@@ -4001,7 +4006,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Няма служители за посочените критерии
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
DocType: Restaurant,Default Customer,Потребител по подразбиране
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси> Настройки за персонала"
DocType: Assessment Plan,Supervisor Name,Наименование на надзорник
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потвърждавайте дали среща е създадена за същия ден
DocType: Program Enrollment Course,Program Enrollment Course,Курс за записване на програмата
@@ -4119,7 +4123,7 @@
DocType: BOM,Website Description,Website Описание
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нетна промяна в собствения капитал
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Най-новият
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адрес трябва да бъде уникален, вече съществува за {0}"
DocType: Serial No,AMC Expiry Date,AMC срок на годност
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Касова бележка
@@ -4136,7 +4140,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Отчет за паричните потоци
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава сума на максимален заем {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Разрешително
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Моля изберете прехвърляне, ако и вие искате да се включат предходната фискална година баланс оставя на тази фискална година"
DocType: GL Entry,Against Voucher Type,Срещу ваучер Вид
DocType: Physician,Phone (R),Телефон (R)
@@ -4148,7 +4152,7 @@
DocType: Patient,B Negative,B Отрицателен
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,"Състоянието на поддръжката трябва да бъде отменено или завършено, за да бъде изпратено"
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Серийните номера в ред {0} не съвпадат с бележката за доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Серийните номера в ред {0} не съвпадат с бележката за доставка
DocType: Student,Guardian Details,Guardian Детайли
DocType: C-Form,C-Form,Cи-Форма
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Маркирай присъствие за множество служители
@@ -4190,7 +4194,7 @@
DocType: Stock Entry Detail,Basic Amount,Основна сума
DocType: Training Event,Exam,Изпит
DocType: Complaint,Complaint,оплакване
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
DocType: Patient,Alcohol Past Use,Използване на алкохол в миналото
DocType: Fertilizer Content,Fertilizer Content,Съдържание на тор
@@ -4314,6 +4318,7 @@
DocType: Salary Detail,Formula,формула
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Лабораторен тестов шаблон
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Профил за продажби
DocType: Purchase Invoice Item,Total Weight,Общо тегло
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комисионна за покупко-продажба
DocType: Offer Letter Term,Value / Description,Стойност / Описание
@@ -4470,7 +4475,7 @@
DocType: Customer,From Lead,От потенциален клиент
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поръчки пуснати за производство.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изберете фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
DocType: Program Enrollment Tool,Enroll Students,Прием на студенти
DocType: Lab Test,Approved Date,Одобрена дата
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -4546,7 +4551,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Производство - елемент
,Employee Information,Служител - Информация
DocType: Stock Entry Detail,Additional Cost,Допълнителен разход
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако е групирано по ваучер"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако е групирано по ваучер"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Въведи оферта на доставчик
DocType: Quality Inspection,Incoming,Входящ
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Създават се стандартни данъчни шаблони за продажби и покупки.
@@ -4563,7 +4568,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Забележка: {0}
,Delivery Note Trends,Складова разписка - Тенденции
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Тази Седмица Резюме
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,В наличност брой
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,В наличност брой
DocType: Delivery Trip,Calculate Estimated Arrival Times,Изчислете прогнозните часове на пристигане
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Сметка: {0} може да се актуализира само чрез Складови трансакции
DocType: Student Group Creation Tool,Get Courses,Вземете курсове
@@ -4579,7 +4584,7 @@
DocType: Material Request,% Ordered,% Поръчани
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За курсовата студентска група, курсът ще бъде валидиран за всеки студент от записаните курсове по програма за записване."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Работа заплащана на парче
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Ср. Курс купува
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ср. Курс купува
DocType: Task,Actual Time (in Hours),Действителното време (в часове)
DocType: Employee,History In Company,История във фирмата
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Ново съобщение от {sender}
@@ -4627,7 +4632,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Валута на BOM # {1} трябва да бъде равна на избраната валута {2}
DocType: Journal Entry Account,Exchange Rate,Обменен курс
DocType: Patient,Additional information regarding the patient,Допълнителна информация относно пациента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Поръчка за продажба {0} не е изпратена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Поръчка за продажба {0} не е изпратена
DocType: Homepage,Tag Line,Tag Line
DocType: Fee Component,Fee Component,Такса Компонент
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Управление на автопарка
@@ -4839,7 +4844,7 @@
DocType: Employee Education,Employee Education,Служител - Образование
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicate група т намерена в таблицата на т група
DocType: Land Unit,Parent Land Unit,Звено за родители
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
DocType: Fertilizer,Fertilizer Name,Име на тора
DocType: Salary Slip,Net Pay,Net Pay
DocType: Account,Account,Сметка
@@ -4918,7 +4923,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Групата клиенти е задължителна в POS профила
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Записи на служителите.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Моля, задайте Следваща Амортизация Дата"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Моля, задайте Следваща Амортизация Дата"
DocType: HR Settings,Payroll Settings,Настройки ТРЗ
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Съвпадение без свързана фактури и плащания.
DocType: POS Settings,POS Settings,POS настройки
@@ -5085,7 +5090,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Напомняне за рожден ден за {0}
DocType: Asset Maintenance Task,Last Completion Date,Последна дата на приключване
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни след последната поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
DocType: Buying Settings,Naming Series,Поредни Номера
DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Застраховка Начална дата трябва да бъде по-малка от застраховка Крайна дата
@@ -5211,6 +5216,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Вземете Записи на плащане
DocType: Quotation Item,Against Docname,Срещу Документ
DocType: SMS Center,All Employee (Active),All Employee (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Клиент> Група клиенти> Територия
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Вижте сега
DocType: BOM,Raw Material Cost,Разходи за суровини
DocType: Item Reorder,Re-Order Level,Re-Поръчка Level
@@ -5309,7 +5315,6 @@
DocType: Room,Seating Capacity,Седалки капацитет
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Лабораторни тестови групи
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Клиент> Група клиенти> Територия
DocType: Project,Total Expense Claim (via Expense Claims),Общо разход претенция (чрез разход Вземания)
DocType: GST Settings,GST Summary,Резюме на GST
DocType: Assessment Result,Total Score,Общ резултат
@@ -5322,7 +5327,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Бяха създадени графици за курсовете
DocType: Journal Entry,Total Debit,Общо дебит
DocType: Manufacturing Settings,Default Finished Goods Warehouse,По подразбиране - Склад за готова продукция
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Търговец
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Търговец
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Бюджет и Разходен център
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Не е разрешен няколко начина на плащане по подразбиране
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
@@ -5495,7 +5500,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Помислете за данък или такса за
DocType: Driver,Driving License Category,Категория на лиценза за шофьори
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Действително Количество е задължително
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} понастоящем има {1} карта на Доставчика за покупки и поръчките за покупка на този доставчик трябва да се издават с повишено внимание.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} понастоящем има {1} карта на Доставчика за покупки и поръчките за покупка на този доставчик трябва да се издават с повишено внимание.
DocType: Asset Maintenance Team,Asset Maintenance Team,Екип за поддръжка на активи
DocType: Employee Loan,Loan Type,Вид на кредита
DocType: Scheduling Tool,Scheduling Tool,Scheduling Tool
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 9a255a4..b50e61f 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,মূল্য অনুসারে সাজান
,Delay Days,বিলম্বিত দিনগুলি
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,পরিষেবা ব্যায়ের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,চালান
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,ধারণ স্টক এন্ট্রি করুন
DocType: Purchase Invoice Item,Item Weight Details,আইটেম ওজন বিশদ
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","রেফারেন্স: {0}, আইটেম কোড: {1} এবং গ্রাহক: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,কেজি
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,একটি কাজের জন্য খোলা.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},{1} সারি {1} এ উপসম্পাদক আইটেমের জন্য BOM নির্দিষ্ট করা হয়নি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},{1} সারি {1} এ উপসম্পাদক আইটেমের জন্য BOM নির্দিষ্ট করা হয়নি
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ফলাফল জমা দেওয়া হয়েছে
DocType: Item Attribute,Increment,বৃদ্ধি
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},অনুমোদিত নয় {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,থেকে আইটেম পান
DocType: Price List,Price Not UOM Dependant,দাম না UOM নির্ভরশীলতা
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},প্রোডাক্ট {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,তালিকাভুক্ত কোনো আইটেম
DocType: Asset Repair,Error Description,ত্রুটি বর্ণনা
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,মুদিখানা
DocType: Quality Inspection Reading,Reading 1,1 পঠন
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,পরবর্তী অবচয় তারিখ আগে ক্রয়ের তারিখ হতে পারে না
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,পরবর্তী অবচয় তারিখ আগে ক্রয়ের তারিখ হতে পারে না
DocType: Crop,Perennial,বহুবর্ষজীবী
DocType: Consultation,Consultation Date,পরামর্শ তারিখ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext ব্যবহারকারীদের জন্য পণ্য তালিকা এবং আবিষ্কার
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","যেমন, "প্রাথমিক স্কুল" বা "বিশ্ববিদ্যালয়""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,স্টক রিপোর্ট
DocType: Warehouse,Warehouse Detail,ওয়ারহাউস বিস্তারিত
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,টার্ম শেষ তারিখ পরে একাডেমিক ইয়ার বছর শেষ তারিখ যা শব্দটি সংযুক্ত করা হয় না হতে পারে (শিক্ষাবর্ষ {}). তারিখ সংশোধন করে আবার চেষ্টা করুন.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", অবারিত হতে পারে না যেমন অ্যাসেট রেকর্ড আইটেমটি বিরুদ্ধে বিদ্যমান "ফিক্সড সম্পদ""
DocType: Delivery Trip,Departure Time,ছাড়ার সময়
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,স্পেসিফিকেশন বিবরণ পান
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,সরবরাহকারী স্ট্যান্ডিং টেম্পলেট।
DocType: Lead,Interested,আগ্রহী
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,উদ্বোধন
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,উদ্বোধন
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},থেকে {0} থেকে {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,ট্যাক্স সেট করতে ব্যর্থ হয়েছে
DocType: Item,Copy From Item Group,আইটেম গ্রুপ থেকে কপি
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,প্রতি বছর পত্রাদি
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে 'আগাম' {1} এই একটি অগ্রিম এন্ট্রি হয়.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
DocType: Email Digest,Profit & Loss,লাভ ক্ষতি
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,লিটার
DocType: Task,Total Costing Amount (via Time Sheet),মোট খোয়াতে পরিমাণ (টাইম শিট মাধ্যমে)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,এই কোম্পানি বিরুদ্ধে লেনদেন উপর ভিত্তি করে। বিস্তারিত জানার জন্য নীচের টাইমলাইনে দেখুন
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,স্বয়ংক্রিয় উপাদান অনুরোধ নির্মাণের ইমেইল দ্বারা সূচিত
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,প্রতিরোধী
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
DocType: Opening Invoice Creation Tool,Invoice Type,চালান প্রকার
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,চালান পত্র
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,পতিহীনা
DocType: Request for Quotation,Request for Quotation,উদ্ধৃতি জন্য অনুরোধ
DocType: Healthcare Settings,Require Lab Test Approval,ল্যাব টেস্ট অনুমোদন প্রয়োজন
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,আইটেম কোড> আইটেম গ্রুপ> ব্র্যান্ড
DocType: Salary Slip Timesheet,Working Hours,কর্মঘন্টা
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,পুরো অসাধারন
DocType: Naming Series,Change the starting / current sequence number of an existing series.,একটি বিদ্যমান সিরিজের শুরু / বর্তমান ক্রম সংখ্যা পরিবর্তন করুন.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
DocType: Drug Prescription,Dosage,ডোজ
DocType: Journal Entry Account,Sales Order,বিক্রয় আদেশ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,গড়. হার বিক্রী
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,গড়. হার বিক্রী
DocType: Assessment Plan,Examiner Name,পরীক্ষক নাম
DocType: Lab Test Template,No Result,কোন ফল
DocType: Purchase Invoice Item,Quantity and Rate,পরিমাণ ও হার
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,বেতনের সময়কাল নির্বাচন
DocType: Purchase Invoice,Unpaid,অবৈতনিক
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,বিক্রয়ের জন্য সংরক্ষিত
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,মানব সম্পদে কর্মচারী নেমিং সিস্টেম> এইচআর সেটিংস সেট আপ করুন
DocType: Packing Slip,From Package No.,প্যাকেজ নং থেকে
DocType: Item Attribute,To Range,পরিসীমা
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,সিকিউরিটিজ এবং আমানত
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,কারখানা
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ক্রয় অর্ডারগুলি সতর্ক করুন
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,আপনার গ্রাহকদের কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,পর্যাপ্ত যন্ত্রাংশ তৈরি করুন
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,পর্যাপ্ত যন্ত্রাংশ তৈরি করুন
DocType: POS Profile User,POS Profile User,পিওএস প্রোফাইল ব্যবহারকারী
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,সরাসরি আয়
DocType: Patient Appointment,Date TIme,তারিখ সময়
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",অ্যাকাউন্ট দ্বারা গ্রুপকৃত তাহলে অ্যাকাউন্ট উপর ভিত্তি করে ফিল্টার করতে পারবে না
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",অ্যাকাউন্ট দ্বারা গ্রুপকৃত তাহলে অ্যাকাউন্ট উপর ভিত্তি করে ফিল্টার করতে পারবে না
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,প্রশাসনিক কর্মকর্তা
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,কোম্পানী এবং ট্যাক্স সেট আপ
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,দয়া করে কোর্সের নির্বাচন
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,পার্থক্য অ্যাকাউন্ট
DocType: Purchase Invoice,Supplier GSTIN,সরবরাহকারী GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,তার নির্ভরশীল টাস্ক {0} বন্ধ না হয় বন্ধ টাস্ক না পারেন.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
DocType: Production Order,Additional Operating Cost,অতিরিক্ত অপারেটিং খরচ
DocType: Lab Test Template,Lab Routine,ল্যাব রাউটিং
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,অঙ্গরাগ
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 সাথে সর্ম্পক
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,ম্যানেজার
DocType: Payment Entry,Payment From / To,পেমেন্ট থেকে / প্রতি
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},নতুন ক্রেডিট সীমা গ্রাহকের জন্য বর্তমান অসামান্য রাশির চেয়ে কম হয়. ক্রেডিট সীমা অন্তত হতে হয়েছে {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},নতুন ক্রেডিট সীমা গ্রাহকের জন্য বর্তমান অসামান্য রাশির চেয়ে কম হয়. ক্রেডিট সীমা অন্তত হতে হয়েছে {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},গুদামে অ্যাকাউন্ট সেট করুন {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'গ্রুপ দ্বারা' এবং 'উপর ভিত্তি করে' একই হতে পারে না
DocType: Sales Person,Sales Person Targets,সেলস পারসন লক্ষ্যমাত্রা
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,ব্যাচ নাম
DocType: Fee Validity,Max number of visit,দেখার সর্বাধিক সংখ্যা
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,নথিভুক্ত করা
DocType: GST Settings,GST Settings,GST সেটিং
DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,বাজেট বিরুদ্ধে
DocType: Employee,Cell Number,মোবাইল নম্বর
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,প্রদত্ত মানদণ্ডের জন্য কোনও কর্মচারী নেই। পরীক্ষা করুন যে বেতন স্লিপগুলি ইতিমধ্যে তৈরি করা হয়নি।
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,অটো উপাদান অনুরোধ উত্পন্ন
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,অটো উপাদান অনুরোধ উত্পন্ন
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,নষ্ট
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম 'জার্নাল এন্ট্রি বিরুদ্ধে' বর্তমান ভাউচার লিখতে পারবেন না
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,উত্পাদন জন্য সংরক্ষিত
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,শক্তি
DocType: Opportunity,Opportunity From,থেকে সুযোগ
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,মাসিক বেতন বিবৃতি.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,সারি {0}: {1} আইটেমের জন্য প্রয়োজনীয় সিরিয়াল নম্বর {2}। আপনি {3} প্রদান করেছেন।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,সারি {0}: {1} আইটেমের জন্য প্রয়োজনীয় সিরিয়াল নম্বর {2}। আপনি {3} প্রদান করেছেন।
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,একটি টেবিল নির্বাচন করুন
DocType: BOM,Website Specifications,ওয়েবসাইট উল্লেখ
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} 'প্রাপকদের' একটি অবৈধ ইমেল ঠিকানা
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,উদ্ধৃতি অনুরোধ
DocType: Vital Signs,Heart Rate / Pulse,হার্ট রেট / পালস
DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"আইটেম মাধ্যমে বিতরণ করা হয় না, কারণ 'আপডেট স্টক চেক করা যাবে না {0}"
DocType: Vehicle,Acquisition Date,অধিগ্রহণ তারিখ
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,আমরা
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),আপনার চিঠির মাথাটি আপলোড করুন (এটি ওয়েবপৃষ্ঠাটি 900px দ্বারা 100px করে রাখুন)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: অ্যাকাউন্ট {2} একটি গ্রুপ হতে পারে না
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,আইটেম সারি {idx}: {DOCTYPE} {DOCNAME} উপরে বিদ্যমান নেই '{DOCTYPE}' টেবিল
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড {0} ইতিমধ্যে সম্পন্ন বা বাতিল করা হয়েছে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড {0} ইতিমধ্যে সম্পন্ন বা বাতিল করা হয়েছে
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,কোন কর্ম
DocType: Item Variant Settings,Copy Fields to Variant,ক্ষেত্রগুলি থেকে বৈকল্পিক কপি করুন
DocType: Asset,Opening Accumulated Depreciation,খোলা সঞ্চিত অবচয়
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,সেলস অংশীদার এবং টেরিটরি
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),বন্ধ (খোলা + মোট)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),বন্ধ (খোলা + মোট)
DocType: Journal Entry,Depreciation Entry,অবচয় এণ্ট্রি
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,প্রথম ডকুমেন্ট টাইপ নির্বাচন করুন
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,অ্যাকাউন্ট মুদ্রা মুদ্রণ করুন
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,এই রক্ষণাবেক্ষণ পরিদর্শন বাতিল আগে বাতিল উপাদান ভিজিট {0}
DocType: Crop Cycle,ISO 8016 standard,আইএসও 8016 স্ট্যান্ডার্ড
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},সিরিয়াল কোন {0} আইটেম অন্তর্গত নয় {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,ডিফল্ট পরিশোধযোগ্য অংশ
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
DocType: Fee Structure,Components,উপাদান
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
DocType: Quality Inspection Reading,Reading 6,6 পঠন
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,কোমপানির নাম
DocType: SMS Center,Total Message(s),মোট বার্তা (গুলি)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} সেটআপের মাধ্যমে> সেটিংস> নামকরণ সিরিজ জন্য নামকরণ সিরিজ সেট করুন
DocType: Purchase Invoice,Additional Discount Percentage,অতিরিক্ত ছাড় শতাংশ
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,সব সাহায্য ভিডিওর একটি তালিকা দেখুন
DocType: Agriculture Analysis Criteria,Soil Texture,মৃত্তিকা টেক্সচার
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM ওয়েবসাইট আইটেম
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
DocType: Timesheet Detail,Bill,বিল
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,পরবর্তী অবচয় তারিখ অতীত তারিখ হিসাবে প্রবেশ করানো হয়
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,পরবর্তী অবচয় তারিখ অতীত তারিখ হিসাবে প্রবেশ করানো হয়
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,সাদা
DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),সারি {0}: Qty জন্য পাওয়া যায় না {4} গুদামে {1} এন্ট্রির সময় পোস্টিং এ ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,পরের যোগাযোগ তারিখ
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty খোলা
DocType: Healthcare Settings,Appointment Reminder,নিয়োগ অনুস্মারক
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
DocType: Program Enrollment Tool Student,Student Batch Name,ছাত্র ব্যাচ নাম
DocType: Consultation,Doctor,ডাক্তার
DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,অ্যালোকেশন টুল ত্যাগ
DocType: Item,Hub Category to Publish,হাব বিভাগ প্রকাশ করতে
DocType: Leave Block List,Leave Block List Dates,ব্লক তালিকা তারিখগুলি ছেড়ে
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,অনুগ্রহ করে সেটআপ> নম্বরিং সিরিজ এর মাধ্যমে উপস্থিতি জন্য ধারাবাহিক সংখ্যা নির্ধারণ করুন
DocType: Sales Invoice,Billing Address GSTIN,বিলিং ঠিকানা জিএসটিআইএন
DocType: Assessment Plan,Evaluate,মূল্যনির্ধারণ
DocType: Workstation,Net Hour Rate,নিট ঘন্টা হার
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,সেলস চালান পেমেন্ট
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,বিক্রয় আদেশ / সমাপ্ত পণ্য গুদাম সংরক্ষিত ওয়্যারহাউস
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,বিক্রয় পরিমাণ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,বিক্রয় পরিমাণ
DocType: Repayment Schedule,Interest Amount,সুদের পরিমাণ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,আপনি এই রেকর্ডের জন্য ব্যয় রাজসাক্ষী হয়. ‧- 'status' এবং সংরক্ষণ আপডেট করুন
DocType: Serial No,Creation Document No,ক্রিয়েশন ডকুমেন্ট
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,খোলা অ্যাকাউন্টিং ব্যালান্স
,GST Sales Register,GST সেলস নিবন্ধন
DocType: Sales Invoice Advance,Sales Invoice Advance,বিক্রয় চালান অগ্রিম
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,কিছুই অনুরোধ করতে
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,কিছুই অনুরোধ করতে
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,আপনার ডোমেন নির্বাচন করুন
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},আরেকটি বাজেট রেকর্ড '{0}' ইতিমধ্যে বিরুদ্ধে বিদ্যমান {1} '{2}' অর্থবছরের জন্য {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,সৃষ্টির সময় ক্ষেত্রগুলি শুধুমাত্র কপি করা হবে।
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","এই বৈকল্পিক আইটেম কোড যোগ করা হবে. আপনার সমাহার "এস এম", এবং উদাহরণস্বরূপ, যদি আইটেমটি কোড "টি-শার্ট", "টি-শার্ট-এস এম" হতে হবে বৈকল্পিক আইটেমটি কোড"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,আপনি বেতন স্লিপ সংরক্ষণ একবার (কথায়) নিট পে দৃশ্যমান হবে.
DocType: Purchase Invoice,Is Return,ফিরে যেতে হবে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,সতর্কতা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,সতর্কতা
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,রিটার্ন / ডেবিট নোট
DocType: Price List Country,Price List Country,মূল্যতালিকা দেশ
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} আইটেম জন্য বৈধ সিরিয়াল আমরা {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} আইটেম জন্য বৈধ সিরিয়াল আমরা {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,আইটেম কোড সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM রূপান্তর ফ্যাক্টর
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ব্যাচ নম্বর পেতে আইটেম কোড লিখুন দয়া করে
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
DocType: Supplier Scorecard,Warn for new Request for Quotations,উদ্ধৃতি জন্য নতুন অনুরোধের জন্য সতর্কতা
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ক্রয় আদেশ আপনি পরিকল্পনা সাহায্য এবং আপনার ক্রয়ের উপর ফলোআপ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ল্যাব টেস্ট প্রেসক্রিপশন
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",মোট ইস্যু / স্থানান্তর পরিমাণ {0} উপাদান অনুরোধ মধ্যে {1} \ আইটেম জন্য অনুরোধ পরিমাণ {2} তার চেয়ে অনেক বেশী হতে পারে না {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,ওয়ারহাউস যোগাযোগের তথ্য
DocType: Payment Entry,Write Off Difference Amount,বন্ধ লিখতে পার্থক্য পরিমাণ
DocType: Volunteer,Volunteer Name,স্বেচ্ছাসেবক নাম
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,শিক্ষা> শিক্ষা সেটিংস এ প্রশিক্ষক নামকরণ পদ্ধতি স্থাপন করুন
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: কর্মচারী ইমেল পাওয়া যায়নি, অত: পর না পাঠানো ই-মেইল"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},দেশের জন্য শপিংয়ের নিয়ম প্রযোজ্য নয় {0}
DocType: Item,Foreign Trade Details,বৈদেশিক বানিজ্য বিবরণ
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,গ্রুপ রোল নম্বর
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,সব কাজের ওজন মোট হওয়া উচিত 1. অনুযায়ী সব প্রকল্পের কাজগুলো ওজন নিয়ন্ত্রন করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ক্যাপিটাল উপকরণ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র 'প্রয়োগ'."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,শিশু গুদাম এই গুদাম জন্য বিদ্যমান. আপনি এই গুদাম মুছতে পারবেন না.
DocType: Item,Website Item Groups,ওয়েবসাইট আইটেম গ্রুপ
DocType: Purchase Invoice,Total (Company Currency),মোট (কোম্পানি একক)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,{0} সিরিয়াল নম্বর একবারের বেশি প্রবেশ
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,{0} সিরিয়াল নম্বর একবারের বেশি প্রবেশ
DocType: Journal Entry,Journal Entry,জার্নাল এন্ট্রি
DocType: Expense Claim Advance,Unclaimed amount,নিষিদ্ধ পরিমাণ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} প্রগতিতে আইটেম
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,যোগাযোগ লগ ইন করুন.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",উদ্ধৃতি জন্য অনুরোধ আরো চেক পোর্টাল সেটিংস জন্য পোর্টাল থেকে অ্যাক্সেস করতে অক্ষম হয়.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,সরবরাহকারী স্কোরকার্ড ভেরিয়েবল স্কোরিং
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,রাজধানীতে পরিমাণ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,রাজধানীতে পরিমাণ
DocType: Sales Invoice,Shipping Address Name,শিপিং ঠিকানা নাম
DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,কোর্স সময়সূচী তৈরি ত্রুটি ছিল
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,এই যানবাহন বিরুদ্ধে লগ উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,আপনি মুছে ফেলতে পারবেন না অর্থবছরের {0}. অর্থবছরের {0} গ্লোবাল সেটিংস এ ডিফল্ট হিসাবে সেট করা হয়
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,একই নামের একটি গ্রাহক ইতিমধ্যে বিদ্যমান
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,এটি বেতন স্লিপ জমা দেবে এবং জার্নাল এণ্ট্রি তৈরি করবে। আপনি কি এগিয়ে যেতে চান?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,প্রাইসিং
DocType: Quotation,Term Details,টার্ম বিস্তারিত
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} এই ছাত্র দলের জন্য ছাত্রদের তুলনায় আরো নথিভুক্ত করা যায় না.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),মোট (কর ছাড়)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,লিড কাউন্ট
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 থেকে বেশী হতে হবে"
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,পরিমান মত মজুত আছে
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,চালান বাতিলের পেমেন্ট লিঙ্কমুক্ত
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},বর্তমান দূরত্বমাপণী পড়া প্রবেশ প্রাথমিক যানবাহন ওডোমিটার চেয়ে বড় হতে হবে {0}
DocType: Restaurant Reservation,No Show,না দেখান
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} সেটআপের মাধ্যমে> সেটিংস> নামকরণ সিরিজ জন্য নামকরণ সিরিজ সেট করুন
DocType: Shipping Rule Country,Shipping Rule Country,শিপিং রুল দেশ
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ত্যাগ এবং অ্যাটেনডেন্স
DocType: Maintenance Visit,Partially Completed,আংশিকভাবে সম্পন্ন
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,শিক্ষার্থীর গ্রুপ প্রশিক্ষক
DocType: Grant Application,Assessment Mark (Out of 10),মূল্যায়ন মার্ক (10 এর মধ্যে)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 মোবাইল কোন
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,প্রধান
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,প্রধান
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,বৈকল্পিক
DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
DocType: Employee Attendance Tool,Employees HTML,এমপ্লয়িজ এইচটিএমএল
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,কোর্সের সমাহার
DocType: Student Leave Application,Student Leave Application,শিক্ষার্থীর ছুটি আবেদন
DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},কর্মচারী {0} হাফ দিনে {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},মোট কাজ ঘন্টা সর্বোচ্চ কর্মঘন্টা চেয়ে বেশী করা উচিত হবে না {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,উপর
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),প্রকৃত শেষ তারিখ (টাইম শিট মাধ্যমে)
DocType: Soil Texture,Soil Type,মৃত্তিকা টাইপ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,নতুন বার্তা
,Quotation Trends,উদ্ধৃতি প্রবণতা
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
DocType: Shipping Rule,Shipping Amount,শিপিং পরিমাণ
DocType: Supplier Scorecard Period,Period Score,সময়কাল স্কোর
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,গ্রাহকরা যোগ করুন
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,গাড়ির খরচ
DocType: Serial No,Invoice Details,চালান বিস্তারিত
DocType: Grant Application,Show on Website,ওয়েবসাইট দেখান
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,শুরু করা যাক
DocType: Hub Category,Hub Category,হাব বিভাগ
DocType: Purchase Invoice,SEZ,এসইজেড
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,বি ইতিবাচক
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
DocType: Patient Medical Record,Patient Medical Record,রোগীর চিকিৎসা রেকর্ড
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,অ-গ্রুপ গ্রুপ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,স্পোর্টস
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,কোন উদ্ধৃত কোন প্রাপ্ত RFQ সেট করতে পারবেন না
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,অ্যাকাউন্ট মুদ্রার মুদ্রণ করতে একটি অ্যাকাউন্ট নির্বাচন করুন
,Production Analytics,উত্পাদনের অ্যানালিটিক্স
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,এই রোগীর বিরুদ্ধে লেনদেনের উপর নির্ভর করে। বিস্তারিত জানার জন্য নীচের টাইমলাইনে দেখুন
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,খরচ আপডেট
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,কোম্পানি নির্বাচন ...
DocType: Leave Control Panel,Leave blank if considered for all departments,সব বিভাগের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
DocType: Payroll Entry,Fortnightly,পাক্ষিক
DocType: Currency Exchange,From Currency,মুদ্রা থেকে
DocType: Vital Signs,Weight (In Kilogram),ওজন (কিলোগ্রামে)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,অভিভাবকরা
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,দাম দেখানো হবে না যদি মূল্য তালিকা নির্ধারণ করা হয় না
DocType: Stock Entry,Total Incoming Value,মোট ইনকামিং মূল্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets সাহায্য আপনার দলের দ্বারা সম্পন্ন তৎপরতা জন্য সময়, খরচ এবং বিলিং ট্র্যাক রাখতে"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ক্রয়মূল্য তালিকা
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,সরবরাহকারী স্কোরকার্ড ভেরিয়েবলের টেমপ্লেট
@@ -2654,7 +2659,7 @@
DocType: Company,For Reference Only.,শুধুমাত্র রেফারেন্সের জন্য.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},চিকিত্সক {0} {1} এ উপলব্ধ নয়
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,ব্যাচ নির্বাচন কোন
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},অকার্যকর {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},অকার্যকর {0}: {1}
,GSTR-1,GSTR -1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,রেফারেন্স INV
@@ -2691,8 +2696,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
DocType: Water Analysis,Origin,উত্স
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,এই দস্তাবেজটি দ্বারা সীমা উত্তীর্ণ {0} {1} আইটেমের জন্য {4}. আপনি তৈরি করছেন আরেকটি {3} একই বিরুদ্ধে {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
@@ -2748,7 +2753,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,নতুন ক্রয় আদেশের জন্য সতর্ক করুন
DocType: Quality Inspection Reading,Reading 9,9 পঠন
DocType: Supplier,Is Frozen,জমাটবাধা
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,গ্রুপ নোড গুদাম লেনদেনের জন্য নির্বাচন করতে অনুমতি দেওয়া হয় না
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,গ্রুপ নোড গুদাম লেনদেনের জন্য নির্বাচন করতে অনুমতি দেওয়া হয় না
DocType: Buying Settings,Buying Settings,রাজধানীতে সেটিংস
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,একটি সমাপ্ত ভাল আইটেম জন্য BOM নং
DocType: Upload Attendance,Attendance To Date,তারিখ উপস্থিতি
@@ -2762,6 +2767,7 @@
DocType: Grant Application,Organization,সংগঠন
DocType: BOM Update Tool,BOM Update Tool,BOM আপডেট সরঞ্জাম
DocType: SG Creation Tool Course,Student Group Name,স্টুডেন্ট গ্রুপের নাম
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,বিস্ফোরক দেখুন দেখান
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ফি তৈরি করা
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
DocType: Room,Room Number,রুম নম্বর
@@ -2772,7 +2778,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,ট্যাক্স টেমপ্লেট তৈরি করুন
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ব্যবহারকারী ফোরাম
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
DocType: Lab Test Sample,Lab Test Sample,ল্যাব পরীক্ষার নমুনা
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
@@ -2843,7 +2849,7 @@
DocType: Membership,USD,আমেরিকান ডলার
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,চালান করুন
DocType: Selling Settings,Auto close Opportunity after 15 days,15 দিন পর অটো বন্ধ সুযোগ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} এর স্কোরকার্ড স্থানের কারণে {0} জন্য ক্রয় অর্ডার অনুমোদিত নয়।
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} এর স্কোরকার্ড স্থানের কারণে {0} জন্য ক্রয় অর্ডার অনুমোদিত নয়।
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,শেষ বছর
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / লিড%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
@@ -2934,7 +2940,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-উপরে
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,সারি # {0}: জার্নাল এন্ট্রি {1} অ্যাকাউন্ট নেই {2} বা ইতিমধ্যেই অন্য ভাউচার বিরুদ্ধে মিলেছে
DocType: Supplier Scorecard Criteria,Criteria Weight,মাপদণ্ড ওজন
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,সরবরাহকারী> সরবরাহকারী প্রকার
DocType: Buying Settings,Default Buying Price List,ডিফল্ট ক্রয় মূল্য তালিকা
DocType: Payroll Entry,Salary Slip Based on Timesheet,বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড উপর ভিত্তি করে
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,কেনা দর
@@ -3022,7 +3027,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,লেটার হেডসে যান
DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,সব ঠিকানাগুলি.
DocType: Company,Stock Settings,স্টক সেটিংস
@@ -3199,6 +3204,7 @@
DocType: Company,Default Inventory Account,ডিফল্ট পরিসংখ্যা অ্যাকাউন্ট
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,সারি {0}: সমাপ্ত Qty শূন্য অনেক বেশী হতে হবে.
DocType: Antibiotic,Antibiotic Name,অ্যান্টিবায়োটিক নাম
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,আইটেম কোড> আইটেম গ্রুপ> ব্র্যান্ড
DocType: Purchase Invoice,Apply Additional Discount On,অতিরিক্ত ডিসকাউন্ট উপর প্রয়োগ
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,প্রকার নির্বাচন করুন ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,সমস্ত জমি ইউনিট যা ফসল ক্রমবর্ধমান হয় একটি লিঙ্ক
@@ -3391,6 +3397,7 @@
DocType: Supplier,Credit Limit,ক্রেডিট সীমা
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,গড়। মূল্য তালিকা হার বিক্রি
DocType: Production Plan Sales Order,Salse Order Date,কর্দমস্রাবক আগ্নেয়গিরি ক্রম তারিখের
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,সরবরাহকারী> সরবরাহকারী প্রকার
DocType: Salary Component,Salary Component,বেতন কম্পোনেন্ট
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,পেমেন্ট দাখিলা {0} উন-লিঙ্ক আছে
DocType: GL Entry,Voucher No,ভাউচার কোন
@@ -3399,7 +3406,7 @@
DocType: Leave Allocation,Leave Allocation,অ্যালোকেশন ত্যাগ
DocType: Payment Request,Recipient Message And Payment Details,প্রাপক বার্তা এবং পেমেন্ট বিবরণ
DocType: Training Event,Trainer Email,প্রশিক্ষকদের ইমেইল
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,তৈরি উপাদান অনুরোধ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,তৈরি উপাদান অনুরোধ {0}
DocType: Restaurant Reservation,No of People,মানুষের সংখ্যা
DocType: Production Planning Tool,Include sub-contracted raw materials,উপ-সংকুচিত কাঁচামাল অন্তর্ভুক্ত
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,পদ বা চুক্তি টেমপ্লেট.
@@ -3463,7 +3470,7 @@
DocType: Production Planning Tool,Create Material Requests,উপাদান অনুরোধ করুন
DocType: Employee Education,School/University,স্কুল / বিশ্ববিদ্যালয়
DocType: Payment Request,Reference Details,রেফারেন্স বিস্তারিত
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,প্রত্যাশিত মান দরকারী জীবন পর গ্রস ক্রয়ের পরিমাণ কম হওয়া আবশ্যক
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,প্রত্যাশিত মান দরকারী জীবন পর গ্রস ক্রয়ের পরিমাণ কম হওয়া আবশ্যক
DocType: Sales Invoice Item,Available Qty at Warehouse,ওয়্যারহাউস এ উপলব্ধ Qty
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,বিলের পরিমাণ
DocType: Asset,Double Declining Balance,ডাবল পড়ন্ত ব্যালেন্স
@@ -3475,7 +3482,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,আপডেট পান
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: অ্যাকাউন্ট {2} কোম্পানির অন্তর্গত নয় {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,প্রতিটি গুণাবলী থেকে কমপক্ষে একটি মান নির্বাচন করুন
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
apps/erpnext/erpnext/config/hr.py +310,Leave Management,ম্যানেজমেন্ট ত্যাগ
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,অ্যাকাউন্ট দ্বারা গ্রুপ
DocType: Sales Order,Fully Delivered,সম্পূর্ণ বিতরণ
@@ -3486,14 +3493,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},বিতরণ পরিমাণ ঋণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,প্রোগ্রামে যান
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},সারি {0} # বরাদ্দকৃত পরিমাণ {1} দাবি না করা পরিমাণের চেয়ে বড় হতে পারে না {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,অনুগ্রহ করে সেটআপ> নম্বরিং সিরিজ এর মাধ্যমে উপস্থিতি জন্য ধারাবাহিক সংখ্যা নির্ধারণ করুন
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,উত্পাদনের অর্ডার তৈরি করা না
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ছাত্র হিসাবে অবস্থা পরিবর্তন করা যাবে না {0} ছাত্র আবেদনপত্রের সাথে সংযুক্ত করা হয় {1}
DocType: Asset,Fully Depreciated,সম্পূর্ণরূপে মূল্যমান হ্রাস
,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,চিহ্নিত এ্যাটেনডেন্স এইচটিএমএল
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","উদ্ধৃতি প্রস্তাব, দর আপনি আপনার গ্রাহকদের কাছে পাঠানো হয়েছে"
DocType: Sales Order,Customer's Purchase Order,গ্রাহকের ক্রয় আদেশ
@@ -3577,7 +3583,7 @@
DocType: Stock Settings,Item Naming By,দফে নামকরণ
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},অন্য সময়ের সমাপ্তি এন্ট্রি {0} পরে তৈরি করা হয়েছে {1}
DocType: Production Order,Material Transferred for Manufacturing,উপাদান উৎপাদন জন্য বদলিকৃত
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,অ্যাকাউন্ট {0} না বিদ্যমান
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,অ্যাকাউন্ট {0} না বিদ্যমান
DocType: Project,Project Type,প্রকল্প ধরন
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,এই টাস্কের জন্য শিশু টাস্ক বিদ্যমান। আপনি এই টাস্কটি মুছতে পারবেন না।
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক.
@@ -3679,11 +3685,11 @@
DocType: Company,Asset Depreciation Cost Center,অ্যাসেট অবচয় মূল্য কেন্দ্র
DocType: Sales Order Item,Sales Order Date,বিক্রয় আদেশ তারিখ
DocType: Sales Invoice Item,Delivered Qty,বিতরিত Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,মোট Excl। কর
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","যদি চেক করা, প্রতিটি উৎপাদন আইটেমের সব শিশুদের উপাদান অনুরোধ অন্তর্ভুক্ত করা হবে."
DocType: Assessment Plan,Assessment Plan,অ্যাসেসমেন্ট প্ল্যান
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,গ্রাহক {0} তৈরি করা হয়।
DocType: Stock Settings,Limit Percent,সীমা শতকরা
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,শিক্ষা> শিক্ষা সেটিংস এ প্রশিক্ষক নামকরণ পদ্ধতি স্থাপন করুন
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,বর্তমানে কোন গুদামে পন্য উপলব্ধ নেই
,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পরিশোধ সময়সীমার
DocType: Sample Collection,No. of print,মুদ্রণের সংখ্যা
@@ -3699,12 +3705,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),ঋণ গ্রহিতা ({0})
DocType: Pricing Rule,Margin,মার্জিন
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,নতুন গ্রাহকরা
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,পুরো লাভ %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,পুরো লাভ %
DocType: Appraisal Goal,Weightage (%),গুরুত্ব (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,পিওএস প্রোফাইল পরিবর্তন করুন
DocType: Bank Reconciliation Detail,Clearance Date,পরিস্কারের তারিখ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,মূল্যায়ন প্রতিবেদন
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,গ্রস ক্রয়ের পরিমাণ বাধ্যতামূলক
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,গ্রস ক্রয়ের পরিমাণ বাধ্যতামূলক
DocType: Lead,Address Desc,নিম্নক্রমে ঠিকানার
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,পার্টির বাধ্যতামূলক
DocType: Journal Entry,JV-,JV-
@@ -3736,7 +3742,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,স্থায়ী নাম
DocType: Stock Entry,Customer or Supplier Details,গ্রাহক বা সরবরাহকারী
DocType: Employee Loan Application,Required by Date,তারিখ দ্বারা প্রয়োজনীয়
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),ক্লোজিং ব্যালেন্স (ডঃ - সিআর)
DocType: Lead,Lead Owner,লিড মালিক
DocType: Bin,Requested Quantity,অনুরোধ পরিমাণ
DocType: Patient,Marital Status,বৈবাহিক অবস্থা
@@ -3750,7 +3755,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,একাধিক বৈকল্পিক
DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% বিতরণ করা হয়েছে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,অন্য ব্যবহারকারী হিসাবে লগইন করুন দয়া করে
DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
@@ -3849,7 +3854,7 @@
DocType: Serial No,Out of AMC,এএমসি আউট
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
DocType: Company,Default Cash Account,ডিফল্ট নগদ অ্যাকাউন্ট
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,এই শিক্ষার্থী উপস্থিতির উপর ভিত্তি করে
@@ -3999,7 +4004,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,উল্লিখিত মানদণ্ড জন্য কোন কর্মচারী
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
DocType: Restaurant,Default Customer,ডিফল্ট গ্রাহক
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,মানব সম্পদে কর্মচারী নেমিং সিস্টেম> এইচআর সেটিংস সেট আপ করুন
DocType: Assessment Plan,Supervisor Name,সুপারভাইজার নাম
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,একই দিনের জন্য অ্যাপয়েন্টমেন্ট তৈরি করা হয় কিনা তা নিশ্চিত করবেন না
DocType: Program Enrollment Course,Program Enrollment Course,প্রোগ্রাম তালিকাভুক্তি কোর্সের
@@ -4117,7 +4121,7 @@
DocType: BOM,Website Description,ওয়েবসাইট বর্ণনা
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ইক্যুইটি মধ্যে নিট পরিবর্তন
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,নতুন
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ই-মেইল ঠিকানা অবশ্যই ইউনিক হতে হবে, ইতিমধ্যে অস্তিত্বমান {0}"
DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,প্রাপ্তি
@@ -4134,7 +4138,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,লাইসেন্স
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,এছাড়াও আপনি আগের অর্থবছরের ভারসাম্য এই অর্থবছরের ছেড়ে অন্তর্ভুক্ত করতে চান তাহলে এগিয়ে দয়া করে নির্বাচন করুন
DocType: GL Entry,Against Voucher Type,ভাউচার টাইপ বিরুদ্ধে
DocType: Physician,Phone (R),ফোন (আর)
@@ -4146,7 +4150,7 @@
DocType: Patient,B Negative,বি নেতিবাচক
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,রক্ষণাবেক্ষণ স্থিতি বাতিল বা জমা দিতে সম্পন্ন করা হয়েছে
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,{0} সারিতে সিরিয়াল নম্বর দিয়ে ডেলিভারি নোট মেলে না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,{0} সারিতে সিরিয়াল নম্বর দিয়ে ডেলিভারি নোট মেলে না
DocType: Student,Guardian Details,গার্ডিয়ান বিবরণ
DocType: C-Form,C-Form,সি-ফরম
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,একাধিক কর্মীদের জন্য মার্ক এ্যাটেনডেন্স
@@ -4188,7 +4192,7 @@
DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
DocType: Training Event,Exam,পরীক্ষা
DocType: Complaint,Complaint,অভিযোগ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
DocType: Patient,Alcohol Past Use,অ্যালকোহল অতীত ব্যবহার
DocType: Fertilizer Content,Fertilizer Content,সার কনটেন্ট
@@ -4312,6 +4316,7 @@
DocType: Salary Detail,Formula,সূত্র
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,সিরিয়াল #
DocType: Lab Test Template,Lab Test Template,ল্যাব টেস্ট টেমপ্লেট
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,বিক্রয় অ্যাকাউন্ট
DocType: Purchase Invoice Item,Total Weight,সম্পূর্ণ ওজন
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,বিক্রয় কমিশনের
DocType: Offer Letter Term,Value / Description,মূল্য / বিবরণ:
@@ -4468,7 +4473,7 @@
DocType: Customer,From Lead,লিড
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,আদেশ উৎপাদনের জন্য মুক্তি.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
DocType: Program Enrollment Tool,Enroll Students,শিক্ষার্থীরা তালিকাভুক্ত
DocType: Lab Test,Approved Date,অনুমোদিত তারিখ
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,স্ট্যান্ডার্ড বিক্রি
@@ -4544,7 +4549,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,উত্পাদনের আইটেম
,Employee Information,কর্মচারী তথ্য
DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
DocType: Quality Inspection,Incoming,ইনকামিং
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,বিক্রয় এবং ক্রয় জন্য ডিফল্ট ট্যাক্স টেমপ্লেট তৈরি করা হয়।
@@ -4561,7 +4566,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},উল্লেখ্য: {0}
,Delivery Note Trends,হুণ্ডি প্রবণতা
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,স্টক Qty ইন
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,স্টক Qty ইন
DocType: Delivery Trip,Calculate Estimated Arrival Times,আনুমানিক আসন্ন টাইমস হিসাব করুন
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,অ্যাকাউন্ট: {0} শুধুমাত্র স্টক লেনদেনের মাধ্যমে আপডেট করা যাবে
DocType: Student Group Creation Tool,Get Courses,কোর্স করুন
@@ -4577,7 +4582,7 @@
DocType: Material Request,% Ordered,% আদেশ
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","কোর্সের ভিত্তিক স্টুডেন্ট গ্রুপের জন্য, কোর্স প্রোগ্রাম তালিকাভুক্তি মধ্যে নাম নথিভুক্ত কোর্স থেকে শিক্ষার্থীর জন্য যাচাই করা হবে না।"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ফুরণ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,গড়. রাজধানীতে হার
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,গড়. রাজধানীতে হার
DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{প্রেরক} থেকে নতুন বার্তা
@@ -4625,7 +4630,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},সারি {0}: BOM # মুদ্রা {1} নির্বাচিত মুদ্রার সমান হতে হবে {2}
DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
DocType: Patient,Additional information regarding the patient,রোগীর সম্পর্কে অতিরিক্ত তথ্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
DocType: Homepage,Tag Line,ট্যাগ লাইন
DocType: Fee Component,Fee Component,ফি কম্পোনেন্ট
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,দ্রুতগামী ব্যবস্থাপনা
@@ -4837,7 +4842,7 @@
DocType: Employee Education,Employee Education,কর্মচারী শিক্ষা
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ডুপ্লিকেট আইটেম গ্রুপ আইটেম গ্রুপ টেবিল অন্তর্ভুক্ত
DocType: Land Unit,Parent Land Unit,প্যারেন্ট ল্যান্ড ইউনিট
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
DocType: Fertilizer,Fertilizer Name,সারের নাম
DocType: Salary Slip,Net Pay,নেট বেতন
DocType: Account,Account,হিসাব
@@ -4916,7 +4921,7 @@
DocType: Item Customer Detail,Ref Code,সুত্র কোড
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,গ্রাহক গোষ্ঠী পিওএস প্রোফাইলে প্রয়োজনীয়
apps/erpnext/erpnext/config/hr.py +12,Employee records.,কর্মচারী রেকর্ড.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,নির্ধারণ করুন পরবর্তী অবচয় তারিখ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,নির্ধারণ করুন পরবর্তী অবচয় তারিখ
DocType: HR Settings,Payroll Settings,বেতনের সেটিংস
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,অ লিঙ্ক চালান এবং পেমেন্টস্ মেলে.
DocType: POS Settings,POS Settings,পিওএস সেটিংস
@@ -5083,7 +5088,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
DocType: Asset Maintenance Task,Last Completion Date,শেষ সমাপ্তি তারিখ
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
DocType: Buying Settings,Naming Series,নামকরণ সিরিজ
DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,বীমা তারিখ শুরু তুলনায় বীমা শেষ তারিখ কম হওয়া উচিত
@@ -5209,6 +5214,7 @@
DocType: Bank Reconciliation,Get Payment Entries,পেমেন্ট দাখিলা করুন
DocType: Quotation Item,Against Docname,Docname বিরুদ্ধে
DocType: SMS Center,All Employee (Active),সকল কর্মচারী (অনলাইনে)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,গ্রাহক> গ্রাহক গোষ্ঠী> টেরিটরি
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,এখন দেখুন
DocType: BOM,Raw Material Cost,কাঁচামাল খরচ
DocType: Item Reorder,Re-Order Level,পুনর্বিন্যাস স্তর
@@ -5307,7 +5313,6 @@
DocType: Room,Seating Capacity,আসন ধারন ক্ষমতা
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,ল্যাব টেস্ট গ্রুপ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,গ্রাহক> গ্রাহক গোষ্ঠী> টেরিটরি
DocType: Project,Total Expense Claim (via Expense Claims),মোট ব্যয় দাবি (ব্যয় দাবি মাধ্যমে)
DocType: GST Settings,GST Summary,GST সারাংশ
DocType: Assessment Result,Total Score,সম্পূর্ণ ফলাফল
@@ -5320,7 +5325,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,নিম্নলিখিত কোর্স সময়সূচী তৈরি করা হয়েছিল
DocType: Journal Entry,Total Debit,খরচের অঙ্ক
DocType: Manufacturing Settings,Default Finished Goods Warehouse,ডিফল্ট তৈরি পণ্য গুদাম
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,সেলস পারসন
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,সেলস পারসন
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,বাজেট এবং খরচ কেন্দ্র
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,পেমেন্ট একাধিক ডিফল্ট মোড অনুমতি দেওয়া হয় না
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,জন্য
@@ -5493,7 +5498,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,জন্য ট্যাক্স বা চার্জ ধরে নেবেন
DocType: Driver,Driving License Category,ড্রাইভিং লাইসেন্স বিভাগ
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,প্রকৃত স্টক বাধ্যতামূলক
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} বর্তমানে একটি {1} সরবরাহকারী স্কোরকার্ড দাঁড়িয়ে আছে, এবং এই সরবরাহকারীকে ক্রয় আদেশগুলি সতর্কতার সাথে জারি করা উচিত।"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} বর্তমানে একটি {1} সরবরাহকারী স্কোরকার্ড দাঁড়িয়ে আছে, এবং এই সরবরাহকারীকে ক্রয় আদেশগুলি সতর্কতার সাথে জারি করা উচিত।"
DocType: Asset Maintenance Team,Asset Maintenance Team,সম্পদ রক্ষণাবেক্ষণ টিম
DocType: Employee Loan,Loan Type,ঋণ প্রকার
DocType: Scheduling Tool,Scheduling Tool,পূর্বপরিকল্পনা টুল
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 1821da9..7bafb0c 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sortiraj po cijeni
,Delay Days,Dani odlaganja
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servis rashodi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Napravite zadržavanje zaliha zaliha
DocType: Purchase Invoice Item,Item Weight Details,Detaljna težina stavke
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, Šifra: {1} i kupaca: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otvaranje za posao.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM nije naveden za stavku podizvođača {0} na redu {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM nije naveden za stavku podizvođača {0} na redu {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Rezultat je podnet
DocType: Item Attribute,Increment,Prirast
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Vremenski razmak
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nije dozvoljeno za {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Get stavke iz
DocType: Price List,Price Not UOM Dependant,Cena nije UOM zavisna
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No stavke navedene
DocType: Asset Repair,Error Description,Opis greške
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Trgovina prehrambenom robom
DocType: Quality Inspection Reading,Reading 1,Čitanje 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,mirovinskim fondovima
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija datum ne može biti prije Datum kupovine
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija datum ne može biti prije Datum kupovine
DocType: Crop,Perennial,Višegodišnje
DocType: Consultation,Consultation Date,Datum konsultacije
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Spisak proizvoda i otkrivanje za korisnike ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",npr "Osnovna škola" ili "Univerzitet"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Stock Izvještaji
DocType: Warehouse,Warehouse Detail,Detalji o skladištu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termin Završni datum ne može biti kasnije od kraja godine Datum akademske godine za koji je vezana pojam (akademska godina {}). Molimo ispravite datume i pokušajte ponovo.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Da li je osnovno sredstvo" ne može biti označeno, kao rekord imovine postoji u odnosu na stavku"
DocType: Delivery Trip,Departure Time,Vrijeme odlaska
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Šabloni pozicija dobavljača.
DocType: Lead,Interested,Zainteresovan
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Otvaranje
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Od {0} do {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Neuspešno podešavanje poreza
DocType: Item,Copy From Item Group,Primjerak iz točke Group
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Ostavlja per Godina
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Molimo provjerite 'Je li Advance ""protiv Account {1} ako je to unaprijed unos."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
DocType: Email Digest,Profit & Loss,Dobiti i gubitka
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),Ukupno Costing Iznos (preko Time Sheet)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ovo se zasniva na transakcijama protiv ove kompanije. Pogledajte detalje u nastavku
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijesti putem e-pošte na stvaranje automatskog Materijal Zahtjeva
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Otporno
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi valuta
DocType: Opening Invoice Creation Tool,Invoice Type,Tip fakture
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Otpremnica
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Udovički
DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
DocType: Healthcare Settings,Require Lab Test Approval,Zahtevati odobrenje za testiranje laboratorija
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Šifra proizvoda> Grupa proizvoda> Marka
DocType: Salary Slip Timesheet,Working Hours,Radno vrijeme
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total Outstanding
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Unesite troška
DocType: Drug Prescription,Dosage,Doziranje
DocType: Journal Entry Account,Sales Order,Narudžbe kupca
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Prosj. Prodaja Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Prosj. Prodaja Rate
DocType: Assessment Plan,Examiner Name,Examiner Naziv
DocType: Lab Test Template,No Result,Bez rezultata
DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Odaberite perioda isplate
DocType: Purchase Invoice,Unpaid,Neplaćeno
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervirano za prodaju
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Molimo da podesite sistem imenovanja zaposlenih u ljudskim resursima> HR Settings
DocType: Packing Slip,From Package No.,Iz paketa broj
DocType: Item Attribute,To Range,U rasponu
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,radionica
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozoravajte narudžbenice
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dosta dijelova za izgradnju
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosta dijelova za izgradnju
DocType: POS Profile User,POS Profile User,POS korisnik profila
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direktni prihodi
DocType: Patient Appointment,Date TIme,Date TIme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa , ako grupirani po računu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa , ako grupirani po računu"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrativni službenik
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Osnivanje preduzeća i porezi
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Molimo odaberite predmeta
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Konto razlike
DocType: Purchase Invoice,Supplier GSTIN,dobavljač GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ne možete zatvoriti zadatak kao zavisne zadatak {0} nije zatvoren.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
DocType: Production Order,Additional Operating Cost,Dodatni operativnih troškova
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,kozmetika
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Odnos sa Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,menadžer
DocType: Payment Entry,Payment From / To,Plaćanje Od / Do
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manje od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manje od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Molimo postavite nalog u skladištu {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' Temelji se na' i 'Grupisanje po ' ne mogu biti isti
DocType: Sales Person,Sales Person Targets,Prodaje osobi Mete
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Batch ime
DocType: Fee Validity,Max number of visit,Maksimalan broj poseta
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet created:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,upisati
DocType: GST Settings,GST Settings,PDV Postavke
DocType: Selling Settings,Customer Naming By,Kupac Imenovanje By
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,budžet protiv
DocType: Employee,Cell Number,Mobitel Broj
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Za određene kriterijume nema zaposlenika. Proverite da li su listovi plata još uvek nisu kreirani.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto materijala Zahtjevi Generirano
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto materijala Zahtjevi Generirano
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervirano za proizvodnju
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energija
DocType: Opportunity,Opportunity From,Prilika od
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Red {0}: {1} Serijski brojevi potrebni za stavku {2}. Proveli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Red {0}: {1} Serijski brojevi potrebni za stavku {2}. Proveli ste {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Izaberite tabelu
DocType: BOM,Website Specifications,Web Specifikacije
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je nevažeća adresa e-pošte u 'Primaocima'
@@ -1042,7 +1043,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citiraj zatraženo
DocType: Vital Signs,Heart Rate / Pulse,Srčana brzina / impuls
DocType: Company,Default Bank Account,Zadani bankovni račun
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Azuriranje zalihe' se ne može provjeriti jer artikli nisu dostavljeni putem {0}
DocType: Vehicle,Acquisition Date,akvizicija Datum
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1066,7 +1067,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Otpremite svoju pismo glavom (Držite ga na webu kao 900px po 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Račun {2} ne može biti Group
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka Row {idx}: {doctype} {docname} ne postoji u gore '{doctype}' sto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No zadataka
DocType: Item Variant Settings,Copy Fields to Variant,Kopiraj polja na varijantu
DocType: Asset,Opening Accumulated Depreciation,Otvaranje Ispravka vrijednosti
@@ -1178,9 +1179,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan materijal za podsklopove
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i teritorija
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} mora biti aktivna
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Zatvaranje (otvaranje + ukupno)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Zatvaranje (otvaranje + ukupno)
DocType: Journal Entry,Depreciation Entry,Amortizacija Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Ispis u valuti računa
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
@@ -1206,7 +1208,7 @@
DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Radnik {0} nije aktivan ili ne postoji
DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Stavka Varijante {0} ažurirani
DocType: Quality Inspection Reading,Reading 6,Čitanje 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1258,6 +1260,7 @@
,Company Name,Naziv preduzeća
DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo postavite Naming Series za {0} preko Setup> Settings> Series Naming
DocType: Purchase Invoice,Additional Discount Percentage,Dodatni popust Procenat
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pogledaj listu svih snimke Pomoć
DocType: Agriculture Analysis Criteria,Soil Texture,Tekstura tla
@@ -1285,7 +1288,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Web Stavka
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
DocType: Timesheet Detail,Bill,račun
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sljedeća Amortizacija datum se unosi kao proteklih dana
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Sljedeća Amortizacija datum se unosi kao proteklih dana
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bijel
DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Količina nije dostupan za {4} u skladištu {1} na postavljanje trenutku stupanja ({2} {3})
@@ -1301,7 +1304,7 @@
DocType: Lead,Next Contact Date,Datum sledeceg kontaktiranja
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Otvaranje Kol
DocType: Healthcare Settings,Appointment Reminder,Pamćenje imenovanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Unesite račun za promjene Iznos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Unesite račun za promjene Iznos
DocType: Program Enrollment Tool Student,Student Batch Name,Student Batch Ime
DocType: Consultation,Doctor,Doktor
DocType: Holiday List,Holiday List Name,Naziv liste odmora
@@ -1317,6 +1320,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ostavite raspodjele alat
DocType: Item,Hub Category to Publish,Glavna kategorija za objavljivanje
DocType: Leave Block List,Leave Block List Dates,Ostavite datumi lista blokiranih
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Molimo da podesite serije brojeva za prisustvo preko Setup> Serija numeracije
DocType: Sales Invoice,Billing Address GSTIN,Adresa za obračun GSTIN
DocType: Assessment Plan,Evaluate,Procijenite
DocType: Workstation,Net Hour Rate,Neto Hour Rate
@@ -1350,7 +1354,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Prodaja fakture za plaćanje
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Prodaja Iznos
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodaja Iznos
DocType: Repayment Schedule,Interest Amount,Iznos kamata
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Vi steRashodi Odobritelj za ovaj rekord . Molimo Ažuriranje "" status"" i Save"
DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Otvaranje Računovodstvo Balance
,GST Sales Register,PDV prodaje Registracija
DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ništa se zatražiti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ništa se zatražiti
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Izaberite svoje domene
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Još jedan budžet rekord '{0}' već postoji protiv {1} '{2}' za fiskalnu godinu {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Polja će se kopirati samo u trenutku kreiranja.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ovo će biti dodan na Šifra za varijantu. Na primjer, ako je vaš skraćenica ""SM"", a stavka kod je ""T-SHIRT"", stavka kod varijante će biti ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
DocType: Purchase Invoice,Is Return,Je li povratak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Oprez
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Oprez
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Povratak / Debit Napomena
DocType: Price List Country,Price List Country,Cijena Lista država
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} valjani serijski broj za artikal {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} valjani serijski broj za artikal {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod artikla ne može se mijenjati za serijski broj.
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM konverzijski faktor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Unesite Šifra da Batch Broj
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
DocType: Supplier Scorecard,Warn for new Request for Quotations,Upozorite na novi zahtev za citate
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na kupovinu
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Testiranje laboratorijskih testova
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Ukupne emisije / Transfer količina {0} u Industrijska Zahtjev {1} \ ne može biti veća od tražene količine {2} za Stavka {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
DocType: Payment Entry,Write Off Difference Amount,Otpis Razlika Iznos
DocType: Volunteer,Volunteer Name,Ime volontera
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Molimo vas da podesite sistem imenovanja instruktora u obrazovanju> Obrazovne postavke
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: e-mail nije poslat jer e-mail zaposlenog nije pronađen
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pravilo o isporuci ne važi za zemlju {0}
DocType: Item,Foreign Trade Details,Vanjske trgovine Detalji
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Grupa Roll Broj
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupno sve težine zadatka treba da bude 1. Molimo prilagodite težine svih zadataka projekta u skladu s tim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalni oprema
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,skladište dijete postoji za to skladište. Ne možete brisati ovo skladište.
DocType: Item,Website Item Groups,Website Stavka Grupe
DocType: Purchase Invoice,Total (Company Currency),Ukupno (Company valuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
DocType: Journal Entry,Journal Entry,Časopis Stupanje
DocType: Expense Claim Advance,Unclaimed amount,Neobjavljeni iznos
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} stavke u tijeku
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevni pregled komunikacije
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zahtjev za ponudu je onemogućen pristup iz portala, za više postavki portal ček."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavljač Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Iznos nabavke
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iznos nabavke
DocType: Sales Invoice,Shipping Address Name,Dostava adresa Ime
DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Bilo je grešaka u kreiranju rasporeda kursa
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ovo se zasniva na rezanje protiv ovog vozila. Pogledajte vremenski okvir ispod za detalje
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
DocType: Customer,Default Price List,Zadani cjenik
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati fiskalnu godinu {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Kupac sa istim imenom već postoji
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ovo će poslati naknade za plate i kreirati obračunski dnevnik. Da li želite da nastavite?
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,cijene
DocType: Quotation,Term Details,Oročeni Detalji
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ne može upisati više od {0} studenata za ovu grupa studenata.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Ukupno (bez poreza)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Available
@@ -2026,7 +2030,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odvajanje Plaćanje o otkazivanju fakture
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno čitanje Odometar ušli bi trebao biti veći od početnog kilometraže vozila {0}
DocType: Restaurant Reservation,No Show,Ne Show
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo postavite Naming Series za {0} preko Setup> Settings> Series Naming
DocType: Shipping Rule Country,Shipping Rule Country,Dostava Pravilo Country
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ostavite i posjećenost
DocType: Maintenance Visit,Partially Completed,Djelomično Završeni
@@ -2117,7 +2120,7 @@
DocType: Student Group Instructor,Student Group Instructor,Student Group Instruktor
DocType: Grant Application,Assessment Mark (Out of 10),Oznaka ocene (od 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Nema
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Glavni
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varijanta
DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
DocType: Employee Attendance Tool,Employees HTML,Zaposleni HTML
@@ -2165,7 +2168,7 @@
DocType: Course,Course Abbreviation,Skraćenica za golf
DocType: Student Leave Application,Student Leave Application,Student Leave aplikacije
DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenik {0} na Poludnevni na {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Ukupno radnog vremena ne smije biti veća od max radnog vremena {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
@@ -2350,9 +2353,10 @@
DocType: Task,Actual End Date (via Time Sheet),Stvarni Završni datum (preko Time Sheet)
DocType: Soil Texture,Soil Type,Vrsta zemljišta
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Broj {0} {1} protiv {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nova poruka
,Quotation Trends,Trendovi ponude
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Stavka artikla se ne spominje u master artiklu za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
DocType: Shipping Rule,Shipping Amount,Iznos transporta
DocType: Supplier Scorecard Period,Period Score,Ocena perioda
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj Kupci
@@ -2363,7 +2367,7 @@
,Vehicle Expenses,Troškovi vozila
DocType: Serial No,Invoice Details,Račun Detalji
DocType: Grant Application,Show on Website,Show on Website
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon koristan život mora biti veći ili jednak {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon koristan život mora biti veći ili jednak {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Počnite
DocType: Hub Category,Hub Category,Glavna kategorija
DocType: Purchase Invoice,SEZ,SEZ
@@ -2394,7 +2398,7 @@
DocType: Patient,B Positive,B Pozitivan
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Količina mora biti 1, kao stavka je osnovno sredstvo. Molimo koristite posebnom redu za više kom."
DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
DocType: Patient Medical Record,Patient Medical Record,Medicinski zapis pacijenta
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupa Non-grupa
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,sportovi
@@ -2444,6 +2448,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Ne možete postaviti primljeni RFQ na No Quote
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Ukupno Odbitak
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Izaberite nalog za štampanje u valuti računa
,Production Analytics,proizvodnja Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ovo se zasniva na transakcijama protiv ovog pacijenta. Za detalje pogledajte vremenski okvir ispod
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Troškova Ažurirano
@@ -2498,7 +2503,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Odaberite preduzeće...
DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako smatra za sve odjele
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
DocType: Payroll Entry,Fortnightly,četrnaestodnevni
DocType: Currency Exchange,From Currency,Od novca
DocType: Vital Signs,Weight (In Kilogram),Težina (u kilogramu)
@@ -2574,7 +2579,7 @@
DocType: Student,Guardians,čuvari
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Cijene neće biti prikazan ako nije postavljena Cjenik
DocType: Stock Entry,Total Incoming Value,Ukupna vrijednost Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,To je potrebno Debit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,To je potrebno Debit
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vremena, troškova i naplate za aktivnostima obavlja svoj tim"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupoprodajna cijena List
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šabloni varijabli indeksa dobavljača.
@@ -2675,7 +2680,7 @@
DocType: Company,For Reference Only.,Za referencu samo.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Lekar {0} nije dostupan na {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Izaberite serijski br
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},{1}: Invalid {0}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},{1}: Invalid {0}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2712,8 +2717,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
DocType: Water Analysis,Origin,Poreklo
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Da li što još {3} u odnosu na isti {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Izaberite promjene iznos računa
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Izaberite promjene iznos računa
DocType: Purchase Invoice,Price List Currency,Cjenik valuta
DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -2769,7 +2774,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Upozoriti na nova narudžbina
DocType: Quality Inspection Reading,Reading 9,Čitanje 9
DocType: Supplier,Is Frozen,Je zamrznut
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,skladište Group čvor nije dozvoljeno da izaberete za transakcije
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,skladište Group čvor nije dozvoljeno da izaberete za transakcije
DocType: Buying Settings,Buying Settings,Podešavanja nabavke
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM broj za Gotovi Dobar točki
DocType: Upload Attendance,Attendance To Date,Gledatelja do danas
@@ -2783,6 +2788,7 @@
DocType: Grant Application,Organization,organizacija
DocType: BOM Update Tool,BOM Update Tool,Alat za ažuriranje BOM
DocType: SG Creation Tool Course,Student Group Name,Student Ime grupe
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Pokažite eksplodiran pogled
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Kreiranje naknada
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo Vas da proverite da li ste zaista želite izbrisati sve transakcije za ovu kompaniju. Tvoj gospodar podaci će ostati kao što je to. Ova akcija se ne može poništiti.
DocType: Room,Room Number,Broj sobe
@@ -2793,7 +2799,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Napravite poreznu šemu
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
DocType: Lab Test Sample,Lab Test Sample,Primjer laboratorijskog testa
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Brzi unos u dnevniku
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
@@ -2864,7 +2870,7 @@
DocType: Membership,USD,Američki dolar
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Napravite fakturu
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blizu Opportunity nakon 15 dana
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Narudžbe za kupovinu nisu dozvoljene za {0} zbog stanja kartice koja se nalazi na {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Narudžbe za kupovinu nisu dozvoljene za {0} zbog stanja kartice koja se nalazi na {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,do kraja godine
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
@@ -2976,7 +2982,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nema nalog {2} ili već usklađeni protiv drugog vaučer
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterij Težina
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dobavljač> Tip dobavljača
DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
DocType: Payroll Entry,Salary Slip Based on Timesheet,Plaća za klađenje na Timesheet osnovu
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Procenat kupovine
@@ -3064,7 +3069,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Pratite Potencijalnog kupca prema tip industrije .
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Idite u Letterheads
DocType: Item Supplier,Item Supplier,Dobavljač artikla
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
DocType: Company,Stock Settings,Stock Postavke
@@ -3253,6 +3258,7 @@
DocType: Company,Default Inventory Account,Uobičajeno zaliha računa
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završena Količina mora biti veća od nule.
DocType: Antibiotic,Antibiotic Name,Antibiotički naziv
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Šifra proizvoda> Grupa proizvoda> Marka
DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Izaberite Tip ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Veza sa svim zemljišnim jedinicama u kojima rastu usevi
@@ -3446,6 +3452,7 @@
DocType: Supplier,Credit Limit,Kreditni limit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Prodajna cijena cena
DocType: Production Plan Sales Order,Salse Order Date,Salse Order Datum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dobavljač> Tip dobavljača
DocType: Salary Component,Salary Component,Plaća Komponenta
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Plaćanje Unosi {0} su un-povezani
DocType: GL Entry,Voucher No,Bon Ne
@@ -3454,7 +3461,7 @@
DocType: Leave Allocation,Leave Allocation,Ostavite Raspodjela
DocType: Payment Request,Recipient Message And Payment Details,Primalac poruka i plaćanju
DocType: Training Event,Trainer Email,trener-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materijalni Zahtjevi {0} stvorio
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materijalni Zahtjevi {0} stvorio
DocType: Restaurant Reservation,No of People,Broj ljudi
DocType: Production Planning Tool,Include sub-contracted raw materials,Uključiti pod ugovorom sirovina
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predložak termina ili ugovor.
@@ -3518,7 +3525,7 @@
DocType: Production Planning Tool,Create Material Requests,Stvaranje materijalni zahtijevi
DocType: Employee Education,School/University,Škola / Univerzitet
DocType: Payment Request,Reference Details,Reference Detalji
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost Nakon Korisni Život mora biti manja od bruto Kupovina Iznos
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost Nakon Korisni Život mora biti manja od bruto Kupovina Iznos
DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Naplaćeni iznos
DocType: Asset,Double Declining Balance,Double degresivne
@@ -3530,7 +3537,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada kompaniji {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Izaberite najmanje jednu vrijednost od svakog atributa.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Ostavite Management
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupa po računu
DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
@@ -3541,14 +3548,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni iznos ne može biti veći od Iznos kredita {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Idi na programe
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Red {0} # Raspodijeljena količina {1} ne može biti veća od nezadovoljne količine {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Molimo da podesite serije brojeva za prisustvo preko Setup> Serija numeracije
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Proizvodnog naloga kreiranu
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' Do datuma"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ne može promijeniti status studenta {0} je povezana s primjenom student {1}
DocType: Asset,Fully Depreciated,potpuno je oslabio
,Stock Projected Qty,Projektovana kolicina na zalihama
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Posjećenost HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali svojim kupcima"
DocType: Sales Order,Customer's Purchase Order,Narudžbenica kupca
@@ -3632,7 +3638,7 @@
DocType: Stock Settings,Item Naming By,Artikal imenovan po
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
DocType: Production Order,Material Transferred for Manufacturing,Materijal Prebačen za izradu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Račun {0} ne postoji
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Račun {0} ne postoji
DocType: Project,Project Type,Vrsta projekta
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Zadatak za djecu postoji za ovaj zadatak. Ne možete da izbrišete ovaj zadatak.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Amortizacija troškova Center
DocType: Sales Order Item,Sales Order Date,Datum narudžbe kupca
DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Total Excl. Porez
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ako je označeno, sva djeca svake proizvodne artikl će biti uključeni u Industrijska zahtjevima."
DocType: Assessment Plan,Assessment Plan,plan procjene
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Klijent {0} je kreiran.
DocType: Stock Settings,Limit Percent,limit Procenat
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Molimo vas da podesite sistem imenovanja instruktora u obrazovanju> Obrazovne postavke
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno nema dostupnih trgovina na zalihama
,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
DocType: Sample Collection,No. of print,Broj otiska
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Dužnici ({0})
DocType: Pricing Rule,Margin,Marža
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi Kupci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruto dobit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto dobit%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Promenite POS profil
DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Izveštaj o proceni
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Kupovina Iznos je obavezno
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruto Kupovina Iznos je obavezno
DocType: Lead,Address Desc,Adresa silazno
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party je obavezno
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stalno ime
DocType: Stock Entry,Customer or Supplier Details,Detalji o Kupcu ili Dobavljacu
DocType: Employee Loan Application,Required by Date,Potreban po datumu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Zatvaranje bilansa (Dr - Cr)
DocType: Lead,Lead Owner,Vlasnik Lead-a
DocType: Bin,Requested Quantity,Tražena količina
DocType: Patient,Marital Status,Bračni status
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Višestruke varijante
DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Isporučeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: {1} Naručena količina ne može biti manji od minimalnog bi Količina {2} (iz točke).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni Distribucija Postotak
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Molimo prijavite se kao drugi korisnik.
DocType: Territory,Territory Targets,Teritorij Mete
@@ -3904,7 +3909,7 @@
DocType: Serial No,Out of AMC,Od AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
DocType: Company,Default Cash Account,Zadani novčani račun
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
@@ -4054,7 +4059,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nema zaposlenih po navedenim kriterijumima
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
DocType: Restaurant,Default Customer,Podrazumevani korisnik
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Molimo da podesite sistem imenovanja zaposlenih u ljudskim resursima> HR Settings
DocType: Assessment Plan,Supervisor Name,Supervizor ime
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ne potvrdite da li je zakazan termin za isti dan
DocType: Program Enrollment Course,Program Enrollment Course,Program Upis predmeta
@@ -4172,7 +4176,7 @@
DocType: BOM,Website Description,Web stranica Opis
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto promjena u kapitalu
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnoviji
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
DocType: Serial No,AMC Expiry Date,AMC Datum isteka
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,priznanica
@@ -4189,7 +4193,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanim tokovima
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od Maksimalni iznos kredita od {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
DocType: Physician,Phone (R),Telefon (R)
@@ -4201,7 +4205,7 @@
DocType: Patient,B Negative,B Negativno
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Status održavanja mora biti poništen ili završen za slanje
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u nizu {0} ne odgovara otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u nizu {0} ne odgovara otpremnica
DocType: Student,Guardian Details,Guardian Detalji
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Prisustvo za više zaposlenih
@@ -4243,7 +4247,7 @@
DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
DocType: Training Event,Exam,ispit
DocType: Complaint,Complaint,Žalba
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
DocType: Patient,Alcohol Past Use,Upotreba alkohola u prošlosti
DocType: Fertilizer Content,Fertilizer Content,Sadržaj đubriva
@@ -4367,6 +4371,7 @@
DocType: Salary Detail,Formula,formula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Lab test šablon
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Račun prodaje
DocType: Purchase Invoice Item,Total Weight,Ukupna tezina
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisija za prodaju
DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
@@ -4524,7 +4529,7 @@
DocType: Customer,From Lead,Od Lead-a
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
DocType: Program Enrollment Tool,Enroll Students,upisati studenti
DocType: Lab Test,Approved Date,Odobreni datum
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
@@ -4600,7 +4605,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Proizvodnja Item
,Employee Information,Informacija o zaposlenom
DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Provjerite Supplier kotaciji
DocType: Quality Inspection,Incoming,Dolazni
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Osnovani porezni predlošci za prodaju i kupovinu su stvoreni.
@@ -4617,7 +4622,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Napomena : {0}
,Delivery Note Trends,Trendovi otpremnica
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ovonedeljnom Pregled
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na skladištu Količina
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Na skladištu Količina
DocType: Delivery Trip,Calculate Estimated Arrival Times,Izračunajte procenjene vremenske prilike
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} može ažurirati samo preko Stock Transakcije
DocType: Student Group Creation Tool,Get Courses,Get kursevi
@@ -4633,7 +4638,7 @@
DocType: Material Request,% Ordered,% Poruceno
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za studentske grupe na osnovu Naravno, kurs će biti potvrđeni za svakog studenta iz upisao jezika u upisu Programa."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,rad plaćen na akord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Prosj. Buying Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Prosj. Buying Rate
DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
DocType: Employee,History In Company,Povijest tvrtke
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nova poruka od {pošiljaoca}
@@ -4681,7 +4686,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Red {0}: Valuta sastavnicu # {1} treba da bude jednaka odabrane valute {2}
DocType: Journal Entry Account,Exchange Rate,Tečaj
DocType: Patient,Additional information regarding the patient,Dodatne informacije o pacijentu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
DocType: Homepage,Tag Line,Tag Line
DocType: Fee Component,Fee Component,naknada Komponenta
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
@@ -4893,7 +4898,7 @@
DocType: Employee Education,Employee Education,Obrazovanje zaposlenog
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplikat stavka grupa naći u tabeli stavka grupa
DocType: Land Unit,Parent Land Unit,Roditeljska jedinica
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
DocType: Fertilizer,Fertilizer Name,Ime đubriva
DocType: Salary Slip,Net Pay,Neto plaća
DocType: Account,Account,Konto
@@ -4972,7 +4977,7 @@
DocType: Item Customer Detail,Ref Code,Ref. Šifra
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Korisnička grupa je potrebna u POS profilu
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaposlenih evidencija.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Molimo podesite Sljedeća Amortizacija Datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Molimo podesite Sljedeća Amortizacija Datum
DocType: HR Settings,Payroll Settings,Postavke plaće
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
DocType: POS Settings,POS Settings,POS Settings
@@ -5139,7 +5144,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
DocType: Asset Maintenance Task,Last Completion Date,Zadnji datum završetka
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
DocType: Buying Settings,Naming Series,Imenovanje serije
DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum osiguranje Početak bi trebao biti manji od datuma osiguranje Kraj
@@ -5266,6 +5271,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Get plaćanja unosi
DocType: Quotation Item,Against Docname,Protiv Docname
DocType: SMS Center,All Employee (Active),Svi zaposleni (aktivni)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klijent> Grupa klijenata> Teritorija
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pregled Sada
DocType: BOM,Raw Material Cost,Troškovi sirovina
DocType: Item Reorder,Re-Order Level,Re-order Level
@@ -5364,7 +5370,6 @@
DocType: Room,Seating Capacity,Broj sjedećih mjesta
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Laboratorijske grupe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klijent> Grupa klijenata> Teritorija
DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi potraživanja (preko rashodi potraživanja)
DocType: GST Settings,GST Summary,PDV Pregled
DocType: Assessment Result,Total Score,Ukupni rezultat
@@ -5377,7 +5382,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Stvoreni su sledeći planovi kursa
DocType: Journal Entry,Total Debit,Ukupno zaduženje
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Uobičajeno Gotovi proizvodi skladište
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Referent prodaje
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Referent prodaje
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budžet i troškova Center
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Višestruki način plaćanja nije dozvoljen
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
@@ -5550,7 +5555,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
DocType: Driver,Driving License Category,Kategorija vozačke dozvole
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Qty je obavezno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutno ima {1} Scorecard stava, a narudžbine za ovaj dobavljač treba izdati oprezno."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutno ima {1} Scorecard stava, a narudžbine za ovaj dobavljač treba izdati oprezno."
DocType: Asset Maintenance Team,Asset Maintenance Team,Tim za održavanje imovine
DocType: Employee Loan,Loan Type,Vrsta kredita
DocType: Scheduling Tool,Scheduling Tool,zakazivanje alata
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index b848528..e6c9ab4 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ordena per Preu
,Delay Days,Dies de retard
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,despesa servei
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Factura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Feu l'entrada d'existències de retenció
DocType: Purchase Invoice Item,Item Weight Details,Detalls del pes de l'element
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referència: {0}, Codi de l'article: {1} i el Client: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,L'obertura per a una ocupació.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},La BOM no està especificada per subcontractar l'element {0} a la fila {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},La BOM no està especificada per subcontractar l'element {0} a la fila {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultat enviat
DocType: Item Attribute,Increment,Increment
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Lapse de temps
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},No està permès per {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obtenir articles de
DocType: Price List,Price Not UOM Dependant,Preu no dependent de l'UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producte {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hi ha elements que s'enumeren
DocType: Asset Repair,Error Description,Descripció de l'error
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Botiga
DocType: Quality Inspection Reading,Reading 1,Lectura 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fons de Pensions
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
DocType: Crop,Perennial,Perenne
DocType: Consultation,Consultation Date,Data de consulta
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Llistat de productes i descobriment per als usuaris d'ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","per exemple, "escola primària" o "Universitat""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Informes d'arxiu
DocType: Warehouse,Warehouse Detail,Detall Magatzem
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La data final de durada no pot ser posterior a la data de cap d'any de l'any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
DocType: Delivery Trip,Departure Time,Hora de sortida
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Obtenir Detalls d'Especificacions
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Plantilles de classificació dels proveïdors.
DocType: Lead,Interested,Interessat
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Obertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Obertura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Des {0} a {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,No s'ha pogut configurar els impostos
DocType: Item,Copy From Item Group,Copiar del Grup d'Articles
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Deixa per any
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
DocType: Email Digest,Profit & Loss,D'pèrdues i guanys
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,litre
DocType: Task,Total Costing Amount (via Time Sheet),Càlcul del cost total Monto (a través de fulla d'hores)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Això es basa en operacions contra aquesta empresa. Vegeu la línia de temps a continuació per obtenir detalls
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificació per correu electrònic a la creació de la Sol·licitud de materials automàtica
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistent
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi moneda
DocType: Opening Invoice Creation Tool,Invoice Type,Tipus de Factura
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Nota de lliurament
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Vidu
DocType: Request for Quotation,Request for Quotation,Sol · licitud de pressupost
DocType: Healthcare Settings,Require Lab Test Approval,Requereix aprovació de la prova de laboratori
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Codi d'article> Grup d'elements> Marca
DocType: Salary Slip Timesheet,Working Hours,Hores de Treball
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total pendent
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Canviar el número de seqüència inicial/actual d'una sèrie existent.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Si us plau entra el centre de cost
DocType: Drug Prescription,Dosage,Dosificació
DocType: Journal Entry Account,Sales Order,Ordre de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. La venda de Tarifa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. La venda de Tarifa
DocType: Assessment Plan,Examiner Name,Nom de l'examinador
DocType: Lab Test Template,No Result,sense Resultat
DocType: Purchase Invoice Item,Quantity and Rate,Quantitat i taxa
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Seleccioneu el període de nòmina
DocType: Purchase Invoice,Unpaid,No pagat
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Mantinguts per a la venda
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configureu el sistema de nomenclatura d'empleats en recursos humans> Configuració de recursos humans
DocType: Packing Slip,From Package No.,Del paquet número
DocType: Item Attribute,To Range,Per Abast
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valors i Dipòsits
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Taller
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Aviseu comandes de compra
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Peces suficient per construir
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Peces suficient per construir
DocType: POS Profile User,POS Profile User,Usuari de perfil de TPV
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Ingrés Directe
DocType: Patient Appointment,Date TIme,Data i hora
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Oficial Administratiu
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Creació d'empreses i impostos
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Seleccioneu de golf
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Compte de diferències
DocType: Purchase Invoice,Supplier GSTIN,GSTIN proveïdor
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
DocType: Lab Test Template,Lab Routine,Rutina de laboratori
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Productes cosmètics
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relació amb Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gerent
DocType: Payment Entry,Payment From / To,El pagament de / a
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Establiu el compte a Magatzem {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basat En' i 'Agrupar Per' no pot ser el mateix
DocType: Sales Person,Sales Person Targets,Objectius persona de vendes
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Nom del lot
DocType: Fee Validity,Max number of visit,Nombre màxim de visites
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Part d'hores de creació:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,inscriure
DocType: GST Settings,GST Settings,ajustaments GST
DocType: Selling Settings,Customer Naming By,Customer Naming By
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,contra pressupost
DocType: Employee,Cell Number,Número de cel·la
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,No hi ha cap empleat per als criteris establerts. Comproveu que ja no s'hagin creat salaris.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Les sol·licituds de material auto generada
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Les sol·licituds de material auto generada
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservat per a la fabricació
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
DocType: Opportunity,Opportunity From,Oportunitat De
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nòmina mensual.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Nombres de sèrie obligatoris per a l'element {2}. Heu proporcionat {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Nombres de sèrie obligatoris per a l'element {2}. Heu proporcionat {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Seleccioneu una taula
DocType: BOM,Website Specifications,Especificacions del lloc web
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} és una adreça electrònica no vàlida a "Destinataris"
@@ -1042,7 +1043,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Cita sol·licitada
DocType: Vital Signs,Heart Rate / Pulse,Taxa / pols del cor
DocType: Company,Default Bank Account,Compte bancari per defecte
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Actualització d'Estoc""no es pot comprovar perquè els articles no es lliuren a través de {0}"
DocType: Vehicle,Acquisition Date,Data d'adquisició
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Ens
@@ -1066,7 +1067,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Carregueu el vostre capçal de lletra (manteniu-lo web a 900px per 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Compte {2} no pot ser un grup
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Element Fila {} idx: {} {DOCTYPE docname} no existeix en l'anterior '{} tipus de document' taula
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Part d'hores {0} ja s'hagi completat o cancel·lat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Part d'hores {0} ja s'hagi completat o cancel·lat
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hi ha tasques
DocType: Item Variant Settings,Copy Fields to Variant,Copia els camps a la variant
DocType: Asset,Opening Accumulated Depreciation,L'obertura de la depreciació acumulada
@@ -1178,9 +1179,10 @@
DocType: Production Order,Plan material for sub-assemblies,Material de Pla de subconjunts
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Punts de venda i Territori
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} ha d'estar activa
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Tancament (obertura + total)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Tancament (obertura + total)
DocType: Journal Entry,Depreciation Entry,Entrada depreciació
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si us plau. Primer seleccioneu el tipus de document
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Impressió en moneda de compte
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel·la Visites Materials {0} abans de cancel·lar aquesta visita de manteniment
DocType: Crop Cycle,ISO 8016 standard,Norma ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},El número de Sèrie {0} no pertany a l'article {1}
@@ -1206,7 +1208,7 @@
DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
DocType: Fee Structure,Components,components
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d'actius en el punt {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d'actius en el punt {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Article Variants {0} actualitza
DocType: Quality Inspection Reading,Reading 6,Lectura 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1258,6 +1260,7 @@
,Company Name,Nom de l'Empresa
DocType: SMS Center,Total Message(s),Total Missatge(s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Estableix la sèrie de noms per a {0} mitjançant la configuració> Configuració> Sèrie de nomenclatura
DocType: Purchase Invoice,Additional Discount Percentage,Percentatge de descompte addicional
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veure una llista de tots els vídeos d'ajuda
DocType: Agriculture Analysis Criteria,Soil Texture,Textura del sòl
@@ -1285,7 +1288,7 @@
DocType: BOM Website Item,BOM Website Item,BOM lloc web d'articles
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
DocType: Timesheet Detail,Bill,projecte de llei
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La depreciació propera data s'introdueix com a data passada
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,La depreciació propera data s'introdueix com a data passada
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Blanc
DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Quantitat no està disponible per {4} al magatzem {1} a publicar moment de l'entrada ({2} {3})
@@ -1301,7 +1304,7 @@
DocType: Lead,Next Contact Date,Data del següent contacte
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Quantitat d'obertura
DocType: Healthcare Settings,Appointment Reminder,Recordatori de cites
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
DocType: Program Enrollment Tool Student,Student Batch Name,Lot Nom de l'estudiant
DocType: Consultation,Doctor,Doctor
DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
@@ -1317,6 +1320,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Deixa Eina d'Assignació
DocType: Item,Hub Category to Publish,Categoria de concentradora per publicar
DocType: Leave Block List,Leave Block List Dates,Deixa llista de blocs dates
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Configureu la sèrie de numeració per assistència mitjançant la configuració> Sèrie de numeració
DocType: Sales Invoice,Billing Address GSTIN,Adreça de facturació GSTIN
DocType: Assessment Plan,Evaluate,Avaluar
DocType: Workstation,Net Hour Rate,Hora taxa neta
@@ -1350,7 +1354,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,El pagament de factures de vendes
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Magatzem Reservat a Ordres de venda / Magatzem de productes acabats
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Quantitat de Venda
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Quantitat de Venda
DocType: Repayment Schedule,Interest Amount,Suma d'interès
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
DocType: Serial No,Creation Document No,Creació document nº
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Obertura de Balanç de Comptabilitat
,GST Sales Register,GST Registre de Vendes
DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Res per sol·licitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Res per sol·licitar
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Seleccioneu els vostres dominis
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altre rècord Pressupost '{0}' ja existeix en contra {1} '{2}' per a l'any fiscal {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Els camps es copiaran només en el moment de la creació.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
DocType: Purchase Invoice,Is Return,És la tornada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Precaució
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Precaució
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Retorn / dèbit Nota
DocType: Price List Country,Price List Country,Preu de llista País
DocType: Item,UOMs,UOMS
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} amb números de sèrie vàlids per Punt {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} amb números de sèrie vàlids per Punt {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El Codi de l'article no es pot canviar de número de sèrie
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM factor de conversió
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Si us plau, introdueixi el codi d'article per obtenir el nombre de lot"
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
DocType: Supplier Scorecard,Warn for new Request for Quotations,Adverteu una nova sol·licitud de pressupostos
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Les ordres de compra li ajudarà a planificar i donar seguiment a les seves compres
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescripcions de proves de laboratori
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",La quantitat total d'emissió / Transferència {0} en la Sol·licitud de material {1} \ no pot ser major que la quantitat sol·licitada {2} per a l'article {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
DocType: Payment Entry,Write Off Difference Amount,Amortitzar import de la diferència
DocType: Volunteer,Volunteer Name,Nom del voluntari
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Configureu el sistema de nomenclatura d'instructor a l'educació> Configuració de l'educació
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: No s'ha trobat el correu electrònic dels empleats, per tant, no correu electrònic enviat"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},La regla d'enviament no és aplicable al país {0}
DocType: Item,Foreign Trade Details,Detalls estrangera Comerç
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Nombre Rotllo Grup
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tots els pesos de tasques ha de ser 1. Si us plau ajusta els pesos de totes les tasques del projecte en conseqüència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Equipments
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,existeix magatzem nen per a aquest magatzem. No es pot eliminar aquest magatzem.
DocType: Item,Website Item Groups,Grups d'article del Web
DocType: Purchase Invoice,Total (Company Currency),Total (Companyia moneda)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Nombre de sèrie {0} va entrar més d'una vegada
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Nombre de sèrie {0} va entrar més d'una vegada
DocType: Journal Entry,Journal Entry,Entrada de diari
DocType: Expense Claim Advance,Unclaimed amount,Quantitat no reclamada
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} articles en procés
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Registre de Comunicació.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Sol·licitud de Cotització es desactiva amb l'accés des del portal, per més ajustos del portal de verificació."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Quadre de puntuació de proveïdors Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Import Comprar
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Import Comprar
DocType: Sales Invoice,Shipping Address Name,Nom de l'Adreça d'enviament
DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,S'ha produït un error en crear un calendari de cursos
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Això es basa en els registres contra aquest vehicle. Veure cronologia avall per saber més
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
DocType: Customer,Default Price List,Llista de preus per defecte
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,registrar el moviment d'actius {0} creat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,registrar el moviment d'actius {0} creat
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No es pot eliminar l'any fiscal {0}. Any fiscal {0} s'estableix per defecte en la configuració global
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ja existeix un client amb el mateix nom
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Això enviarà Slips salarials i crear ingressos de periodificació acumulats. Voleu continuar?
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,la fixació de preus
DocType: Quotation,Term Details,Detalls termini
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,No es pot inscriure més de {0} estudiants d'aquest grup d'estudiants.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (sense impostos)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Comptador de plom
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ha de ser més gran que 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock disponible
@@ -2026,7 +2030,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculació de Pagament a la cancel·lació de la factura
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odòmetre entrat ha de ser més gran que el comptaquilòmetres inicial {0}
DocType: Restaurant Reservation,No Show,No hi ha espectacle
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Estableix la sèrie de noms per a {0} mitjançant la configuració> Configuració> Sèrie de nomenclatura
DocType: Shipping Rule Country,Shipping Rule Country,Regla País d'enviament
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Deixa i Assistència
DocType: Maintenance Visit,Partially Completed,Va completar parcialment
@@ -2117,7 +2120,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instructor grup d'alumnes
DocType: Grant Application,Assessment Mark (Out of 10),Marc d'avaluació (de 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Sense Guardian2 mòbil
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Inici
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Inici
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
@@ -2165,7 +2168,7 @@
DocType: Course,Course Abbreviation,Abreviatura de golf
DocType: Student Leave Application,Student Leave Application,Aplicació Deixar estudiant
DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Empleat {0} del mig dia del {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Total d'hores de treball no han de ser més grans que les hores de treball max {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,En
@@ -2350,9 +2353,10 @@
DocType: Task,Actual End Date (via Time Sheet),Data de finalització real (a través de fulla d'hores)
DocType: Soil Texture,Soil Type,Tipus de sòl
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nou missatge
,Quotation Trends,Quotation Trends
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
DocType: Shipping Rule,Shipping Amount,Total de l'enviament
DocType: Supplier Scorecard Period,Period Score,Puntuació de períodes
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Afegir Clients
@@ -2363,7 +2367,7 @@
,Vehicle Expenses,Les despeses de vehicles
DocType: Serial No,Invoice Details,Detalls de la factura
DocType: Grant Application,Show on Website,Mostra al lloc web
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Comença
DocType: Hub Category,Hub Category,Categoria de concentrador
DocType: Purchase Invoice,SEZ,SEZ
@@ -2394,7 +2398,7 @@
DocType: Patient,B Positive,B Positiu
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Quantitat ha de ser 1, com a element és un actiu fix. Si us plau, utilitzeu fila separada per al qty múltiple."
DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr no pot estar en blanc o l'espai
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr no pot estar en blanc o l'espai
DocType: Patient Medical Record,Patient Medical Record,Registre mèdic del pacient
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grup de No-Grup
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Esports
@@ -2444,6 +2448,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,No es pot establir una RFQ rebuda a cap quota
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Deducció total
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Seleccioneu un compte per imprimir a la moneda del compte
,Production Analytics,Anàlisi de producció
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Això es basa en operacions contra aquest pacient. Vegeu la línia de temps a continuació per obtenir detalls
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Cost Actualitzat
@@ -2498,7 +2503,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleccioneu l'empresa ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Deixar en blanc si es considera per a tots els departaments
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
DocType: Payroll Entry,Fortnightly,quinzenal
DocType: Currency Exchange,From Currency,De la divisa
DocType: Vital Signs,Weight (In Kilogram),Pes (en quilogram)
@@ -2574,7 +2579,7 @@
DocType: Student,Guardians,guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Els preus no es mostren si la llista de preus no s'ha establert
DocType: Stock Entry,Total Incoming Value,Valor Total entrant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Es requereix dèbit per
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Es requereix dèbit per
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Taula de temps ajuden a mantenir la noció del temps, el cost i la facturació d'activitats realitzades pel seu equip"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Llista de preus de Compra
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantilles de variables de quadre de comandament de proveïdors.
@@ -2675,7 +2680,7 @@
DocType: Company,For Reference Only.,Només de referència.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},El metge {0} no està disponible a {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Seleccioneu Lot n
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No vàlida {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},No vàlida {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Referència Inv
@@ -2712,8 +2717,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
DocType: Water Analysis,Origin,Origen
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Aquest document està per sobre del límit de {0} {1} per a l'element {4}. Estàs fent una altra {3} contra el mateix {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Seleccioneu el canvi import del compte
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Seleccioneu el canvi import del compte
DocType: Purchase Invoice,Price List Currency,Price List Currency
DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
@@ -2769,7 +2774,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Adverteix noves comandes de compra
DocType: Quality Inspection Reading,Reading 9,Lectura 9
DocType: Supplier,Is Frozen,Està Congelat
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,magatzem node de grup no se li permet seleccionar per a les transaccions
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,magatzem node de grup no se li permet seleccionar per a les transaccions
DocType: Buying Settings,Buying Settings,Ajustaments de compra
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. de producte acabat d'article
DocType: Upload Attendance,Attendance To Date,Assistència fins a la Data
@@ -2783,6 +2788,7 @@
DocType: Grant Application,Organization,organització
DocType: BOM Update Tool,BOM Update Tool,Eina d'actualització de la BOM
DocType: SG Creation Tool Course,Student Group Name,Nom del grup d'estudiant
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Mostra la vista desplegada
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creació de tarifes
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Si us plau, assegureu-vos que realment voleu esborrar totes les transaccions d'aquesta empresa. Les seves dades mestres romandran tal com és. Aquesta acció no es pot desfer."
DocType: Room,Room Number,Número d'habitació
@@ -2793,7 +2799,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Feu la plantilla fiscal
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fòrum d'Usuaris
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","No s'ha pogut actualitzar valors, factura conté els articles de l'enviament de la gota."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","No s'ha pogut actualitzar valors, factura conté els articles de l'enviament de la gota."
DocType: Lab Test Sample,Lab Test Sample,Exemple de prova de laboratori
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Seient Ràpida
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
@@ -2864,7 +2870,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fer Factura
DocType: Selling Settings,Auto close Opportunity after 15 days,Tancament automàtic després de 15 dies d'Oportunitats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les ordres de compra no estan permeses per {0} a causa d'un quadre de comandament de peu de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les ordres de compra no estan permeses per {0} a causa d'un quadre de comandament de peu de {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,De cap d'any
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Plom
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
@@ -2976,7 +2982,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Per sobre de 90-
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Seient {1} no té en compte {2} o ja compara amb un altre bo
DocType: Supplier Scorecard Criteria,Criteria Weight,Criteris de pes
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Proveïdor> Tipus de proveïdor
DocType: Buying Settings,Default Buying Price List,Llista de preus per defecte
DocType: Payroll Entry,Salary Slip Based on Timesheet,Sobre la base de nòmina de part d'hores
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tarifa de compra
@@ -3064,7 +3069,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Aneu als membres
DocType: Item Supplier,Item Supplier,Article Proveïdor
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Totes les direccions.
DocType: Company,Stock Settings,Ajustaments d'estocs
@@ -3253,6 +3258,7 @@
DocType: Company,Default Inventory Account,Compte d'inventari per defecte
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Complet Quantitat ha de ser més gran que zero.
DocType: Antibiotic,Antibiotic Name,Nom antibiòtic
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Codi d'article> Grup d'elements> Marca
DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Selecciona el tipus ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Un enllaç a totes les Unitats de Terres en les quals el Cultiu creix
@@ -3446,6 +3452,7 @@
DocType: Supplier,Credit Limit,Límit de Crèdit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Mitjana Preu de la venda de tarifes
DocType: Production Plan Sales Order,Salse Order Date,Salse Data de la comanda
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Proveïdor> Tipus de proveïdor
DocType: Salary Component,Salary Component,component salari
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Les entrades de pagament {0} són no-relacionat
DocType: GL Entry,Voucher No,Número de comprovant
@@ -3454,7 +3461,7 @@
DocType: Leave Allocation,Leave Allocation,Assignació d'absència
DocType: Payment Request,Recipient Message And Payment Details,Missatge receptor i formes de pagament
DocType: Training Event,Trainer Email,entrenador correu electrònic
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Sol·licituds de material {0} creats
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Sol·licituds de material {0} creats
DocType: Restaurant Reservation,No of People,No de la gent
DocType: Production Planning Tool,Include sub-contracted raw materials,Inclogui matèries primeres subcontractats
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Plantilla de termes o contracte.
@@ -3518,7 +3525,7 @@
DocType: Production Planning Tool,Create Material Requests,Crear sol·licituds de materials
DocType: Employee Education,School/University,Escola / Universitat
DocType: Payment Request,Reference Details,Detalls Referència
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l'import brut de compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l'import brut de compra
DocType: Sales Invoice Item,Available Qty at Warehouse,Disponible Quantitat en magatzem
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Quantitat facturada
DocType: Asset,Double Declining Balance,Doble saldo decreixent
@@ -3530,7 +3537,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir actualitzacions
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Compte {2} no pertany a l'empresa {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Seleccioneu com a mínim un valor de cadascun dels atributs.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Deixa Gestió
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Agrupa Per Comptes
DocType: Sales Order,Fully Delivered,Totalment Lliurat
@@ -3541,14 +3548,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma desemborsat no pot ser més gran que Suma del préstec {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Vés als programes
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},La fila {0} # quantitat assignada {1} no pot ser major que la quantitat no reclamada {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Configureu la sèrie de numeració per assistència mitjançant la configuració> Sèrie de numeració
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Ordre de producció no s'ha creat
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},No es pot canviar l'estat d'estudiant {0} està vinculada amb l'aplicació de l'estudiant {1}
DocType: Asset,Fully Depreciated,Estant totalment amortitzats
,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Assistència marcat HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Les cites són propostes, les ofertes que ha enviat als seus clients"
DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
@@ -3632,7 +3638,7 @@
DocType: Stock Settings,Item Naming By,Article Naming Per
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Una altra entrada Període de Tancament {0} s'ha fet després de {1}
DocType: Production Order,Material Transferred for Manufacturing,Material transferit per a la Fabricació
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,{0} no existeix Compte
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,{0} no existeix Compte
DocType: Project,Project Type,Tipus de Projecte
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Existeix una tasca infantil per a aquesta tasca. No podeu suprimir aquesta tasca.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Tan quantitat destí com Quantitat són obligatoris.
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Centre de l'amortització del cost dels actius
DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
DocType: Sales Invoice Item,Delivered Qty,Quantitat lliurada
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Excl. Total Impost
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si se selecciona, tots els fills de cada element de la producció s'inclouran en les sol·licituds de materials."
DocType: Assessment Plan,Assessment Plan,pla d'avaluació
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,S'ha creat el client {0}.
DocType: Stock Settings,Limit Percent,límit de percentatge
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Configureu el sistema de nomenclatura d'instructor a l'educació> Configuració de l'educació
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Actualment no hi ha existències disponibles en cap magatzem
,Payment Period Based On Invoice Date,Període de pagament basat en Data de la factura
DocType: Sample Collection,No. of print,Nº d'impressió
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Deutors ({0})
DocType: Pricing Rule,Margin,Marge
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clients Nous
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Benefici Brut%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Benefici Brut%
DocType: Appraisal Goal,Weightage (%),Ponderació (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Canvieu el perfil de POS
DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidació
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Informe d'avaluació
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Compra import brut és obligatori
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Compra import brut és obligatori
DocType: Lead,Address Desc,Descripció de direcció
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Part és obligatòria
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Nom estable
DocType: Stock Entry,Customer or Supplier Details,Client o proveïdor Detalls
DocType: Employee Loan Application,Required by Date,Requerit per Data
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Equilibri de tancament (Dr - Cr)
DocType: Lead,Lead Owner,Responsable del client potencial
DocType: Bin,Requested Quantity,quantitat sol·licitada
DocType: Patient,Marital Status,Estat Civil
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variants múltiples
DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Lliurat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l'article).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l'article).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Inicieu sessió com un altre usuari.
DocType: Territory,Territory Targets,Objectius Territori
@@ -3904,7 +3909,7 @@
DocType: Serial No,Out of AMC,Fora d'AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d'amortitzacions
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Feu Manteniment Visita
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
DocType: Company,Default Cash Account,Compte de Tresoreria predeterminat
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Això es basa en la presència d'aquest Estudiant
@@ -4055,7 +4060,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Cap empleat pels criteris esmentats
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
DocType: Restaurant,Default Customer,Client per defecte
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configureu el sistema de nomenclatura d'empleats en recursos humans> Configuració de recursos humans
DocType: Assessment Plan,Supervisor Name,Nom del supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,No confirmeu si es crea una cita per al mateix dia
DocType: Program Enrollment Course,Program Enrollment Course,I matrícula Programa
@@ -4173,7 +4177,7 @@
DocType: BOM,Website Description,Descripció del lloc web
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Canvi en el Patrimoni Net
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,El més nou
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adreça de correu electrònic ha de ser únic, ja existeix per {0}"
DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,rebut
@@ -4190,7 +4194,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estat de fluxos d'efectiu
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,llicència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
DocType: GL Entry,Against Voucher Type,Contra el val tipus
DocType: Physician,Phone (R),Telèfon (R)
@@ -4202,7 +4206,7 @@
DocType: Patient,B Negative,B negatiu
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,L'estat de manteniment s'ha de cancel·lar o completar per enviar
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Números de sèrie en fila {0} no coincideix amb la nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Números de sèrie en fila {0} no coincideix amb la nota de lliurament
DocType: Student,Guardian Details,guardià detalls
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marc d'Assistència per a diversos empleats
@@ -4244,7 +4248,7 @@
DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
DocType: Training Event,Exam,examen
DocType: Complaint,Complaint,Queixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
DocType: Patient,Alcohol Past Use,Ús del passat alcohòlic
DocType: Fertilizer Content,Fertilizer Content,Contingut d'abonament
@@ -4368,6 +4372,7 @@
DocType: Salary Detail,Formula,fórmula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Plantilla de prova de laboratori
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Compte de vendes
DocType: Purchase Invoice Item,Total Weight,Pes total
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comissió de Vendes
DocType: Offer Letter Term,Value / Description,Valor / Descripció
@@ -4525,7 +4530,7 @@
DocType: Customer,From Lead,De client potencial
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comandes llançades per a la producció.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS perfil requerit per fer l'entrada POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS perfil requerit per fer l'entrada POS
DocType: Program Enrollment Tool,Enroll Students,inscriure els estudiants
DocType: Lab Test,Approved Date,Data aprovada
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -4601,7 +4606,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Element Producció
,Employee Information,Informació de l'empleat
DocType: Stock Entry Detail,Additional Cost,Cost addicional
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Fer Oferta de Proveïdor
DocType: Quality Inspection,Incoming,Entrant
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Es creen plantilles d'impostos predeterminades per a vendes i compra.
@@ -4618,7 +4623,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Nota: {0}
,Delivery Note Trends,Nota de lliurament Trends
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Resum de la setmana
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,En estoc Quantitat
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,En estoc Quantitat
DocType: Delivery Trip,Calculate Estimated Arrival Times,Calcular els temps estimats d'arribada
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,El compte: {0} només pot ser actualitzat a través de transaccions d'estoc
DocType: Student Group Creation Tool,Get Courses,obtenir Cursos
@@ -4634,7 +4639,7 @@
DocType: Material Request,% Ordered,Demanem%
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per grup d'alumnes basat curs, aquest serà validat per cada estudiant dels cursos matriculats en el Programa d'Inscripció."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Treball a preu fet
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Quota de compra mitja
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Quota de compra mitja
DocType: Task,Actual Time (in Hours),Temps real (en hores)
DocType: Employee,History In Company,Història a la Companyia
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nou missatge de {sender}
@@ -4682,7 +4687,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la llista de materials # {1} ha de ser igual a la moneda seleccionada {2}
DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
DocType: Patient,Additional information regarding the patient,Informació addicional sobre el pacient
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
DocType: Homepage,Tag Line,tag Line
DocType: Fee Component,Fee Component,Quota de components
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestió de Flotes
@@ -4894,7 +4899,7 @@
DocType: Employee Education,Employee Education,Formació Empleat
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,grup d'articles duplicat trobat en la taula de grup d'articles
DocType: Land Unit,Parent Land Unit,Unitat de terres primàries
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l'article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l'article.
DocType: Fertilizer,Fertilizer Name,Nom del fertilitzant
DocType: Salary Slip,Net Pay,Pay Net
DocType: Account,Account,Compte
@@ -4973,7 +4978,7 @@
DocType: Item Customer Detail,Ref Code,Codi de Referència
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,El Grup de clients es requereix en el perfil de POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registres d'empleats.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
DocType: HR Settings,Payroll Settings,Ajustaments de Nòmines
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
DocType: POS Settings,POS Settings,Configuració de la TPV
@@ -5140,7 +5145,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Recordatori d'aniversari per {0}
DocType: Asset Maintenance Task,Last Completion Date,Última data de finalització
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dies des de l'última comanda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,data d'inici d'assegurança ha de ser inferior a la data d'Assegurances Fi
@@ -5266,6 +5271,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Obtenir registres de pagament
DocType: Quotation Item,Against Docname,Contra DocName
DocType: SMS Center,All Employee (Active),Tot Empleat (Actiu)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Client> Grup de clients> Territori
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Veure ara
DocType: BOM,Raw Material Cost,Matèria primera Cost
DocType: Item Reorder,Re-Order Level,Re-Order Nivell
@@ -5364,7 +5370,6 @@
DocType: Room,Seating Capacity,nombre de places
DocType: Issue,ISS-,ISS
DocType: Lab Test Groups,Lab Test Groups,Grups de prova de laboratori
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Client> Grup de clients> Territori
DocType: Project,Total Expense Claim (via Expense Claims),Reclamació de Despeses totals (a través de reclamacions de despeses)
DocType: GST Settings,GST Summary,Resum GST
DocType: Assessment Result,Total Score,Puntuació total
@@ -5377,7 +5382,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Es van crear els horaris dels cursos següents
DocType: Journal Entry,Total Debit,Dèbit total
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Defecte Acabat Productes Magatzem
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Pressupost i de centres de cost
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,No es permet el mode de pagament múltiple per defecte
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,per a la
@@ -5550,7 +5555,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Consider Tax or Charge for
DocType: Driver,Driving License Category,Categoria de llicència de conducció
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La quantitat actual és obligatòria
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} té actualment un {1} Quadre de comandament del proveïdor en peu, i les ordres de compra d'aquest proveïdor s'han de fer amb precaució."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} té actualment un {1} Quadre de comandament del proveïdor en peu, i les ordres de compra d'aquest proveïdor s'han de fer amb precaució."
DocType: Asset Maintenance Team,Asset Maintenance Team,Equip de manteniment d'actius
DocType: Employee Loan,Loan Type,Tipus de préstec
DocType: Scheduling Tool,Scheduling Tool,Eina de programació
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index a891059..fac30f5 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Seřadit podle ceny
,Delay Days,Delay Dny
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Zadejte retenční položku
DocType: Purchase Invoice Item,Item Weight Details,Položka podrobnosti o hmotnosti
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, kód položky: {1} a zákazník: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otevření o zaměstnání.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},Kusovník není zadán pro subdodavatelskou položku {0} na řádku {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},Kusovník není zadán pro subdodavatelskou položku {0} na řádku {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Výsledek byl předložen
DocType: Item Attribute,Increment,Přírůstek
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Časové rozpětí
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Není dovoleno {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Položka získaná z
DocType: Price List,Price Not UOM Dependant,Cena není závislá na UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Žádné položky nejsou uvedeny
DocType: Asset Repair,Error Description,Popis chyby
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Potraviny
DocType: Quality Inspection Reading,Reading 1,Čtení 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Vedle Odpisy datum nemůže být před zakoupením Datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Vedle Odpisy datum nemůže být před zakoupením Datum
DocType: Crop,Perennial,Trvalka
DocType: Consultation,Consultation Date,Datum konzultace
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Výpis produktů a objevy pro uživatele ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",například "Základní škola" nebo "univerzita"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Stock Reports
DocType: Warehouse,Warehouse Detail,Sklad Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Datum ukončení nemůže být později než v roce Datum ukončení akademického roku, ke kterému termín je spojena (akademický rok {}). Opravte data a zkuste to znovu."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Je dlouhodobý majetek"" nemůže být nezaškrtnutý protože existuje zápis aktiva oproti této položce"
DocType: Delivery Trip,Departure Time,Čas odjezdu
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Šablony dodavatelů.
DocType: Lead,Interested,Zájemci
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Otvor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Od {0} do {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Nepodařilo se nastavit daně
DocType: Item,Copy From Item Group,Kopírovat z bodu Group
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Dovolených za rok
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
DocType: Email Digest,Profit & Loss,Ztráta zisku
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litr
DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulace Částka (přes Time Sheet)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Toto je založeno na transakcích proti této společnosti. Více informací naleznete v časové ose níže
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Odolný
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Konzultace
DocType: Journal Entry,Multi Currency,Více měn
DocType: Opening Invoice Creation Tool,Invoice Type,Typ faktury
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Dodací list
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Ovdovělý
DocType: Request for Quotation,Request for Quotation,Žádost o cenovou nabídku
DocType: Healthcare Settings,Require Lab Test Approval,Požadovat schválení testu laboratoře
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kód položky> Skupina položek> Značka
DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Naprosto vynikající
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
DocType: Drug Prescription,Dosage,Dávkování
DocType: Journal Entry Account,Sales Order,Prodejní objednávky
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. Prodej Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodej Rate
DocType: Assessment Plan,Examiner Name,Jméno Examiner
DocType: Lab Test Template,No Result,Žádný výsledek
DocType: Purchase Invoice Item,Quantity and Rate,Množství a cena
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Vyberte mzdové
DocType: Purchase Invoice,Unpaid,Nezaplacený
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Vyhrazeno pro prodej
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů> Nastavení HR"
DocType: Packing Slip,From Package No.,Od č balíčku
DocType: Item Attribute,To Range,K Rozsah
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Dílna
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozornění na nákupní objednávky
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dost Části vybudovat
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dost Části vybudovat
DocType: POS Profile User,POS Profile User,Uživatel profilu POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Přímý příjmů
DocType: Patient Appointment,Date TIme,Čas schůzky
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Správní ředitel
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Založení společnosti a daně
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnost Kurz
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
DocType: Purchase Invoice,Supplier GSTIN,Dodavatel GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nelze zavřít úkol, jak jeho závislý úkol {0} není uzavřen."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
DocType: Production Order,Additional Operating Cost,Další provozní náklady
DocType: Lab Test Template,Lab Routine,Lab Rutine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetika
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Souvislost s Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manažer
DocType: Payment Entry,Payment From / To,Platba z / do
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úvěrový limit je nižší než aktuální dlužné částky za zákazníka. Úvěrový limit musí být aspoň {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úvěrový limit je nižší než aktuální dlužné částky za zákazníka. Úvěrový limit musí být aspoň {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Nastavte prosím účet ve skladu {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno na"" a ""Seskupeno podle"", nemůže být stejné"
DocType: Sales Person,Sales Person Targets,Obchodník cíle
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Batch Name
DocType: Fee Validity,Max number of visit,Maximální počet návštěv
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Časového rozvrhu vytvoření:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Zapsat
DocType: GST Settings,GST Settings,Nastavení GST
DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,rozpočet Proti
DocType: Employee,Cell Number,Číslo buňky
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Pro daná kritéria neexistuje žádný zaměstnanec. Zkontrolujte, zda nebyly dosud vytvořeny platové kursy."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Žádosti Auto materiál vygenerovaný
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Žádosti Auto materiál vygenerovaný
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Vyhrazeno pro výrobu
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
DocType: Opportunity,Opportunity From,Příležitost Z
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Řádek {0}: {1} Sériová čísla vyžadovaná pro položku {2}. Poskytli jste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Řádek {0}: {1} Sériová čísla vyžadovaná pro položku {2}. Poskytli jste {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vyberte prosím tabulku
DocType: BOM,Website Specifications,Webových stránek Specifikace
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neplatná e-mailová adresa v adresáři "Příjemci"
@@ -1042,7 +1043,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Požadovaná citace
DocType: Vital Signs,Heart Rate / Pulse,Srdeční frekvence / puls
DocType: Company,Default Bank Account,Výchozí Bankovní účet
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Aktualizovat sklad' nemůže být zaškrtnuto, protože položky nejsou dodány přes {0}"
DocType: Vehicle,Acquisition Date,akvizice Datum
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1066,7 +1067,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Nahrajte své písmeno hlava (Udržujte web přátelský jako 900 x 100 pixelů)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Účet {2} nemůže být skupina
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v předchozím '{typ_dokumentu}' tabulka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,žádné úkoly
DocType: Item Variant Settings,Copy Fields to Variant,Kopírování polí na variantu
DocType: Asset,Opening Accumulated Depreciation,Otevření Oprávky
@@ -1178,9 +1179,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneři a teritoria
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} musí být aktivní
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Uzavření (otevření + celkem)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Uzavření (otevření + celkem)
DocType: Journal Entry,Depreciation Entry,odpisy Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vyberte první typ dokumentu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Tisk v měně účtu
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
@@ -1206,7 +1208,7 @@
DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
DocType: Fee Structure,Components,Komponenty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Bod Varianty {0} aktualizováno
DocType: Quality Inspection Reading,Reading 6,Čtení 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1258,6 +1260,7 @@
,Company Name,Název společnosti
DocType: SMS Center,Total Message(s),Celkem zpráv (y)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení> Nastavení> Pojmenování
DocType: Purchase Invoice,Additional Discount Percentage,Další slevy Procento
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobrazit seznam všech nápovědy videí
DocType: Agriculture Analysis Criteria,Soil Texture,Půdní textury
@@ -1285,7 +1288,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website Item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
DocType: Timesheet Detail,Bill,Účet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Vedle Odpisy Datum se zadává jako uplynulém dni
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Vedle Odpisy Datum se zadává jako uplynulém dni
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bílá
DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Řádek {0}: Množství není k dispozici pro {4} ve skladu {1} při účtování čas vložení údajů ({2} {3})
@@ -1301,7 +1304,7 @@
DocType: Lead,Next Contact Date,Další Kontakt Datum
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Otevření POČET
DocType: Healthcare Settings,Appointment Reminder,Připomenutí pro jmenování
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
DocType: Program Enrollment Tool Student,Student Batch Name,Student Batch Name
DocType: Consultation,Doctor,Doktor
DocType: Holiday List,Holiday List Name,Název seznamu dovolené
@@ -1317,6 +1320,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Nástroj pro přidělování dovolených
DocType: Item,Hub Category to Publish,Kategorie Hubu k publikování
DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Prosím, nastavte číselnou sérii pro Účast přes Nastavení> Číslovací série"
DocType: Sales Invoice,Billing Address GSTIN,Fakturační adresa GSTIN
DocType: Assessment Plan,Evaluate,Vyhodnoťte
DocType: Workstation,Net Hour Rate,Net Hour Rate
@@ -1350,7 +1354,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Prodejní faktury Platba
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Prodejní Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodejní Částka
DocType: Repayment Schedule,Interest Amount,Zájem Částka
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
DocType: Serial No,Creation Document No,Tvorba dokument č
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Otevření účetnictví Balance
,GST Sales Register,Obchodní registr GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nic požadovat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nic požadovat
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Vyberte své domény
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Další rekord Rozpočet '{0}' již existuje proti {1} '{2}' za fiskální rok {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Pole budou kopírovány pouze v době vytváření.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Pozor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Pozor
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Return / vrubopis
DocType: Price List Country,Price List Country,Ceník Země
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Prosím, zadejte kód položky se dostat číslo šarže"
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
DocType: Supplier Scorecard,Warn for new Request for Quotations,Upozornit na novou žádost o nabídky
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Objednávky pomohou při plánování a navázat na vašich nákupech
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Předpisy pro laboratorní testy
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Celkové emise / přenosu množství {0} v hmotné Request {1} \ nemůže být vyšší než požadované množství {2} pro položku {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
DocType: Payment Entry,Write Off Difference Amount,Odepsat Difference Částka
DocType: Volunteer,Volunteer Name,Jméno dobrovolníka
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Prosím, nastavte systém pro pojmenování instruktorů ve vzdělání> Nastavení vzdělávání"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaměstnanec nebyl nalezen, a proto je pošta neposlal"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pravidlo odeslání se nevztahuje na zemi {0}
DocType: Item,Foreign Trade Details,Zahraniční obchod Podrobnosti
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Číslo role skupiny
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Součet všech vah úkol by měl být 1. Upravte váhy všech úkolů projektu v souladu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitálové Vybavení
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dítě sklad existuje pro tento sklad. Nemůžete odstranit tento sklad.
DocType: Item,Website Item Groups,Webové stránky skupiny položek
DocType: Purchase Invoice,Total (Company Currency),Total (Company měny)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
DocType: Journal Entry,Journal Entry,Zápis do deníku
DocType: Expense Claim Advance,Unclaimed amount,Nevyžádaná částka
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} položky v probíhající
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",Žádost o cenovou nabídku je zakázán přístup z portálu pro více Zkontrolujte nastavení portálu.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabilní skóre skóre dodavatele skóre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Nákup Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Nákup Částka
DocType: Sales Invoice,Shipping Address Name,Název dodací adresy
DocType: Material Request,Terms and Conditions Content,Podmínky Content
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Došlo k chybám při vytváření plánu rozvrhů
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To je založeno na protokolech proti tomuto vozidlu. Viz časovou osu níže podrobnosti
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
DocType: Customer,Default Price List,Výchozí Ceník
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nelze odstranit fiskální rok {0}. Fiskální rok {0} je nastaven jako výchozí v globálním nastavení
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Zákazník se stejným jménem již existuje
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tím bude předkládán výplatní pásky a vytvářet záznamy časového rozvrhu. Chcete pokračovat?
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Stanovení ceny
DocType: Quotation,Term Details,Termín Podrobnosti
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nemůže přihlásit více než {0} studentů na této studentské skupiny.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Celkem (bez daně)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet vedoucích
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí být větší než 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Skladem k dispozici
@@ -2026,7 +2030,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odpojit Platba o zrušení faktury
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuální stavu km vstoupil by měla být větší než počáteční měřiče ujeté vzdálenosti {0}
DocType: Restaurant Reservation,No Show,Žádné vystoupení
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení> Nastavení> Pojmenování
DocType: Shipping Rule Country,Shipping Rule Country,Přepravní Pravidlo Země
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Nechat docházky
DocType: Maintenance Visit,Partially Completed,Částečně Dokončeno
@@ -2117,7 +2120,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instruktor skupiny studentů
DocType: Grant Application,Assessment Mark (Out of 10),Známka hodnocení (z 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Žádné
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hlavní
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Hlavní
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varianta
DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
DocType: Employee Attendance Tool,Employees HTML,zaměstnanci HTML
@@ -2165,7 +2168,7 @@
DocType: Course,Course Abbreviation,Zkratka hřiště
DocType: Student Leave Application,Student Leave Application,Student nechat aplikaci
DocType: Item,Will also apply for variants,Bude platit i pro varianty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaměstnanec {0} na půl dne na {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Celkem pracovní doba by neměla být větší než maximální pracovní doby {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
@@ -2350,9 +2353,10 @@
DocType: Task,Actual End Date (via Time Sheet),Skutečné datum ukončení (přes Time Sheet)
DocType: Soil Texture,Soil Type,Typ půdy
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Množství {0} {1} na {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nová zpráva
,Quotation Trends,Uvozovky Trendy
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
DocType: Shipping Rule,Shipping Amount,Částka - doprava
DocType: Supplier Scorecard Period,Period Score,Skóre období
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Přidat zákazníky
@@ -2363,7 +2367,7 @@
,Vehicle Expenses,Náklady pro auta
DocType: Serial No,Invoice Details,Podrobnosti faktury
DocType: Grant Application,Show on Website,Zobrazit na webu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Očekávané hodnoty po celou dobu životnosti, musí být větší než nebo rovna {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},"Očekávané hodnoty po celou dobu životnosti, musí být větší než nebo rovna {0}"
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Začněte dál
DocType: Hub Category,Hub Category,Kategorie Hubu
DocType: Purchase Invoice,SEZ,SEZ
@@ -2394,7 +2398,7 @@
DocType: Patient,B Positive,B Pozitivní
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, když je položka investičního majetku. Prosím použít samostatný řádek pro vícenásobné Mn."
DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
DocType: Patient Medical Record,Patient Medical Record,Záznam pacienta
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Skupina na Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportovní
@@ -2444,6 +2448,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Nelze nastavit přijatou RFQ na Žádnou nabídku
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Celkem Odpočet
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Vyberte účet, který chcete vytisknout v měně účtu"
,Production Analytics,výrobní Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To je založeno na transakcích proti tomuto pacientovi. Podrobnosti viz časová osa níže
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Náklady Aktualizováno
@@ -2498,7 +2503,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vyberte společnost ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} je povinná k položce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} je povinná k položce {1}
DocType: Payroll Entry,Fortnightly,Čtrnáctidenní
DocType: Currency Exchange,From Currency,Od Měny
DocType: Vital Signs,Weight (In Kilogram),Hmotnost (v kilogramech)
@@ -2574,7 +2579,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny nebude zobrazeno, pokud Ceník není nastaven"
DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debetní K je vyžadováno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debetní K je vyžadováno
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomůže udržet přehled o času, nákladů a účtování pro aktivit hotový svého týmu"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šablony proměnných tabulky dodavatelů dodavatelů.
@@ -2675,7 +2680,7 @@
DocType: Company,For Reference Only.,Pouze orientační.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Lékař {0} není dostupný v {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Vyberte číslo šarže
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neplatný {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Neplatný {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PInv-RET-
DocType: Fee Validity,Reference Inv,Odkaz Inv
@@ -2712,8 +2717,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
DocType: Water Analysis,Origin,Původ
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicí {0} {1} pro položku {4}. Děláte si jiný {3} proti stejné {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Prosím nastavte opakující se po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Vybrat změna výše účet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Prosím nastavte opakující se po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Vybrat změna výše účet
DocType: Purchase Invoice,Price List Currency,Ceník Měna
DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -2769,7 +2774,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Upozornit na nové nákupní objednávky
DocType: Quality Inspection Reading,Reading 9,Čtení 9
DocType: Supplier,Is Frozen,Je Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Uzel skupina sklad není dovoleno vybrat pro transakce
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Uzel skupina sklad není dovoleno vybrat pro transakce
DocType: Buying Settings,Buying Settings,Nákup Nastavení
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
DocType: Upload Attendance,Attendance To Date,Účast na data
@@ -2783,6 +2788,7 @@
DocType: Grant Application,Organization,Organizace
DocType: BOM Update Tool,BOM Update Tool,Nástroj pro aktualizaci kusovníku
DocType: SG Creation Tool Course,Student Group Name,Jméno Student Group
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Zobrazit rozložený pohled
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Vytváření poplatků
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Ujistěte se, že opravdu chcete vymazat všechny transakce pro tuto společnost. Vaše kmenová data zůstanou, jak to je. Tuto akci nelze vrátit zpět."
DocType: Room,Room Number,Číslo pokoje
@@ -2793,7 +2799,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Vytvořte šablonu daní
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
DocType: Lab Test Sample,Lab Test Sample,Laboratorní testovací vzorek
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Rychlý vstup Journal
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
@@ -2864,7 +2870,7 @@
DocType: Membership,USD,americký dolar
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Proveďte faktury
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto v blízkosti Příležitost po 15 dnech
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Příkazy na nákup nejsou pro {0} povoleny kvůli postavení skóre {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Příkazy na nákup nejsou pro {0} povoleny kvůli postavení skóre {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,konec roku
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
@@ -2976,7 +2982,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Nad
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Řádek # {0}: Journal Entry {1} nemá účet {2} nebo již uzavřeno proti jinému poukazu
DocType: Supplier Scorecard Criteria,Criteria Weight,Kritéria Váha
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dodavatel> Typ dodavatele
DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
DocType: Payroll Entry,Salary Slip Based on Timesheet,Plat Slip na základě časového rozvrhu
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Rychlost nákupu
@@ -3064,7 +3069,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Přejděte na Letterheads
DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všechny adresy.
DocType: Company,Stock Settings,Stock Nastavení
@@ -3253,6 +3258,7 @@
DocType: Company,Default Inventory Account,Výchozí účet inventáře
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Řádek {0}: Dokončené množství musí být větší než nula.
DocType: Antibiotic,Antibiotic Name,Název antibiotika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kód položky> Skupina položek> Značka
DocType: Purchase Invoice,Apply Additional Discount On,Použít dodatečné Sleva na
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Vyberte typ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Spojení se všemi pozemními jednotkami, ve kterých rostou"
@@ -3446,6 +3452,7 @@
DocType: Supplier,Credit Limit,Úvěrový limit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Průměrné Míra prodejních cen
DocType: Production Plan Sales Order,Salse Order Date,Salse Datum objednávky
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dodavatel> Typ dodavatele
DocType: Salary Component,Salary Component,plat Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Platební Příspěvky {0} jsou un-spojený
DocType: GL Entry,Voucher No,Voucher No
@@ -3454,7 +3461,7 @@
DocType: Leave Allocation,Leave Allocation,Přidelení dovolené
DocType: Payment Request,Recipient Message And Payment Details,Příjemce zprávy a platebních informací
DocType: Training Event,Trainer Email,trenér Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materiál Žádosti {0} vytvořené
DocType: Restaurant Reservation,No of People,Počet lidí
DocType: Production Planning Tool,Include sub-contracted raw materials,Zahrnout sub-smluvní suroviny
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablona podmínek nebo smlouvy.
@@ -3518,7 +3525,7 @@
DocType: Production Planning Tool,Create Material Requests,Vytvořit požadavek na materiál
DocType: Employee Education,School/University,Škola / University
DocType: Payment Request,Reference Details,Odkaz Podrobnosti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekávaná hodnota Po celou dobu životnosti musí být menší než Gross částky nákupu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekávaná hodnota Po celou dobu životnosti musí být menší než Gross částky nákupu
DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturovaná částka
DocType: Asset,Double Declining Balance,Double degresivní
@@ -3530,7 +3537,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získat aktualizace
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Účet {2} nepatří do společnosti {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Vyberte alespoň jednu hodnotu z každého atributu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Správa absencí
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Seskupit podle účtu
DocType: Sales Order,Fully Delivered,Plně Dodáno
@@ -3541,14 +3548,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplacené částky nemůže být větší než Výše úvěru {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Přejděte na položku Programy
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Řádek {0} # Přidělená částka {1} nemůže být vyšší než částka, která nebyla požadována. {2}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Prosím, nastavte číselnou sérii pro Účast přes Nastavení> Číslovací série"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Výrobní příkaz nebyl vytvořen
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nemůže změnit statut studenta {0} je propojen s aplikací studentské {1}
DocType: Asset,Fully Depreciated,plně odepsán
,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účast HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citace jsou návrhy, nabídky jste svým zákazníkům odeslané"
DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
@@ -3632,7 +3638,7 @@
DocType: Stock Settings,Item Naming By,Položka Pojmenování By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
DocType: Production Order,Material Transferred for Manufacturing,Materiál Přenesená pro výrobu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Účet {0} neexistuje
DocType: Project,Project Type,Typ projektu
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Dětská úloha existuje pro tuto úlohu. Tuto úlohu nelze odstranit.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového střediska
DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Celkem Excl. Daň
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Zda zaškrtnuto, vypíše včetně stromu každé výrobní položky v požadavku materiálu."
DocType: Assessment Plan,Assessment Plan,Plan Assessment
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Zákazník {0} je vytvořen.
DocType: Stock Settings,Limit Percent,Limit Procento
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Prosím, nastavte systém pro pojmenování instruktorů ve vzdělání> Nastavení vzdělávání"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,V současné době žádné skladové zásoby nejsou k dispozici
,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
DocType: Sample Collection,No. of print,Počet tisku
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Dlužníci ({0})
DocType: Pricing Rule,Margin,Marže
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Hrubý Zisk %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Hrubý Zisk %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Změňte profil POS
DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Zpráva o hodnocení
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Částka nákupu je povinná
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross Částka nákupu je povinná
DocType: Lead,Address Desc,Popis adresy
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party je povinná
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stálé jméno
DocType: Stock Entry,Customer or Supplier Details,Zákazníka nebo dodavatele Podrobnosti
DocType: Employee Loan Application,Required by Date,Vyžadováno podle data
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Závěrečný zůstatek (Dr - Cr)
DocType: Lead,Lead Owner,Majitel leadu
DocType: Bin,Requested Quantity,Požadované množství
DocType: Patient,Marital Status,Rodinný stav
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Více variant
DocType: Sales Invoice,Against Income Account,Proti účet příjmů
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dodáno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Přihlaste se jako další uživatel.
DocType: Territory,Territory Targets,Území Cíle
@@ -3904,7 +3909,7 @@
DocType: Serial No,Out of AMC,Out of AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
DocType: Company,Default Cash Account,Výchozí Peněžní účet
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To je založeno na účasti tohoto studenta
@@ -4054,7 +4059,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Žádní zaměstnanci nesplnili uvedená kritéria
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
DocType: Restaurant,Default Customer,Výchozí zákazník
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů> Nastavení HR"
DocType: Assessment Plan,Supervisor Name,Jméno Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nepotvrzujte, zda je událost vytvořena ve stejný den"
DocType: Program Enrollment Course,Program Enrollment Course,Program pro zápis do programu
@@ -4172,7 +4176,7 @@
DocType: BOM,Website Description,Popis webu
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Čistá změna ve vlastním kapitálu
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nejnovější
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí být jedinečná, již existuje pro {0}"
DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Příjem
@@ -4189,7 +4193,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Přehled o peněžních tocích
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výše úvěru nesmí být vyšší než Maximální výše úvěru částku {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
DocType: GL Entry,Against Voucher Type,Proti poukazu typu
DocType: Physician,Phone (R),Telefon (R)
@@ -4201,7 +4205,7 @@
DocType: Patient,B Negative,B Negativní
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Stav údržby musí být zrušen nebo dokončen k odeslání
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Sériová čísla v řádku {0} neodpovídají poznámce k doručení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Sériová čísla v řádku {0} neodpovídají poznámce k doručení
DocType: Student,Guardian Details,Guardian Podrobnosti
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark docházky pro více zaměstnanců
@@ -4243,7 +4247,7 @@
DocType: Stock Entry Detail,Basic Amount,Základní částka
DocType: Training Event,Exam,Zkouška
DocType: Complaint,Complaint,Stížnost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
DocType: Leave Allocation,Unused leaves,Nepoužité listy
DocType: Patient,Alcohol Past Use,Alkohol v minulosti
DocType: Fertilizer Content,Fertilizer Content,Obsah hnojiv
@@ -4366,6 +4370,7 @@
DocType: Salary Detail,Formula,Vzorec
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Šablona zkušebního laboratoře
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Prodejní účet
DocType: Purchase Invoice Item,Total Weight,Celková váha
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Provize z prodeje
DocType: Offer Letter Term,Value / Description,Hodnota / Popis
@@ -4523,7 +4528,7 @@
DocType: Customer,From Lead,Od Leadu
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
DocType: Program Enrollment Tool,Enroll Students,zapsat studenti
DocType: Lab Test,Approved Date,Datum schválení
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
@@ -4599,7 +4604,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Výrobní položka
,Employee Information,Informace o zaměstnanci
DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Vytvořit nabídku dodavatele
DocType: Quality Inspection,Incoming,Přicházející
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Výchozí daňové šablony pro prodej a nákup jsou vytvořeny.
@@ -4616,7 +4621,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Poznámka: {0}
,Delivery Note Trends,Dodací list Trendy
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Tento týden Shrnutí
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na skladě Množství
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Na skladě Množství
DocType: Delivery Trip,Calculate Estimated Arrival Times,Vypočítat odhadované časy příjezdu
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
DocType: Student Group Creation Tool,Get Courses,Získat kurzy
@@ -4632,7 +4637,7 @@
DocType: Material Request,% Ordered,% objednáno
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Pro kurzovou studentskou skupinu bude kurz pro každého studenta ověřen z přihlášených kurzů při zápisu do programu.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Úkolová práce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Nákup Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Nákup Rate
DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
DocType: Employee,History In Company,Historie ve Společnosti
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nová zpráva od {odesílatele}
@@ -4680,7 +4685,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Řádek {0}: Měna BOM # {1} by se měla rovnat vybrané měně {2}
DocType: Journal Entry Account,Exchange Rate,Exchange Rate
DocType: Patient,Additional information regarding the patient,Další informace týkající se pacienta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
DocType: Homepage,Tag Line,tag linka
DocType: Fee Component,Fee Component,poplatek Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet management
@@ -4892,7 +4897,7 @@
DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicitní skupinu položek uvedeny v tabulce na položku ve skupině
DocType: Land Unit,Parent Land Unit,Rodičovská jednotka
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
DocType: Fertilizer,Fertilizer Name,Jméno hnojiva
DocType: Salary Slip,Net Pay,Net Pay
DocType: Account,Account,Účet
@@ -4971,7 +4976,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Zákaznická skupina je vyžadována v POS profilu
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaměstnanecké záznamy.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosím, stojí vedle odpisů Datum"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Prosím, stojí vedle odpisů Datum"
DocType: HR Settings,Payroll Settings,Nastavení Mzdové
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
DocType: POS Settings,POS Settings,Nastavení POS
@@ -5138,7 +5143,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Narozeninová připomínka pro {0}
DocType: Asset Maintenance Task,Last Completion Date,Poslední datum dokončení
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
DocType: Buying Settings,Naming Series,Číselné řady
DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum pojištění startu by měla být menší než pojištění koncovým datem
@@ -5265,6 +5270,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Získat Platební položky
DocType: Quotation Item,Against Docname,Proti Docname
DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Zákazník> Skupina zákazníků> Území
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
DocType: BOM,Raw Material Cost,Cena surovin
DocType: Item Reorder,Re-Order Level,Úroveň pro znovuobjednání
@@ -5363,7 +5369,6 @@
DocType: Room,Seating Capacity,Počet míst k sezení
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Laboratorní testovací skupiny
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Zákazník> Skupina zákazníků> Území
DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nároků)
DocType: GST Settings,GST Summary,Souhrn GST
DocType: Assessment Result,Total Score,Celkové skóre
@@ -5376,7 +5381,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Byly vytvořeny následující kurzy
DocType: Journal Entry,Total Debit,Celkem Debit
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Výchozí sklad hotových výrobků
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Prodej Osoba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodej Osoba
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Rozpočet a nákladového střediska
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Vícenásobný výchozí způsob platby není povolen
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pro
@@ -5549,7 +5554,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
DocType: Driver,Driving License Category,Kategorie řidičských oprávnění
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutečné Množství je povinné
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v současné době disponuje {1} hodnotící tabulkou dodavatelů a objednávky na nákup tohoto dodavatele by měly být vydány s opatrností.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v současné době disponuje {1} hodnotící tabulkou dodavatelů a objednávky na nákup tohoto dodavatele by měly být vydány s opatrností.
DocType: Asset Maintenance Team,Asset Maintenance Team,Tým pro údržbu aktiv
DocType: Employee Loan,Loan Type,Typ úvěru
DocType: Scheduling Tool,Scheduling Tool,Plánování Tool
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index c14076b..69c090c 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -6,7 +6,7 @@
,Lead Id,Bly Id
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +71,'Total','Total'
DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Selling Beløb
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selling Beløb
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
DocType: Item,Default Selling Cost Center,Standard Selling Cost center
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index abab31a..efe7652 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorter efter Pris
,Delay Days,Forsinkelsesdage
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Lav retention lager indgang
DocType: Purchase Invoice Item,Item Weight Details,Vægt Vægt Detaljer
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, varekode: {1} og kunde: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Rekruttering
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM er ikke specificeret til underleverancer punkt {0} i række {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM er ikke specificeret til underleverancer punkt {0} i række {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultat indsendt
DocType: Item Attribute,Increment,Tilvækst
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tidsperiode
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ikke tilladt for {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Hent varer fra
DocType: Price List,Price Not UOM Dependant,Pris Ikke UOM Afhængig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Lager kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Lager kan ikke opdateres mod følgeseddel {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ingen emner opført
DocType: Asset Repair,Error Description,Fejlbeskrivelse
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Købmand
DocType: Quality Inspection Reading,Reading 1,Læsning 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pensionskasser
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Næste afskrivningsdato kan ikke være før købsdatoen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Næste afskrivningsdato kan ikke være før købsdatoen
DocType: Crop,Perennial,Perennial
DocType: Consultation,Consultation Date,Høringsdato
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktliste og opdagelse for ERPNext-brugere
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",fx "Primary School" eller "University"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Stock Rapporter
DocType: Warehouse,Warehouse Detail,Lagerinformation
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Slutdato kan ikke være senere end året Slutdato af skoleåret, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Er anlægsaktiv"" kan ikke være umarkeret, da der eksisterer et anlægsaktiv på varen"
DocType: Delivery Trip,Departure Time,Afgangstid
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Hent specifikationer
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Skabeloner af leverandørplaceringer.
DocType: Lead,Interested,Interesseret
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Åbning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Åbning
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Fra {0} til {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Kunne ikke oprette skatter
DocType: Item,Copy From Item Group,Kopier fra varegruppe
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Fratrædelsesdato skal være større end ansættelsesdato
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Fravær pr. år
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst "Er Advance 'mod konto {1}, hvis dette er et forskud post."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Lager {0} ikke hører til firmaet {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Lager {0} ikke hører til firmaet {1}
DocType: Email Digest,Profit & Loss,Profit & Loss
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,liter
DocType: Task,Total Costing Amount (via Time Sheet),Totale omkostninger (via tidsregistrering)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dette er baseret på transaktioner mod denne virksomhed. Se tidslinjen nedenfor for detaljer
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på e-mail om oprettelse af automatiske materialeanmodninger
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistente
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi Valuta
DocType: Opening Invoice Creation Tool,Invoice Type,Fakturatype
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Følgeseddel
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Enke
DocType: Request for Quotation,Request for Quotation,Anmodning om tilbud
DocType: Healthcare Settings,Require Lab Test Approval,Kræv labtestgodkendelse
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Varenummer> Varegruppe> Mærke
DocType: Salary Slip Timesheet,Working Hours,Arbejdstider
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Samlet Udestående
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Indtast omkostningssted
DocType: Drug Prescription,Dosage,Dosering
DocType: Journal Entry Account,Sales Order,Salgsordre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Gns. Salgssats
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Gns. Salgssats
DocType: Assessment Plan,Examiner Name,Censornavn
DocType: Lab Test Template,No Result,ingen Resultat
DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Vælg Lønperiode
DocType: Purchase Invoice,Unpaid,Åben
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserveret til salg
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer> HR-indstillinger
DocType: Packing Slip,From Package No.,Fra pakkenr.
DocType: Item Attribute,To Range,At Rækkevidde
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Værksted
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Advarer indkøbsordrer
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Nævn et par af dine kunder. Disse kunne være firmaer eller privatpersoner.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Nok Dele til Build
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nok Dele til Build
DocType: POS Profile User,POS Profile User,POS profil bruger
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte indkomst
DocType: Patient Appointment,Date TIme,Dato Tid
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Kontorfuldmægtig
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Opsætning af selskab og skatter
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vælg kursus
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Differencekonto
DocType: Purchase Invoice,Supplier GSTIN,Leverandør GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Opgaven kan ikke lukkes, da dens afhængige opgave {0} ikke er lukket."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Indtast venligst lager for hvilket materialeanmodning vil blive rejst
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Indtast venligst lager for hvilket materialeanmodning vil blive rejst
DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
DocType: Lab Test Template,Lab Routine,Lab Rutine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetik
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Forholdet til Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Leder
DocType: Payment Entry,Payment From / To,Betaling fra/til
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kreditmaksimum er mindre end nuværende udestående beløb for kunden. Credit grænse skal være mindst {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kreditmaksimum er mindre end nuværende udestående beløb for kunden. Credit grænse skal være mindst {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Venligst indstil konto i lager {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Sortér efter ' ikke kan være samme
DocType: Sales Person,Sales Person Targets,Salgs person Mål
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Partinavn
DocType: Fee Validity,Max number of visit,Maks antal besøg
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timeseddel oprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Indskrive
DocType: GST Settings,GST Settings,GST-indstillinger
DocType: Selling Settings,Customer Naming By,Kundenavngivning af
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Budget Against
DocType: Employee,Cell Number,Mobiltelefonnr.
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Der er ingen medarbejder for de givne kriterier. Kontroller, at Lønningslister ikke allerede er oprettet."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Automatisk materialeanmodning dannet
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automatisk materialeanmodning dannet
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Du kan ikke indtaste det aktuelle bilag i ""Mod Kassekladde 'kolonne"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reserveret til fremstilling
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energi
DocType: Opportunity,Opportunity From,Salgsmulighed fra
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedlige lønseddel.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Række {0}: {1} Serienumre er nødvendige for punkt {2}. Du har angivet {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Række {0}: {1} Serienumre er nødvendige for punkt {2}. Du har angivet {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vælg venligst en tabel
DocType: BOM,Website Specifications,Website Specifikationer
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er en ugyldig e-mail-adresse i 'Modtagere'
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citat krævet
DocType: Vital Signs,Heart Rate / Pulse,Hjertefrekvens / puls
DocType: Company,Default Bank Account,Standard bankkonto
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, fordi varerne ikke leveres via {0}"
DocType: Vehicle,Acquisition Date,Erhvervelsesdato
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nummerserie
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Upload dit brevhoved (Hold det webvenligt som 900px ved 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} kan ikke være en gruppe
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DOCNAME} findes ikke i ovenstående '{doctype}' tabel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Tidsregistreringskladde {0} er allerede afsluttet eller annulleret
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Tidsregistreringskladde {0} er allerede afsluttet eller annulleret
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Ingen opgaver
DocType: Item Variant Settings,Copy Fields to Variant,Kopier felt til variant
DocType: Asset,Opening Accumulated Depreciation,Åbning Akkumulerede afskrivninger
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Forhandlere og områder
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,Stykliste {0} skal være aktiv
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Lukning (Åbning + I alt)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Lukning (Åbning + I alt)
DocType: Journal Entry,Depreciation Entry,Afskrivninger indtastning
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vælg dokumenttypen først
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Udskriv i Konto Valuta
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serienummer {0} hører ikke til vare {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,Standard betales Konti
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
DocType: Fee Structure,Components,Lønarter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Item Varianter {0} opdateret
DocType: Quality Inspection Reading,Reading 6,Læsning 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,Firmaets navn
DocType: SMS Center,Total Message(s),Besked (er) i alt
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Indstil navngivningsserien for {0} via Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatprocent
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle hjælpevideoerne
DocType: Agriculture Analysis Criteria,Soil Texture,Jordstruktur
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website Item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Upload dit brevhoved og logo. (Du kan redigere dem senere).
DocType: Timesheet Detail,Bill,Faktureres
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Næste afskrivningsdato er indtastet som tidligere dato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Næste afskrivningsdato er indtastet som tidligere dato
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Hvid
DocType: SMS Center,All Lead (Open),Alle emner (åbne)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Række {0}: Antal ikke tilgængelig for {4} i lageret {1} på udstationering tid af posten ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,Næste kontakt d.
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Åbning Antal
DocType: Healthcare Settings,Appointment Reminder,Aftalens påmindelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Indtast konto for returbeløb
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Indtast konto for returbeløb
DocType: Program Enrollment Tool Student,Student Batch Name,Elevgruppenavn
DocType: Consultation,Doctor,Læge
DocType: Holiday List,Holiday List Name,Helligdagskalendernavn
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Fraværstildelingsværktøj
DocType: Item,Hub Category to Publish,Hub kategori til udgivelse
DocType: Leave Block List,Leave Block List Dates,Fraværsblokeringsdatoer
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning> Nummereringsserie
DocType: Sales Invoice,Billing Address GSTIN,Faktureringsadresse GSTIN
DocType: Assessment Plan,Evaluate,Vurdere
DocType: Workstation,Net Hour Rate,Netto timeløn
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-Retsinformation
DocType: POS Profile,Sales Invoice Payment,Salgsfakturabetaling
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Salgsbeløb
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Salgsbeløb
DocType: Repayment Schedule,Interest Amount,Renter Beløb
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du er udlægsgodkender til denne oplysning. Opdater ""Status"" og gem"
DocType: Serial No,Creation Document No,Oprettet med dok.-nr.
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Åbning Regnskab Balance
,GST Sales Register,GST salgsregistrering
DocType: Sales Invoice Advance,Sales Invoice Advance,Salgsfaktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Intet at anmode om
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Intet at anmode om
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Vælg dine domæner
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En anden Budget rekord '{0}' findes allerede mod {1} '{2}' for regnskabsåret {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Felter vil blive kopieret over kun på tidspunktet for oprettelsen.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til varen af varianten. For eksempel, hvis dit forkortelse er ""SM"", og varenummeret er ""T-SHIRT"", så vil variantens varenummer blive ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
DocType: Purchase Invoice,Is Return,Er Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Advarsel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Advarsel
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Retur / debetnota
DocType: Price List Country,Price List Country,Prislisteland
DocType: Item,UOMs,Enheder
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} gyldige serienumre for vare {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} gyldige serienumre for vare {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Varenr. kan ikke ændres for Serienummer
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Indtast venligst varenr. for at få partinr.
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
DocType: Supplier Scorecard,Warn for new Request for Quotations,Advar om ny anmodning om tilbud
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Indkøbsordrer hjælpe dig med at planlægge og følge op på dine køb
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Den samlede overførselsmængde {0} i materialeanmodning {1} \ kan ikke være større end den anmodede mængde {2} for vare {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Lagerkontaktinformation
DocType: Payment Entry,Write Off Difference Amount,Skriv Off Forskel Beløb
DocType: Volunteer,Volunteer Name,Frivilligt navn
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Indstil venligst instruktørens navngivningssystem under Uddannelse> Uddannelsesindstillinger
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Medarbejderens e-mail er ikke fundet, og derfor er e-mailen ikke sendt"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Forsendelsesregel gælder ikke for land {0}
DocType: Item,Foreign Trade Details,Udenrigshandel Detaljer
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Gruppe Roll nummer
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totalen for vægtningen af alle opgaver skal være 1. Juster vægten af alle sagsopgaver i overensstemmelse hermed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Følgeseddel {0} er ikke godkendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Følgeseddel {0} er ikke godkendt
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Udstyr
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelsesregel skal først baseres på feltet 'Gælder for', som kan indeholde vare, varegruppe eller varemærke."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,eksisterer Child lager for dette lager. Du kan ikke slette dette lager.
DocType: Item,Website Item Groups,Hjemmeside-varegrupper
DocType: Purchase Invoice,Total (Company Currency),I alt (firmavaluta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
DocType: Journal Entry,Journal Entry,Kassekladde
DocType: Expense Claim Advance,Unclaimed amount,Uopkrævet beløb
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} igangværende varer
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikation log.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",Adgang til portal er deaktiveret for anmodning om tilbud. Check portal instillinger
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverandør Scorecard Scoringsvariabel
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Køb Beløb
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Køb Beløb
DocType: Sales Invoice,Shipping Address Name,Leveringsadressenavn
DocType: Material Request,Terms and Conditions Content,Vilkår og -betingelsesindhold
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Der opstod fejl ved at oprette kursusplan
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dette er baseret på kørebogen for køretøjet. Se tidslinje nedenfor for detaljer
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
DocType: Customer,Default Price List,Standardprisliste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Asset Movement rekord {0} skabt
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Asset Movement rekord {0} skabt
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette Fiscal År {0}. Regnskabsår {0} er indstillet som standard i Globale indstillinger
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,En kunde med samme navn eksisterer allerede
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dette vil indgive Lønningslister og skabe periodiseringsjournalindtastning. Vil du fortsætte?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Priser
DocType: Quotation,Term Details,Betingelsesdetaljer
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kan ikke tilmelde mere end {0} studerende til denne elevgruppe.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),I alt (uden skat)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} skal være større end 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Lager til rådighed
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fjern link Betaling ved Annullering af faktura
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuel kilometerstand indtastet bør være større end Køretøjets indledende kilometerstand {0}
DocType: Restaurant Reservation,No Show,Ingen Vis
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Indstil navngivningsserien for {0} via Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Forsendelsesregelland
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Fravær og fremmøde
DocType: Maintenance Visit,Partially Completed,Delvist afsluttet
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
DocType: Grant Application,Assessment Mark (Out of 10),Bedømmelsesmærke (ud af 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Formynder 2 mobiltelefonnr.
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Hoved
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
DocType: Employee Attendance Tool,Employees HTML,Medarbejdere HTML
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,Kursusforkortelse
DocType: Student Leave Application,Student Leave Application,Student Leave Application
DocType: Item,Will also apply for variants,Vil også gælde for varianter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Medarbejder {0} på halv tid den {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Arbejdstid i alt bør ikke være større end maksimal arbejdstid {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdato (via Tidsregistreringen)
DocType: Soil Texture,Soil Type,Jordtype
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Mængden {0} {1} mod {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Ny besked
,Quotation Trends,Tilbud trends
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Varegruppe ikke er nævnt i vare-masteren for vare {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debit-Til konto skal være et tilgodehavende konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debit-Til konto skal være et tilgodehavende konto
DocType: Shipping Rule,Shipping Amount,Forsendelsesmængde
DocType: Supplier Scorecard Period,Period Score,Periode score
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Tilføj kunder
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,Køretøjsudgifter
DocType: Serial No,Invoice Details,Faktura detaljer
DocType: Grant Application,Show on Website,Vis på hjemmesiden
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Forventet værdi efter brugstid skal være større end eller lig med {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Forventet værdi efter brugstid skal være større end eller lig med {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Start på
DocType: Hub Category,Hub Category,Nav kategori
DocType: Purchase Invoice,SEZ,SEZ
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,B positiv
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række # {0}: Antal skal være én, eftersom varen er et anlægsaktiv. Brug venligst separat række til flere antal."
DocType: Leave Block List Allow,Leave Block List Allow,Tillad blokerede fraværsansøgninger
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Gruppe til ikke-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Kan ikke indstille en modtaget RFQ til No Quote
DocType: Quotation,QTN-,T-
DocType: Salary Slip,Total Deduction,Fradrag i alt
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Vælg en konto, der skal udskrives i kontovaluta"
,Production Analytics,Produktionsanalyser
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dette er baseret på transaktioner mod denne patient. Se tidslinjen nedenfor for detaljer
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Omkostninger opdateret
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vælg firma ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Lad feltet stå tomt, hvis det skal gælde for alle afdelinger"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
DocType: Payroll Entry,Fortnightly,Hver 14. dag
DocType: Currency Exchange,From Currency,Fra Valuta
DocType: Vital Signs,Weight (In Kilogram),Vægt (i kilogram)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Priserne vil ikke blive vist, hvis prisliste ikke er indstillet"
DocType: Stock Entry,Total Incoming Value,Samlet værdi indgående
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debet-til skal angives
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debet-til skal angives
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidskladder hjælper med at holde styr på tid, omkostninger og fakturering for aktiviteter udført af dit team"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøbsprisliste
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Skabeloner af leverandør scorecard variabler.
@@ -2654,7 +2659,7 @@
DocType: Company,For Reference Only.,Kun til reference.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Læge {0} ikke tilgængelig på {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Vælg partinr.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Ugyldig {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-Retsinformation
DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2691,8 +2696,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
DocType: Water Analysis,Origin,Oprindelse
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokument er over grænsen ved {0} {1} for vare {4}. Er du gør en anden {3} mod samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Vælg ændringsstørrelse konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Vælg ændringsstørrelse konto
DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
DocType: Naming Series,User must always select,Brugeren skal altid vælge
DocType: Stock Settings,Allow Negative Stock,Tillad negativ lagerbeholdning
@@ -2748,7 +2753,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Advarer om nye indkøbsordrer
DocType: Quality Inspection Reading,Reading 9,Reading 9
DocType: Supplier,Is Frozen,Er Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Gruppe node lager er ikke tilladt at vælge for transaktioner
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Gruppe node lager er ikke tilladt at vælge for transaktioner
DocType: Buying Settings,Buying Settings,Indkøbsindstillinger
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Styklistenr. for en færdigvare
DocType: Upload Attendance,Attendance To Date,Fremmøde tildato
@@ -2762,6 +2767,7 @@
DocType: Grant Application,Organization,Organisation
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Elevgruppenavn
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Vis eksploderet visning
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Oprettelse af gebyrer
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
DocType: Room,Room Number,Værelsesnummer
@@ -2772,7 +2778,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Lav skatskabelon
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Brugerforum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Råmaterialer kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Hurtig kassekladde
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
@@ -2843,7 +2849,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Make Faktura
DocType: Selling Settings,Auto close Opportunity after 15 days,Luk automatisk salgsmulighed efter 15 dage
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Indkøbsordrer er ikke tilladt for {0} på grund af et scorecard stående på {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Indkøbsordrer er ikke tilladt for {0} på grund af et scorecard stående på {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Slutår
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Tilbud/emne %
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Fratrædelsesdato skal være større end ansættelsesdato
@@ -2935,7 +2941,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-over
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Kassekladde {1} har ikke konto {2} eller allerede matchet mod en anden kupon
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterier Vægt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Leverandør> Leverandør Type
DocType: Buying Settings,Default Buying Price List,Standard indkøbsprisliste
DocType: Payroll Entry,Salary Slip Based on Timesheet,Lønseddel baseret på timeregistreringen
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Købspris
@@ -3023,7 +3028,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Analysér emner efter branchekode.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Gå til Letterheads
DocType: Item Supplier,Item Supplier,Vareleverandør
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Indtast venligst varenr. for at få partinr.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Indtast venligst varenr. for at få partinr.
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
DocType: Company,Stock Settings,Lagerindstillinger
@@ -3200,6 +3205,7 @@
DocType: Company,Default Inventory Account,Standard lagerkonto
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Række {0}: suppleret Antal skal være større end nul.
DocType: Antibiotic,Antibiotic Name,Antibiotikum Navn
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Varenummer> Varegruppe> Mærke
DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Vælg type ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Et link til alle de jordarealer, hvor afgrøden vokser"
@@ -3393,6 +3399,7 @@
DocType: Supplier,Credit Limit,Kreditgrænse
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Gennemsnitlig. Salgsprisliste Pris
DocType: Production Plan Sales Order,Salse Order Date,Salse Order Dato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Leverandør> Leverandør Type
DocType: Salary Component,Salary Component,Lønart
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Betalings Entries {0} er un-linked
DocType: GL Entry,Voucher No,Bilagsnr.
@@ -3401,7 +3408,7 @@
DocType: Leave Allocation,Leave Allocation,Fraværstildeling
DocType: Payment Request,Recipient Message And Payment Details,Modtager Besked Og Betalingsoplysninger
DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materialeanmodning {0} oprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materialeanmodning {0} oprettet
DocType: Restaurant Reservation,No of People,Ingen af mennesker
DocType: Production Planning Tool,Include sub-contracted raw materials,Medtag underleverandører råmaterialer
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Skabelon til vilkår eller kontrakt.
@@ -3465,7 +3472,7 @@
DocType: Production Planning Tool,Create Material Requests,Opret materialeanmodning
DocType: Employee Education,School/University,Skole / Universitet
DocType: Payment Request,Reference Details,Henvisning Detaljer
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet værdi efter brugstid skal være mindre end bruttokøbesummen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet værdi efter brugstid skal være mindre end bruttokøbesummen
DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængeligt antal på lageret
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Faktureret beløb
DocType: Asset,Double Declining Balance,Dobbelt Faldende Balance
@@ -3477,7 +3484,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Modtag nyhedsbrev
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} tilhører ikke firma {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Vælg mindst en værdi fra hver af attributterne.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materialeanmodning {0} er annulleret eller stoppet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materialeanmodning {0} er annulleret eller stoppet
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Fraværsadministration
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Sortér efter konto
DocType: Sales Order,Fully Delivered,Fuldt Leveres
@@ -3488,14 +3495,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Udbetalte beløb kan ikke være større end Lånebeløb {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Gå til Programmer
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Række {0} # Tildelt mængde {1} kan ikke være større end uanmeldt mængde {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning> Nummereringsserie
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Indkøbsordrenr. påkrævet for vare {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Produktionsordre ikke oprettet
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan ikke ændre status som studerende {0} er forbundet med student ansøgning {1}
DocType: Asset,Fully Depreciated,fuldt afskrevet
,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Kunden {0} hører ikke til sag {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Kunden {0} hører ikke til sag {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Markant Deltagelse HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citater er forslag, bud, du har sendt til dine kunder"
DocType: Sales Order,Customer's Purchase Order,Kundens indkøbsordre
@@ -3579,7 +3585,7 @@
DocType: Stock Settings,Item Naming By,Item Navngivning By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} findes ikke
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Konto {0} findes ikke
DocType: Project,Project Type,Sagstype
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Børneopgave eksisterer for denne opgave. Du kan ikke slette denne opgave.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
@@ -3681,11 +3687,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Afskrivninger Omkostninger center
DocType: Sales Order Item,Sales Order Date,Salgsordredato
DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,I alt ekskl. Skat
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Hvis markeret, vil alle underelementer i hvert produktionselement indgå i materialeanmodningerne."
DocType: Assessment Plan,Assessment Plan,Plan Assessment
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Kunden {0} er oprettet.
DocType: Stock Settings,Limit Percent,Begrænsningsprocent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Indstil venligst instruktørens navngivningssystem under Uddannelse> Uddannelsesindstillinger
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Der er i øjeblikket ingen lager på lageret
,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
DocType: Sample Collection,No. of print,Antal udskrifter
@@ -3701,12 +3707,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Debitorer ({0})
DocType: Pricing Rule,Margin,Margen
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Gross Profit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Gross Profit%
DocType: Appraisal Goal,Weightage (%),Vægtning (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Skift POS-profil
DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Vurderingsrapport
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttokøbesummen er obligatorisk
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruttokøbesummen er obligatorisk
DocType: Lead,Address Desc,Adresse
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party er obligatorisk
DocType: Journal Entry,JV-,JV-
@@ -3738,7 +3744,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stående navn
DocType: Stock Entry,Customer or Supplier Details,Kunde- eller leverandørdetaljer
DocType: Employee Loan Application,Required by Date,Kræves af Dato
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Afslutningsbalance (Dr - Cr)
DocType: Lead,Lead Owner,Emneejer
DocType: Bin,Requested Quantity,Anmodet mængde
DocType: Patient,Marital Status,Civilstand
@@ -3752,7 +3757,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Flere varianter
DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Leveret
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Log venligst ind som en anden bruger.
DocType: Territory,Territory Targets,Områdemål
@@ -3851,7 +3856,7 @@
DocType: Serial No,Out of AMC,Ud af AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Vedligeholdelse Besøg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
DocType: Company,Default Cash Account,Standard Kontant konto
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er baseret på deltagelse af denne Student
@@ -4002,7 +4007,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ingen ansatte for de nævnte kriterier
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Ingen stykliste-varer at fremstille
DocType: Restaurant,Default Customer,Standardkunden
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer> HR-indstillinger
DocType: Assessment Plan,Supervisor Name,supervisor Navn
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Bekræft ikke, om en aftale er oprettet for samme dag"
DocType: Program Enrollment Course,Program Enrollment Course,Tilmeldingskursusprogramm
@@ -4120,7 +4124,7 @@
DocType: BOM,Website Description,Hjemmesidebeskrivelse
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoændring i Equity
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nyeste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadresse skal være unik, findes allerede for {0}"
DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Kvittering
@@ -4137,7 +4141,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pengestrømsanalyse
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige det maksimale lånebeløb på {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Vælg dette felt, hvis du også ønsker at inkludere foregående regnskabsår fraværssaldo til indeværende regnskabsår"
DocType: GL Entry,Against Voucher Type,Mod Bilagstype
DocType: Physician,Phone (R),Telefon (R)
@@ -4149,7 +4153,7 @@
DocType: Patient,B Negative,B Negativ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Vedligeholdelsesstatus skal annulleres eller afsluttes for at indsende
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i række {0} stemmer ikke overens med Leveringsnotat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i række {0} stemmer ikke overens med Leveringsnotat
DocType: Student,Guardian Details,Guardian Detaljer
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Deltagelse for flere medarbejdere
@@ -4191,7 +4195,7 @@
DocType: Stock Entry Detail,Basic Amount,Grundbeløb
DocType: Training Event,Exam,Eksamen
DocType: Complaint,Complaint,Klage
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
DocType: Leave Allocation,Unused leaves,Ubrugte blade
DocType: Patient,Alcohol Past Use,Alkohol tidligere brug
DocType: Fertilizer Content,Fertilizer Content,Gødning Indhold
@@ -4315,6 +4319,7 @@
DocType: Salary Detail,Formula,Formel
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serienummer
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Salgskonto
DocType: Purchase Invoice Item,Total Weight,Totalvægt
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Salgsprovisioner
DocType: Offer Letter Term,Value / Description,/ Beskrivelse
@@ -4471,7 +4476,7 @@
DocType: Customer,From Lead,Fra Emne
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordrer frigivet til produktion.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
DocType: Program Enrollment Tool,Enroll Students,Tilmeld Studerende
DocType: Lab Test,Approved Date,Godkendt dato
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard salg
@@ -4547,7 +4552,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produktion Vare
,Employee Information,Medarbejder Information
DocType: Stock Entry Detail,Additional Cost,Yderligere omkostning
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",Kan ikke filtrere baseret på bilagsnr. hvis der sorteres efter Bilagstype
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",Kan ikke filtrere baseret på bilagsnr. hvis der sorteres efter Bilagstype
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Opret Leverandørtilbud
DocType: Quality Inspection,Incoming,Indgående
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standard skat skabeloner til salg og køb oprettes.
@@ -4564,7 +4569,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Bemærk: {0}
,Delivery Note Trends,Følgeseddel Tendenser
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Denne uges oversigt
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,På lager Antal
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,På lager Antal
DocType: Delivery Trip,Calculate Estimated Arrival Times,Beregn Anslåede ankomsttider
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Lagertransaktioner
DocType: Student Group Creation Tool,Get Courses,Hent kurser
@@ -4580,7 +4585,7 @@
DocType: Material Request,% Ordered,% Bestilt
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",For kursusbaseret studentegruppe vil kurset blive valideret for hver elev fra de tilmeldte kurser i programtilmelding.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Akkordarbejde
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Gns. købssats
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Gns. købssats
DocType: Task,Actual Time (in Hours),Faktisk tid (i timer)
DocType: Employee,History In Company,Historie I Company
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Ny besked fra {afsender}
@@ -4628,7 +4633,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Række {0}: Valuta af BOM # {1} skal være lig med den valgte valuta {2}
DocType: Journal Entry Account,Exchange Rate,Vekselkurs
DocType: Patient,Additional information regarding the patient,Yderligere oplysninger om patienten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Salgsordre {0} er ikke godkendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Salgsordre {0} er ikke godkendt
DocType: Homepage,Tag Line,tag Linje
DocType: Fee Component,Fee Component,Gebyr Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Firmabiler
@@ -4840,7 +4845,7 @@
DocType: Employee Education,Employee Education,Medarbejder Uddannelse
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Samme varegruppe findes to gange i varegruppetabellen
DocType: Land Unit,Parent Land Unit,Moderselskab
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
DocType: Fertilizer,Fertilizer Name,Gødning Navn
DocType: Salary Slip,Net Pay,Nettoløn
DocType: Account,Account,Konto
@@ -4919,7 +4924,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Kundegruppe er påkrævet i POS-profil
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Medarbejder Records.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Indtast Næste afskrivningsdato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Indtast Næste afskrivningsdato
DocType: HR Settings,Payroll Settings,Lønindstillinger
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
DocType: POS Settings,POS Settings,POS-indstillinger
@@ -5086,7 +5091,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Birthday Reminder for {0}
DocType: Asset Maintenance Task,Last Completion Date,Sidste sluttidspunkt
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dage siden sidste ordre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
DocType: Buying Settings,Naming Series,Navngivningsnummerserie
DocType: Leave Block List,Leave Block List Name,Blokering af fraværsansøgninger
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdato skal være mindre end Forsikring Slutdato
@@ -5212,6 +5217,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Hent betalingsposter
DocType: Quotation Item,Against Docname,Mod Docname
DocType: SMS Center,All Employee (Active),Alle medarbejdere (aktive)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kunde> Kundegruppe> Territorium
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
DocType: BOM,Raw Material Cost,Råmaterialeomkostninger
DocType: Item Reorder,Re-Order Level,Re-Order Level
@@ -5310,7 +5316,6 @@
DocType: Room,Seating Capacity,Seating Capacity
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Lab Test Grupper
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kunde> Kundegruppe> Territorium
DocType: Project,Total Expense Claim (via Expense Claims),Udlæg ialt (via Udlæg)
DocType: GST Settings,GST Summary,GST Sammendrag
DocType: Assessment Result,Total Score,Samlet score
@@ -5323,7 +5328,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Følgende kursusplaner blev oprettet
DocType: Journal Entry,Total Debit,Samlet debet
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard færdigvarer Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Salgsmedarbejder
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Salgsmedarbejder
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budget og Omkostningssted
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Flere standard betalingsmåder er ikke tilladt
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,for
@@ -5496,7 +5501,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
DocType: Driver,Driving License Category,Kørekort kategori
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øjeblikket en {1} leverandør scorecard stående, og købsordrer til denne leverandør bør udstedes med forsigtighed."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øjeblikket en {1} leverandør scorecard stående, og købsordrer til denne leverandør bør udstedes med forsigtighed."
DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
DocType: Employee Loan,Loan Type,Lånetype
DocType: Scheduling Tool,Scheduling Tool,Planlægning Tool
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 8ec9ddf..087fd18 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Nach Preis sortieren
,Delay Days,Verzögerungstage
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Dienstzeitaufwand
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Rechnung
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Machen Sie den Vorratsbestandseintrag
DocType: Purchase Invoice Item,Item Weight Details,Artikel Gewicht Details
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenz: {0}, Item Code: {1} und Kunde: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Stellenausschreibung
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},Die Stückliste ist für die Lohnbearbeitungseinheit {0} in der Zeile {1} nicht angegeben.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},Die Stückliste ist für die Lohnbearbeitungseinheit {0} in der Zeile {1} nicht angegeben.
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Ergebnis übermittelt
DocType: Item Attribute,Increment,Schrittweite
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Zeitspanne
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nicht zulässig für {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Holen Sie Elemente aus
DocType: Price List,Price Not UOM Dependant,Preis nicht UOM abhängig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Keine Artikel aufgeführt
DocType: Asset Repair,Error Description,Fehlerbeschreibung
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Lebensmittelgeschäft
DocType: Quality Inspection Reading,Reading 1,Ablesewert 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pensionsfonds
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nächstes Abschreibedatum kann nicht vor dem Kaufdatum sein
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Nächstes Abschreibedatum kann nicht vor dem Kaufdatum sein
DocType: Crop,Perennial,Staude
DocType: Consultation,Consultation Date,Konsultationsdatum
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktliste und Erkennung für ERPNext-Benutzer
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","z.B. ""Grundschule"" oder ""Universität"""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Lagerberichte
DocType: Warehouse,Warehouse Detail,Lagerdetail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Der Begriff Enddatum kann nicht später sein als das Jahr Enddatum des Akademischen Jahres an dem der Begriff verknüpft ist (Akademisches Jahr {}). Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ist Anlagevermögen"" kann nicht deaktiviert werden, da Anlagebuchung gegen den Artikel vorhanden"
DocType: Delivery Trip,Departure Time,Abfahrtszeit
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Spezifikationsdetails aufrufen
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Vorlagen der Lieferantenwertung.
DocType: Lead,Interested,Interessiert
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Eröffnung
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Eröffnung
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Von {0} bis {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Fehler beim Einrichten der Steuern
DocType: Item,Copy From Item Group,Von Artikelgruppe kopieren
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Abwesenheiten pro Jahr
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, ."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
DocType: Email Digest,Profit & Loss,Profiteinbuße
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Liter
DocType: Task,Total Costing Amount (via Time Sheet),Gesamtkostenbetrag (über Arbeitszeitblatt)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dies beruht auf Transaktionen gegen diese Gesellschaft. Siehe Zeitleiste unten für Details
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Bei Erstellung einer automatischen Materialanfrage per E-Mail benachrichtigen
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Beständig
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Rücksprache
DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
DocType: Opening Invoice Creation Tool,Invoice Type,Rechnungstyp
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Lieferschein
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Verwitwet
DocType: Request for Quotation,Request for Quotation,Angebotsanfrage
DocType: Healthcare Settings,Require Lab Test Approval,Erforderliche Labortests genehmigen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Artikelcode> Artikelgruppe> Marke
DocType: Salary Slip Timesheet,Working Hours,Arbeitszeit
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Absolut aussergewöhnlich
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Anfangs- / Ist-Wert eines Nummernkreises ändern.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Bitte die Kostenstelle eingeben
DocType: Drug Prescription,Dosage,Dosierung
DocType: Journal Entry Account,Sales Order,Kundenauftrag
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Durchschnittlicher Verkaufspreis
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Durchschnittlicher Verkaufspreis
DocType: Assessment Plan,Examiner Name,Prüfer-Name
DocType: Lab Test Template,No Result,Kein Ergebnis
DocType: Purchase Invoice Item,Quantity and Rate,Menge und Preis
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Wählen Sie Abrechnungsperiode
DocType: Purchase Invoice,Unpaid,Unbezahlt
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserviert für Verkauf
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Bitte richten Sie das Mitarbeiterbenennungssystem in Human Resource> HR Settings ein
DocType: Packing Slip,From Package No.,Von Paket Nr.
DocType: Item Attribute,To Range,Bis-Bereich
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Wertpapiere und Einlagen
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Werkstatt
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Warnung Bestellungen
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Genug Teile zu bauen
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genug Teile zu bauen
DocType: POS Profile User,POS Profile User,POS-Profilbenutzer
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte Erträge
DocType: Patient Appointment,Date TIme,Terminzeit
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Wenn nach Konto gruppiert wurde, kann nicht auf Grundlage des Kontos gefiltert werden."
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Wenn nach Konto gruppiert wurde, kann nicht auf Grundlage des Kontos gefiltert werden."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrativer Benutzer
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Gründung von Unternehmen und Steuern
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Bitte wählen Sie Kurs
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Differenzkonto
DocType: Purchase Invoice,Supplier GSTIN,Lieferant GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht geschlossen werden, da die von ihr abhängige Aufgabe {0} nicht geschlossen ist."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
DocType: Production Order,Additional Operating Cost,Zusätzliche Betriebskosten
DocType: Lab Test Template,Lab Routine,Laborroutine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetika
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Beziehung mit Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Leiter
DocType: Payment Entry,Payment From / To,Zahlung von / an
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Neue Kreditlimit ist weniger als die aktuellen ausstehenden Betrag für den Kunden. Kreditlimit hat atleast sein {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Neue Kreditlimit ist weniger als die aktuellen ausstehenden Betrag für den Kunden. Kreditlimit hat atleast sein {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Bitte Konto in Lager {0} setzen
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""basierend auf"" und ""guppiert nach"" können nicht gleich sein"
DocType: Sales Person,Sales Person Targets,Ziele für Vertriebsmitarbeiter
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Chargenname
DocType: Fee Validity,Max number of visit,Maximaler Besuch
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet erstellt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Einschreiben
DocType: GST Settings,GST Settings,GST-Einstellungen
DocType: Selling Settings,Customer Naming By,Benennung der Kunden nach
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Budget gegen
DocType: Employee,Cell Number,Mobiltelefonnummer
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Es gibt keinen Angestellten für die gegebenen Kriterien. Überprüfen Sie, ob Gehaltsabrechnungen nicht bereits erstellt wurden."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Automatische Materialanfragen generiert
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automatische Materialanfragen generiert
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Buchungssatz"" eingegeben werden"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,für die Herstellung Reserviert
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
DocType: Opportunity,Opportunity From,Chance von
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Monatliche Gehaltsabrechnung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Zeile {0}: {1} Für den Eintrag {2} benötigte Seriennummern. Du hast {3} zur Verfügung gestellt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Zeile {0}: {1} Für den Eintrag {2} benötigte Seriennummern. Du hast {3} zur Verfügung gestellt.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Bitte wählen Sie eine Tabelle
DocType: BOM,Website Specifications,Webseiten-Spezifikationen
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0} ist eine ungültige E-Mail-Adresse in ""Empfänger"""
@@ -1042,7 +1043,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Angebot angefordert
DocType: Vital Signs,Heart Rate / Pulse,Herzfrequenz / Puls
DocType: Company,Default Bank Account,Standardbankkonto
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Lager aktualisieren"" kann nicht ausgewählt werden, da Artikel nicht über {0} geliefert wurden"
DocType: Vehicle,Acquisition Date,Kaufdatum
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Stk
@@ -1066,7 +1067,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Laden Sie Ihren Briefkopf hoch (Halten Sie ihn webfreundlich wie 900px bis 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} darf keine Gruppe sein
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Artikel Row {idx}: {} {Doctype docname} existiert nicht in der oben '{Doctype}' Tisch
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,keine Vorgänge
DocType: Item Variant Settings,Copy Fields to Variant,Kopiere Felder auf Varianten
DocType: Asset,Opening Accumulated Depreciation,Öffnungs Kumulierte Abschreibungen
@@ -1178,9 +1179,10 @@
DocType: Production Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vertriebspartner und Territorium
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,Stückliste {0} muss aktiv sein
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Schließen (Eröffnung + Gesamt)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Schließen (Eröffnung + Gesamt)
DocType: Journal Entry,Depreciation Entry,Abschreibungs Eintrag
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Bitte zuerst den Dokumententyp auswählen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,In Kontowährung drucken
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialkontrolle {0} stornieren vor Abbruch dieses Wartungsbesuchs
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 Standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Seriennummer {0} gehört nicht zu Artikel {1}
@@ -1206,7 +1208,7 @@
DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
DocType: Fee Structure,Components,Komponenten
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1258,6 +1260,7 @@
,Company Name,Firmenname
DocType: SMS Center,Total Message(s),Summe Nachricht(en)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setzen Sie die Namensserie für {0} über Setup> Einstellungen> Namensserie
DocType: Purchase Invoice,Additional Discount Percentage,Zusätzlicher prozentualer Rabatt
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Sehen Sie eine Liste aller Hilfe-Videos
DocType: Agriculture Analysis Criteria,Soil Texture,Bodentextur
@@ -1285,7 +1288,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Webseitenartikel
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
DocType: Timesheet Detail,Bill,Rechnung
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Weiter Abschreibungen Datum wird als vergangenes Datum eingegeben
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Weiter Abschreibungen Datum wird als vergangenes Datum eingegeben
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Weiß
DocType: SMS Center,All Lead (Open),Alle Leads (offen)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Menge nicht für {4} in Lager {1} zum Zeitpunkt des Eintrags Entsendung ({2} {3})
@@ -1301,7 +1304,7 @@
DocType: Lead,Next Contact Date,Nächstes Kontaktdatum
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Anfangsmenge
DocType: Healthcare Settings,Appointment Reminder,Termin Erinnerung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
DocType: Program Enrollment Tool Student,Student Batch Name,Studentenstapelname
DocType: Consultation,Doctor,Arzt
DocType: Holiday List,Holiday List Name,Urlaubslistenname
@@ -1317,6 +1320,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Urlaubszuordnungs-Werkzeug
DocType: Item,Hub Category to Publish,Zu veröffentlichende Hub-Kategorie
DocType: Leave Block List,Leave Block List Dates,Urlaubssperrenliste Termine
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über Setup> Nummerierungsserie ein
DocType: Sales Invoice,Billing Address GSTIN,Rechnungsadresse Steuernummer
DocType: Assessment Plan,Evaluate,Bewerten
DocType: Workstation,Net Hour Rate,Nettostundensatz
@@ -1350,7 +1354,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-Ret
DocType: POS Profile,Sales Invoice Payment,Ausgangsrechnung-Zahlungen
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Lager im Kundenauftrag reserviert / Fertigwarenlager
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Verkaufsbetrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Verkaufsbetrag
DocType: Repayment Schedule,Interest Amount,Zinsbetrag
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sie sind der Ausgabenbewilliger für diesen Datensatz. Bitte aktualisieren Sie den ""Status"" und speichern Sie ihn ab"
DocType: Serial No,Creation Document No,Belegerstellungs-Nr.
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Eröffnungsbilanz
,GST Sales Register,GST Verkaufsregister
DocType: Sales Invoice Advance,Sales Invoice Advance,Anzahlung auf Ausgangsrechnung
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nichts anzufragen
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nichts anzufragen
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Wählen Sie Ihre Domains
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ein weitere Budgetplan '{0}' existiert bereits gegen {1} {2} 'für das Geschäftsjahr {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Felder werden nur zum Zeitpunkt der Erstellung kopiert.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dies wird an den Artikelcode der Variante angehängt. Beispiel: Wenn Ihre Abkürzung ""SM"" und der Artikelcode ""T-SHIRT"" sind, so ist der Artikelcode der Variante ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettolohn (in Worten) wird angezeigt, sobald Sie die Gehaltsabrechnung speichern."
DocType: Purchase Invoice,Is Return,Ist Rückgabe
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Vorsicht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Vorsicht
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Return / Lastschrift
DocType: Price List Country,Price List Country,Preisliste Land
DocType: Item,UOMs,Maßeinheiten
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelnummer kann nicht für Seriennummer geändert werden
DocType: Purchase Invoice Item,UOM Conversion Factor,Maßeinheit-Umrechnungsfaktor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Bitte geben Sie Item Code zu Chargennummer erhalten
@@ -1495,7 +1499,7 @@
DocType: Employee Loan Application,Repayment Info,Die Rückzahlung Info
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +446,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
DocType: Maintenance Team Member,Maintenance Role,Wartungsrolle
-apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Doppelte Zeile {0} mit dem gleichen {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},Dupliziere Zeile {0} mit demselben {1}
,Trial Balance,Probebilanz
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +438,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
apps/erpnext/erpnext/config/hr.py +305,Setting up Employees,Mitarbeiter anlegen
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
DocType: Supplier Scorecard,Warn for new Request for Quotations,Warnung für neue Angebotsanfrage
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Bestellungen helfen Ihnen bei der Planung und Follow-up auf Ihre Einkäufe
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Labortestverordnungen
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Die gesamte Ausgabe / Transfer Menge {0} in Material anfordern {1} \ kann nicht größer sein als die angeforderte Menge {2} für Artikel {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Kontaktinformation des Lager
DocType: Payment Entry,Write Off Difference Amount,Differenzbetrag Abschreibung
DocType: Volunteer,Volunteer Name,Freiwilliger Name
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Bitte richten Sie das Instructor Naming System in Education> Education Settings ein
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Mitarbeiter E-Mail nicht gefunden, E-Mail daher nicht gesendet"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Versandregel gilt nicht für Land {0}
DocType: Item,Foreign Trade Details,Außenhandelsdetails
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Gruppenrolle Nummer
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summe aller Aufgabe Gewichte sollten 1. Bitte stellen Sie Gewichte aller Projektaufgaben werden entsprechend
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Betriebsvermögen
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Es sind Unterlager für dieses Lager vorhanden. Sie können dieses Lager daher nicht löschen.
DocType: Item,Website Item Groups,Webseiten-Artikelgruppen
DocType: Purchase Invoice,Total (Company Currency),Gesamtsumme (Firmenwährung)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Seriennummer {0} wurde mehrfach erfasst
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Seriennummer {0} wurde mehrfach erfasst
DocType: Journal Entry,Journal Entry,Buchungssatz
DocType: Expense Claim Advance,Unclaimed amount,Nicht beanspruchte Menge
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} Elemente in Bearbeitung
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationsprotokoll
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Angebotsanfrage ist für den Zugriff aus dem Portal deaktiviert, für mehr Kontrolle Portaleinstellungen."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Einkaufsbetrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Einkaufsbetrag
DocType: Sales Invoice,Shipping Address Name,Lieferadresse Bezeichnung
DocType: Material Request,Terms and Conditions Content,Allgemeine Geschäftsbedingungen Inhalt
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Beim Erstellen des Kursplans sind Fehler aufgetreten
@@ -1890,7 +1893,7 @@
DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
DocType: Loan Type,Maximum Loan Amount,Maximaler Darlehensbetrag
DocType: Pricing Rule,Pricing Rule,Preisregel
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplikatrolle für Schüler {0}
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},Duplikat Rollennummer für den Schüler {0}
DocType: Budget,Action if Annual Budget Exceeded,Erwünschte Aktion bei überschrittenem jährlichem Budget
apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag
DocType: Shopping Cart Settings,Payment Success URL,Payment Success URL
@@ -1993,7 +1996,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dies basiert auf Protokollen gegen dieses Fahrzeug. Siehe Zeitleiste unten für Details
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
DocType: Customer,Default Price List,Standardpreisliste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sie können das Geschäftsjahr {0} nicht löschen. Das Geschäftsjahr {0} ist als Standard in den globalen Einstellungen festgelegt
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ein Kunde mit demselben Namen existiert bereits
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dies wird Gehaltsabrechnungen übermitteln und eine periodengerechte Journalbuchung erstellen. Willst du fortfahren?
@@ -2007,6 +2010,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Preisgestaltung
DocType: Quotation,Term Details,Details der Geschäftsbedingungen
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kann nicht mehr als {0} Studenten für diese Studentengruppe einschreiben.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Summe (ohne Steuern)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Anazhl Leads
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} muss größer 0 sein
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Lager verfügbar
@@ -2025,7 +2029,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Zahlung auf Annullierung der Rechnung
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Der eingegebene aktuelle Kilometerstand sollte größer sein als der Anfangskilometerstand {0}
DocType: Restaurant Reservation,No Show,Keine Show
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setzen Sie die Namensserie für {0} über Setup> Einstellungen> Namensserie
DocType: Shipping Rule Country,Shipping Rule Country,Versandregel für Land
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Urlaub und Anwesenheit
DocType: Maintenance Visit,Partially Completed,Teilweise abgeschlossen
@@ -2116,7 +2119,7 @@
DocType: Student Group Instructor,Student Group Instructor,Student Group Instructor
DocType: Grant Application,Assessment Mark (Out of 10),Bewertungsnote (von 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil Nein
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Haupt
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Haupt
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
DocType: Employee Attendance Tool,Employees HTML,Mitarbeiter HTML
@@ -2164,7 +2167,7 @@
DocType: Course,Course Abbreviation,Kurs Abkürzung
DocType: Student Leave Application,Student Leave Application,Student Urlaubsantrag
DocType: Item,Will also apply for variants,Gilt auch für Varianten
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Vermögen kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Vermögen kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Mitarbeiter {0} am {1} nur halbtags anwesend
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Insgesamt Arbeitszeit sollte nicht größer sein als die maximale Arbeitszeit {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Am
@@ -2348,9 +2351,10 @@
DocType: Task,Actual End Date (via Time Sheet),Das tatsächliche Enddatum (durch Zeiterfassung)
DocType: Soil Texture,Soil Type,Bodenart
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Neue Nachricht
,Quotation Trends,Trendanalyse Angebote
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Artikelgruppe ist im Artikelstamm für Artikel {0} nicht erwähnt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
DocType: Shipping Rule,Shipping Amount,Versandbetrag
DocType: Supplier Scorecard Period,Period Score,Periodenspieler
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Kunden hinzufügen
@@ -2361,7 +2365,7 @@
,Vehicle Expenses,Fahrzeugkosten
DocType: Serial No,Invoice Details,Rechnungs-Details
DocType: Grant Application,Show on Website,Auf der Website anzeigen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Erwartungswert nach Nutzungsdauer muss größer sein als oder gleich {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Erwartungswert nach Nutzungsdauer muss größer sein als oder gleich {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Beginnen am
DocType: Hub Category,Hub Category,Hub-Kategorie
DocType: Purchase Invoice,SEZ,SEZ
@@ -2392,7 +2396,7 @@
DocType: Patient,B Positive,B Positiv
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Menge muss 1 sein, als Element eine Anlage ist. Bitte verwenden Sie separate Zeile für mehrere Menge."
DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
DocType: Patient Medical Record,Patient Medical Record,Patient Medizinische Aufzeichnung
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Gruppe an konzernfremde
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2442,6 +2446,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,"Kann einen empfangenen RFQ nicht auf ""kein Zitat"" setzen."
DocType: Quotation,QTN-,ANG-
DocType: Salary Slip,Total Deduction,Gesamtabzug
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Wählen Sie ein Konto aus, das in der Kontowährung gedruckt werden soll"
,Production Analytics,Produktions-Analysen
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dies beruht auf Transaktionen gegen diesen Patienten. Siehe Zeitleiste unten für Details
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kosten aktualisiert
@@ -2496,7 +2501,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Firma auswählen...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Freilassen, wenn für alle Abteilungen gültig"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
DocType: Payroll Entry,Fortnightly,vierzehntägig
DocType: Currency Exchange,From Currency,Von Währung
DocType: Vital Signs,Weight (In Kilogram),Gewicht (in Kilogramm)
@@ -2572,7 +2577,7 @@
DocType: Student,Guardians,Wächter
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Die Preise werden nicht angezeigt, wenn Preisliste nicht gesetzt"
DocType: Stock Entry,Total Incoming Value,Summe der Einnahmen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debit Um erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debit Um erforderlich
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Zeiterfassungen helfen den Überblick über Zeit, Kosten und Abrechnung für Aktivitäten von Ihrem Team getan"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Vorlagen der Lieferanten-Scorecard-Variablen.
@@ -2673,7 +2678,7 @@
DocType: Company,For Reference Only.,Nur zu Referenzzwecken.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Arzt {0} nicht verfügbar auf {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Wählen Sie Batch No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-Ret
DocType: Fee Validity,Reference Inv,Referenz ERE
@@ -2710,8 +2715,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Arbeitsgänge und Betriebskosten angeben und eine eindeutige Arbeitsgang-Nr. für diesen Arbeitsgang angeben.
DocType: Water Analysis,Origin,Ursprung
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dieses Dokument ist über dem Limit von {0} {1} für item {4}. Machen Sie eine andere {3} gegen die gleiche {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Wählen Sie Änderungsbetrag Konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Wählen Sie Änderungsbetrag Konto
DocType: Purchase Invoice,Price List Currency,Preislistenwährung
DocType: Naming Series,User must always select,Benutzer muss immer auswählen
DocType: Stock Settings,Allow Negative Stock,Negativen Lagerbestand zulassen
@@ -2767,7 +2772,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Warnung für neue Bestellungen
DocType: Quality Inspection Reading,Reading 9,Ablesewert 9
DocType: Supplier,Is Frozen,Ist gesperrt
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Gruppenknoten Lager ist nicht für Transaktionen zu wählen erlaubt
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Gruppenknoten Lager ist nicht für Transaktionen zu wählen erlaubt
DocType: Buying Settings,Buying Settings,Einkaufs-Einstellungen
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stücklisten-Nr. für einen fertigen Artikel
DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
@@ -2781,6 +2786,7 @@
DocType: Grant Application,Organization,Firma
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Schülergruppenname
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Explosionsansicht anzeigen
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Gebühren anlegen
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Bitte sicher stellen, dass wirklich alle Transaktionen für diese Firma gelöscht werden sollen. Die Stammdaten bleiben bestehen. Diese Aktion kann nicht rückgängig gemacht werden."
DocType: Room,Room Number,Zimmernummer
@@ -2791,7 +2797,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Steuervorlage erstellen
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Benutzer-Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
DocType: Lab Test Sample,Lab Test Sample,Labortestprobe
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Schnellbuchung
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
@@ -2862,7 +2868,7 @@
DocType: Membership,USD,US Dollar
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Rechnung erstellen
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto schließen Gelegenheit nach 15 Tagen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Kaufaufträge sind für {0} wegen einer Scorecard von {1} nicht erlaubt.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Kaufaufträge sind für {0} wegen einer Scorecard von {1} nicht erlaubt.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Ende Jahr
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
@@ -2974,7 +2980,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Über 90
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nicht Konto {2} oder bereits abgestimmt gegen einen anderen Gutschein
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterien Gewicht
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Lieferant> Lieferantentyp
DocType: Buying Settings,Default Buying Price List,Standard-Einkaufspreisliste
DocType: Payroll Entry,Salary Slip Based on Timesheet,Gehaltsabrechnung Basierend auf Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kaufrate
@@ -3062,7 +3067,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Leads nach Branchentyp nachverfolgen
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Gehe zu Briefpapier
DocType: Item Supplier,Item Supplier,Artikellieferant
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle Adressen
DocType: Company,Stock Settings,Lager-Einstellungen
@@ -3251,6 +3256,7 @@
DocType: Company,Default Inventory Account,Standard Inventurkonto
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Abgeschlossen Menge muss größer als Null sein.
DocType: Antibiotic,Antibiotic Name,Antibiotika-Name
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Artikelcode> Artikelgruppe> Marke
DocType: Purchase Invoice,Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Art auswählen...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Eine Verknüpfung zu allen Landeinheiten, in denen die Kulturpflanze wächst"
@@ -3444,6 +3450,7 @@
DocType: Supplier,Credit Limit,Kreditlimit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Durchschn. Preislistenpreis verkaufen
DocType: Production Plan Sales Order,Salse Order Date,Bestelldatum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Lieferant> Lieferantentyp
DocType: Salary Component,Salary Component,Gehaltskomponente
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Zahlungs Einträge {0} sind un-linked
DocType: GL Entry,Voucher No,Belegnr.
@@ -3452,7 +3459,7 @@
DocType: Leave Allocation,Leave Allocation,Urlaubszuordnung
DocType: Payment Request,Recipient Message And Payment Details,Empfänger der Nachricht und Zahlungsdetails
DocType: Training Event,Trainer Email,Trainer E-Mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materialanfrage {0} erstellt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materialanfrage {0} erstellt
DocType: Restaurant Reservation,No of People,Nein von Menschen
DocType: Production Planning Tool,Include sub-contracted raw materials,Fügen Sie Unteraufträge Rohstoffe
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag
@@ -3516,7 +3523,7 @@
DocType: Production Planning Tool,Create Material Requests,Materialanfragen erstellen
DocType: Employee Education,School/University,Schule/Universität
DocType: Payment Request,Reference Details,Referenzdetails
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Erwartungswert nach der Ausmusterung muss kleiner sein als Bruttokaufbetrag
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Erwartungswert nach der Ausmusterung muss kleiner sein als Bruttokaufbetrag
DocType: Sales Invoice Item,Available Qty at Warehouse,Verfügbarer Lagerbestand
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Rechnungsbetrag
DocType: Asset,Double Declining Balance,Doppelte degressive
@@ -3528,7 +3535,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates abholen
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} gehört nicht zur Firma {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Wählen Sie mindestens einen Wert für jedes der Attribute aus.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Urlaube verwalten
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Gruppieren nach Konto
DocType: Sales Order,Fully Delivered,Komplett geliefert
@@ -3539,14 +3546,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zahlter Betrag kann nicht größer sein als Darlehensbetrag {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Gehen Sie zu Programme
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Zeile {0} # Der zugewiesene Betrag {1} darf nicht größer sein als der nicht beanspruchte Betrag {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über Setup> Nummerierungsserie ein
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Fertigungsauftrag nicht erstellt
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kann nicht den Status als Student ändern {0} ist mit Studenten Anwendung verknüpft {1}
DocType: Asset,Fully Depreciated,vollständig abgeschriebene
,Stock Projected Qty,Prognostizierte Lagerbestandsmenge
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Teilnahme HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",Angebote sind Offerten an einen Kunden zur Lieferung von Materialien bzw. zur Erbringung von Leistungen.
DocType: Sales Order,Customer's Purchase Order,Kundenauftrag
@@ -3630,7 +3636,7 @@
DocType: Stock Settings,Item Naming By,Artikelbezeichnung nach
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Eine weitere Periodenabschlussbuchung {0} wurde nach {1} erstellt
DocType: Production Order,Material Transferred for Manufacturing,Material zur Herstellung übertragen
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} existiert nicht
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Konto {0} existiert nicht
DocType: Project,Project Type,Projekttyp
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Untergeordnete Aufgabe existiert für diese Aufgabe. Sie können diese Aufgabe nicht löschen.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Entweder Zielstückzahl oder Zielmenge ist zwingend erforderlich.
@@ -3732,11 +3738,11 @@
DocType: Company,Asset Depreciation Cost Center,Kostenstelle für Anlagenabschreibung
DocType: Sales Order Item,Sales Order Date,Kundenauftrags-Datum
DocType: Sales Invoice Item,Delivered Qty,Gelieferte Stückzahl
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Gesamtpreis MwSt
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Wenn aktiviert, werden alle Unterartikel der einzelnen Produktionssartikel in die Materialanforderungen einbezogen."
DocType: Assessment Plan,Assessment Plan,Beurteilungsplan
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Kunde {0} wird erstellt.
DocType: Stock Settings,Limit Percent,Limit-Prozent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Bitte richten Sie das Instructor Naming System in Education> Education Settings ein
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Derzeit ist kein Bestand in einem Lager verfügbar
,Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf Rechnungsdatum
DocType: Sample Collection,No. of print,Anzahl Druck
@@ -3752,12 +3758,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Schuldnern ({0})
DocType: Pricing Rule,Margin,Marge
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Neue Kunden
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Rohgewinn %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Rohgewinn %
DocType: Appraisal Goal,Weightage (%),Gewichtung (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Ändern Sie das POS-Profil
DocType: Bank Reconciliation Detail,Clearance Date,Abrechnungsdatum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Beurteilung
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttokaufbetrag ist erforderlich
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruttokaufbetrag ist erforderlich
DocType: Lead,Address Desc,Adresszusatz
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Partei ist obligatorisch
DocType: Journal Entry,JV-,JV-
@@ -3774,7 +3780,7 @@
Grouped for test templates which are a group of other test templates.
<br>
No Result for tests with no results. Also, no Lab Test is created. e.g.. Sub Tests for Grouped results.","Single für Ergebnisse, die nur einen einzigen Eingang, Ergebnis UOM und Normalwert erfordern <br> Compound für Ergebnisse, die mehrere Eingabefelder mit entsprechenden Ereignisnamen, Ergebnis-UOMs und Normalwerten erfordern <br> Beschreibend für Tests mit mehreren Ergebniskomponenten und entsprechenden Ergebniserfassungsfeldern. <br> Gruppiert für Testvorlagen, die eine Gruppe von anderen Testvorlagen sind. <br> Kein Ergebnis für Tests ohne Ergebnisse. Außerdem wird kein Labortest erstellt. z.B. Sub-Tests für gruppierte Ergebnisse."
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +75,Row #{0}: Duplicate entry in References {1} {2},Zeile # {0}: Eintrag in Referenzen verdoppeln {1} {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +75,Row #{0}: Duplicate entry in References {1} {2},Zeile # {0}: Eintrag in Referenzen {1} {2} duplizieren
apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Ort, an dem Arbeitsgänge der Fertigung ablaufen."
apps/erpnext/erpnext/education/doctype/instructor/instructor.js +18,As Examiner,Als Prüfer
DocType: Asset Movement,Source Warehouse,Ausgangslager
@@ -3789,7 +3795,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Standing Name
DocType: Stock Entry,Customer or Supplier Details,Kunden- oder Lieferanten-Details
DocType: Employee Loan Application,Required by Date,Erforderlich by Date
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Schlussbilanz (Dr - Cr)
DocType: Lead,Lead Owner,Eigentümer des Leads
DocType: Bin,Requested Quantity,die angeforderte Menge
DocType: Patient,Marital Status,Familienstand
@@ -3803,7 +3808,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Mehrere Varianten
DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% geliefert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Prozentuale Aufteilung der monatsweisen Verteilung
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Bitte melden Sie sich als anderer Benutzer an.
DocType: Territory,Territory Targets,Ziele für die Region
@@ -3902,7 +3907,7 @@
DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Wartungsbesuch erstellen
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
DocType: Company,Default Cash Account,Standardbarkonto
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dies hängt von der Anwesenheit dieses Studierenden ab
@@ -4052,7 +4057,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Keine Mitarbeiter für die genannten Kriterien
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
DocType: Restaurant,Default Customer,Standardkunde
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Bitte richten Sie das Mitarbeiterbenennungssystem in Human Resource> HR Settings ein
DocType: Assessment Plan,Supervisor Name,Name des Vorgesetzten
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Bestätigen Sie nicht, ob der Termin für denselben Tag erstellt wurde"
DocType: Program Enrollment Course,Program Enrollment Course,Programm Einschreibung Kurs
@@ -4170,7 +4174,7 @@
DocType: BOM,Website Description,Webseiten-Beschreibung
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoveränderung des Eigenkapitals
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Neueste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, diese wird bereits für {0} verwendet"
DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Kaufbeleg
@@ -4187,7 +4191,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Geldflussrechnung
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Darlehensbetrag darf nicht höher als der Maximalbetrag {0} sein
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lizenz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertragen"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
DocType: GL Entry,Against Voucher Type,Gegenbeleg-Art
DocType: Physician,Phone (R),Telefon (R)
@@ -4199,7 +4203,7 @@
DocType: Patient,B Negative,B Negativ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Der Wartungsstatus muss abgebrochen oder zum Senden abgeschlossen werden
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein
DocType: Student,Guardian Details,Wächter-Details
DocType: C-Form,C-Form,Kontakt-Formular
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Anwesenheit für mehrere Mitarbeiter markieren
@@ -4241,7 +4245,7 @@
DocType: Stock Entry Detail,Basic Amount,Grundbetrag
DocType: Training Event,Exam,Prüfung
DocType: Complaint,Complaint,Beschwerde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
DocType: Patient,Alcohol Past Use,vergangener Alkoholkonsum
DocType: Fertilizer Content,Fertilizer Content,Dünger Inhalt
@@ -4365,6 +4369,7 @@
DocType: Salary Detail,Formula,Formel
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serien #
DocType: Lab Test Template,Lab Test Template,Labortestvorlage
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Verkaufskonto
DocType: Purchase Invoice Item,Total Weight,Gesamtgewicht
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Provision auf den Umsatz
DocType: Offer Letter Term,Value / Description,Wert / Beschreibung
@@ -4521,7 +4526,7 @@
DocType: Customer,From Lead,Von Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Für die Produktion freigegebene Bestellungen
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Geschäftsjahr auswählen ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
DocType: Program Enrollment Tool,Enroll Students,einschreiben Studenten
DocType: Lab Test,Approved Date,Genehmigter Termin
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard-Vertrieb
@@ -4597,7 +4602,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produktions-Artikel
,Employee Information,Mitarbeiterinformationen
DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Lieferantenangebot erstellen
DocType: Quality Inspection,Incoming,Eingehend
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standardsteuervorlagen für Verkauf und Einkauf werden erstellt.
@@ -4614,7 +4619,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Hinweis: {0}
,Delivery Note Trends,Entwicklung Lieferscheine
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Zusammenfassung dieser Woche
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Anzahl auf Lager
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Anzahl auf Lager
DocType: Delivery Trip,Calculate Estimated Arrival Times,Berechnen Sie die voraussichtliche Ankunftszeit
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kann nur über Lagertransaktionen aktualisiert werden
DocType: Student Group Creation Tool,Get Courses,Erhalten Sie Kurse
@@ -4630,7 +4635,7 @@
DocType: Material Request,% Ordered,% bestellt
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Für die Kursbasierte Studentengruppe wird der Kurs für jeden Schüler aus den eingeschriebenen Kursen in der Programmregistrierung validiert.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Akkordarbeit
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
DocType: Employee,History In Company,Historie im Unternehmen
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Neue Nachricht von {Absender}
@@ -4678,7 +4683,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Währung der BOM # {1} sollte auf die gewählte Währung gleich {2}
DocType: Journal Entry Account,Exchange Rate,Wechselkurs
DocType: Patient,Additional information regarding the patient,Zusätzliche Informationen zum Patienten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
DocType: Homepage,Tag Line,Tag-Linie
DocType: Fee Component,Fee Component,Fee-Komponente
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Flottenmanagement
@@ -4890,7 +4895,7 @@
DocType: Employee Education,Employee Education,Mitarbeiterschulung
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Doppelte Artikelgruppe in der Artikelgruppentabelle gefunden
DocType: Land Unit,Parent Land Unit,Elternlandeinheit
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
DocType: Fertilizer,Fertilizer Name,Dünger Name
DocType: Salary Slip,Net Pay,Nettolohn
DocType: Account,Account,Konto
@@ -4969,7 +4974,7 @@
DocType: Item Customer Detail,Ref Code,Ref-Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Kundengruppe ist im POS-Profil erforderlich
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Mitarbeiterdatensätze
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Bitte setzen Sie Next Abschreibungen Datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Bitte setzen Sie Next Abschreibungen Datum
DocType: HR Settings,Payroll Settings,Einstellungen zur Gehaltsabrechnung
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen
DocType: POS Settings,POS Settings,POS-Einstellungen
@@ -5136,7 +5141,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Geburtstagserinnerung für {0}
DocType: Asset Maintenance Task,Last Completion Date,Letztes Fertigstellungsdatum
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
DocType: Buying Settings,Naming Series,Nummernkreis
DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versicherung Startdatum sollte weniger als Versicherung Enddatum
@@ -5263,6 +5268,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Get Payment-Einträge
DocType: Quotation Item,Against Docname,Zu Dokumentenname
DocType: SMS Center,All Employee (Active),Alle Mitarbeiter (Aktiv)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kunde> Kundengruppe> Gebiet
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Jetzt ansehen
DocType: BOM,Raw Material Cost,Rohmaterialkosten
DocType: Item Reorder,Re-Order Level,Meldebestand
@@ -5361,7 +5367,6 @@
DocType: Room,Seating Capacity,Sitzplatzkapazität
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Labortestgruppen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kunde> Kundengruppe> Gebiet
DocType: Project,Total Expense Claim (via Expense Claims),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnungen)
DocType: GST Settings,GST Summary,GST Zusammenfassung
DocType: Assessment Result,Total Score,Gesamtpunktzahl
@@ -5374,7 +5379,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Folgende Kurspläne wurden erstellt
DocType: Journal Entry,Total Debit,Gesamt-Soll
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard-Fertigwarenlager
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vertriebsmitarbeiter
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vertriebsmitarbeiter
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budget und Kostenstellen
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Mehrere Standard-Zahlungsarten sind nicht erlaubt
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,für die
@@ -5547,7 +5552,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Steuern oder Gebühren berücksichtigen für
DocType: Driver,Driving License Category,Führerscheinkategorie
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Die tatsächliche Menge ist zwingend erforderlich
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} hat derzeit eine {1} Supplier Scorecard stehen, und Bestellungen an diesen Lieferanten sollten mit Vorsicht erteilt werden."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} hat derzeit eine {1} Supplier Scorecard stehen, und Bestellungen an diesen Lieferanten sollten mit Vorsicht erteilt werden."
DocType: Asset Maintenance Team,Asset Maintenance Team,Asset-Wartungsteam
DocType: Employee Loan,Loan Type,Art des Darlehens
DocType: Scheduling Tool,Scheduling Tool,Scheduling-Werkzeug
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index cdc5bc5..d6c9dc3 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ταξινόμηση κατά Τιμή
,Delay Days,Ημέρες καθυστέρησης
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Δαπάνη παροχής υπηρεσιών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Τιμολόγιο
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Δημιουργία καταχώρησης Αποθέματος Αποθήκευσης
DocType: Purchase Invoice Item,Item Weight Details,Λεπτομέρειες βάρους στοιχείου
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Αναφορά: {0}, Κωδικός είδους: {1} και Πελάτης: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Άνοιγμα θέσης εργασίας.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},Το BOM δεν έχει οριστεί για την υπεργολαβία του στοιχείου {0} στη σειρά {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},Το BOM δεν έχει οριστεί για την υπεργολαβία του στοιχείου {0} στη σειρά {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Αποτέλεσμα υποβολής
DocType: Item Attribute,Increment,Προσαύξηση
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Χρονικό διάστημα
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Δεν επιτρέπεται η {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Πάρτε τα στοιχεία από
DocType: Price List,Price Not UOM Dependant,Τιμή Δεν εξαρτάται από UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Προϊόν {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Δεν αναγράφονται στοιχεία
DocType: Asset Repair,Error Description,Περιγραφή σφάλματος
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Παντοπωλείο
DocType: Quality Inspection Reading,Reading 1,Μέτρηση 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Επόμενο Αποσβέσεις ημερομηνία αυτή δεν μπορεί να είναι πριν από την Ημερομηνία Αγοράς
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Επόμενο Αποσβέσεις ημερομηνία αυτή δεν μπορεί να είναι πριν από την Ημερομηνία Αγοράς
DocType: Crop,Perennial,Αιωνόβιος
DocType: Consultation,Consultation Date,Ημερομηνία διαβούλευσης
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Κατάλογος προϊόντων και ανακάλυψη για χρήστες ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",π.χ. «Δημοτικό Σχολείο» ή «Πανεπιστήμιο»
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Αναφορές απόθεμα
DocType: Warehouse,Warehouse Detail,Λεπτομέρειες αποθήκης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Το τέλος Όρος ημερομηνία δεν μπορεί να είναι μεταγενέστερη της χρονιάς Ημερομηνία Λήξης του Ακαδημαϊκού Έτους στην οποία ο όρος συνδέεται (Ακαδημαϊκό Έτος {}). Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Είναι Παγίων" δεν μπορεί να είναι ανεξέλεγκτη, καθώς υπάρχει Asset ρεκόρ έναντι του στοιχείου"
DocType: Delivery Trip,Departure Time,Ωρα αναχώρησης
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Βρες λεπτομέρειες προδιαγραφών
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Πρότυπα κατάταξης προμηθευτών.
DocType: Lead,Interested,Ενδιαφερόμενος
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Άνοιγμα
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Άνοιγμα
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Από {0} έως {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Αποτυχία ορισμού φόρων
DocType: Item,Copy From Item Group,Αντιγραφή από ομάδα ειδών
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Αφήνει ανά έτος
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Γραμμή {0}: παρακαλώ επιλέξτε το «είναι προκαταβολή» έναντι του λογαριασμού {1} αν αυτό είναι μια καταχώρηση προκαταβολής.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Η αποθήκη {0} δεν ανήκει στην εταιρεία {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Η αποθήκη {0} δεν ανήκει στην εταιρεία {1}
DocType: Email Digest,Profit & Loss,Απώλειες κερδών
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Λίτρο
DocType: Task,Total Costing Amount (via Time Sheet),Σύνολο Κοστολόγηση Ποσό (μέσω Ώρα Φύλλο)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,"Αυτό βασίζεται σε συναλλαγές έναντι αυτής της Εταιρείας. Για λεπτομέρειες, δείτε την παρακάτω χρονολογική σειρά"
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ειδοποίηση μέσω email σχετικά με την αυτόματη δημιουργία αιτήσης υλικού
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Ανθεκτικός
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Διαβουλεύσεις
DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
DocType: Opening Invoice Creation Tool,Invoice Type,Τύπος τιμολογίου
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Δελτίο αποστολής
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Χήρος
DocType: Request for Quotation,Request for Quotation,Αίτηση για προσφορά
DocType: Healthcare Settings,Require Lab Test Approval,Απαιτείται έγκριση δοκιμής εργαστηρίου
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Κωδικός στοιχείου> Ομάδα στοιχείων> Μάρκα
DocType: Salary Slip Timesheet,Working Hours,Ώρες εργασίας
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Σύνολο εξαιρετικών
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Αλλάξτε τον αρχικό/τρέχων αύξοντα αριθμός μιας υπάρχουσας σειράς.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
DocType: Drug Prescription,Dosage,Δοσολογία
DocType: Journal Entry Account,Sales Order,Παραγγελία πώλησης
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Μέση τιμή πώλησης
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Μέση τιμή πώλησης
DocType: Assessment Plan,Examiner Name,Όνομα εξεταστής
DocType: Lab Test Template,No Result,Κανένα αποτέλεσμα
DocType: Purchase Invoice Item,Quantity and Rate,Ποσότητα και τιμή
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Επιλέξτε Περίοδο Μισθοδοσίας
DocType: Purchase Invoice,Unpaid,Απλήρωτα
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Προορίζεται για την πώληση
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό> Ρυθμίσεις HR
DocType: Packing Slip,From Package No.,Από αρ. συσκευασίας
DocType: Item Attribute,To Range,Να Σειρά
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Κινητές αξίες και καταθέσεις
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Συνεργείο
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Προειδοποίηση παραγγελιών αγοράς
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Αρκετά τμήματα για να χτίσει
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Αρκετά τμήματα για να χτίσει
DocType: POS Profile User,POS Profile User,Χρήστης προφίλ POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Άμεσα έσοδα
DocType: Patient Appointment,Date TIme,Ημερομηνία ώρα
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Δεν μπορείτε να φιλτράρετε με βάση λογαριασμό, εάν είναι ομαδοποιημένες ανά λογαριασμό"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Δεν μπορείτε να φιλτράρετε με βάση λογαριασμό, εάν είναι ομαδοποιημένες ανά λογαριασμό"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Διοικητικός λειτουργός
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Δημιουργία εταιρείας και φόροι
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Επιλέξτε Course
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Λογαριασμός διαφορών
DocType: Purchase Invoice,Supplier GSTIN,Προμηθευτής GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Δεν μπορεί να κλείσει το έργο ως εξαρτώμενη εργασία του {0} δεν έχει κλείσει.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
DocType: Production Order,Additional Operating Cost,Πρόσθετο λειτουργικό κόστος
DocType: Lab Test Template,Lab Routine,Εργαστήριο Ρουτίνας
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Καλλυντικά
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Σχέση με Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Προϊστάμενος
DocType: Payment Entry,Payment From / To,Πληρωμή Από / Προς
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Νέο πιστωτικό όριο είναι μικρότερο από το τρέχον οφειλόμενο ποσό για τον πελάτη. Πιστωτικό όριο πρέπει να είναι atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Νέο πιστωτικό όριο είναι μικρότερο από το τρέχον οφειλόμενο ποσό για τον πελάτη. Πιστωτικό όριο πρέπει να είναι atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Ορίστε τον λογαριασμό στην αποθήκη {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Τα πεδία με βάση και ομαδοποίηση κατά δεν μπορεί να είναι ίδια
DocType: Sales Person,Sales Person Targets,Στόχοι πωλητή
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,παρτίδα Όνομα
DocType: Fee Validity,Max number of visit,Μέγιστος αριθμός επισκέψεων
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Εγγράφω
DocType: GST Settings,GST Settings,Ρυθμίσεις GST
DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,προϋπολογισμού κατά
DocType: Employee,Cell Number,Αριθμός κινητού
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Δεν υπάρχει υπάλληλος για τα συγκεκριμένα κριτήρια. Βεβαιωθείτε ότι δεν έχουν ήδη δημιουργηθεί οι μισθοί.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Αυτόματη Υλικό αιτήσεις που δημιουργούνται
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Αυτόματη Υλικό αιτήσεις που δημιουργούνται
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Απολεσθέν
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Που προορίζεται για την κατασκευή
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Ενέργεια
DocType: Opportunity,Opportunity From,Ευκαιρία από
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Σειρά {0}: {1} Σειριακοί αριθμοί που απαιτούνται για το στοιχείο {2}. Παρέχετε {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Σειρά {0}: {1} Σειριακοί αριθμοί που απαιτούνται για το στοιχείο {2}. Παρέχετε {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Επιλέξτε έναν πίνακα
DocType: BOM,Website Specifications,Προδιαγραφές δικτυακού τόπου
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0} μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου στους ""Παραλήπτες"""
@@ -1042,7 +1043,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Quote Ζητήθηκε
DocType: Vital Signs,Heart Rate / Pulse,Καρδιακός ρυθμός / παλμός
DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"«Ενημέρωση Αποθήκες» δεν μπορεί να ελεγχθεί, διότι τα στοιχεία δεν παραδίδονται μέσω {0}"
DocType: Vehicle,Acquisition Date,Ημερομηνία απόκτησης
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Αριθμοί
@@ -1066,7 +1067,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Μεταφορτώστε την επιστολή σας κεφάλι (Διατηρήστε το web φιλικό ως 900px by 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Ο λογαριασμός {2} δεν μπορεί να είναι μια ομάδα
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Στοιχείο Σειρά {idx}: {doctype} {docname} δεν υπάρχει στην παραπάνω »{doctype} 'τραπέζι
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Φύλλο κατανομής χρόνου {0} έχει ήδη ολοκληρωθεί ή ακυρωθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Φύλλο κατανομής χρόνου {0} έχει ήδη ολοκληρωθεί ή ακυρωθεί
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Δεν καθήκοντα
DocType: Item Variant Settings,Copy Fields to Variant,Αντιγραφή πεδίων στην παραλλαγή
DocType: Asset,Opening Accumulated Depreciation,Άνοιγμα Συσσωρευμένες Αποσβέσεις
@@ -1178,9 +1179,10 @@
DocType: Production Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Συνεργάτες πωλήσεων και Επικράτεια
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Κλείσιμο (Άνοιγμα + Σύνολο)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Κλείσιμο (Άνοιγμα + Σύνολο)
DocType: Journal Entry,Depreciation Entry,αποσβέσεις Έναρξη
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Παρακαλώ επιλέξτε τον τύπο του εγγράφου πρώτα
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Εκτύπωση στο νόμισμα λογαριασμού
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Ακύρωση επισκέψεων {0} πριν από την ακύρωση αυτής της επίσκεψης για συντήρηση
DocType: Crop Cycle,ISO 8016 standard,Πρότυπο ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Ο σειριακός αριθμός {0} δεν ανήκει στο είδος {1}
@@ -1206,7 +1208,7 @@
DocType: Supplier,Default Payable Accounts,Προεπιλεγμένοι λογαριασμοί πληρωτέων
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
DocType: Fee Structure,Components,εξαρτήματα
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1258,6 +1260,7 @@
,Company Name,Όνομα εταιρείας
DocType: SMS Center,Total Message(s),Σύνολο μηνυμάτων
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Πρόσθετες ποσοστό έκπτωσης
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Δείτε μια λίστα με όλα τα βίντεο βοήθειας
DocType: Agriculture Analysis Criteria,Soil Texture,Υφή του εδάφους
@@ -1285,7 +1288,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Ιστοσελίδα του Είδους
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
DocType: Timesheet Detail,Bill,Νομοσχέδιο
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Επόμενο αποσβέσεις Ημερομηνία εισάγεται ως τελευταία ημερομηνία
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Επόμενο αποσβέσεις Ημερομηνία εισάγεται ως τελευταία ημερομηνία
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Λευκό
DocType: SMS Center,All Lead (Open),Όλες οι Συστάσεις (ανοιχτές)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Σειρά {0}: Ποσότητα δεν είναι διαθέσιμη για {4} στην αποθήκη {1} στην απόσπαση χρόνο έναρξης ({2} {3})
@@ -1301,7 +1304,7 @@
DocType: Lead,Next Contact Date,Ημερομηνία επόμενης επικοινωνίας
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Αρχική ποσότητα
DocType: Healthcare Settings,Appointment Reminder,Υπενθύμιση συναντήσεων
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
DocType: Program Enrollment Tool Student,Student Batch Name,Φοιτητής παρτίδας Όνομα
DocType: Consultation,Doctor,Γιατρός
DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
@@ -1317,6 +1320,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Εργαλείο κατανομής αδειών
DocType: Item,Hub Category to Publish,Κατηγορία Hub για δημοσίευση
DocType: Leave Block List,Leave Block List Dates,Ημερομηνίες λίστας αποκλεισμού ημερών άδειας
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Παρακαλούμε ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του Setup> Series Numbering
DocType: Sales Invoice,Billing Address GSTIN,Διεύθυνση χρέωσης GSTIN
DocType: Assessment Plan,Evaluate,Αξιολογώ
DocType: Workstation,Net Hour Rate,Καθαρή τιμή ώρας
@@ -1350,7 +1354,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-αναδρομική έναρξη
DocType: POS Profile,Sales Invoice Payment,Τιμολόγιο πωλήσεων Πληρωμής
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Αποθήκη δεσμευμένων στις παραγγελίες πωλησης/ αποθήκη έτοιμων προϊόντων
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Ποσό πώλησης
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Ποσό πώλησης
DocType: Repayment Schedule,Interest Amount,Ποσό Τόκου
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
DocType: Serial No,Creation Document No,Αρ. εγγράφου δημιουργίας
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Άνοιγμα λογιστικό υπόλοιπο
,GST Sales Register,Μητρώο Πωλήσεων GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Προκαταβολή τιμολογίου πώλησης
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Τίποτα να ζητηθεί
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Τίποτα να ζητηθεί
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Επιλέξτε τους τομείς σας
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Άλλο ένα ρεκόρ Προϋπολογισμός '{0}' υπάρχει ήδη κατά {1} '{2}' για το οικονομικό έτος {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Τα πεδία θα αντιγραφούν μόνο κατά τη στιγμή της δημιουργίας.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Αυτό θα πρέπει να επισυνάπτεται στο κφδικό είδους της παραλλαγής. Για παράδειγμα, εάν η συντομογραφία σας είναι «sm» και ο κωδικός του είδους είναι ""t-shirt"", ο κωδικός του της παραλλαγής του είδους θα είναι ""t-shirt-sm"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Οι καθαρές αποδοχές (ολογράφως) θα είναι ορατές τη στιγμή που θα αποθηκεύσετε τη βεβαίωση αποδοχών
DocType: Purchase Invoice,Is Return,Είναι η επιστροφή
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Προσοχή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Προσοχή
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Επιστροφή / χρεωστικό σημείωμα
DocType: Price List Country,Price List Country,Τιμοκατάλογος Χώρα
DocType: Item,UOMs,Μ.Μ.
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} Έγκυροι σειριακοί αριθμοί για το είδος {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} Έγκυροι σειριακοί αριθμοί για το είδος {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ο κωδικός είδους δεν μπορεί να αλλάξει για τον σειριακό αριθμό
DocType: Purchase Invoice Item,UOM Conversion Factor,Συντελεστής μετατροπής Μ.Μ.
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Παρακαλώ εισάγετε τον κωδικό του Είδους να πάρει Αριθμός Παρτίδας
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
DocType: Supplier Scorecard,Warn for new Request for Quotations,Προειδοποίηση για νέα Αιτήματα για Προσφορές
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,εντολές αγοράς σας βοηθήσει να σχεδιάσετε και να παρακολουθούν τις αγορές σας
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Προδιαγραφές εργαστηριακών δοκιμών
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}","Η συνολική ποσότητα Issue / Μεταφορά {0} στο Αίτημα Υλικό {1} \ δεν μπορεί να είναι μεγαλύτερη από ό, τι ζητήσατε ποσότητα {2} για τη θέση {3}"
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Πληροφορίες επικοινωνίας για την αποθήκη
DocType: Payment Entry,Write Off Difference Amount,Γράψτε Off Διαφορά Ποσό
DocType: Volunteer,Volunteer Name,Όνομα εθελοντή
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση> Ρυθμίσεις Εκπαίδευσης
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Η δ/ση email του υπάλλήλου δεν βρέθηκε, το μυνημα δεν εστάλη"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Ο κανόνας αποστολής δεν ισχύει για τη χώρα {0}
DocType: Item,Foreign Trade Details,Εξωτερικού Εμπορίου Λεπτομέρειες
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Αριθμός Αριθμός Roll
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Σύνολο όλων των βαρών στόχος θα πρέπει να είναι: 1. Παρακαλώ ρυθμίστε τα βάρη όλων των εργασιών του έργου ανάλογα
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Κεφάλαιο εξοπλισμών
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Υπάρχει αποθήκη παιδί για αυτή την αποθήκη. Δεν μπορείτε να διαγράψετε αυτό αποθήκη.
DocType: Item,Website Item Groups,Ομάδες ειδών δικτυακού τόπου
DocType: Purchase Invoice,Total (Company Currency),Σύνολο (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Ο σειριακός αριθμός {0} εισήχθηκε περισσότερο από μία φορά
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Ο σειριακός αριθμός {0} εισήχθηκε περισσότερο από μία φορά
DocType: Journal Entry,Journal Entry,Λογιστική εγγραφή
DocType: Expense Claim Advance,Unclaimed amount,Ακυρωμένο ποσό
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} αντικείμενα σε εξέλιξη
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Αρχείο καταγραφής επικοινωνίας
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Αίτηση Προσφοράς είναι απενεργοποιημένη η πρόσβαση από την πύλη, για περισσότερες ρυθμίσεις πύλης ελέγχου."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Μεταβλητή βαθμολόγησης του Προμηθευτή Scorecard
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Ποσό αγοράς
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Ποσό αγοράς
DocType: Sales Invoice,Shipping Address Name,Όνομα διεύθυνσης αποστολής
DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Παρουσιάστηκαν σφάλματα κατά τη δημιουργία του προγράμματος μαθημάτων
@@ -1993,7 +1996,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Αυτό βασίζεται στα ημερολόγια του κατά αυτό το όχημα. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Δεν μπορείτε να διαγράψετε Χρήσεως {0}. Φορολογικό Έτος {0} έχει οριστεί ως προεπιλογή στο Καθολικές ρυθμίσεις
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ένας πελάτης με το ίδιο όνομα υπάρχει ήδη
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Αυτό θα παρουσιάσει τα μισθολογικά φύλλα και θα δημιουργήσει εγγραφή εισόδου περιοδικών. Θέλετε να συνεχίσετε?
@@ -2007,6 +2010,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,τιμολόγηση
DocType: Quotation,Term Details,Λεπτομέρειες όρων
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Δεν μπορούν να εγγραφούν περισσότερες από {0} μαθητές για αυτή την ομάδα των σπουδαστών.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Σύνολο (χωρίς Φόρο)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Αρχικός αριθμός
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} πρέπει να είναι μεγαλύτερη από μηδέν
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Διαθέσιμο διαθέσιμο
@@ -2025,7 +2029,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Αποσύνδεση Πληρωμή κατά την ακύρωσης της Τιμολόγιο
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Τρέχουσα ανάγνωση οδομέτρων τέθηκε πρέπει να είναι μεγαλύτερη από την αρχική του χιλιομετρητή του οχήματος {0}
DocType: Restaurant Reservation,No Show,Δεν δείχνουν
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ορίστε την Ονοματοδοσία Series για {0} μέσω του Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Αποστολές κανόνα της χώρας
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Αφήστε και φοίτηση
DocType: Maintenance Visit,Partially Completed,Ημιτελής
@@ -2116,7 +2119,7 @@
DocType: Student Group Instructor,Student Group Instructor,Φοιτητής ομάδας εκπαιδευτών
DocType: Grant Application,Assessment Mark (Out of 10),Βαθμός αξιολόγησης (από 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Όχι
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Κύριο
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Κύριο
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Παραλλαγή
DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
DocType: Employee Attendance Tool,Employees HTML,Οι εργαζόμενοι HTML
@@ -2164,7 +2167,7 @@
DocType: Course,Course Abbreviation,Σύντμηση γκολφ
DocType: Student Leave Application,Student Leave Application,Φοιτητής Αφήστε Εφαρμογή
DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Υπάλληλος {0} για Μισή μέρα στο {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Οι συνολικές ώρες εργασίας δεν πρέπει να είναι μεγαλύτερη από το ωράριο εργασίας max {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Στις
@@ -2348,9 +2351,10 @@
DocType: Task,Actual End Date (via Time Sheet),Πραγματική Ημερομηνία λήξης (μέσω Ώρα Φύλλο)
DocType: Soil Texture,Soil Type,Τύπος εδάφους
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Νέο μήνυμα
,Quotation Trends,Τάσεις προσφορών
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
DocType: Shipping Rule,Shipping Amount,Κόστος αποστολής
DocType: Supplier Scorecard Period,Period Score,Αποτέλεσμα περιόδου
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Προσθέστε πελάτες
@@ -2361,7 +2365,7 @@
,Vehicle Expenses,Έξοδα όχημα
DocType: Serial No,Invoice Details,Λεπτομέρειες τιμολογίου
DocType: Grant Application,Show on Website,Εμφάνιση στο δικτυακό τόπο
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Ξεκινήστε
DocType: Hub Category,Hub Category,Κατηγορία Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2392,7 +2396,7 @@
DocType: Patient,B Positive,Β Θετικό
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
DocType: Patient Medical Record,Patient Medical Record,Ιατρικό αρχείο ασθενούς
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Ομάδα για να μη Ομάδα
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Αθλητισμός
@@ -2442,6 +2446,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Δεν είναι δυνατή η ρύθμιση ενός ληφθέντος RFQ σε καμία παράθεση
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Επιλέξτε ένα λογαριασμό για εκτύπωση σε νόμισμα λογαριασμού
,Production Analytics,παραγωγή Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,"Αυτό βασίζεται σε συναλλαγές κατά αυτού του Ασθενούς. Για λεπτομέρειες, δείτε την παρακάτω γραμμή χρόνου"
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Κόστος Ενημερώθηκε
@@ -2496,7 +2501,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Επιλέξτε εταιρία...
DocType: Leave Control Panel,Leave blank if considered for all departments,Άφησε το κενό αν ισχύει για όλα τα τμήματα
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
DocType: Payroll Entry,Fortnightly,Κατά δεκατετραήμερο
DocType: Currency Exchange,From Currency,Από το νόμισμα
DocType: Vital Signs,Weight (In Kilogram),Βάρος (σε χιλιόγραμμα)
@@ -2572,7 +2577,7 @@
DocType: Student,Guardians,φύλακες
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Οι τιμές δεν θα εμφανίζεται αν Τιμοκατάλογος δεν έχει οριστεί
DocType: Stock Entry,Total Incoming Value,Συνολική εισερχόμενη αξία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Χρεωστικό να απαιτείται
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Χρεωστικό να απαιτείται
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Φύλλων βοηθήσει να παρακολουθείτε την ώρα, το κόστος και τη χρέωση για δραστηριότητες γίνεται από την ομάδα σας"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Τιμοκατάλογος αγορών
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Πρότυπα των μεταβλητών βαθμολογίας του προμηθευτή.
@@ -2673,7 +2678,7 @@
DocType: Company,For Reference Only.,Για αναφορά μόνο.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Ο γιατρός {0} δεν είναι διαθέσιμος στις {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Επιλέξτε Αριθμός παρτίδας
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Άκυρη {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Άκυρη {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-αναδρομική έναρξη
DocType: Fee Validity,Reference Inv,Αναφορά Inv
@@ -2710,8 +2715,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
DocType: Water Analysis,Origin,Προέλευση
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Το έγγραφο αυτό είναι πάνω από το όριο του {0} {1} για το στοιχείο {4}. Κάνετε μια άλλη {3} κατά την ίδια {2};
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
@@ -2767,7 +2772,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Προειδοποίηση για νέες παραγγελίες αγοράς
DocType: Quality Inspection Reading,Reading 9,Μέτρηση 9
DocType: Supplier,Is Frozen,Είναι Κατεψυγμένα
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,αποθήκη κόμβος ομάδας δεν επιτρέπεται να επιλέξετε για τις συναλλαγές
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,αποθήκη κόμβος ομάδας δεν επιτρέπεται να επιλέξετε για τις συναλλαγές
DocType: Buying Settings,Buying Settings,Ρυθμίσεις αγοράς
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Αρ. Λ.Υ. Για ένα τελικό καλό είδος
DocType: Upload Attendance,Attendance To Date,Προσέλευση μέχρι ημερομηνία
@@ -2781,6 +2786,7 @@
DocType: Grant Application,Organization,Οργάνωση
DocType: BOM Update Tool,BOM Update Tool,Εργαλείο ενημέρωσης BOM
DocType: SG Creation Tool Course,Student Group Name,Όνομα ομάδας φοιτητής
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Εμφάνιση αναλυτικής προβολής
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Δημιουργία τελών
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
DocType: Room,Room Number,Αριθμός δωματίου
@@ -2791,7 +2797,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Κάντε πρότυπο φόρου
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Φόρουμ Χρηστών
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
DocType: Lab Test Sample,Lab Test Sample,Δοκιμαστικό δείγμα εργαστηρίου
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
@@ -2862,7 +2868,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Δημιούργησε τιμολόγιο
DocType: Selling Settings,Auto close Opportunity after 15 days,Αυτόματη κοντά Ευκαιρία μετά από 15 ημέρες
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Οι εντολές αγοράς δεν επιτρέπονται για {0} λόγω μόνιμης θέσης {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Οι εντολές αγοράς δεν επιτρέπονται για {0} λόγω μόνιμης θέσης {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,στο τέλος του έτους
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Ποσοστό / Μόλυβδος%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
@@ -2974,7 +2980,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Παραπάνω
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Σειρά # {0}: Εφημερίδα Έναρξη {1} δεν έχει λογαριασμό {2} ή ήδη συγκρίνεται με ένα άλλο κουπόνι
DocType: Supplier Scorecard Criteria,Criteria Weight,Κριτήρια Βάρος
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Προμηθευτής> Τύπος προμηθευτή
DocType: Buying Settings,Default Buying Price List,Προεπιλεγμένος τιμοκατάλογος αγορών
DocType: Payroll Entry,Salary Slip Based on Timesheet,Μισθός Slip Βάσει Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Ποσοστό αγοράς
@@ -3062,7 +3067,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Παρακολούθηση επαφών με βάση τον τύπο βιομηχανίας.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Πηγαίνετε στο Letterheads
DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Όλες τις διευθύνσεις.
DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
@@ -3251,6 +3256,7 @@
DocType: Company,Default Inventory Account,Προεπιλεγμένος λογαριασμός αποθέματος
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Σειρά {0}: Ολοκληρώθηκε Ποσότητα πρέπει να είναι μεγαλύτερη από το μηδέν.
DocType: Antibiotic,Antibiotic Name,Όνομα αντιβιοτικού
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Κωδικός στοιχείου> Ομάδα στοιχείων> Μάρκα
DocType: Purchase Invoice,Apply Additional Discount On,Εφαρμόστε επιπλέον έκπτωση On
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Επιλέξτε Τύπο ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Ένας σύνδεσμος με όλες τις μονάδες γης στις οποίες αναπτύσσεται η καλλιέργεια
@@ -3444,6 +3450,7 @@
DocType: Supplier,Credit Limit,Πιστωτικό όριο
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Μέγ. Τιμοκατάλογος τιμών πώλησης
DocType: Production Plan Sales Order,Salse Order Date,Salse Παραγγελία Ημερομηνία
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Προμηθευτής> Τύπος προμηθευτή
DocType: Salary Component,Salary Component,μισθός Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Ενδείξεις πληρωμής {0} είναι μη-συνδεδεμένα
DocType: GL Entry,Voucher No,Αρ. αποδεικτικού
@@ -3452,7 +3459,7 @@
DocType: Leave Allocation,Leave Allocation,Κατανομή άδειας
DocType: Payment Request,Recipient Message And Payment Details,Μήνυμα παραλήπτη και τις λεπτομέρειες πληρωμής
DocType: Training Event,Trainer Email,εκπαιδευτής Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Οι αίτησης υλικού {0} δημιουργήθηκαν
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Οι αίτησης υλικού {0} δημιουργήθηκαν
DocType: Restaurant Reservation,No of People,Όχι των ανθρώπων
DocType: Production Planning Tool,Include sub-contracted raw materials,Περιλαμβάνουν υπεργολαβίας πρώτων υλών
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Πρότυπο των όρων ή της σύμβασης.
@@ -3516,7 +3523,7 @@
DocType: Production Planning Tool,Create Material Requests,Δημιουργία αιτήσεων υλικού
DocType: Employee Education,School/University,Σχολείο / πανεπιστήμιο
DocType: Payment Request,Reference Details,Λεπτομέρειες αναφοράς
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή πρέπει να είναι μικρότερο από το ακαθάριστο ποσό αγοράς
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή πρέπει να είναι μικρότερο από το ακαθάριστο ποσό αγοράς
DocType: Sales Invoice Item,Available Qty at Warehouse,Διαθέσιμη ποσότητα στην αποθήκη
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Χρεωμένο ποσό
DocType: Asset,Double Declining Balance,Διπλά φθίνοντος υπολοίπου
@@ -3528,7 +3535,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Λήψη ενημερώσεων
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Ο λογαριασμός {2} δεν ανήκει στην εταιρεία {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Επιλέξτε τουλάχιστον μία τιμή από κάθε ένα από τα χαρακτηριστικά.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Αφήστε Διαχείρισης
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Ομαδοποίηση κατά λογαριασμό
DocType: Sales Order,Fully Delivered,Έχει παραδοθεί πλήρως
@@ -3539,14 +3546,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Εκταμιευόμενο ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Μεταβείτε στα Προγράμματα
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Η σειρά {0} # Το κατανεμημένο ποσό {1} δεν μπορεί να είναι μεγαλύτερο από το ποσό που δεν ζητήθηκε {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Παρακαλούμε ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του Setup> Series Numbering
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Παραγγελία παραγωγή δεν δημιουργήθηκε
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""Από Ημερομηνία"" πρέπει να είναι μεταγενέστερο από το πεδίο ""Έως Ημερομηνία"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},δεν μπορεί να αλλάξει την κατάσταση ως φοιτητής {0} συνδέεται με την εφαρμογή των φοιτητών {1}
DocType: Asset,Fully Depreciated,αποσβεσθεί πλήρως
,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Αξιοσημείωτη Συμμετοχή HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Οι αναφορές είναι οι προτάσεις, οι προσφορές που έχουν στείλει στους πελάτες σας"
DocType: Sales Order,Customer's Purchase Order,Εντολή Αγοράς του Πελάτη
@@ -3630,7 +3636,7 @@
DocType: Stock Settings,Item Naming By,Ονομασία είδους κατά
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Μια ακόμη καταχώρηση κλεισίματος περιόδου {0} έχει γίνει μετά από {1}
DocType: Production Order,Material Transferred for Manufacturing,Υλικό το οποίο μεταφέρεται για Βιομηχανία
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Ο λογαριασμός {0} δεν υπάρχει
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Ο λογαριασμός {0} δεν υπάρχει
DocType: Project,Project Type,Τύπος έργου
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Υπάρχει εργασία παιδιού για αυτή την εργασία. Δεν μπορείτε να διαγράψετε αυτήν την εργασία.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα.
@@ -3732,11 +3738,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Κέντρο Αποσβέσεις Κόστους
DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης
DocType: Sales Invoice Item,Delivered Qty,Ποσότητα που παραδόθηκε
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Σύνολο εξαιρέσεων Φόρος
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Αν επιλεγεί, όλα τα παιδιά του κάθε στοιχείου παραγωγής θα πρέπει να περιλαμβάνονται στο υλικό αιτήματα."
DocType: Assessment Plan,Assessment Plan,σχέδιο αξιολόγησης
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Ο πελάτης {0} δημιουργείται.
DocType: Stock Settings,Limit Percent,όριο Ποσοστό
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Ρυθμίστε το Σύστημα Ονομάτων Εκπαιδευτών στην Εκπαίδευση> Ρυθμίσεις Εκπαίδευσης
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Επί του παρόντος δεν υπάρχει διαθέσιμο απόθεμα σε καμία αποθήκη
,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία τιμολογίου
DocType: Sample Collection,No. of print,Αριθ. Εκτύπωσης
@@ -3752,12 +3758,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Οφειλέτες ({0})
DocType: Pricing Rule,Margin,Περιθώριο
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Νέοι πελάτες
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Μικτό κέρδος (%)
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Μικτό κέρδος (%)
DocType: Appraisal Goal,Weightage (%),Ζύγισμα (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Αλλάξτε το προφίλ POS
DocType: Bank Reconciliation Detail,Clearance Date,Ημερομηνία εκκαθάρισης
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Έκθεση αξιολόγησης
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Ακαθάριστο ποσό αγοράς είναι υποχρεωτική
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Ακαθάριστο ποσό αγοράς είναι υποχρεωτική
DocType: Lead,Address Desc,Περιγραφή διεύθυνσης
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Κόμμα είναι υποχρεωτική
DocType: Journal Entry,JV-,JV-
@@ -3789,7 +3795,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Μόνιμο όνομα
DocType: Stock Entry,Customer or Supplier Details,Πελάτη ή προμηθευτή Λεπτομέρειες
DocType: Employee Loan Application,Required by Date,Απαιτείται από την Ημερομηνία
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Υπόλοιπο κλεισίματος (Dr-Cr)
DocType: Lead,Lead Owner,Ιδιοκτήτης επαφής
DocType: Bin,Requested Quantity,ζήτησε Ποσότητα
DocType: Patient,Marital Status,Οικογενειακή κατάσταση
@@ -3803,7 +3808,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Πολλαπλές παραλλαγές
DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Παραδόθηκαν
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Θέση {0}: Διέταξε ποσότητα {1} δεν μπορεί να είναι μικρότερη από την ελάχιστη ποσότητα προκειμένου {2} (ορίζεται στο σημείο).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Θέση {0}: Διέταξε ποσότητα {1} δεν μπορεί να είναι μικρότερη από την ελάχιστη ποσότητα προκειμένου {2} (ορίζεται στο σημείο).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ποσοστό μηνιαίας διανομής
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Συνδεθείτε ως άλλος χρήστης.
DocType: Territory,Territory Targets,Στόχοι περιοχών
@@ -3902,7 +3907,7 @@
DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
DocType: Company,Default Cash Account,Προεπιλεγμένος λογαριασμός μετρητών
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Αυτό βασίζεται στην συμμετοχή του φοιτητή
@@ -4052,7 +4057,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Δεν υπάρχουν υπάλληλοι για τα προαναφερθέντα κριτήρια
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
DocType: Restaurant,Default Customer,Προεπιλεγμένος πελάτης
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό> Ρυθμίσεις HR
DocType: Assessment Plan,Supervisor Name,Όνομα Επόπτη
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Μην επιβεβαιώνετε εάν το ραντεβού δημιουργείται για την ίδια ημέρα
DocType: Program Enrollment Course,Program Enrollment Course,Πρόγραμμα εγγραφής στο πρόγραμμα
@@ -4170,7 +4174,7 @@
DocType: BOM,Website Description,Περιγραφή δικτυακού τόπου
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Νεότερο
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Διεύθυνση e-mail πρέπει να είναι μοναδική, υπάρχει ήδη για {0}"
DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,ΑΠΟΔΕΙΞΗ ΠΛΗΡΩΜΗΣ
@@ -4187,7 +4191,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Κατάσταση ταμειακών ροών
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Άδεια
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Παρακαλώ επιλέξτε μεταφορά εάν θέλετε επίσης να περιλαμβάνεται το ισοζύγιο από το προηγούμενο οικονομικό έτος σε αυτό η χρήση
DocType: GL Entry,Against Voucher Type,Κατά τον τύπο αποδεικτικού
DocType: Physician,Phone (R),Τηλέφωνο (R)
@@ -4199,7 +4203,7 @@
DocType: Patient,B Negative,Β Αρνητικό
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Η κατάσταση συντήρησης πρέπει να ακυρωθεί ή να ολοκληρωθεί για υποβολή
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Οι σειριακοί αριθμοί στη σειρά {0} δεν ταιριάζουν με τη Σημείωση Παραλαβής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Οι σειριακοί αριθμοί στη σειρά {0} δεν ταιριάζουν με τη Σημείωση Παραλαβής
DocType: Student,Guardian Details,Guardian Λεπτομέρειες
DocType: C-Form,C-Form,C-form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark φοίτηση για πολλούς εργαζόμενους
@@ -4241,7 +4245,7 @@
DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
DocType: Training Event,Exam,Εξέταση
DocType: Complaint,Complaint,Καταγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
DocType: Patient,Alcohol Past Use,Χρήση αλκοόλ στο παρελθόν
DocType: Fertilizer Content,Fertilizer Content,Περιεκτικότητα σε λιπάσματα
@@ -4365,6 +4369,7 @@
DocType: Salary Detail,Formula,Τύπος
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Σειριακός αριθμός #
DocType: Lab Test Template,Lab Test Template,Πρότυπο δοκιμής εργαστηρίου
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Λογαριασμός πωλήσεων
DocType: Purchase Invoice Item,Total Weight,Συνολικό βάρος
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Προμήθεια επί των πωλήσεων
DocType: Offer Letter Term,Value / Description,Αξία / Περιγραφή
@@ -4522,7 +4527,7 @@
DocType: Customer,From Lead,Από Σύσταση
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Παραγγελίες ανοιχτές για παραγωγή.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
DocType: Program Enrollment Tool,Enroll Students,εγγραφούν μαθητές
DocType: Lab Test,Approved Date,Εγκεκριμένη ημερομηνία
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Πρότυπες πωλήσεις
@@ -4598,7 +4603,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Είδος παραγωγής
,Employee Information,Πληροφορίες υπαλλήλου
DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
DocType: Quality Inspection,Incoming,Εισερχόμενος
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Προεπιλεγμένα πρότυπα φόρου για τις πωλήσεις και την αγορά δημιουργούνται.
@@ -4615,7 +4620,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Σημείωση : {0}
,Delivery Note Trends,Τάσεις δελτίου αποστολής
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Περίληψη της Εβδομάδας
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Σε Απόθεμα Ποσότητα
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Σε Απόθεμα Ποσότητα
DocType: Delivery Trip,Calculate Estimated Arrival Times,Υπολογίστε τους εκτιμώμενους χρόνους άφιξης
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Ο λογαριασμός: {0} μπορεί να ενημερώνεται μόνο μέσω συναλλαγών αποθέματος
DocType: Student Group Creation Tool,Get Courses,Πάρτε μαθήματα
@@ -4631,7 +4636,7 @@
DocType: Material Request,% Ordered,% Παραγγέλθηκαν
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Για το Student Group, το μάθημα θα επικυρωθεί για κάθε φοιτητή από τα εγγεγραμμένα μαθήματα στην εγγραφή του προγράμματος."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Εργασία με το κομμάτι
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Μέση τιμή αγοράς
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Μέση τιμή αγοράς
DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
DocType: Employee,History In Company,Ιστορικό στην εταιρεία
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Νέο μήνυμα από {sender}
@@ -4679,7 +4684,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Σειρά {0}: Νόμισμα της BOM # {1} θα πρέπει να είναι ίσο με το επιλεγμένο νόμισμα {2}
DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
DocType: Patient,Additional information regarding the patient,Πρόσθετες πληροφορίες σχετικά με τον ασθενή
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
DocType: Homepage,Tag Line,Γραμμή ετικέτας
DocType: Fee Component,Fee Component,χρέωση Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Διαχείριση στόλου
@@ -4891,7 +4896,7 @@
DocType: Employee Education,Employee Education,Εκπαίδευση των υπαλλήλων
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Διπλότυπη ομάδα στοιχείο που βρέθηκαν στο τραπέζι ομάδα στοιχείου
DocType: Land Unit,Parent Land Unit,Μονάδα Γονικής Γης
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
DocType: Fertilizer,Fertilizer Name,Όνομα λιπάσματος
DocType: Salary Slip,Net Pay,Καθαρές αποδοχές
DocType: Account,Account,Λογαριασμός
@@ -4970,7 +4975,7 @@
DocType: Item Customer Detail,Ref Code,Κωδ. Αναφοράς
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Η ομάδα πελατών απαιτείται στο POS Profile
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Εγγραφές υπαλλήλων
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Παρακαλούμε να ορίσετε Επόμενο Αποσβέσεις Ημερομηνία
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Παρακαλούμε να ορίσετε Επόμενο Αποσβέσεις Ημερομηνία
DocType: HR Settings,Payroll Settings,Ρυθμίσεις μισθοδοσίας
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Ταίριαξε μη συνδεδεμένα τιμολόγια και πληρωμές.
DocType: POS Settings,POS Settings,Ρυθμίσεις POS
@@ -5137,7 +5142,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
DocType: Asset Maintenance Task,Last Completion Date,Τελευταία ημερομηνία ολοκλήρωσης
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
DocType: Buying Settings,Naming Series,Σειρά ονομασίας
DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ημερομηνία Ασφαλιστική Αρχή θα πρέπει να είναι μικρότερη από την ημερομηνία λήξης Ασφαλιστική
@@ -5263,6 +5268,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Πάρτε Καταχωρήσεις Πληρωμής
DocType: Quotation Item,Against Docname,Κατά όνομα εγγράφου
DocType: SMS Center,All Employee (Active),Όλοι οι υπάλληλοι (ενεργοί)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Πελάτης> Ομάδα πελατών> Επικράτεια
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Δείτε τώρα
DocType: BOM,Raw Material Cost,Κόστος πρώτων υλών
DocType: Item Reorder,Re-Order Level,Επίπεδο επαναπαραγγελίας
@@ -5361,7 +5367,6 @@
DocType: Room,Seating Capacity,Καθιστικό Χωρητικότητα
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Εργαστηριακές ομάδες δοκιμών
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Πελάτης> Ομάδα πελατών> Επικράτεια
DocType: Project,Total Expense Claim (via Expense Claims),Σύνολο αξίωση Εξόδων (μέσω αξιώσεις Εξόδων)
DocType: GST Settings,GST Summary,Σύνοψη GST
DocType: Assessment Result,Total Score,Συνολικό σκορ
@@ -5374,7 +5379,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Ακολούθησαν τα προγράμματα μαθημάτων
DocType: Journal Entry,Total Debit,Συνολική χρέωση
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Προεπιλογή Έτοιμα προϊόντα Αποθήκη
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Πωλητής
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Πωλητής
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Προϋπολογισμός και Κέντρο Κόστους
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Δεν επιτρέπεται πολλαπλή μέθοδος προεπιλογής πληρωμής
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,για το
@@ -5547,7 +5552,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Σκεφτείτε φόρο ή επιβάρυνση για
DocType: Driver,Driving License Category,Κατηγορία άδειας οδήγησης
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Η πραγματική ποσότητα είναι υποχρεωτική
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} έχει σήμερα μια {1} καρτέλα βαθμολογίας προμηθευτή και οι εντολές αγοράς σε αυτόν τον προμηθευτή πρέπει να εκδίδονται με προσοχή.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} έχει σήμερα μια {1} καρτέλα βαθμολογίας προμηθευτή και οι εντολές αγοράς σε αυτόν τον προμηθευτή πρέπει να εκδίδονται με προσοχή.
DocType: Asset Maintenance Team,Asset Maintenance Team,Ομάδα συντήρησης περιουσιακών στοιχείων
DocType: Employee Loan,Loan Type,Τύπος Δανείου
DocType: Scheduling Tool,Scheduling Tool,εργαλείο προγραμματισμού
diff --git a/erpnext/translations/es-MX.csv b/erpnext/translations/es-MX.csv
index 88a231f..f5fa025 100644
--- a/erpnext/translations/es-MX.csv
+++ b/erpnext/translations/es-MX.csv
@@ -2,7 +2,7 @@
DocType: Student Group Student,Student Group Student,Alumno de Grupo de Estudiantes
DocType: Delivery Note,% Installed,% Instalado
DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta de ganancia/pérdida en la disposición de activos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Por favor, introduzca la Vuenta para el Cambio Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Por favor, introduzca la Vuenta para el Cambio Monto"
DocType: Sales Order,SO-,OV-
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +246,Please set the Item Code first,"Por favor, primero define el Código del Artículo"
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar saldos de Ganancias y Perdidas de año fiscal sin cerrar
@@ -60,7 +60,7 @@
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Sólo Solicitudes de Permiso con estado ""Aprobado"" y ""Rechazado"" puede ser presentado"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,El almacén de origen y el de destino deben ser diferentes
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","El Artículo de Servico, el Tipo, la Frecuencia y la Cantidad de Gasto son requeridos"
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,El Importe Bruto de Compra es obligatorio
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,El Importe Bruto de Compra es obligatorio
DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
DocType: Lab Test Template,Standard Selling Rate,Tarifa de Venta Estándar
DocType: Program Enrollment,School House,Casa Escuela
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 73a8d12..f37e1b8 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -10,7 +10,7 @@
DocType: Packing Slip,From Package No.,Del Paquete N º
,Quotation Trends,Tendencias de Cotización
DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Promedio de Compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Promedio de Compra
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +315,Serial No {0} created,Número de orden {0} creado
DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
DocType: Production Order Operation,"in Minutes
@@ -67,7 +67,7 @@
DocType: Production Order,Actual Start Date,Fecha de inicio actual
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta
DocType: Delivery Note Item,Against Sales Order Item,Contra la Orden de Venta de Artículos
@@ -81,11 +81,11 @@
Se utiliza para las tasas y cargos"
DocType: BOM,Operating Cost,Costo de Funcionamiento
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totales del Objetivo
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por 'nombre'"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por 'nombre'"
DocType: Naming Series,Help HTML,Ayuda HTML
DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
DocType: Territory,Territory Targets,Territorios Objetivos
DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
DocType: Attendance,Employee Name,Nombre del Empleado
@@ -128,7 +128,7 @@
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Vista en árbol para la administración de los territorios
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Número de serie {0} entraron más de una vez
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Número de serie {0} entraron más de una vez
apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
DocType: Target Detail,Target Detail,Objetivo Detalle
DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
@@ -162,7 +162,7 @@
DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante
DocType: Item Reorder,Re-Order Level,Reordenar Nivel
DocType: Customer,Sales Team Details,Detalles del equipo de ventas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos en firme de los clientes.
DocType: Warranty Claim,Service Address,Dirección del Servicio
@@ -252,7 +252,7 @@
DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta
DocType: Item,Synced With Hub,Sincronizado con Hub
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Serie es obligatorio
,Item Shortage Report,Reportar carencia de producto
DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base del cliente
@@ -264,7 +264,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
DocType: Purchase Invoice Item,Serial No,Números de Serie
,Bank Reconciliation Statement,Extractos Bancarios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +187,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3}
@@ -347,7 +347,7 @@
DocType: Material Request,% Ordered,% Pedido
apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',La 'Fecha de inicio estimada' no puede ser mayor que la 'Fecha de finalización estimada'
DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero"
DocType: Delivery Stop,Contact Name,Nombre del Contacto
DocType: Quotation,Quotation Lost Reason,Cotización Pérdida Razón
DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales
@@ -358,14 +358,14 @@
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
DocType: Assessment Plan,Schedule,Horario
,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Solicitud de Material {0} creada
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Solicitud de Material {0} creada
DocType: Item,Has Variants,Tiene Variantes
DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
DocType: Quotation Item,Stock Balance,Balance de Inventarios
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
DocType: POS Profile,Write Off Cost Center,Centro de costos de desajuste
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar Solicitudes de ausencia en bloques de días.
DocType: Purchase Invoice Item,Net Rate,Tasa neta
DocType: Purchase Taxes and Charges,Reference Row #,Referencia Fila #
@@ -462,7 +462,7 @@
DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registro de Asistencia .
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
DocType: Purchase Invoice,Supplied Items,Artículos suministrados
DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas
DocType: Account,Debit,Débito
@@ -476,7 +476,7 @@
apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Hacer Visita de Mantenimiento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
DocType: Workstation,Rent Cost,Renta Costo
apps/erpnext/erpnext/hooks.py +142,Issues,Problemas
DocType: BOM Update Tool,Current BOM,Lista de materiales actual
@@ -613,7 +613,7 @@
DocType: Serial No,Out of AMC,Fuera de AMC
DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprobar Vacaciones
DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
must be greater than or equal to {2}","Fila {0}: Para establecer {1} periodicidad, diferencia entre desde y hasta la fecha \
debe ser mayor que o igual a {2}"
@@ -684,7 +684,7 @@
DocType: Stock Entry,Delivery Note No,No. de Nota de Entrega
DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
,Requested Items To Be Ordered,Solicitud de Productos Aprobados
DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
apps/erpnext/erpnext/accounts/doctype/account/account.py +81,Root cannot be edited.,Root no se puede editar .
@@ -762,7 +762,7 @@
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes Nuevos
DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Pieza de trabajo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
DocType: Item,Has Batch No,Tiene lote No
DocType: Serial No,Creation Document Type,Tipo de creación de documentos
@@ -846,7 +846,7 @@
DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
DocType: Fiscal Year,Year End Date,Año de Finalización
DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
apps/erpnext/erpnext/controllers/buying_controller.py +289,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0}
@@ -892,7 +892,7 @@
DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
DocType: Warehouse,Warehouse Detail,Detalle de almacenes
DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock
DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalle de Calendario de Mantenimiento
@@ -920,7 +920,7 @@
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Escasez Cantidad
,Cash Flow,Flujo de Caja
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Función que esta autorizada a presentar las transacciones que excedan los límites de crédito establecidos .
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1}
DocType: Stock Settings,Default Stock UOM,Unidad de Medida Predeterminada para Inventario
DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
@@ -929,7 +929,7 @@
DocType: Quotation Item,Quotation Item,Cotización del artículo
DocType: Employee,Date of Issue,Fecha de emisión
DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
DocType: Delivery Note Item,Against Sales Invoice Item,Contra la Factura de Venta de Artículos
DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Entradas en el diario de contabilidad.
@@ -994,7 +994,7 @@
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
,Sales Browser,Navegador de Ventas
DocType: Employee,Contact Details,Datos del Contacto
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Los usuarios que pueden aprobar las solicitudes de licencia de un empleado específico
apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar Solicitudes de Material ( MRP ) y Órdenes de Producción .
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index d0682a9..f351041 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ordenar por Precio
,Delay Days,Días de demora
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gasto de Servicio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Factura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Hacer la Entrada de Stock de Retención
DocType: Purchase Invoice Item,Item Weight Details,Detalles del Peso del Artículo
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, Código del Artículo: {1} y Cliente: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kilogramo
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un puesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},La Lista de Materiales no está especificada para la subcontratación del elemento {0} en la fila {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},La Lista de Materiales no está especificada para la subcontratación del elemento {0} en la fila {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultado enviado
DocType: Item Attribute,Increment,Incremento
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Espacio de tiempo
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},No está permitido para {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obtener artículos de
DocType: Price List,Price Not UOM Dependant,Precio no Dependiente de UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producto {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hay elementos en la lista
DocType: Asset Repair,Error Description,Descripción del Error
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Abarrotes
DocType: Quality Inspection Reading,Reading 1,Lectura 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fondo de pensiones
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Siguiente Fecha de Depreciación no puede ser anterior a la Fecha de Compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Siguiente Fecha de Depreciación no puede ser anterior a la Fecha de Compra
DocType: Crop,Perennial,Perenne
DocType: Consultation,Consultation Date,Fecha de Consulta
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Listado de productos y descubrimiento para usuarios de ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","por ejemplo, "escuela primaria" o "Universidad""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Reportes de Stock
DocType: Warehouse,Warehouse Detail,Detalles del Almacén
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La fecha final de duración no puede ser posterior a la fecha de fin de año del año académico al que está vinculado el término (año académico {}). Por favor, corrija las fechas y vuelve a intentarlo."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Es activo fijo"" no puede estar sin marcar, ya que existe registro de activos contra el elemento"
DocType: Delivery Trip,Departure Time,Hora de Salida
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Obtener especificaciones
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Plantillas de posiciones de proveedores.
DocType: Lead,Interested,Interesado
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Apertura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Desde {0} a {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Error al configurar los impuestos
DocType: Item,Copy From Item Group,Copiar desde grupo
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Ausencias por año
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
DocType: Email Digest,Profit & Loss,Perdidas & Ganancias
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litro
DocType: Task,Total Costing Amount (via Time Sheet),Importe total del cálculo del coste (mediante el cuadro de horario de trabajo)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Esto se basa en transacciones contra esta Compañía. Vea la cronología a continuación para más detalles
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistente
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi Moneda
DocType: Opening Invoice Creation Tool,Invoice Type,Tipo de factura
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Nota de entrega
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Viudo
DocType: Request for Quotation,Request for Quotation,Solicitud de Cotización
DocType: Healthcare Settings,Require Lab Test Approval,Requerir la aprobación de la Prueba de Laboratorio
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Código de artículo> Grupo de artículos> Marca
DocType: Salary Slip Timesheet,Working Hours,Horas de Trabajo
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total Excepcional
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, introduzca el centro de costos"
DocType: Drug Prescription,Dosage,Dosificación
DocType: Journal Entry Account,Sales Order,Orden de venta (OV)
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Precio de venta promedio
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Precio de venta promedio
DocType: Assessment Plan,Examiner Name,Nombre del examinador
DocType: Lab Test Template,No Result,Sin resultados
DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Precios
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Seleccione el Período de Nómina
DocType: Purchase Invoice,Unpaid,Impagado
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservado para venta
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos> Configuración de recursos humanos
DocType: Packing Slip,From Package No.,Desde Paquete Nro.
DocType: Item Attribute,To Range,A rango
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Taller
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avisar en Órdenes de Compra
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Piezas suficiente para construir
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Piezas suficiente para construir
DocType: POS Profile User,POS Profile User,Usuario de Perfil POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Ingreso directo
DocType: Patient Appointment,Date TIme,Fecha y Hora
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Funcionario administrativo
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Configuración de Compañía e Impuestos
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Por favor seleccione Curso
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Cuenta para la Diferencia
DocType: Purchase Invoice,Supplier GSTIN,GSTIN de Proveedor
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
DocType: Lab Test Template,Lab Routine,Rutina de Laboratorio
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Cosméticos
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relación con Tutor2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gerente
DocType: Payment Entry,Payment From / To,Pago de / a
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuevo límite de crédito es menor que la cantidad pendiente actual para el cliente. límite de crédito tiene que ser al menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuevo límite de crédito es menor que la cantidad pendiente actual para el cliente. límite de crédito tiene que ser al menos {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Configura la Cuenta en Almacén {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basado en' y 'Agrupar por' no pueden ser iguales
DocType: Sales Person,Sales Person Targets,Objetivos de ventas del vendedor
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Nombre del lote
DocType: Fee Validity,Max number of visit,Número máximo de visitas
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Tabla de Tiempo creada:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Inscribirse
DocType: GST Settings,GST Settings,Configuración de GST
DocType: Selling Settings,Customer Naming By,Ordenar cliente por
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Contra Presupuesto
DocType: Employee,Cell Number,Número de movil
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,No hay empleado para los criterios dados. Verifique que las hojas salariales aún no se hayan creado.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Solicitudes de Material Automáticamente Generadas
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Solicitudes de Material Automáticamente Generadas
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para la fabricación
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energía
DocType: Opportunity,Opportunity From,Oportunidad desde
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nómina mensual.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Números de serie necesarios para el elemento {2}. Ha proporcionado {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Números de serie necesarios para el elemento {2}. Ha proporcionado {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Por favor seleccione una mesa
DocType: BOM,Website Specifications,Especificaciones del sitio web
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} es una dirección de correo electrónico no válida en "Destinatarios"
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Presupuesto Solicitado
DocType: Vital Signs,Heart Rate / Pulse,Frecuencia Cardíaca / Pulso
DocType: Company,Default Bank Account,Cuenta bancaria por defecto
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar existencias' no puede marcarse porque los artículos no se han entregado mediante {0}
DocType: Vehicle,Acquisition Date,Fecha de Adquisición
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos.
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Suba su encabezado de carta (mantenlo compatible con la web como 900 px por 100 px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cuenta {2} no puede ser un grupo
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Elemento Fila {idx}: {doctype} {docname} no existe en la anterior tabla '{doctype}'
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Table de Tiempo {0} ya se haya completado o cancelado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Table de Tiempo {0} ya se haya completado o cancelado
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hay tareas
DocType: Item Variant Settings,Copy Fields to Variant,Copiar Campos a Variante
DocType: Asset,Opening Accumulated Depreciation,Apertura de la depreciación acumulada
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Socios Comerciales y Territorio
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Cierre (Apertura + Total)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Cierre (Apertura + Total)
DocType: Journal Entry,Depreciation Entry,Entrada de Depreciación
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Imprimir en moneda de la cuenta
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar visitas {0} antes de cancelar la visita de mantenimiento
DocType: Crop Cycle,ISO 8016 standard,Estándar ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
DocType: Fee Structure,Components,componentes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el artículo {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el artículo {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,{0} variantes actualizadas del producto
DocType: Quality Inspection Reading,Reading 6,Lectura 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,Nombre de compañía
DocType: SMS Center,Total Message(s),Total Mensage(s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Establezca Naming Series para {0} a través de Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Porcentaje de descuento adicional
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Ver una lista de todos los vídeos de ayuda
DocType: Agriculture Analysis Criteria,Soil Texture,Textura de la Tierra
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM de artículo del sitio web
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
DocType: Timesheet Detail,Bill,Cuenta
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La próxima fecha de depreciación se introduce como fecha pasada
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,La próxima fecha de depreciación se introduce como fecha pasada
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Blanco
DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no está disponible para {4} en el almacén {1} en el momento de publicación de la entrada ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,Siguiente fecha de contacto
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Cant. de Apertura
DocType: Healthcare Settings,Appointment Reminder,Recordatorio de Cita
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el importe de cambio"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el importe de cambio"
DocType: Program Enrollment Tool Student,Student Batch Name,Nombre de Lote del Estudiante
DocType: Consultation,Doctor,Doctor
DocType: Holiday List,Holiday List Name,Nombre de festividad
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Herramienta de asignación de vacaciones
DocType: Item,Hub Category to Publish,Categoría de Hub para Publicar
DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Configure las series de numeración para Asistencia a través de Configuración> Serie de numeración
DocType: Sales Invoice,Billing Address GSTIN,Dirección de facturación GSTIN
DocType: Assessment Plan,Evaluate,Evaluar
DocType: Workstation,Net Hour Rate,Tasa neta por hora
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Pago de Facturas de Venta
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Cantidad de venta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Cantidad de venta
DocType: Repayment Schedule,Interest Amount,Cantidad de Interés
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
DocType: Serial No,Creation Document No,Creación del documento No
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura de saldos contables
,GST Sales Register,Registro de ventas de GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nada que solicitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nada que solicitar
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Seleccione sus Dominios
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Otro registro de Presupuesto '{0}' ya existe en contra {1} '{2}' para el año fiscal {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Los campos se copiarán solo al momento de la creación.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial.
DocType: Purchase Invoice,Is Return,Es un retorno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Precaución
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Precaución
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Retorno / Nota de Débito
DocType: Price List Country,Price List Country,Lista de precios del país
DocType: Item,UOMs,UdM
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} núms. de serie válidos para el artículo {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} núms. de serie válidos para el artículo {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El código del producto no se puede cambiar por un número de serie
DocType: Purchase Invoice Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Por favor, introduzca el código de artículo para obtener el número de lote"
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Orden de venta {0} no es válida
DocType: Supplier Scorecard,Warn for new Request for Quotations,Avisar de nuevas Solicitudes de Presupuesto
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Las órdenes de compra le ayudará a planificar y dar seguimiento a sus compras
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescripciones para pruebas de laboratorio
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",La cantidad total de emisión / Transferencia {0} en la Solicitud de material {1} \ no puede ser mayor que la cantidad solicitada {2} para el artículo {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Información del Contacto en el Almacén
DocType: Payment Entry,Write Off Difference Amount,Amortizar importe de la diferencia
DocType: Volunteer,Volunteer Name,Nombre del Voluntario
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Configure el Sistema de nombres de instructor en Educación> Configuración educativa
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Regla de Envío no aplicable para el país {0}
DocType: Item,Foreign Trade Details,Detalles de Comercio Extranjero
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Grupo Número de rodillos
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de todos los pesos de tareas debe ser 1. Por favor ajusta los pesos de todas las tareas del proyecto en consecuencia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,BIENES DE CAPITAL
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,No se puede eliminar este almacén. Existe almacén hijo para este almacén.
DocType: Item,Website Item Groups,Grupos de productos en el sitio web
DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez
DocType: Journal Entry,Journal Entry,Asiento contable
DocType: Expense Claim Advance,Unclaimed amount,Cantidad no Reclamada
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} artículos en curso
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Registro de comunicaciones
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",Solicitud de Presupuesto está desactivado para acceder desde el portal. Comprobar la configuración del portal.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variable de puntuación de tarjeta de calificación del proveedor
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Importe de compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Importe de compra
DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío
DocType: Material Request,Terms and Conditions Content,Contenido de los términos y condiciones
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Hubo errores al crear el Programa del Curso
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Esta basado en registros contra este Vehículo. Ver el cronograma debajo para más detalles
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
DocType: Customer,Default Price List,Lista de precios por defecto
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Movimiento de activo {0} creado
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Movimiento de activo {0} creado
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No se puede eliminar el año fiscal {0}. Año fiscal {0} se establece por defecto en la configuración global
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ya existe un cliente con el mismo nombre
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Esto enviará hojas de salario y creará asientos acumulados. ¿Quieres proceder?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Precios
DocType: Quotation,Term Details,Detalles de términos y condiciones
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes para este grupo de estudiantes.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (sin impuestos)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Cuenta de Iniciativa
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} debe ser mayor que 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Disponible
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculación de Pago en la cancelación de la factura
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odómetro ingresada debe ser mayor que el cuentakilómetros inicial {0}
DocType: Restaurant Reservation,No Show,No Mostrar
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Establezca Naming Series para {0} a través de Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Regla de envio del país
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ausencia y Asistencia
DocType: Maintenance Visit,Partially Completed,Parcialmente completado
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instructor de Grupo Estudiantil
DocType: Grant Application,Assessment Mark (Out of 10),Marca de evaluación (de 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Móvil del Tutor2
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Principal
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
DocType: Employee Attendance Tool,Employees HTML,Empleados HTML
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,Abreviatura del Curso
DocType: Student Leave Application,Student Leave Application,Solicitud de Licencia para Estudiante
DocType: Item,Will also apply for variants,También se aplicará para las variantes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya es {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya es {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Empleado {0} del medio día del {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Total de horas de trabajo no deben ser mayores que las horas de trabajo max {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Encendido
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),Fecha de finalización real (a través de hoja de horas)
DocType: Soil Texture,Soil Type,Tipo de Suelo
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nuevo Mensaje
,Quotation Trends,Tendencias de Presupuestos
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
DocType: Shipping Rule,Shipping Amount,Monto de envío
DocType: Supplier Scorecard Period,Period Score,Puntuación del Período
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Agregar Clientes
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,Los gastos del vehículo
DocType: Serial No,Invoice Details,Detalles de la factura
DocType: Grant Application,Show on Website,Mostrar en el Sitio Web
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Comienza en
DocType: Hub Category,Hub Category,Categoría de Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,B Positivo
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila #{0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para cantidad múltiple."
DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
DocType: Patient Medical Record,Patient Medical Record,Registro Médico del Paciente
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupo a No-Grupo
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Deportes
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,No se puede establecer una Solicitud de Cotización (RFQ= recibida sin ninguna Cotización
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Deducción Total
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Seleccione una cuenta para imprimir en la moneda de la cuenta
,Production Analytics,Análisis de Producción
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Esto se basa en transacciones contra este Paciente. Vea la cronología a continuación para más detalles
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Costo actualizado
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleccione la compañía...
DocType: Leave Control Panel,Leave blank if considered for all departments,Deje en blanco si se utilizará para todos los departamentos
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante, etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
DocType: Payroll Entry,Fortnightly,Quincenal
DocType: Currency Exchange,From Currency,Desde Moneda
DocType: Vital Signs,Weight (In Kilogram),Peso (en kilogramo)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,Tutores
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Los precios no se muestran si la lista de precios no se ha establecido
DocType: Stock Entry,Total Incoming Value,Valor total de entradas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Débito Para es requerido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Débito Para es requerido
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Las Tablas de Tiempos ayudan a mantener la noción del tiempo, el coste y la facturación de actividades realizadas por su equipo"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantillas de variables de Calificación de Proveedores.
@@ -2654,7 +2659,7 @@
DocType: Company,For Reference Only.,Sólo para referencia.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},El Médico {0} no está disponible en {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Seleccione Lote No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No válido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},No válido {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Factura de Referencia
@@ -2691,8 +2696,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
DocType: Water Analysis,Origin,Origen
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está por encima del límite de {0} {1} para el elemento {4}. ¿Estás haciendo otra {3} contra el mismo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Por favor configura recurrente después de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Seleccione la cuenta de cambio
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Por favor configura recurrente después de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Seleccione la cuenta de cambio
DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
DocType: Naming Series,User must always select,El usuario deberá elegir siempre
DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
@@ -2748,7 +2753,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Avisar para nuevas Órdenes de Compra
DocType: Quality Inspection Reading,Reading 9,Lectura 9
DocType: Supplier,Is Frozen,Se encuentra congelado(a)
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,No se permite seleccionar el almacén de nodos de grupo para operaciones
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,No se permite seleccionar el almacén de nodos de grupo para operaciones
DocType: Buying Settings,Buying Settings,Configuración de compras
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Lista de materiales (LdM) para el producto terminado
DocType: Upload Attendance,Attendance To Date,Asistencia a la Fecha
@@ -2762,6 +2767,7 @@
DocType: Grant Application,Organization,Organización
DocType: BOM Update Tool,BOM Update Tool,Herramienta de actualización de Lista de Materiales (BOM)
DocType: SG Creation Tool Course,Student Group Name,Nombre del grupo de estudiante
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Mostrar vista explosionada
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creación de Tarifas
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegurate de que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
DocType: Room,Room Number,Número de habitación
@@ -2772,7 +2778,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Hacer una plantilla de impuestos
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foro de Usuarios
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos con envío triangulado."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos con envío triangulado."
DocType: Lab Test Sample,Lab Test Sample,Muestra de Prueba de Laboratorio
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Asiento Contable Rápido
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
@@ -2843,7 +2849,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Hacer Factura
DocType: Selling Settings,Auto close Opportunity after 15 days,Cerrar Oportunidad automáticamente luego de 15 días
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Las órdenes de compra no están permitidas para {0} debido a una tarjeta de puntuación de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Las órdenes de compra no están permitidas para {0} debido a una tarjeta de puntuación de {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Año final
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Cotización / Iniciativa %
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
@@ -2935,7 +2941,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 o más
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila #{0}: Asiento {1} no tiene cuenta {2} o ya compara con otro bono
DocType: Supplier Scorecard Criteria,Criteria Weight,Peso del Criterio
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Proveedor> Tipo de proveedor
DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
DocType: Payroll Entry,Salary Slip Based on Timesheet,Nomina basada en el Parte de Horas
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tipo de Cambio de Compra
@@ -3023,7 +3028,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Ir a Membretes
DocType: Item Supplier,Item Supplier,Proveedor del Producto
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} quotation_to {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todas las direcciones.
DocType: Company,Stock Settings,Configuración de inventarios
@@ -3212,6 +3217,7 @@
DocType: Company,Default Inventory Account,Cuenta de Inventario Predeterminada
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Cantidad completada debe ser mayor que cero.
DocType: Antibiotic,Antibiotic Name,Nombre del Antibiótico
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Código de artículo> Grupo de artículos> Marca
DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Seleccione Tipo...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Un enlace a todas las unidades de tierra en las que crece la cosecha
@@ -3405,6 +3411,7 @@
DocType: Supplier,Credit Limit,Límite de Crédito
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Promedio Precio de la Lista de Precios de Venta
DocType: Production Plan Sales Order,Salse Order Date,Fecha de Orden de Venta
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Proveedor> Tipo de proveedor
DocType: Salary Component,Salary Component,Componente Salarial
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Las entradas de pago {0} estan no-relacionadas
DocType: GL Entry,Voucher No,Comprobante No.
@@ -3413,7 +3420,7 @@
DocType: Leave Allocation,Leave Allocation,Asignación de vacaciones
DocType: Payment Request,Recipient Message And Payment Details,Mensaje receptor y formas de pago
DocType: Training Event,Trainer Email,Correo electrónico del entrenador
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Requisición de materiales {0} creada
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Requisición de materiales {0} creada
DocType: Restaurant Reservation,No of People,Nro de Personas
DocType: Production Planning Tool,Include sub-contracted raw materials,Incluya materias primas subcontratados
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
@@ -3477,7 +3484,7 @@
DocType: Production Planning Tool,Create Material Requests,Crear Requisición de Materiales
DocType: Employee Education,School/University,Escuela / Universidad.
DocType: Payment Request,Reference Details,Detalles Referencia
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperado después de la vida útil debe ser inferior al importe bruto de compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperado después de la vida útil debe ser inferior al importe bruto de compra
DocType: Sales Invoice Item,Available Qty at Warehouse,Cantidad Disponible en Almacén
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Importe facturado
DocType: Asset,Double Declining Balance,Doble Disminución de Saldo
@@ -3489,7 +3496,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtener Actualizaciones
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Cuenta {2} no pertenece a la compañía {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Seleccione al menos un valor de cada uno de los atributos.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Gestión de ausencias
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Agrupar por cuenta
DocType: Sales Order,Fully Delivered,Entregado completamente
@@ -3500,14 +3507,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Monto desembolsado no puede ser mayor que Monto del préstamo {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Ir a Programas
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Fila {0} # Cantidad Asignada {1} no puede ser mayor que la Cantidad no Reclamada {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Configure las series de numeración para Asistencia a través de Configuración> Serie de numeración
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Orden de producción no se ha creado
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},No se puede cambiar el estado de estudiante {0} está vinculada con la aplicación del estudiante {1}
DocType: Asset,Fully Depreciated,Totalmente depreciado
,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Asistencia Marcada HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Las citas son propuestas, las ofertas que ha enviado a sus clientes"
DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
@@ -3591,7 +3597,7 @@
DocType: Stock Settings,Item Naming By,Ordenar productos por
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
DocType: Production Order,Material Transferred for Manufacturing,Material Transferido para la Producción
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,La cuenta {0} no existe
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,La cuenta {0} no existe
DocType: Project,Project Type,Tipo de proyecto
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Existe Tarea Hija para esta Tarea. No puedes eliminar esta Tarea.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Es obligatoria la meta fe facturación.
@@ -3693,11 +3699,11 @@
DocType: Company,Asset Depreciation Cost Center,Centro de la amortización del coste de los activos
DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
DocType: Sales Invoice Item,Delivered Qty,Cantidad entregada
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Total Excl. Impuesto
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si se selecciona, todos los hijos de cada elemento de la producción se incluirán en las solicitudes de materiales."
DocType: Assessment Plan,Assessment Plan,Plan de Evaluación
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Se crea el Cliente {0}.
DocType: Stock Settings,Limit Percent,límite de porcentaje
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Configure el Sistema de nombres de instructor en Educación> Configuración educativa
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Actualmente no hay stock disponible en ningún almacén
,Payment Period Based On Invoice Date,Periodos de pago según facturas
DocType: Sample Collection,No. of print,Nro de impresión
@@ -3713,12 +3719,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Deudores ({0})
DocType: Pricing Rule,Margin,Margen
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuevos clientes
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Beneficio Bruto %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Beneficio Bruto %
DocType: Appraisal Goal,Weightage (%),Porcentaje (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Cambiar el Perfil de POS
DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Informe de evaluación
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Importe Bruto de Compra es obligatorio
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Importe Bruto de Compra es obligatorio
DocType: Lead,Address Desc,Dirección
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Parte es obligatoria
DocType: Journal Entry,JV-,JV-
@@ -3750,7 +3756,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Nombre en uso
DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
DocType: Employee Loan Application,Required by Date,Requerido por Fecha
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Saldo de cierre (Dr - Cr)
DocType: Lead,Lead Owner,Propietario de la iniciativa
DocType: Bin,Requested Quantity,Cantidad requerida
DocType: Patient,Marital Status,Estado Civil
@@ -3764,7 +3769,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Multiples Variantes
DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Entregado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Por favor inicie sesión como otro usuario.
DocType: Territory,Territory Targets,Metas de territorios
@@ -3863,7 +3868,7 @@
DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Crear visita de mantenimiento
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Configuración general del sistema.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basado en la asistencia de este estudiante
@@ -4013,7 +4018,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Sin empleados por los criterios mencionados
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
DocType: Restaurant,Default Customer,Cliente predeterminado
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos> Configuración de recursos humanos
DocType: Assessment Plan,Supervisor Name,Nombre del supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,No confirme si la cita se crea para el mismo día
DocType: Program Enrollment Course,Program Enrollment Course,Inscripción al Programa Curso
@@ -4131,7 +4135,7 @@
DocType: BOM,Website Description,Descripción del Sitio Web
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Cambio en el Patrimonio Neto
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,El Más Nuevo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Dirección de correo electrónico debe ser única, ya existe para {0}"
DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Recibo
@@ -4148,7 +4152,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estado de Flujos de Efectivo
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Monto del préstamo no puede exceder cantidad máxima del préstamo de {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año
DocType: GL Entry,Against Voucher Type,Tipo de comprobante
DocType: Physician,Phone (R),Teléfono (R)
@@ -4160,7 +4164,7 @@
DocType: Patient,B Negative,B Negativo
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,El Estado de Mantenimiento debe ser Cancelado o Completado para Enviar
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Los números de serie en la fila {0} no coinciden con Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Los números de serie en la fila {0} no coinciden con Nota de entrega
DocType: Student,Guardian Details,Detalles del Tutor
DocType: C-Form,C-Form,C - Forma
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Asistencia para múltiples empleados
@@ -4202,7 +4206,7 @@
DocType: Stock Entry Detail,Basic Amount,Importe Base
DocType: Training Event,Exam,Examen
DocType: Complaint,Complaint,Queja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
DocType: Leave Allocation,Unused leaves,Ausencias no utilizadas
DocType: Patient,Alcohol Past Use,Uso Pasado de Alcohol
DocType: Fertilizer Content,Fertilizer Content,Contenido de Fertilizante
@@ -4326,6 +4330,7 @@
DocType: Salary Detail,Formula,Fórmula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #.
DocType: Lab Test Template,Lab Test Template,Plantilla de Prueba de Laboratorio
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Cuenta de ventas
DocType: Purchase Invoice Item,Total Weight,Peso Total
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comisiones sobre ventas
DocType: Offer Letter Term,Value / Description,Valor / Descripción
@@ -4482,7 +4487,7 @@
DocType: Customer,From Lead,Desde Iniciativa
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Las órdenes publicadas para la producción.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
DocType: Program Enrollment Tool,Enroll Students,Inscribir Estudiantes
DocType: Lab Test,Approved Date,Fecha Aprobada
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venta estándar
@@ -4558,7 +4563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Elemento de producción
,Employee Information,Información del empleado
DocType: Stock Entry Detail,Additional Cost,Costo adicional
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Crear oferta de venta de un proveedor
DocType: Quality Inspection,Incoming,Entrante
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Se crean plantillas de impuestos predeterminadas para ventas y compras.
@@ -4575,7 +4580,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Nota: {0}
,Delivery Note Trends,Evolución de las notas de entrega
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Resumen de la semana.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,En Cantidad de Stock
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,En Cantidad de Stock
DocType: Delivery Trip,Calculate Estimated Arrival Times,Calcule los Tiempos Estimados de Llegada
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Cuenta: {0} sólo puede ser actualizada mediante transacciones de inventario
DocType: Student Group Creation Tool,Get Courses,Obtener Cursos
@@ -4591,7 +4596,7 @@
DocType: Material Request,% Ordered,% Ordenado
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para los grupos de estudiantes basados en cursos, el curso será validado para cada estudiante de los cursos inscritos en la inscripción al programa."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Trabajo por obra
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Precio de compra promedio
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Precio de compra promedio
DocType: Task,Actual Time (in Hours),Tiempo real (en horas)
DocType: Employee,History In Company,Historia en la Compañia
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nuevo mensaje de {sender}
@@ -4639,7 +4644,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la lista de materiales # {1} debe ser igual a la moneda seleccionada {2}
DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
DocType: Patient,Additional information regarding the patient,Información adicional sobre el paciente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
DocType: Homepage,Tag Line,tag Line
DocType: Fee Component,Fee Component,Componente de Couta
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestión de Flota
@@ -4851,7 +4856,7 @@
DocType: Employee Education,Employee Education,Educación del empleado
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Se encontró grupo de artículos duplicado en la table de grupo de artículos
DocType: Land Unit,Parent Land Unit,Unidad de Tierra Padre
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
DocType: Fertilizer,Fertilizer Name,Nombre de Fertilizante
DocType: Salary Slip,Net Pay,Pago Neto
DocType: Account,Account,Cuenta
@@ -4930,7 +4935,7 @@
DocType: Item Customer Detail,Ref Code,Código de referencia
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Se requiere grupo de clientes en el Perfil de Punto de Venta
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de los empleados.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Por favor, establece la Siguiente Fecha de Depreciación"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Por favor, establece la Siguiente Fecha de Depreciación"
DocType: HR Settings,Payroll Settings,Configuración de nómina
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
DocType: POS Settings,POS Settings,Configuración de POS
@@ -5097,7 +5102,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
DocType: Asset Maintenance Task,Last Completion Date,Última Fecha de Finalización
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde la última orden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
DocType: Buying Settings,Naming Series,Secuencias e identificadores
DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,La fecha de comienzo del seguro debe ser menos que la fecha de fin del seguro
@@ -5224,6 +5229,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Obtener registros de pago
DocType: Quotation Item,Against Docname,Contra Docname
DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Cliente> Grupo de clientes> Territorio
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
DocType: BOM,Raw Material Cost,Costo de materia prima
DocType: Item Reorder,Re-Order Level,Nivel mínimo de stock.
@@ -5322,7 +5328,6 @@
DocType: Room,Seating Capacity,Número de plazas
DocType: Issue,ISS-,ISS
DocType: Lab Test Groups,Lab Test Groups,Grupos de Pruebas de Laboratorio
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Cliente> Grupo de clientes> Territorio
DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
DocType: GST Settings,GST Summary,Resumen de GST
DocType: Assessment Result,Total Score,Puntaje Total
@@ -5335,7 +5340,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Se crearon los siguientes horarios del curso
DocType: Journal Entry,Total Debit,Débito Total
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Almacén predeterminado de productos terminados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vendedores
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedores
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Presupuesto y Centro de Costo
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,No se permiten múltiple métodos de pago predeterminados
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,para el/la
@@ -5508,7 +5513,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impuestos o cargos por
DocType: Driver,Driving License Category,Categoría de Licencia de Conducir
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La cantidad real es obligatoria
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} tiene actualmente una {1} Tarjeta de Puntuación de Proveedores y las Órdenes de Compra a este Proveedor deben ser emitidas con precaución.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} tiene actualmente una {1} Tarjeta de Puntuación de Proveedores y las Órdenes de Compra a este Proveedor deben ser emitidas con precaución.
DocType: Asset Maintenance Team,Asset Maintenance Team,Equipo de mantenimiento de activos
DocType: Employee Loan,Loan Type,Tipo de préstamo
DocType: Scheduling Tool,Scheduling Tool,Herramienta de programación
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index b43056f..8303022 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorteeri hinnaga
,Delay Days,Viivituspäevad
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Teenuse kulu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Arve
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Tehke säilitusvaru kanne
DocType: Purchase Invoice Item,Item Weight Details,Artikli kaal detailid
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Viide: {0}, Kood: {1} ja kliendi: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avamine tööd.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM-i ei ole määratud rühma {1} jaoks alltöövõtukoha jaoks {0}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM-i ei ole määratud rühma {1} jaoks alltöövõtukoha jaoks {0}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Tulemus esitatakse
DocType: Item Attribute,Increment,Juurdekasv
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Ajavahemik
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ei ole lubatud {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Võta esemed
DocType: Price List,Price Not UOM Dependant,Hind ei sõltu UOMist
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Toote {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nr loetletud
DocType: Asset Repair,Error Description,Viga Kirjeldus
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Toiduained
DocType: Quality Inspection Reading,Reading 1,Lugemine 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pensionifondid
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Järgmine kulum kuupäev ei saa olla enne Ostukuupäevale
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Järgmine kulum kuupäev ei saa olla enne Ostukuupäevale
DocType: Crop,Perennial,Mitmeaastane
DocType: Consultation,Consultation Date,Konsulteerimise kuupäev
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNexti kasutajate toodete loetelu ja avastus
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",nt "algkool" või "Ülikool"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Stock aruanded
DocType: Warehouse,Warehouse Detail,Ladu Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Krediidilimiit on ületanud kliendi {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Krediidilimiit on ületanud kliendi {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term lõppkuupäev ei saa olla hilisem kui aasta lõpu kuupäev õppeaasta, mille mõiste on seotud (Academic Year {}). Palun paranda kuupäev ja proovi uuesti."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Kas Põhivarade" ei saa märkimata, kui Asset Olemas vastu kirje"
DocType: Delivery Trip,Departure Time,Väljumisaeg
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Saada tehnilisi üksikasju
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Tarnijate tabeli näidised.
DocType: Lead,Interested,Huvitatud
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Avaus
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Avaus
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Alates {0} kuni {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Maksude seadistamine ebaõnnestus
DocType: Item,Copy From Item Group,Kopeeri Punkt Group
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Leevendab kuupäev peab olema suurem kui Liitumis
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Lehed aastas
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Palun vaadake "Kas Advance" vastu Konto {1}, kui see on ette sisenemist."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Ladu {0} ei kuulu firma {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Ladu {0} ei kuulu firma {1}
DocType: Email Digest,Profit & Loss,Kasumiaruanne
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Liiter
DocType: Task,Total Costing Amount (via Time Sheet),Kokku kuluarvestus summa (via Time Sheet)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,See põhineb tehingutel selle äriühingu vastu. Üksikasjalikuma teabe saamiseks lugege allpool toodud ajakava
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,"Soovin e-postiga loomiseks, automaatne Material taotlus"
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Vastupidav
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Konsultatsioon
DocType: Journal Entry,Multi Currency,Multi Valuuta
DocType: Opening Invoice Creation Tool,Invoice Type,Arve Type
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Toimetaja märkus
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Lesk
DocType: Request for Quotation,Request for Quotation,Hinnapäring
DocType: Healthcare Settings,Require Lab Test Approval,Nõuda laborikatse heakskiitmist
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Tootekood> Elemendi grupp> Bränd
DocType: Salary Slip Timesheet,Working Hours,Töötunnid
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Kokku tasumata
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Muuda algus / praegune järjenumber olemasoleva seeria.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Palun sisestage Cost Center
DocType: Drug Prescription,Dosage,Annus
DocType: Journal Entry Account,Sales Order,Müügitellimuse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Keskm. Müügikurss
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Keskm. Müügikurss
DocType: Assessment Plan,Examiner Name,Kontrollija nimi
DocType: Lab Test Template,No Result,No Tulemus
DocType: Purchase Invoice Item,Quantity and Rate,Kogus ja hind
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Vali palgaarvestuse Periood
DocType: Purchase Invoice,Unpaid,Palgata
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserveeritud müük
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Palun seadke töötaja nimesüsteem inimressurss> HR-seaded
DocType: Packing Slip,From Package No.,Siit Package No.
DocType: Item Attribute,To Range,Vahemik
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Väärtpaberitesse ja hoiustesse
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,töökoda
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Hoiata ostutellimusi
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Nimekiri paar oma klientidele. Nad võivad olla organisatsioonid ja üksikisikud.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Aitab Parts ehitada
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Aitab Parts ehitada
DocType: POS Profile User,POS Profile User,POS profiili kasutaja
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Otsene tulu
DocType: Patient Appointment,Date TIme,Kuupäev Kellaaeg
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ei filtreerimiseks konto, kui rühmitatud konto"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Ei filtreerimiseks konto, kui rühmitatud konto"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Haldusspetsialist
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Ettevõtte ja maksude asutamine
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Palun valige Course
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Erinevus konto
DocType: Purchase Invoice,Supplier GSTIN,Pakkuja GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ei saa sulgeda ülesanne oma sõltuvad ülesande {0} ei ole suletud.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
DocType: Production Order,Additional Operating Cost,Täiendav töökulud
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmeetika
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Seos Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Juhataja
DocType: Payment Entry,Payment From / To,Makse edasi / tagasi
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uus krediidilimiit on alla praeguse tasumata summa kliendi jaoks. Krediidilimiit peab olema atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uus krediidilimiit on alla praeguse tasumata summa kliendi jaoks. Krediidilimiit peab olema atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Palun määrake konto Warehouse'i {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Tuleneb"" ja ""Grupeeri alusel"" ei saa olla sama"
DocType: Sales Person,Sales Person Targets,Sales Person Eesmärgid
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,partii Nimi
DocType: Fee Validity,Max number of visit,Maksimaalne külastuse arv
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Töögraafik on loodud:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,registreerima
DocType: GST Settings,GST Settings,GST Seaded
DocType: Selling Settings,Customer Naming By,Kliendi nimetamine By
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Eelarve vastu
DocType: Employee,Cell Number,Mobiilinumber
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Antud kriteeriumide järgi töötaja pole. Kontrollige, kas palgafondid pole veel loodud."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Material Taotlused Loodud
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Material Taotlused Loodud
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kaotsi läinud
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Sa ei saa sisestada praegune voucher in "Against päevikusissekanne veerus
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reserveeritud tootmine
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
DocType: Opportunity,Opportunity From,Opportunity From
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kuupalga avalduse.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rida {0}: {1} punkti {2} jaoks nõutavad seerianumbrid. Te olete esitanud {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rida {0}: {1} punkti {2} jaoks nõutavad seerianumbrid. Te olete esitanud {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Valige tabel
DocType: BOM,Website Specifications,Koduleht erisused
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} on kehtetu e-posti aadress "Saajad"
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Tsiteerimine soovitud
DocType: Vital Signs,Heart Rate / Pulse,Südame löögisageduse / impulsi
DocType: Company,Default Bank Account,Vaikimisi Bank Account
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Filtreerida põhineb Party, Party Tüüp esimene"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Filtreerida põhineb Party, Party Tüüp esimene"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"Värskenda Stock "ei saa kontrollida, sest punkte ei andnud kaudu {0}"
DocType: Vehicle,Acquisition Date,omandamise kuupäevast
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Laadige üles oma kirjapead (hoia see veebipõhine nagu 900 pikslit 100 piksliga)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} ei saa olla Group
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {DOCNAME} ei eksisteeri eespool {doctype} "tabelis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ei ülesanded
DocType: Item Variant Settings,Copy Fields to Variant,Kopeerige väliid variandile
DocType: Asset,Opening Accumulated Depreciation,Avamine akumuleeritud kulum
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan materjali sõlmed
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Müük Partnerid ja territoorium
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,Bom {0} peab olema aktiivne
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Sulgemine (avamine + kokku)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Sulgemine (avamine + kokku)
DocType: Journal Entry,Depreciation Entry,Põhivara Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Palun valige dokumendi tüüp esimene
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Prindi Konto valuutas
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Tühista Material Külastusi {0} enne tühistades selle Hooldus Külasta
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} ei kuulu Punkt {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,Vaikimisi on tasulised kontod
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
DocType: Fee Structure,Components,komponendid
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Punkt variandid {0} uuendatud
DocType: Quality Inspection Reading,Reading 6,Lugemine 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,firma nimi
DocType: SMS Center,Total Message(s),Kokku Sõnum (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Vali toode for Transfer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Palun määrake seerianumbrite nime seeria {0} abil häälestus> Seaded> nime seeria
DocType: Purchase Invoice,Additional Discount Percentage,Täiendav allahindlusprotsendi
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vaata nimekirja kõigi abiga videod
DocType: Agriculture Analysis Criteria,Soil Texture,Mulla tekstuur
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,Bom Koduleht toode
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Laadi üles oma kirjas pea ja logo. (seda saab muuta hiljem).
DocType: Timesheet Detail,Bill,arve
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Järgmine kulum kuupäev on sisestatud viimase kuupäeva
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Järgmine kulum kuupäev on sisestatud viimase kuupäeva
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Valge
DocType: SMS Center,All Lead (Open),Kõik Plii (Open)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rida {0}: Kogus ole saadaval {4} laos {1} postitama aeg kanne ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,Järgmine Kontakt kuupäev
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Avamine Kogus
DocType: Healthcare Settings,Appointment Reminder,Kohtumise meeldetuletus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
DocType: Program Enrollment Tool Student,Student Batch Name,Student Partii Nimi
DocType: Consultation,Doctor,Arst
DocType: Holiday List,Holiday List Name,Holiday nimekiri nimi
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Jäta jaotamine Tool
DocType: Item,Hub Category to Publish,Keskuse kategooria avaldamiseks
DocType: Leave Block List,Leave Block List Dates,Jäta Block loetelu kuupäevad
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Palun seadistage külastuse numbrite seeria seaded> nummering seeria abil
DocType: Sales Invoice,Billing Address GSTIN,Arveldusaadress GSTIN
DocType: Assessment Plan,Evaluate,Hinnake
DocType: Workstation,Net Hour Rate,Net Hour Rate
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Müügiarve tasumine
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveeritud Warehouse Sales Order / valmistoodang Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Müügi summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Müügi summa
DocType: Repayment Schedule,Interest Amount,Intressisummat
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Olete kulul Approver selle kirje. Palun uuendage "Status" ja Save
DocType: Serial No,Creation Document No,Loomise dokument nr
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Avamine Raamatupidamine Balance
,GST Sales Register,GST Sales Registreeri
DocType: Sales Invoice Advance,Sales Invoice Advance,Müügiarve Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Midagi nõuda
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Midagi nõuda
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Valige oma domeenid
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Teine Eelarve rekord "{0} 'on juba olemas vastu {1} {2}" eelarveaastal {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Valdkonnad kopeeritakse ainult loomise ajal.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","See on lisatud Kood variandi. Näiteks, kui teie lühend on "SM", ning objekti kood on "T-särk", kirje kood variant on "T-särk SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netopalk (sõnadega) ilmuvad nähtavale kui salvestate palgatõend.
DocType: Purchase Invoice,Is Return,Kas Tagasi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Ettevaatust
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Ettevaatust
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Tagasi / võlateate
DocType: Price List Country,Price List Country,Hinnakiri Riik
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} kehtiv serial-numbrid Punkt {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} kehtiv serial-numbrid Punkt {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kood ei saa muuta Serial No.
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Palun sisesta Kood saada Partii number
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
DocType: Supplier Scorecard,Warn for new Request for Quotations,Hoiata uue tsitaadi taotlemise eest
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Ostutellimuste aidata teil planeerida ja jälgida oma ostud
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab katsestavad retseptid
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Kogu Issue / Transfer koguse {0} Material taotlus {1} \ saa olla suurem kui nõutud koguse {2} jaoks Punkt {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Ladu Kontakt
DocType: Payment Entry,Write Off Difference Amount,Kirjutage Off erinevuse koguse
DocType: Volunteer,Volunteer Name,Vabatahtlike nimi
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Palun seadke õpetaja nime sisestamine haridusse> Hariduseseaded
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Töötaja e-posti ei leitud, seega e-posti ei saadeta"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Saatmise reegel ei kehti riigile {0}
DocType: Item,Foreign Trade Details,Väliskaubanduse detailid
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Group Roll arv
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Sest {0}, ainult krediitkaardi kontod võivad olla seotud teise vastu deebetkanne"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kokku kõigi ülesanne kaalu peaks 1. Palun reguleerida kaalu kõikide Project ülesandeid vastavalt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital seadmed
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnakujundus Reegel on esimene valitud põhineb "Rakenda On väljale, mis võib olla Punkt punkt Group või kaubamärgile."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Lapse ladu olemas selle lattu. Sa ei saa kustutada selle lattu.
DocType: Item,Website Item Groups,Koduleht Punkt Groups
DocType: Purchase Invoice,Total (Company Currency),Kokku (firma Valuuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serial number {0} sisestatud rohkem kui üks kord
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serial number {0} sisestatud rohkem kui üks kord
DocType: Journal Entry,Journal Entry,Päevikusissekanne
DocType: Expense Claim Advance,Unclaimed amount,Taotlematu summa
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} objekte pooleli
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Side log.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Hinnapäring on blokeeritud, et ligipääs portaali, rohkem kontrolli portaali seaded."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tarnijate skoorikaardi skooride muutuja
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Ostmine summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Ostmine summa
DocType: Sales Invoice,Shipping Address Name,Kohaletoimetamine Aadress Nimi
DocType: Material Request,Terms and Conditions Content,Tingimused sisu
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kurssiplaani loomine tekitas vigu
@@ -1973,7 +1976,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,See põhineb palke vastu Vehicle. Vaata ajakava allpool lähemalt
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Vastu Tarnija Arve {0} dateeritud {1}
DocType: Customer,Default Price List,Vaikimisi hinnakiri
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sa ei saa kustutada eelarveaastal {0}. Eelarveaastal {0} on määratud vaikimisi Global Settings
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Sama nimega klient on juba olemas
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,See esitab Palkade loendused ja loob kogunenud ajakirja kande. Kas soovite jätkata?
@@ -1987,6 +1990,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,hinnapoliitika
DocType: Quotation,Term Details,Term Details
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ei saa registreeruda rohkem kui {0} õpilasi tudeng rühm.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Kokku (maksudeta)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Krahv
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} peab olema suurem kui 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Varu saadaval
@@ -2005,7 +2009,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Lingi eemaldada Makse tühistamine Arve
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Praegune Läbisõit sisestatud peaks olema suurem kui algne Sõiduki odomeetri {0}
DocType: Restaurant Reservation,No Show,Ei näita
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Palun määrake seerianumbrite nime seeria {0} abil häälestus> Seaded> nime seeria
DocType: Shipping Rule Country,Shipping Rule Country,Kohaletoimetamine Reegel Riik
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Jätke ja osavõtt
DocType: Maintenance Visit,Partially Completed,Osaliselt täidetud
@@ -2096,7 +2099,7 @@
DocType: Student Group Instructor,Student Group Instructor,Student Group juhendaja
DocType: Grant Application,Assessment Mark (Out of 10),Hindamismärk (10-st)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Main
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Määra eesliide numeratsiooni seeria oma tehingute
DocType: Employee Attendance Tool,Employees HTML,Töötajad HTML
@@ -2144,7 +2147,7 @@
DocType: Course,Course Abbreviation,muidugi lühend
DocType: Student Leave Application,Student Leave Application,Student Jäta ostusoov
DocType: Item,Will also apply for variants,Kehtib ka variandid
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Töötaja {0} on Half päeval {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Kokku tööaeg ei tohi olla suurem kui max tööaeg {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,edasi
@@ -2328,9 +2331,10 @@
DocType: Task,Actual End Date (via Time Sheet),Tegelik End Date (via Time Sheet)
DocType: Soil Texture,Soil Type,Mullatüüp
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Summa {0} {1} vastu {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Uus sõnum
,Quotation Trends,Tsitaat Trends
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Punkt Group mainimata punktis kapteni kirje {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
DocType: Shipping Rule,Shipping Amount,Kohaletoimetamine summa
DocType: Supplier Scorecard Period,Period Score,Perioodi skoor
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Lisa Kliendid
@@ -2341,7 +2345,7 @@
,Vehicle Expenses,Sõidukite kulud
DocType: Serial No,Invoice Details,arve andmed
DocType: Grant Application,Show on Website,Näita veebisaidil
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Oodatud väärtus pärast kasuliku eluea peab olema suurem või võrdne {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Oodatud väärtus pärast kasuliku eluea peab olema suurem või võrdne {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Alusta uuesti
DocType: Hub Category,Hub Category,Rummu kategooria
DocType: Purchase Invoice,SEZ,SEZ
@@ -2372,7 +2376,7 @@
DocType: Patient,B Positive,B Positiivne
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kui objekt on põhivarana. Palun kasutage eraldi rida mitu tk."
DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
DocType: Patient Medical Record,Patient Medical Record,Patsiendi meditsiiniline aruanne
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupi Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Spordi-
@@ -2422,6 +2426,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Saadud RFQ-d ei saa määrata tsiteerimata
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Kokku mahaarvamine
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Konto valuuta printimiseks valige konto
,Production Analytics,tootmise Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,See põhineb tehingutel selle patsiendi vastu. Täpsema teabe saamiseks vt allpool toodud ajakava
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kulude Uuendatud
@@ -2476,7 +2481,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Valige ettevõtte ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Jäta tühjaks, kui arvestada kõik osakonnad"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tüübid tööhõive (püsiv, leping, intern jne)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
DocType: Payroll Entry,Fortnightly,iga kahe nädala tagant
DocType: Currency Exchange,From Currency,Siit Valuuta
DocType: Vital Signs,Weight (In Kilogram),Kaal (kilogrammides)
@@ -2552,7 +2557,7 @@
DocType: Student,Guardians,Kaitsjad
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Hinnad ei näidata, kui hinnakiri ei ole valitud"
DocType: Stock Entry,Total Incoming Value,Kokku Saabuva Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Kanne on vajalik
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Kanne on vajalik
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aitab jälgida aega, kulusid ja arveldamise aja veetmiseks teha oma meeskonda"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostu hinnakiri
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Pakkujate tulemuskaardi muutujate mallid.
@@ -2653,7 +2658,7 @@
DocType: Company,For Reference Only.,Üksnes võrdluseks.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Arst {0} pole saadaval {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Valige Partii nr
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Vale {0} {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Vale {0} {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Viide inv
@@ -2690,8 +2695,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Määrake tegevuse töökulud ja annab ainulaadse operatsiooni ei oma tegevuse.
DocType: Water Analysis,Origin,Päritolu
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,See dokument on üle piiri {0} {1} artiklijärgse {4}. Kas tegemist teise {3} samade {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Palun määra korduvate pärast salvestamist
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Vali muutus summa kontole
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Palun määra korduvate pärast salvestamist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Vali muutus summa kontole
DocType: Purchase Invoice,Price List Currency,Hinnakiri Valuuta
DocType: Naming Series,User must always select,Kasutaja peab alati valida
DocType: Stock Settings,Allow Negative Stock,Laske Negatiivne Stock
@@ -2747,7 +2752,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Hoiata uute ostutellimuste eest
DocType: Quality Inspection Reading,Reading 9,Lugemine 9
DocType: Supplier,Is Frozen,Kas Külmutatud
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Group sõlme lattu ei tohi valida tehingute
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Group sõlme lattu ei tohi valida tehingute
DocType: Buying Settings,Buying Settings,Ostmine Seaded
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Bom No. jaoks Lõppenud Hea toode
DocType: Upload Attendance,Attendance To Date,Osalemine kuupäev
@@ -2761,6 +2766,7 @@
DocType: Grant Application,Organization,organisatsioon
DocType: BOM Update Tool,BOM Update Tool,BOM-i värskendamise tööriist
DocType: SG Creation Tool Course,Student Group Name,Student Grupi nimi
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Kuva laiendatud vaade
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Tasude loomine
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Palun veendu, et sa tõesti tahad kustutada kõik tehingud selle firma. Teie kapten andmed jäävad, nagu see on. Seda toimingut ei saa tagasi võtta."
DocType: Room,Room Number,Toa number
@@ -2771,7 +2777,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Tehke maksumall
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Kasutaja Foorum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
DocType: Lab Test Sample,Lab Test Sample,Lab prooviproov
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick päevikusissekanne
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
@@ -2842,7 +2848,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Tee arve
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto sule võimalus pärast 15 päeva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Ostukorraldused ei ole {0} jaoks lubatud {1} tulemuskaardi kohta.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Ostukorraldused ei ole {0} jaoks lubatud {1} tulemuskaardi kohta.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Aasta
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Plii%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Leping End Date peab olema suurem kui Liitumis
@@ -2934,7 +2940,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rida # {0}: päevikusissekanne {1} ei ole arvesse {2} või juba võrreldakse teise kviitungi
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteeriumide kaal
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Tarnija> Tarnija tüüp
DocType: Buying Settings,Default Buying Price List,Vaikimisi ostmine hinnakiri
DocType: Payroll Entry,Salary Slip Based on Timesheet,Palgatõend põhjal Töögraafik
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Ostuhind
@@ -3022,7 +3027,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Rada viib Tööstuse tüüp.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Mine kleebiste juurde
DocType: Item Supplier,Item Supplier,Punkt Tarnija
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Kõik aadressid.
DocType: Company,Stock Settings,Stock Seaded
@@ -3199,6 +3204,7 @@
DocType: Company,Default Inventory Account,Vaikimisi Inventory konto
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rida {0}: Teostatud Kogus peab olema suurem kui null.
DocType: Antibiotic,Antibiotic Name,Antibiootikumi nimetus
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Tootekood> Elemendi grupp> Bränd
DocType: Purchase Invoice,Apply Additional Discount On,Rakendada täiendavaid soodustust
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Valige tüüp ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Link kõikidele maaühikutele, kus kasvab kultuur"
@@ -3392,6 +3398,7 @@
DocType: Supplier,Credit Limit,Krediidilimiit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Keskm. Hinnakirja hinna müügihind
DocType: Production Plan Sales Order,Salse Order Date,Salse Order Date
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Tarnija> Tarnija tüüp
DocType: Salary Component,Salary Component,palk Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Makse Sissekanded {0} on un-seotud
DocType: GL Entry,Voucher No,Voucher ei
@@ -3400,7 +3407,7 @@
DocType: Leave Allocation,Leave Allocation,Jäta jaotamine
DocType: Payment Request,Recipient Message And Payment Details,Saaja sõnum ja makse detailid
DocType: Training Event,Trainer Email,treener Post
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materjal Taotlused {0} loodud
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materjal Taotlused {0} loodud
DocType: Restaurant Reservation,No of People,Inimeste arv
DocType: Production Planning Tool,Include sub-contracted raw materials,Kaasa allhanked tooraine
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mall terminite või leping.
@@ -3464,7 +3471,7 @@
DocType: Production Planning Tool,Create Material Requests,Loo Material taotlused
DocType: Employee Education,School/University,Kool / Ülikool
DocType: Payment Request,Reference Details,Viide Üksikasjad
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Oodatud väärtus pärast Kasulik Elu peab olema väiksem kui Gross ostusumma
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Oodatud väärtus pärast Kasulik Elu peab olema väiksem kui Gross ostusumma
DocType: Sales Invoice Item,Available Qty at Warehouse,Saadaval Kogus lattu
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Arve summa
DocType: Asset,Double Declining Balance,Double Degressiivne
@@ -3476,7 +3483,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saada värskendusi
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} ei kuulu Company {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Valige vähemalt igast atribuudist vähemalt üks väärtus.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materjal taotlus {0} on tühistatud või peatatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materjal taotlus {0} on tühistatud või peatatud
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Jäta juhtimine
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupi poolt konto
DocType: Sales Order,Fully Delivered,Täielikult Tarnitakse
@@ -3487,14 +3494,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Väljastatud summa ei saa olla suurem kui Laenusumma {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Avage programmid
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rida {0} # eraldatud summa {1} ei tohi olla suurem kui taotletud summa {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Palun seadistage külastuse numbrite seeria seaded> nummering seeria abil
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ostutellimuse numbri vaja Punkt {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Tootmise et mitte loodud
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"From Date" tuleb pärast "To Date"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Selleks ei saa muuta üliõpilaste {0} on seotud õpilase taotluse {1}
DocType: Asset,Fully Depreciated,täielikult amortiseerunud
,Stock Projected Qty,Stock Kavandatav Kogus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Märkimisväärne osavõtt HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Hinnapakkumised on ettepanekuid, pakkumiste saadetud oma klientidele"
DocType: Sales Order,Customer's Purchase Order,Kliendi ostutellimuse
@@ -3578,7 +3584,7 @@
DocType: Stock Settings,Item Naming By,Punkt nimetamine By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Teine periood sulgemine Entry {0} on tehtud pärast {1}
DocType: Production Order,Material Transferred for Manufacturing,Materjal üleantud tootmine
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} ei ole olemas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Konto {0} ei ole olemas
DocType: Project,Project Type,Projekti tüüp
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Selle ülesande jaoks on olemas lapse ülesanne. Seda ülesannet ei saa kustutada.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Kas eesmärk Kogus või Sihtsummaks on kohustuslik.
@@ -3680,11 +3686,11 @@
DocType: Company,Asset Depreciation Cost Center,Vara amortisatsioonikulu Center
DocType: Sales Order Item,Sales Order Date,Sales Order Date
DocType: Sales Invoice Item,Delivered Qty,Tarnitakse Kogus
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Kokku Excl Maksu
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Kui see on lubatud, kõik lapsed iga tootmise kirje lisatakse materjali taotlused."
DocType: Assessment Plan,Assessment Plan,hindamise kava
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Klient {0} on loodud.
DocType: Stock Settings,Limit Percent,Limit protsent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Palun seadke õpetaja nime sisestamine haridusse> Hariduseseaded
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Praegu pole ühtegi ladu saadaval
,Payment Period Based On Invoice Date,Makse kindlaksmääramisel tuginetakse Arve kuupäev
DocType: Sample Collection,No. of print,Prindi arv
@@ -3700,12 +3706,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Nõuded ({0})
DocType: Pricing Rule,Margin,varu
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uutele klientidele
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Brutokasum%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Brutokasum%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Muuda POS-profiili
DocType: Bank Reconciliation Detail,Clearance Date,Kliirens kuupäev
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Hindamisaruanne
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross ostusumma on kohustuslik
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross ostusumma on kohustuslik
DocType: Lead,Address Desc,Aadress otsimiseks
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Partei on kohustuslik
DocType: Journal Entry,JV-,JV-
@@ -3737,7 +3743,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Alaline nimi
DocType: Stock Entry,Customer or Supplier Details,Klienditeenindus ja tarnijate andmed
DocType: Employee Loan Application,Required by Date,Vajalik kuupäev
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Sulgemisbalanss (Dr - Cr)
DocType: Lead,Lead Owner,Plii Omanik
DocType: Bin,Requested Quantity,taotletud Kogus
DocType: Patient,Marital Status,Perekonnaseis
@@ -3751,7 +3756,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Mitmed variandid
DocType: Sales Invoice,Against Income Account,Sissetuleku konto
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Tarnitakse
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Punkt {0}: Tellitud tk {1} ei saa olla väiksem kui minimaalne tellimuse tk {2} (vastab punktis).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Punkt {0}: Tellitud tk {1} ei saa olla väiksem kui minimaalne tellimuse tk {2} (vastab punktis).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Kuu Distribution osakaal
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Palun logige sisse teise kasutajana.
DocType: Territory,Territory Targets,Territoorium Eesmärgid
@@ -3850,7 +3855,7 @@
DocType: Serial No,Out of AMC,Out of AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Tee hooldus Külasta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Palun pöörduge kasutaja, kes on Sales Master Manager {0} rolli"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Palun pöörduge kasutaja, kes on Sales Master Manager {0} rolli"
DocType: Company,Default Cash Account,Vaikimisi arvelduskontole
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (mitte kliendi või hankija) kapten.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,See põhineb käimist Selle Student
@@ -4000,7 +4005,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nendest kriteeriumidest töötajaid pole
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
DocType: Restaurant,Default Customer,Vaikimisi klient
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Palun seadke töötaja nimesüsteem inimressurss> HR-seaded
DocType: Assessment Plan,Supervisor Name,Juhendaja nimi
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ärge kinnitage, kas kohtumine on loodud samal päeval"
DocType: Program Enrollment Course,Program Enrollment Course,Programm Registreerimine Course
@@ -4118,7 +4122,7 @@
DocType: BOM,Website Description,Koduleht kirjeldus
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Net omakapitali
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Uusim
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posti aadress peab olema unikaalne, juba olemas {0}"
DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,kviitung
@@ -4135,7 +4139,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavoogude aruanne
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Laenusumma ei tohi ületada Maksimaalne laenusumma {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,litsents
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Palun valige kanda, kui soovite ka lisada eelnenud eelarveaasta saldo jätab see eelarveaastal"
DocType: GL Entry,Against Voucher Type,Vastu Voucher Type
DocType: Physician,Phone (R),Telefon (R)
@@ -4147,7 +4151,7 @@
DocType: Patient,B Negative,B on negatiivne
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Hoolduse staatus tuleb tühistada või lõpetada esitamiseks
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ei kuuluv ettevõte {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Seerianumbrid järjest {0} ei ühti saateleht
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Seerianumbrid järjest {0} ei ühti saateleht
DocType: Student,Guardian Details,Guardian detailid
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark õpib mitu töötajat
@@ -4189,7 +4193,7 @@
DocType: Stock Entry Detail,Basic Amount,Põhisummat
DocType: Training Event,Exam,eksam
DocType: Complaint,Complaint,Kaebus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
DocType: Leave Allocation,Unused leaves,Kasutamata lehed
DocType: Patient,Alcohol Past Use,Alkoholi varasem kasutamine
DocType: Fertilizer Content,Fertilizer Content,Väetise sisu
@@ -4312,6 +4316,7 @@
DocType: Salary Detail,Formula,valem
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Müügikonto
DocType: Purchase Invoice Item,Total Weight,Kogukaal
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Müügiprovisjon
DocType: Offer Letter Term,Value / Description,Väärtus / Kirjeldus
@@ -4468,7 +4473,7 @@
DocType: Customer,From Lead,Plii
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Tellimused lastud tootmist.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vali Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
DocType: Program Enrollment Tool,Enroll Students,õppima üliõpilasi
DocType: Lab Test,Approved Date,Heakskiidetud kuupäev
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -4544,7 +4549,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Tootmine toode
,Employee Information,Töötaja Information
DocType: Stock Entry Detail,Additional Cost,Lisakulu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Ei filtreerimiseks Voucher Ei, kui rühmitatud Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Ei filtreerimiseks Voucher Ei, kui rühmitatud Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Tee Tarnija Tsitaat
DocType: Quality Inspection,Incoming,Saabuva
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Müügile ja ostule pääseb alla maksumallid.
@@ -4561,7 +4566,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Märkus: {0}
,Delivery Note Trends,Toimetaja märkus Trends
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Nädala kokkuvõte
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Laos Kogus
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Laos Kogus
DocType: Delivery Trip,Calculate Estimated Arrival Times,Arvuta hinnangulised saabumised
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} saab uuendada ainult läbi Stock Tehingud
DocType: Student Group Creation Tool,Get Courses,saada Kursused
@@ -4577,7 +4582,7 @@
DocType: Material Request,% Ordered,% Tellitud
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kursuse aluseks Student Group, muidugi on kinnitatud iga tudeng õpib Kursused programmi Registreerimine."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Tükitöö
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Keskm. Ostmine Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Keskm. Ostmine Rate
DocType: Task,Actual Time (in Hours),Tegelik aeg (tundides)
DocType: Employee,History In Company,Ajalugu Company
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Uus saatja {sender}
@@ -4625,7 +4630,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rida {0}: valuuta Bom # {1} peaks olema võrdne valitud valuuta {2}
DocType: Journal Entry Account,Exchange Rate,Vahetuskurss
DocType: Patient,Additional information regarding the patient,Täiendav teave patsiendi kohta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
DocType: Homepage,Tag Line,tag Line
DocType: Fee Component,Fee Component,Fee Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
@@ -4837,7 +4842,7 @@
DocType: Employee Education,Employee Education,Töötajate haridus
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicate kirje rühm leidis elemendi rühma tabelis
DocType: Land Unit,Parent Land Unit,Vanemate maaüksus
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
DocType: Fertilizer,Fertilizer Name,Väetise nimi
DocType: Salary Slip,Net Pay,Netopalk
DocType: Account,Account,Konto
@@ -4916,7 +4921,7 @@
DocType: Item Customer Detail,Ref Code,Ref kood
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Kliendiprofiil on vajalik POS-profiilis
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Töötaja arvestust.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Palun määra Järgmine kulum kuupäev
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Palun määra Järgmine kulum kuupäev
DocType: HR Settings,Payroll Settings,Palga Seaded
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Match mitte seotud arved ja maksed.
DocType: POS Settings,POS Settings,POS-seaded
@@ -5083,7 +5088,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Sünnipäev Meeldetuletus {0}
DocType: Asset Maintenance Task,Last Completion Date,Viimase täitmise kuupäev
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Päeva eelmisest Telli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
DocType: Buying Settings,Naming Series,Nimetades Series
DocType: Leave Block List,Leave Block List Name,Jäta Block nimekiri nimi
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Kindlustus Alguse kuupäev peaks olema väiksem kui Kindlustus Lõppkuupäev
@@ -5209,6 +5214,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Saada maksmine Sissekanded
DocType: Quotation Item,Against Docname,Vastu Docname
DocType: SMS Center,All Employee (Active),Kõik Töötaja (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klient> Kliendi Grupp> Territoorium
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vaata nüüd
DocType: BOM,Raw Material Cost,Tooraine hind
DocType: Item Reorder,Re-Order Level,Re-Order Level
@@ -5307,7 +5313,6 @@
DocType: Room,Seating Capacity,istekohtade arv
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Lab katserühmad
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klient> Kliendi Grupp> Territoorium
DocType: Project,Total Expense Claim (via Expense Claims),Kogukulude nõue (via kuluaruanded)
DocType: GST Settings,GST Summary,GST kokkuvõte
DocType: Assessment Result,Total Score,punkte kokku
@@ -5320,7 +5325,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Pärast kursuse ajakava loodi
DocType: Journal Entry,Total Debit,Kokku Deebet
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Vaikimisi valmistoodangu ladu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Eelarve ja Kulukeskus
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Mitu vaiketüüpi ei ole lubatud
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,Selle eest
@@ -5493,7 +5498,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Mõtle maksu, sest"
DocType: Driver,Driving License Category,Juhiloa kategooria
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tegelik Kogus on kohustuslikuks
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} praegu on tarnija tulemuskaart {1} ja selle tarnija ostutellimused peaksid olema ettevaatlikud.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} praegu on tarnija tulemuskaart {1} ja selle tarnija ostutellimused peaksid olema ettevaatlikud.
DocType: Asset Maintenance Team,Asset Maintenance Team,Varahalduse meeskond
DocType: Employee Loan,Loan Type,laenu liik
DocType: Scheduling Tool,Scheduling Tool,Ajastus Tool
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 3aeb406..8ae6b96 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,مرتب سازی بر اساس قیمت
,Delay Days,روزهای تأخیر
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,هزینه خدمات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,فاکتور
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,ورودی ذخایر ذخیره را وارد کنید
DocType: Purchase Invoice Item,Item Weight Details,مورد وزن جزئیات
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",مرجع: {0}، کد مورد: {1} و ضوابط: {2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,کیلوگرم
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,باز کردن برای یک کار.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM برای قرارداد قراردادن {0} در ردیف {1} مشخص نشده است
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM برای قرارداد قراردادن {0} در ردیف {1} مشخص نشده است
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} نتایج ارسال شده
DocType: Item Attribute,Increment,افزایش
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,مدت زمان
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},برای مجاز نیست {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,گرفتن اقلام از
DocType: Price List,Price Not UOM Dependant,قیمت وابسته به UOM نیست
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},محصولات {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,بدون موارد ذکر شده
DocType: Asset Repair,Error Description,شرح خطا
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,خواربار
DocType: Quality Inspection Reading,Reading 1,خواندن 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بعدی تاریخ استهلاک نمی تواند قبل از تاریخ خرید می باشد
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,بعدی تاریخ استهلاک نمی تواند قبل از تاریخ خرید می باشد
DocType: Crop,Perennial,چند ساله
DocType: Consultation,Consultation Date,تاریخ مشاوره
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,لیست محصولات و کشف کاربران ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",به عنوان مثال "مدرسه ابتدایی" یا "دانشگاه"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,گزارش سهام
DocType: Warehouse,Warehouse Detail,جزئیات انبار
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاریخ پایان ترم نمی تواند بعد از تاریخ سال پایان سال تحصیلی که مدت مرتبط است باشد (سال تحصیلی {}). لطفا تاریخ های صحیح و دوباره امتحان کنید.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","آیا دارایی ثابت" نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
DocType: Delivery Trip,Departure Time,زمان خروج
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,دریافت اطلاعات بیشتر مشخصات
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,قالب بندی مقاطع عرضه کننده.
DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,افتتاح
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,افتتاح
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},از {0} به {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,تنظیم مالیات انجام نشد
DocType: Item,Copy From Item Group,کپی برداری از مورد گروه
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,برگ در سال
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ردیف {0}: لطفا بررسی کنید آیا پیشرفته در برابر حساب {1} در صورتی که این یک ورودی پیش است.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},انبار {0} به شرکت تعلق ندارد {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},انبار {0} به شرکت تعلق ندارد {1}
DocType: Email Digest,Profit & Loss,سود و زیان
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,لیتری
DocType: Task,Total Costing Amount (via Time Sheet),مجموع هزینه یابی مقدار (از طریق زمان ورق)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,این بر مبنای معاملات علیه این شرکت است. برای جزئیات بیشتر به جدول زمانی زیر مراجعه کنید
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,با رایانامه آگاه کن در ایجاد درخواست مواد اتوماتیک
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,مقاوم
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,مشاوره
DocType: Journal Entry,Multi Currency,چند ارز
DocType: Opening Invoice Creation Tool,Invoice Type,فاکتور نوع
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,رسید
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,بیوه
DocType: Request for Quotation,Request for Quotation,درخواست برای نقل قول
DocType: Healthcare Settings,Require Lab Test Approval,تصویب آزمایشی آزمایش مورد نیاز است
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,کد مورد> گروه مورد> نام تجاری
DocType: Salary Slip Timesheet,Working Hours,ساعات کاری
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,مجموع برجسته
DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغییر شروع / شماره توالی فعلی از یک سری موجود است.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لطفا وارد مرکز هزینه
DocType: Drug Prescription,Dosage,مصرف
DocType: Journal Entry Account,Sales Order,سفارش فروش
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,میانگین نرخ فروش
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,میانگین نرخ فروش
DocType: Assessment Plan,Examiner Name,نام امتحان
DocType: Lab Test Template,No Result,هیچ نتیجه
DocType: Purchase Invoice Item,Quantity and Rate,مقدار و نرخ
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,انتخاب کنید حقوق و دستمزد دوره
DocType: Purchase Invoice,Unpaid,پرداخت نشده
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,محفوظ برای فروش
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,لطفا سیستم نامگذاری کارمندان را در منابع انسانی تنظیم کنید> تنظیمات HR
DocType: Packing Slip,From Package No.,از شماره بسته بندی
DocType: Item Attribute,To Range,به محدوده
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,اوراق بهادار و سپرده ها
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,کارگاه
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,هشدار سفارشات خرید
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,قطعات اندازه کافی برای ساخت
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,قطعات اندازه کافی برای ساخت
DocType: POS Profile User,POS Profile User,کاربر پروفایل POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,درآمد مستقیم
DocType: Patient Appointment,Date TIme,زمان قرار
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",می توانید بر روی حساب نمی فیلتر بر اساس، در صورتی که توسط حساب گروه بندی
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",می توانید بر روی حساب نمی فیلتر بر اساس، در صورتی که توسط حساب گروه بندی
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,افسر اداری
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ایجاد شرکت و مالیات
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,لطفا دوره را انتخاب کنید
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,حساب تفاوت
DocType: Purchase Invoice,Supplier GSTIN,کننده GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,می توانید کار نزدیک به عنوان وظیفه وابسته به آن {0} بسته نشده است نیست.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
DocType: Production Order,Additional Operating Cost,هزینه های عملیاتی اضافی
DocType: Lab Test Template,Lab Routine,روال آزمایشگاهی
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ارتباط با Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مدیر
DocType: Payment Entry,Payment From / To,پرداخت از / به
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},حد اعتبار جدید کمتر از مقدار برجسته فعلی برای مشتری است. حد اعتبار به حداقل می شود {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},حد اعتبار جدید کمتر از مقدار برجسته فعلی برای مشتری است. حد اعتبار به حداقل می شود {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},لطفا حساب را در Warehouse تنظیم کنید {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
DocType: Sales Person,Sales Person Targets,اهداف فروشنده
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,نام دسته ای
DocType: Fee Validity,Max number of visit,حداکثر تعداد بازدید
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,برنامه زمانی ایجاد شده:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ثبت نام کردن
DocType: GST Settings,GST Settings,تنظیمات GST
DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,بودجه علیه
DocType: Employee,Cell Number,شماره همراه
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,برای معیارهای داده شده هیچ کارمند وجود ندارد چک کنید که حقوق و دستمزد قبلا ایجاد نشده است.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,درخواست مواد تولید خودکار
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,درخواست مواد تولید خودکار
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,از دست رفته
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"شما نمی توانید سند هزینه جاری را در ستون""علیه مجله "" وارد کنید"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,محفوظ برای تولید
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,انرژی
DocType: Opportunity,Opportunity From,فرصت از
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بیانیه حقوق ماهانه.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ردیف {0}: {1} شماره سریال مورد برای {2} مورد نیاز است. شما {3} را ارائه کرده اید.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ردیف {0}: {1} شماره سریال مورد برای {2} مورد نیاز است. شما {3} را ارائه کرده اید.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,لطفا یک جدول را انتخاب کنید
DocType: BOM,Website Specifications,مشخصات وب سایت
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} یک آدرس ایمیل نا معتبردر «گیرندگان» است
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,درخواست نقل قول
DocType: Vital Signs,Heart Rate / Pulse,ضربان قلب / پالس
DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'به روز رسانی موجودی'نمی تواند انتخاب شود ، زیرا موارد از طریق تحویل نمی {0}
DocType: Vehicle,Acquisition Date,تاریخ اکتساب
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,شماره
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),سربرگ خود را بارگذاری کنید (به عنوان وب سایت دوستانه 900px بر روی 100px نگه دارید)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: حساب {2} نمی تواند یک گروه
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,مورد ردیف {IDX}: {} {DOCTYPE DOCNAME} در بالا وجود ندارد '{} DOCTYPE جدول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,برنامه زمانی {0} است در حال حاضر تکمیل و یا لغو
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,برنامه زمانی {0} است در حال حاضر تکمیل و یا لغو
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,وظایف
DocType: Item Variant Settings,Copy Fields to Variant,کپی زمینه به گزینه
DocType: Asset,Opening Accumulated Depreciation,باز کردن استهلاک انباشته
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,شرکای فروش و منطقه
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} باید فعال باشد
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),بسته شدن (باز کردن + مجموع)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),بسته شدن (باز کردن + مجموع)
DocType: Journal Entry,Depreciation Entry,ورود استهلاک
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,لطفا ابتدا نوع سند را انتخاب کنید
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,چاپ در حساب ارز
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغو مواد بازدید {0} قبل از لغو این نگهداری سایت
DocType: Crop Cycle,ISO 8016 standard,ایزو 8016 استاندارد
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},سریال بدون {0} به مورد تعلق ندارد {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,به طور پیش فرض حسابهای پرداختنی
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,مورد انواع {0} به روز شده
DocType: Quality Inspection Reading,Reading 6,خواندن 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,نام شرکت
DocType: SMS Center,Total Message(s),پیام ها (بازدید کنندگان)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,لطفا مجموعه نامگذاری را برای {0} از طریق تنظیمات> تنظیمات> نامگذاری سری
DocType: Purchase Invoice,Additional Discount Percentage,تخفیف اضافی درصد
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,نمایش یک لیست از تمام فیلم ها کمک
DocType: Agriculture Analysis Criteria,Soil Texture,بافت خاک
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM مورد وب سایت
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
DocType: Timesheet Detail,Bill,لایحه
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,بعدی تاریخ استهلاک به عنوان تاریخ گذشته وارد
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,بعدی تاریخ استهلاک به عنوان تاریخ گذشته وارد
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,سفید
DocType: SMS Center,All Lead (Open),همه سرب (باز)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ردیف {0}: تعداد برای در دسترس نیست {4} در انبار {1} در زمان ارسال از ورود ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,تماس با آمار بعدی
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,باز کردن تعداد
DocType: Healthcare Settings,Appointment Reminder,یادآوری انتصاب
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
DocType: Program Enrollment Tool Student,Student Batch Name,دانشجو نام دسته ای
DocType: Consultation,Doctor,دکتر
DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ترک ابزار تخصیص
DocType: Item,Hub Category to Publish,رده توزیع برای انتشار
DocType: Leave Block List,Leave Block List Dates,ترک فهرست بلوک خرما
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,لطفا شماره سریال را برای شرکت کنندگان از طریق Setup> Numbering Series نصب کنید
DocType: Sales Invoice,Billing Address GSTIN,آدرس پرداخت GSTIN
DocType: Assessment Plan,Evaluate,ارزیابی کنید
DocType: Workstation,Net Hour Rate,خالص نرخ ساعت
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,فاکتور فروش پرداخت
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,انبار محفوظ در سفارش فروش / به پایان رسید کالا انبار
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,فروش مقدار
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,فروش مقدار
DocType: Repayment Schedule,Interest Amount,مقدار بهره
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویبکننده هزینه برای این پرونده هستید. لطفاٌ 'وضعیت' را بروزرسانی و سپس ذخیره نمایید
DocType: Serial No,Creation Document No,ایجاد سند بدون
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,باز کردن تعادل حسابداری
,GST Sales Register,GST فروش ثبت نام
DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,هیچ چیز برای درخواست
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,هیچ چیز برای درخواست
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,دامنه های خود را انتخاب کنید
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},دیگری را ضبط بودجه '{0}' در حال حاضر در برابر وجود دارد {1} '{2} برای سال مالی {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,زمینه ها تنها در زمان ایجاد ایجاد می شوند.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",این خواهد شد به کد مورد از نوع اضافه خواهد شد. برای مثال، اگر شما مخفف "SM" است، و کد مورد است "تی شرت"، کد مورد از نوع خواهد بود "تی شرت-SM"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,پرداخت خالص (به عبارت) قابل مشاهده خواهد بود یک بار شما را لغزش حقوق و دستمزد را نجات دهد.
DocType: Purchase Invoice,Is Return,آیا بازگشت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,احتیاط
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,احتیاط
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,بازگشت / دبیت توجه
DocType: Price List Country,Price List Country,لیست قیمت کشور
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} NOS سریال معتبر برای مورد {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} NOS سریال معتبر برای مورد {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,کد مورد می تواند برای شماره سریال نمی تواند تغییر
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM عامل تبدیل
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,لطفا کد کالا وارد کنید برای دریافت شماره بچ
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
DocType: Supplier Scorecard,Warn for new Request for Quotations,اخطار برای درخواست جدید برای نقل قول
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,سفارشات خرید به شما کمک کند برنامه ریزی و پیگیری خرید خود را
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,آزمایشات آزمایشی
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",کل مقدار شماره / انتقال {0} در درخواست پاسخ به مواد {1} \ نمی تواند بیشتر از مقدار درخواست {2} برای مورد {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,انبار اطلاعات تماس
DocType: Payment Entry,Write Off Difference Amount,نوشتن کردن مقدار تفاوت
DocType: Volunteer,Volunteer Name,نام داوطلب
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,لطفا سیستم نامگذاری مربیان را در آموزش و پرورش> تنظیمات تحصیلی تنظیم کنید
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: ایمیل کارمند یافت نشد، از این رو ایمیل ارسال نمی
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},قانون حمل و نقل برای کشور قابل اجرا نیست {0}
DocType: Item,Foreign Trade Details,جزییات تجارت خارجی
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,گروه شماره رول
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,در کل از همه وزن وظیفه باید باشد 1. لطفا وزن همه وظایف پروژه تنظیم بر این اساس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,تجهیزات سرمایه
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب 'درخواست در' درست است که می تواند مورد، مورد گروه و یا تجاری.
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,انبار کودک برای این انبار وجود دارد. شما می توانید این انبار را حذف کنید.
DocType: Item,Website Item Groups,گروه مورد وب سایت
DocType: Purchase Invoice,Total (Company Currency),مجموع (شرکت ارز)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,شماره سریال {0} وارد بیش از یک بار
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,شماره سریال {0} وارد بیش از یک بار
DocType: Journal Entry,Journal Entry,ورودی دفتر
DocType: Expense Claim Advance,Unclaimed amount,مقدار نامعلوم
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} اقلام در حال انجام
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,ورود به سیستم ارتباطات.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",درخواست برای نقل قول به دسترسی از پورتال غیر فعال است، برای اطلاعات بیشتر تنظیمات پورتال چک.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,متغیر رتبه بندی کارت امتیازی تامین کننده
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,مقدار خرید
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,مقدار خرید
DocType: Sales Invoice,Shipping Address Name,حمل و نقل آدرس
DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,اشتباهاتی در ایجاد برنامه درس وجود داشت
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,این است که در سیاهههای مربوط در برابر این خودرو است. مشاهده جدول زمانی زیر برای جزئیات
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,شما نمی توانید حذف سال مالی {0}. سال مالی {0} به عنوان پیش فرض در تنظیمات جهانی تنظیم
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,یک مشتری با همین نام قبلا وجود دارد
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,این باعث می شود که حقوق و دستمزد را ایجاد کنید و مجله ورودی تعهدی ایجاد کنید. آیا شما می خواهید ادامه دهید؟
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,قیمت گذاری
DocType: Quotation,Term Details,جزییات مدت
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,نمی توانید بیش از {0} دانش آموزان برای این گروه از دانشجویان ثبت نام.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),مجموع (بدون مالیات)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,تعداد سرب
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} باید بزرگتر از 0 باشد
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,سهام موجود
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,قطع ارتباط پرداخت در لغو فاکتور
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},خواندن کیلومترشمار فعلی وارد باید بیشتر از اولیه خودرو کیلومترشمار شود {0}
DocType: Restaurant Reservation,No Show,بدون نمایش
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,لطفا مجموعه نامگذاری را برای {0} از طریق تنظیمات> تنظیمات> نامگذاری سری
DocType: Shipping Rule Country,Shipping Rule Country,قانون حمل و نقل کشور
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,حضور و غیاب
DocType: Maintenance Visit,Partially Completed,نیمه تکمیل شده
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,مربی دانشجویی گروه
DocType: Grant Application,Assessment Mark (Out of 10),ارزیابی علامت (از 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 موبایل بدون
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,اصلی
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,اصلی
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,نوع دیگر
DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
DocType: Employee Attendance Tool,Employees HTML,کارمندان HTML
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,مخفف دوره
DocType: Student Leave Application,Student Leave Application,دانشجو مرخصی کاربرد
DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارمند {0} در روز نیمه در {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},کل ساعات کار نباید از ساعات کار حداکثر است بیشتر {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,بر
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),واقعی پایان تاریخ (از طریق زمان ورق)
DocType: Soil Texture,Soil Type,نوع خاک
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,پیام جدید
,Quotation Trends,روند نقل قول
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
DocType: Shipping Rule,Shipping Amount,مقدار حمل و نقل
DocType: Supplier Scorecard Period,Period Score,امتیاز دوره
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,اضافه کردن مشتریان
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,هزینه های خودرو
DocType: Serial No,Invoice Details,جزئیات فاکتور
DocType: Grant Application,Show on Website,نمایش در وب سایت
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,شروع کن
DocType: Hub Category,Hub Category,رده هاب
DocType: Purchase Invoice,SEZ,SEZ
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,B مثبت
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
DocType: Patient Medical Record,Patient Medical Record,پرونده پزشکی بیمار
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,گروه به غیر گروه
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ورزشی
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,نمی توان RFQ دریافتی را بدون نقل قول تنظیم کرد
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,کسر مجموع
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,یک حساب کاربری برای چاپ در حساب حساب را انتخاب کنید
,Production Analytics,تجزیه و تحلیل ترافیک تولید
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,این بر مبنای معاملات در برابر این بیمار است. برای جزئیات بیشتر به جدول زمانی زیر مراجعه کنید
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,هزینه به روز رسانی
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,انتخاب شرکت ...
DocType: Leave Control Panel,Leave blank if considered for all departments,خالی بگذارید اگر برای همه گروه ها در نظر گرفته
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
DocType: Payroll Entry,Fortnightly,دوهفتگی
DocType: Currency Exchange,From Currency,از ارز
DocType: Vital Signs,Weight (In Kilogram),وزن (در کیلوگرم)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,نگهبان
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,قیمت نشان داده نخواهد شد اگر لیست قیمت تنظیم نشده است
DocType: Stock Entry,Total Incoming Value,مجموع ارزش ورودی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,بدهکاری به مورد نیاز است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,بدهکاری به مورد نیاز است
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",برنامه های زمانی کمک به پیگیری از زمان، هزینه و صدور صورت حساب برای فعالیت های انجام شده توسط تیم خود را
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,خرید لیست قیمت
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,الگوهای متغیرهای کارت امتیازی تامین کننده.
@@ -2654,7 +2659,7 @@
DocType: Company,For Reference Only.,برای مرجع تنها.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},پزشک {0} در {1} در دسترس نیست
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,انتخاب دسته ای بدون
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},نامعتبر {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},نامعتبر {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,مجله مرجع
@@ -2691,8 +2696,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
DocType: Water Analysis,Origin,اصل و نسب
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,این سند بیش از حد مجاز است {0} {1} برای آیتم {4}. آیا شما ساخت یکی دیگر از {3} در برابر همان {2}.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,انتخاب تغییر حساب مقدار
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,انتخاب تغییر حساب مقدار
DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
@@ -2748,7 +2753,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,اخطار سفارشات خرید جدید
DocType: Quality Inspection Reading,Reading 9,خواندن 9
DocType: Supplier,Is Frozen,آیا منجمد
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,انبار گره گروه مجاز به برای انجام معاملات را انتخاب کنید
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,انبار گره گروه مجاز به برای انجام معاملات را انتخاب کنید
DocType: Buying Settings,Buying Settings,تنظیمات خرید
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,شماره BOM برای مورد خوبی در دست اجرا
DocType: Upload Attendance,Attendance To Date,حضور و غیاب به روز
@@ -2762,6 +2767,7 @@
DocType: Grant Application,Organization,سازمان
DocType: BOM Update Tool,BOM Update Tool,ابزار به روز رسانی BOM
DocType: SG Creation Tool Course,Student Group Name,نام دانشجو گروه
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,نمایش نمایش منفرد
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ایجاد هزینه ها
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
DocType: Room,Room Number,شماره اتاق
@@ -2772,7 +2778,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,قالب مالیاتی
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,انجمن کاربران
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
DocType: Lab Test Sample,Lab Test Sample,آزمایش آزمایشی نمونه
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
@@ -2843,7 +2849,7 @@
DocType: Membership,USD,دلار آمریکا
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,را فاکتور
DocType: Selling Settings,Auto close Opportunity after 15 days,خودرو فرصت نزدیک پس از 15 روز
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,سفارشات خرید ممنوع است برای {0} به دلیل ایستادن کارت امتیازی از {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,سفارشات خرید ممنوع است برای {0} به دلیل ایستادن کارت امتیازی از {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,پایان سال
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot و / سرب٪
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
@@ -2935,7 +2941,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-بالاتر از
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ردیف # {0}: مجله ورودی {1} می کند حساب کاربری ندارید {2} یا در حال حاضر همسان در برابر کوپن دیگر
DocType: Supplier Scorecard Criteria,Criteria Weight,معیارهای وزن
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,تامین کننده> نوع تامین کننده
DocType: Buying Settings,Default Buying Price List,به طور پیش فرض لیست قیمت خرید
DocType: Payroll Entry,Salary Slip Based on Timesheet,لغزش حقوق و دستمزد بر اساس برنامه زمانی
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,نرخ خرید
@@ -3023,7 +3028,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,آهنگ فرصت های نوع صنعت.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,برو به نامه ها
DocType: Item Supplier,Item Supplier,تامین کننده مورد
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام آدرس.
DocType: Company,Stock Settings,تنظیمات سهام
@@ -3200,6 +3205,7 @@
DocType: Company,Default Inventory Account,حساب پرسشنامه به طور پیش فرض
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ردیف {0}: پایان تعداد باید بزرگتر از صفر باشد.
DocType: Antibiotic,Antibiotic Name,نام آنتی بیوتیک
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,کد مورد> گروه مورد> نام تجاری
DocType: Purchase Invoice,Apply Additional Discount On,درخواست تخفیف اضافی
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,انتخاب نوع ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,لینک به تمام واحد های زمین که در آن محصول در حال رشد است
@@ -3393,6 +3399,7 @@
DocType: Supplier,Credit Limit,محدودیت اعتبار
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,میانگین فروش قیمت نرخ قیمت
DocType: Production Plan Sales Order,Salse Order Date,Salse تاریخ سفارش
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,تامین کننده> نوع تامین کننده
DocType: Salary Component,Salary Component,حقوق و دستمزد و اجزای
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,مطالب پرداخت {0} سازمان ملل متحد در ارتباط هستند
DocType: GL Entry,Voucher No,کوپن بدون
@@ -3401,7 +3408,7 @@
DocType: Leave Allocation,Leave Allocation,ترک تخصیص
DocType: Payment Request,Recipient Message And Payment Details,گیرنده پیام و جزئیات پرداخت
DocType: Training Event,Trainer Email,ترینر ایمیل
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,درخواست مواد {0} ایجاد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,درخواست مواد {0} ایجاد
DocType: Restaurant Reservation,No of People,بدون مردم
DocType: Production Planning Tool,Include sub-contracted raw materials,شامل مواد خام زیر قرارداد
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,الگو از نظر و یا قرارداد.
@@ -3465,7 +3472,7 @@
DocType: Production Planning Tool,Create Material Requests,ایجاد درخواست مواد
DocType: Employee Education,School/University,مدرسه / دانشگاه
DocType: Payment Request,Reference Details,اطلاعات مرجع
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,مقدار مورد انتظار پس از زندگی مفید باید کمتر از خالص خرید مقدار باشد
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,مقدار مورد انتظار پس از زندگی مفید باید کمتر از خالص خرید مقدار باشد
DocType: Sales Invoice Item,Available Qty at Warehouse,تعداد موجود در انبار
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,مقدار فاکتور شده
DocType: Asset,Double Declining Balance,دو موجودی نزولی
@@ -3477,7 +3484,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,دریافت به روز رسانی
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: حساب {2} به شرکت تعلق ندارد {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,حداقل یک مقدار از هر یک از ویژگی ها را انتخاب کنید.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
apps/erpnext/erpnext/config/hr.py +310,Leave Management,ترک مدیریت
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,گروه های حساب
DocType: Sales Order,Fully Delivered,به طور کامل تحویل
@@ -3488,14 +3495,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},میزان مبالغ هزینه نمی تواند بیشتر از وام مبلغ {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,به برنامه ها بروید
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ردیف {0} # مقدار اختصاص داده شده {1} نمیتواند بیشتر از مقدار درخواست نشده باشد {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,لطفا شماره سریال را برای شرکت کنندگان از طریق Setup> Numbering Series نصب کنید
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,تولید سفارش ایجاد نمی
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},می توانید تغییر وضعیت به عنوان دانش آموز نمی {0} است با استفاده از دانش آموزان مرتبط {1}
DocType: Asset,Fully Depreciated,به طور کامل مستهلک
,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,حضور و غیاب مشخص HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",نقل قول پیشنهادات، مناقصه شما را به مشتریان خود ارسال
DocType: Sales Order,Customer's Purchase Order,سفارش خرید مشتری
@@ -3579,7 +3585,7 @@
DocType: Stock Settings,Item Naming By,مورد نامگذاری توسط
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},یکی دیگر از ورودی اختتامیه دوره {0} شده است پس از ساخته شده {1}
DocType: Production Order,Material Transferred for Manufacturing,مواد منتقل ساخت
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,حساب {0} وجود ندارد
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,حساب {0} وجود ندارد
DocType: Project,Project Type,نوع پروژه
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,وظیفه کودک برای این وظیفه وجود دارد. شما نمی توانید این کار را حذف کنید.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,در هر دو صورت تعداد هدف یا هدف مقدار الزامی است.
@@ -3681,11 +3687,11 @@
DocType: Company,Asset Depreciation Cost Center,دارایی مرکز استهلاک هزینه
DocType: Sales Order Item,Sales Order Date,تاریخ سفارش فروش
DocType: Sales Invoice Item,Delivered Qty,تحویل تعداد
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,کل Excl مالیات
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",اگر علامت زده شود، همه بچه ها از هر یک از آیتم تولید خواهد شد در درخواست مواد گنجانده شده است.
DocType: Assessment Plan,Assessment Plan,طرح ارزیابی
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,مشتری {0} ایجاد شده است
DocType: Stock Settings,Limit Percent,درصد محدود
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,لطفا سیستم نامگذاری مربیان را در آموزش و پرورش> تنظیمات تحصیلی تنظیم کنید
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,در حال حاضر هیچ کالایی در انبار وجود ندارد
,Payment Period Based On Invoice Date,دوره پرداخت بر اساس فاکتور عضویت
DocType: Sample Collection,No. of print,تعداد چاپ
@@ -3701,12 +3707,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),بدهکاران ({0})
DocType: Pricing Rule,Margin,حاشیه
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,مشتریان جدید
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,سود ناخالص٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,سود ناخالص٪
DocType: Appraisal Goal,Weightage (%),بین وزنها (٪)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,تغییر مشخصات POS
DocType: Bank Reconciliation Detail,Clearance Date,ترخیص کالا از تاریخ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,گزارش ارزیابی
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,مبلغ خرید خالص الزامی است
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,مبلغ خرید خالص الزامی است
DocType: Lead,Address Desc,نشانی محصول
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,حزب الزامی است
DocType: Journal Entry,JV-,JV-
@@ -3738,7 +3744,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,نام مستعار
DocType: Stock Entry,Customer or Supplier Details,مشتری و یا تامین کننده
DocType: Employee Loan Application,Required by Date,مورد نیاز تاریخ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),تعادل تعادل (Dr - Cr)
DocType: Lead,Lead Owner,مالک راهبر
DocType: Bin,Requested Quantity,تعداد درخواست
DocType: Patient,Marital Status,وضعیت تاهل
@@ -3752,7 +3757,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,گزینه های چندگانه
DocType: Sales Invoice,Against Income Account,به حساب درآمد
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تحویل داده شد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,مورد {0}: تعداد مرتب {1} نمی تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,مورد {0}: تعداد مرتب {1} نمی تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,درصد ماهانه توزیع
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,لطفا به عنوان کاربر دیگری وارد شوید
DocType: Territory,Territory Targets,اهداف منطقه
@@ -3851,7 +3856,7 @@
DocType: Serial No,Out of AMC,از AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,را نگهداری سایت
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
DocType: Company,Default Cash Account,به طور پیش فرض حساب های نقدی
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,این است که در حضور این دانش آموز بر اساس
@@ -4001,7 +4006,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,هیچ کارمند برای معیارهای ذکر شده
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
DocType: Restaurant,Default Customer,مشتری پیش فرض
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,لطفا سیستم نامگذاری کارمندان را در منابع انسانی تنظیم کنید> تنظیمات HR
DocType: Assessment Plan,Supervisor Name,نام استاد راهنما
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,تأیید نکرده اید که قرار ملاقات برای همان روز ایجاد شده باشد
DocType: Program Enrollment Course,Program Enrollment Course,برنامه ثبت نام دوره
@@ -4119,7 +4123,7 @@
DocType: BOM,Website Description,وب سایت توضیحات
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,تغییر خالص در حقوق صاحبان سهام
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,جدیدترین
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",آدرس ایمیل باید منحصر به فرد باشد، در حال حاضر برای {0} وجود دارد
DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,اعلام وصول
@@ -4136,7 +4140,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,صورت جریان وجوه نقد
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,مجوز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,لطفا انتخاب کنید حمل به جلو اگر شما نیز می خواهید که شامل تعادل سال گذشته مالی برگ به سال مالی جاری
DocType: GL Entry,Against Voucher Type,در برابر نوع کوپن
DocType: Physician,Phone (R),تلفن (R)
@@ -4148,7 +4152,7 @@
DocType: Patient,B Negative,B منفی است
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,وضعیت تعمیر و نگهداری باید لغو شود یا تکمیل شود
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},حساب {0} به شرکت {1} تعلق ندارد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,شماره سریال در ردیف {0} با تحویل توجه مطابقت ندارد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,شماره سریال در ردیف {0} با تحویل توجه مطابقت ندارد
DocType: Student,Guardian Details,نگهبان جزییات
DocType: C-Form,C-Form,C-فرم
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,حضور و غیاب علامت برای کارکنان متعدد
@@ -4190,7 +4194,7 @@
DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
DocType: Training Event,Exam,امتحان
DocType: Complaint,Complaint,شکایت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
DocType: Patient,Alcohol Past Use,مصرف الکل گذشته
DocType: Fertilizer Content,Fertilizer Content,محتوای کود
@@ -4314,6 +4318,7 @@
DocType: Salary Detail,Formula,فرمول
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,سریال #
DocType: Lab Test Template,Lab Test Template,آزمایش آزمایشی
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,حساب فروش
DocType: Purchase Invoice Item,Total Weight,وزن مجموع
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,کمیسیون فروش
DocType: Offer Letter Term,Value / Description,ارزش / توضیحات
@@ -4470,7 +4475,7 @@
DocType: Customer,From Lead,از سرب
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,سفارشات برای تولید منتشر شد.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,انتخاب سال مالی ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
DocType: Program Enrollment Tool,Enroll Students,ثبت نام دانش آموزان
DocType: Lab Test,Approved Date,تاریخ تأیید
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,فروش استاندارد
@@ -4546,7 +4551,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,مورد تولید
,Employee Information,اطلاعات کارمند
DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,را عین تامین کننده
DocType: Quality Inspection,Incoming,وارد شونده
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,قالب های پیش فرض مالی برای فروش و خرید ایجاد می شوند.
@@ -4563,7 +4568,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},توجه: {0}
,Delivery Note Trends,روند تحویل توجه داشته باشید
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,خلاصه این هفته
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,در انبار تعداد
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,در انبار تعداد
DocType: Delivery Trip,Calculate Estimated Arrival Times,محاسبه زمان ورود تخمینی
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,حساب: {0} تنها می تواند از طریق معاملات سهام به روز شده
DocType: Student Group Creation Tool,Get Courses,دوره های
@@ -4579,7 +4584,7 @@
DocType: Material Request,% Ordered,مرتب٪
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",برای دوره بر اساس گروه دانشجویی، دوره خواهد شد برای هر دانشجو از دوره های ثبت نام شده در برنامه ثبت نام تایید شده است.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,کار از روی مقاطعه
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,اوسط نرخ خرید
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,اوسط نرخ خرید
DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
DocType: Employee,History In Company,تاریخچه در شرکت
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},پیام جدید از {sender}
@@ -4627,7 +4632,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ردیف {0}: ارز BOM # در {1} باید به ارز انتخاب شده برابر باشد {2}
DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
DocType: Patient,Additional information regarding the patient,اطلاعات اضافی مربوط به بیمار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
DocType: Homepage,Tag Line,نقطه حساس
DocType: Fee Component,Fee Component,هزینه یدکی
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,مدیریت ناوگان
@@ -4839,7 +4844,7 @@
DocType: Employee Education,Employee Education,آموزش و پرورش کارمند
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,گروه مورد تکراری در جدول گروه مورد
DocType: Land Unit,Parent Land Unit,واحد زمین والدین
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
DocType: Fertilizer,Fertilizer Name,نام کود
DocType: Salary Slip,Net Pay,پرداخت خالص
DocType: Account,Account,حساب
@@ -4918,7 +4923,7 @@
DocType: Item Customer Detail,Ref Code,کد
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,گروه مشتری در مشخصات اعتبار مورد نیاز است
apps/erpnext/erpnext/config/hr.py +12,Employee records.,سوابق کارکنان.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,لطفا بعد تاریخ استهلاک
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,لطفا بعد تاریخ استهلاک
DocType: HR Settings,Payroll Settings,تنظیمات حقوق و دستمزد
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,مطابقت فاکتورها غیر مرتبط و پرداخت.
DocType: POS Settings,POS Settings,تنظیمات POS
@@ -5085,7 +5090,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
DocType: Asset Maintenance Task,Last Completion Date,آخرین تاریخ تکمیل
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,روز پس از آخرین سفارش
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
DocType: Buying Settings,Naming Series,نامگذاری سری
DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,تاریخ بیمه شروع باید کمتر از تاریخ پایان باشد بیمه
@@ -5211,6 +5216,7 @@
DocType: Bank Reconciliation,Get Payment Entries,مطلع مطالب پرداخت
DocType: Quotation Item,Against Docname,علیه Docname
DocType: SMS Center,All Employee (Active),همه کارکنان (فعال)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,مشتری> گروه مشتری> قلمرو
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,مشاهده در حال حاضر
DocType: BOM,Raw Material Cost,هزینه مواد خام
DocType: Item Reorder,Re-Order Level,ترتیب سطح
@@ -5309,7 +5315,6 @@
DocType: Room,Seating Capacity,گنجایش
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,آزمایشگاه آزمایشگاه
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,مشتری> گروه مشتری> قلمرو
DocType: Project,Total Expense Claim (via Expense Claims),مجموع ادعای هزینه (از طریق ادعاهای هزینه)
DocType: GST Settings,GST Summary,GST خلاصه
DocType: Assessment Result,Total Score,نمره کل
@@ -5322,7 +5327,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,برنامه های دوره ای ایجاد شد
DocType: Journal Entry,Total Debit,دبیت مجموع
DocType: Manufacturing Settings,Default Finished Goods Warehouse,به طور پیش فرض به پایان رسید کالا انبار
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,فروشنده
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,فروشنده
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,بودجه و هزینه مرکز
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,حالت پیش پرداخت چندگانه مجاز نیست
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,برای
@@ -5495,7 +5500,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,مالیات و یا هزینه در نظر بگیرید برای
DocType: Driver,Driving License Category,رده مجوز رانندگی
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,تعداد واقعی الزامی است
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} در حال حاضر یک کارت امتیازی ارائه کننده {1} دارد و سفارشات خرید به این فروشنده باید با احتیاط صادر شود.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} در حال حاضر یک کارت امتیازی ارائه کننده {1} دارد و سفارشات خرید به این فروشنده باید با احتیاط صادر شود.
DocType: Asset Maintenance Team,Asset Maintenance Team,تیم پشتیبانی دارایی
DocType: Employee Loan,Loan Type,نوع وام
DocType: Scheduling Tool,Scheduling Tool,ابزار برنامه ریزی
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 8c2bdaf..da42984 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Lajittele Hinta
,Delay Days,Viivepäivät
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,palvelu Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,lasku
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Tee säilytyskurssi
DocType: Purchase Invoice Item,Item Weight Details,Kohde Painon tiedot
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Viite: {0}, kohta Koodi: {1} ja Asiakas: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avaaminen ja työn.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM: tä ei ole määritetty alihankintakohteeseen {0} rivillä {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM: tä ei ole määritetty alihankintakohteeseen {0} rivillä {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Tulos toimitettu
DocType: Item Attribute,Increment,Lisäys
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Aikajänne
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ei saa {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Hae nimikkeet
DocType: Price List,Price Not UOM Dependant,Hinta ei ole UOM riippuvainen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Tuotteen {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ei luetellut
DocType: Asset Repair,Error Description,Virhe Kuvaus
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,päivittäistavara
DocType: Quality Inspection Reading,Reading 1,Lukema 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Eläkerahastot
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Seuraava Poistot Date ei voi olla ennen Ostopäivä
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Seuraava Poistot Date ei voi olla ennen Ostopäivä
DocType: Crop,Perennial,Monivuotinen
DocType: Consultation,Consultation Date,Kuulemispäivämäärä
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Tuoteluettelon ja löytämisen ERP: n käyttäjille
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",esimerkiksi "Primary School" tai "University"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Perusraportit
DocType: Warehouse,Warehouse Detail,Varaston lisätiedot
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan {0} luottoraja on ylittynyt: {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan {0} luottoraja on ylittynyt: {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Term Päättymispäivä ei voi olla myöhemmin kuin vuosi Päättymispäivä Lukuvuoden johon termiä liittyy (Lukuvuosi {}). Korjaa päivämäärät ja yritä uudelleen.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Is Fixed Asset" ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
DocType: Delivery Trip,Departure Time,Lähtöaika
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,hae tekniset lisätiedot
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Toimittajien sijoitusten mallit.
DocType: Lead,Interested,kiinnostunut
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Aukko
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Aukko
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},{0} -> {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Verojen asettaminen epäonnistui
DocType: Item,Copy From Item Group,kopioi tuoteryhmästä
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Työsuhteen päättymisäpäivän on oltava aloituspäivän jälkeen
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Vapaat vuodessa
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
DocType: Email Digest,Profit & Loss,Voitonmenetys
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,litra
DocType: Task,Total Costing Amount (via Time Sheet),Yhteensä Costing Määrä (via Time Sheet)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Tämä perustuu liiketoimiin tätä yhtiötä vastaan. Katso yksityiskohtaisia tietoja aikajanasta
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ilmoita automaattisen hankintapyynnön luomisesta sähköpostitse
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,kestävä
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi Valuutta
DocType: Opening Invoice Creation Tool,Invoice Type,lasku tyyppi
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,lähete
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Jäänyt leskeksi
DocType: Request for Quotation,Request for Quotation,Tarjouspyyntö
DocType: Healthcare Settings,Require Lab Test Approval,Vaaditaan Lab Test Approval
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Item Code> Item Group> Tuotemerkki
DocType: Salary Slip Timesheet,Working Hours,Työaika
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Yhteensä erinomainen
DocType: Naming Series,Change the starting / current sequence number of an existing series.,muuta aloitusta / nykyselle järjestysnumerolle tai olemassa oleville sarjoille
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Syötä kustannuspaikka
DocType: Drug Prescription,Dosage,annostus
DocType: Journal Entry Account,Sales Order,Myyntitilaus
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Myynnin keskihinta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Myynnin keskihinta
DocType: Assessment Plan,Examiner Name,Tutkijan Name
DocType: Lab Test Template,No Result,Ei tulosta
DocType: Purchase Invoice Item,Quantity and Rate,Määrä ja hinta
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Valitse Payroll Aika
DocType: Purchase Invoice,Unpaid,Palkaton
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Varattu myytävänä
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Aseta henkilöstön nimeämisjärjestelmä henkilöresursseihin> HR-asetukset
DocType: Packing Slip,From Package No.,pakkauksesta
DocType: Item Attribute,To Range,Vaihtuakseen
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Arvopaperit ja talletukset
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,työpaja
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varoittaa ostotilauksia
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Luettele muutamia asiakkaitasi. Asiakkaat voivat olla organisaatioita tai yksilöitä.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Tarpeeksi osat rakentaa
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Tarpeeksi osat rakentaa
DocType: POS Profile User,POS Profile User,POS-profiilin käyttäjä
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,suorat tulot
DocType: Patient Appointment,Date TIme,Treffiaika
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,hallintovirkailija
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Yrityksen perustaminen ja verotus
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Valitse kurssi
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Erotuksen tili
DocType: Purchase Invoice,Supplier GSTIN,Toimittaja GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Syötä varasto jonne hankintapyyntö ohjataan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Syötä varasto jonne hankintapyyntö ohjataan
DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,kosmetiikka
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Suhde Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Hallinta
DocType: Payment Entry,Payment From / To,Maksaminen / To
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uusi luottoraja on pienempi kuin nykyinen jäljellä asiakkaalle. Luottoraja on oltava atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uusi luottoraja on pienempi kuin nykyinen jäljellä asiakkaalle. Luottoraja on oltava atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Aseta tili Warehouse {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'perustaja' ja 'ryhmä' ei voi olla samat
DocType: Sales Person,Sales Person Targets,Myyjän tavoitteet
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,erä Name
DocType: Fee Validity,Max number of visit,Vierailun enimmäismäärä
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Tuntilomake luotu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,kirjoittautua
DocType: GST Settings,GST Settings,GST Asetukset
DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Budget Against
DocType: Employee,Cell Number,solunumero
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Ei ole työntekijää annettuihin kriteereihin. Tarkista, että palkkapeltoja ei ole vielä luotu."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Automaattinen hankintapyyntö luotu
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automaattinen hankintapyyntö luotu
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hävitty
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Varattu valmistus
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energia
DocType: Opportunity,Opportunity From,tilaisuuteen
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,kuukausipalkka tosite
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rivi {0}: {1} Sarjanumerot kohdasta {2}. Olet antanut {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rivi {0}: {1} Sarjanumerot kohdasta {2}. Olet antanut {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Valitse taulukko
DocType: BOM,Website Specifications,Verkkosivuston tiedot
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients','Vastaanottajat' luettelossa on virheellinen sähköpostiosoite {0}
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Pyydetty pyyntö
DocType: Vital Signs,Heart Rate / Pulse,Syke / pulssi
DocType: Company,Default Bank Account,oletus pankkitili
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",Valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Päivitä varasto' ei voida käyttää tuotteille, joita ei ole toimitettu {0} kautta"
DocType: Vehicle,Acquisition Date,Hankintapäivä
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Lähetä kirjeesi pään (Pidä se web friendly kuin 900px 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Tili {2} ei voi olla ryhmä
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Kohta Rivi {idx}: {DOCTYPE} {DOCNAME} ei ole olemassa edellä {DOCTYPE} table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Tuntilomake {0} on jo täytetty tai peruttu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Tuntilomake {0} on jo täytetty tai peruttu
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ei tehtäviä
DocType: Item Variant Settings,Copy Fields to Variant,Kopioi kentät versioksi
DocType: Asset,Opening Accumulated Depreciation,Avaaminen Kertyneet poistot
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,Suunnittele materiaalit alituotantoon
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Myynnin Partners ja Territory
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} tulee olla aktiivinen
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Sulkeminen (avaaminen + yhteensä)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Sulkeminen (avaaminen + yhteensä)
DocType: Journal Entry,Depreciation Entry,Poistot Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Valitse ensin asiakirjan tyyppi
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Tulosta tili-valuuttaan
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Peru materiaalikäynti {0} ennen huoltokäynnin perumista
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 -standardi
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Sarjanumero {0} ei kuulu tuotteelle {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Työntekijä {0} ei ole aktiivinen tai sitä ei ole olemassa
DocType: Fee Structure,Components,komponentit
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Tuotemallit {0} päivitetty
DocType: Quality Inspection Reading,Reading 6,Lukema 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,Yrityksen nimi
DocType: SMS Center,Total Message(s),viestit yhteensä
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Valitse siirrettävä tuote
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Aseta Naming-sarja {0} asetukseksi Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Lisäalennusprosentti
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Katso luettelo kaikista ohjevideot
DocType: Agriculture Analysis Criteria,Soil Texture,Maaperän rakenne
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM-sivuston Kohta
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Tuo kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
DocType: Timesheet Detail,Bill,Laskuttaa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Seuraavaksi Poistot Date kirjataan ohi päivämäärä
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Seuraavaksi Poistot Date kirjataan ohi päivämäärä
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Valkoinen
DocType: SMS Center,All Lead (Open),Kaikki Liidit (Avoimet)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rivi {0}: Määrä ei saatavilla {4} varasto {1} klo lähettämistä tullessa ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Avaus yksikkömäärä
DocType: Healthcare Settings,Appointment Reminder,Nimitysohje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Anna Account for Change Summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Anna Account for Change Summa
DocType: Program Enrollment Tool Student,Student Batch Name,Opiskelijan Erä Name
DocType: Consultation,Doctor,Lääkäri
DocType: Holiday List,Holiday List Name,lomaluettelo nimi
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Vapaiden kohdistustyökalu
DocType: Item,Hub Category to Publish,Hub Luokka julkaista
DocType: Leave Block List,Leave Block List Dates,"poistu estoluettelo, päivät"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Aseta numeerinen sarja osallistumiselle Setup> Numerosarjan kautta
DocType: Sales Invoice,Billing Address GSTIN,Laskutusosoite GSTIN
DocType: Assessment Plan,Evaluate,Arvioida
DocType: Workstation,Net Hour Rate,tuntihinta (netto)
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-jälkikä-
DocType: POS Profile,Sales Invoice Payment,Myynnin lasku Payment
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,varattu varastosta myyntitilaukseen / valmiit tuotteet varastoon
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Myynnin arvomäärä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Myynnin arvomäärä
DocType: Repayment Schedule,Interest Amount,Korko Arvo
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Olet tämän tietueen hyväksyjä, päivitä 'tila' ja tallenna"
DocType: Serial No,Creation Document No,Dokumentin luonti nro
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Avaa kirjanpidon tase
,GST Sales Register,GST Sales Register
DocType: Sales Invoice Advance,Sales Invoice Advance,"Myyntilasku, ennakko"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ei mitään pyydettävää
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ei mitään pyydettävää
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Valitse verkkotunnuksesi
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Toinen Budget record '{0}' on jo olemassa vastaan {1} {2} 'verovuodelta {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Kentät kopioidaan vain luomisajankohtana.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettomaksu (sanoina) näkyy kun tallennat palkkalaskelman.
DocType: Purchase Invoice,Is Return,on palautus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,varovaisuus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,varovaisuus
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Tuotto / veloitusilmoituksen
DocType: Price List Country,Price List Country,Hinnasto Maa
DocType: Item,UOMs,Mittayksiköt
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} oikea sarjanumero (nos) tuotteelle {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} oikea sarjanumero (nos) tuotteelle {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,sarjanumeron tuotekoodia ei voi vaihtaa
DocType: Purchase Invoice Item,UOM Conversion Factor,Mittayksikön muuntokerroin
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Syötä tuotenumero saada eränumero
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Myyntitilaus {0} ei ole kelvollinen
DocType: Supplier Scorecard,Warn for new Request for Quotations,Varo uutta tarjouspyyntöä
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Ostotilaukset auttaa suunnittelemaan ja seurata ostoksistasi
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Nimikkeen {3} kokonaismäärä {0} ei voi ylittää hankintapyynnön {1} tarvemäärää {2}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot
DocType: Payment Entry,Write Off Difference Amount,Kirjoita Off Ero Määrä
DocType: Volunteer,Volunteer Name,Vapaaehtoinen nimi
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Aseta Instructor Naming System in Education> Koulutusasetukset
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Työntekijän sähköpostiosoitetta ei löytynyt, joten sähköpostia ei lähetetty"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Toimitussääntö ei koske maata {0}
DocType: Item,Foreign Trade Details,Ulkomaankauppa Yksityiskohdat
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Ryhmä rullanumero
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Yhteensä Kaikkien tehtävän painojen tulisi olla 1. Säädä painoja Project tehtävien mukaisesti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Lähete {0} ei ole vahvistettu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Lähete {0} ei ole vahvistettu
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Nimikkeen {0} pitää olla alihankittava nimike
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,käyttöomaisuuspääoma
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnoittelusääntö tulee ensin valita 'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Lapsi varasto olemassa tähän varastoon. Et voi poistaa tätä varasto.
DocType: Item,Website Item Groups,Tuoteryhmien verkkosivu
DocType: Purchase Invoice,Total (Company Currency),Yhteensä (yrityksen valuutta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Sarjanumero {0} kirjattu useammin kuin kerran
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Sarjanumero {0} kirjattu useammin kuin kerran
DocType: Journal Entry,Journal Entry,päiväkirjakirjaus
DocType: Expense Claim Advance,Unclaimed amount,Velvoittamaton määrä
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} kohdetta käynnissä
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Viestintäloki
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",Tarjouspyyntö on lopetettu pääsy portaalin enemmän tarkistaa portaalin asetuksia.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Toimittajan tuloskortin pisteytysmuuttuja
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Oston määrä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Oston määrä
DocType: Sales Invoice,Shipping Address Name,Toimitusosoitteen nimi
DocType: Material Request,Terms and Conditions Content,Ehdot ja säännöt sisältö
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kurssin aikataulua luotiin virheitä
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tämä perustuu tukkien vastaan Vehicle. Katso aikajana lisätietoja alla
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
DocType: Customer,Default Price List,oletus hinnasto
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Asset Movement record {0} luotu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Asset Movement record {0} luotu
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Et voi poistaa tilikautta {0}. Tilikausi {0} on asetettu oletustilikaudeksi järjestelmäasetuksissa.
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Saman nimen omaava asiakas on jo olemassa
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tämä lähettää palkkapäiväsijoitukset ja luo suoritepäiväkirja-merkinnän. Haluatko edetä?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Hinnoittelu
DocType: Quotation,Term Details,Ehdon lisätiedot
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ei voi ilmoittautua enintään {0} opiskelijat tälle opiskelijaryhmälle.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Yhteensä (ilman veroa)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,lyijy Count
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} on oltava suurempi kuin 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Varastossa saatavilla
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Linkityksen Maksu mitätöinti Lasku
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Matkamittarin lukema merkitään pitäisi olla suurempi kuin alkuperäisen ajoneuvon matkamittarin {0}
DocType: Restaurant Reservation,No Show,Ei näytä
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Aseta Naming-sarja {0} asetukseksi Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Toimitustavan maa
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Vapaat ja läsnäolot
DocType: Maintenance Visit,Partially Completed,Osittain Valmis
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,Opiskelijaryhmän Ohjaaja
DocType: Grant Application,Assessment Mark (Out of 10),Arviointimerkki (kymmenestä)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Ei
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Tärkein
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Tärkein
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Malli
DocType: Naming Series,Set prefix for numbering series on your transactions,Aseta sarjojen numeroinnin etuliite tapahtumiin
DocType: Employee Attendance Tool,Employees HTML,Työntekijät HTML
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,Course lyhenne
DocType: Student Leave Application,Student Leave Application,Student Jätä Application
DocType: Item,Will also apply for variants,Sovelletaan myös tuotemalleissa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Työntekijän {0} Half päivä {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Yhteensä työaika ei saisi olla suurempi kuin max työaika {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Päällä
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),Todellinen Lopetuspäivä (via kellokortti)
DocType: Soil Texture,Soil Type,Maaperätyyppi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Uusi viesti
,Quotation Trends,Tarjousten kehitys
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
DocType: Shipping Rule,Shipping Amount,Toimituskustannus arvomäärä
DocType: Supplier Scorecard Period,Period Score,Ajanjakso
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Lisää Asiakkaat
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,ajoneuvojen kulut
DocType: Serial No,Invoice Details,laskun tiedot
DocType: Grant Application,Show on Website,Näytä verkkosivustolla
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Odotettu arvo sen jälkeen, kun käyttöiän on oltava suurempi tai yhtä suuri kuin {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},"Odotettu arvo sen jälkeen, kun käyttöiän on oltava suurempi tai yhtä suuri kuin {0}"
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Aloita
DocType: Hub Category,Hub Category,Hub-luokka
DocType: Purchase Invoice,SEZ,SEZ
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,B Positiivinen
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rivi # {0}: Määrä on 1, kun kohde on kiinteän omaisuuden. Käytä erillistä rivi useita kpl."
DocType: Leave Block List Allow,Leave Block List Allow,Salli
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
DocType: Patient Medical Record,Patient Medical Record,Potilaan lääketieteellinen tietue
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Ryhmä Non-ryhmän
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,urheilu
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Vastaanotettua pyyntöä ei voi määrittää Ei lainkaan
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Vähennys yhteensä
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Valitse tili, jonka haluat tulostaa tilin valuuttana"
,Production Analytics,Tuotanto-analytiikka
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tämä perustuu potilaaseen kohdistuviin liiketoimiin. Katso lisätietoja alla olevasta aikataulusta
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,kustannukset päivitetty
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Valitse yritys...
DocType: Leave Control Panel,Leave blank if considered for all departments,tyhjä mikäli se pidetään vaihtoehtona kaikilla osastoilla
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","työsopimuksen tyypit (jatkuva, sopimus, sisäinen jne)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
DocType: Payroll Entry,Fortnightly,joka toinen viikko
DocType: Currency Exchange,From Currency,valuutasta
DocType: Vital Signs,Weight (In Kilogram),Paino (kilogrammoina)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Hinnat ei näytetä, jos hinnasto ei ole asetettu"
DocType: Stock Entry,Total Incoming Value,"Kokonaisarvo, saapuva"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Veloituksen tarvitaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Veloituksen tarvitaan
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tuntilomakkeet auttavat seuraamaan aikaa, kustannuksia ja laskutusta tiimisi toiminnasta."
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostohinta List
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Toimittajan tuloskortin muuttujien mallipohjat.
@@ -2654,7 +2659,7 @@
DocType: Company,For Reference Only.,vain viitteeksi
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Lääkäri {0} ei ole käytettävissä {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Valitse Erä
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},virheellinen {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},virheellinen {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-jälkikä-
DocType: Fee Validity,Reference Inv,Viite Inv
@@ -2691,8 +2696,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","määritä toiminnot, käyttökustannukset ja anna toiminnoille oma uniikki numero"
DocType: Water Analysis,Origin,alkuperä
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tämä asiakirja on yli rajan {0} {1} alkion {4}. Teetkö toisen {3} vasten samalla {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Valitse muutoksen suuruuden tili
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Valitse muutoksen suuruuden tili
DocType: Purchase Invoice,Price List Currency,"Hinnasto, valuutta"
DocType: Naming Series,User must always select,Käyttäjän tulee aina valita
DocType: Stock Settings,Allow Negative Stock,salli negatiivinen varastoarvo
@@ -2748,7 +2753,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Varo uusia ostotilauksia
DocType: Quality Inspection Reading,Reading 9,Lukema 9
DocType: Supplier,Is Frozen,on jäädytetty
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Ryhmä solmu varasto ei saa valita liiketoimien
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Ryhmä solmu varasto ei saa valita liiketoimien
DocType: Buying Settings,Buying Settings,Oston asetukset
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nro valmiille tuotteelle
DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
@@ -2762,6 +2767,7 @@
DocType: Grant Application,Organization,organisaatio
DocType: BOM Update Tool,BOM Update Tool,BOM-päivitystyökalu
DocType: SG Creation Tool Course,Student Group Name,Opiskelijan Group Name
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Näytä räjähdysnäkymä
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Maksujen luominen
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Haluatko varmasti poistaa kaikki tämän yrityksen tapahtumat, päätyedostosi säilyy silti entisellään, tätä toimintoa ei voi peruuttaa"
DocType: Room,Room Number,Huoneen numero
@@ -2772,7 +2778,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Tee veromalli
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Keskustelupalsta
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
DocType: Lab Test Sample,Lab Test Sample,Lab Test -näyte
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Nopea Päiväkirjakirjaus
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"hintaa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
@@ -2843,7 +2849,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,tee Lasku
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto lähellä Mahdollisuus 15 päivän jälkeen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Ostosopimukset eivät ole sallittuja {0}, koska tulosvastine on {1}."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Ostosopimukset eivät ole sallittuja {0}, koska tulosvastine on {1}."
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,end Year
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lyijy%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
@@ -2935,7 +2941,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ja yli
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rivi # {0}: Päiväkirjakirjaus {1} ei ole huomioon {2} tai jo sovitettu toista voucher
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteerit Paino
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Toimittaja> Toimittajan tyyppi
DocType: Buying Settings,Default Buying Price List,Ostohinnasto (oletus)
DocType: Payroll Entry,Salary Slip Based on Timesheet,Palkka tuntilomakkeen mukaan
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Ostaminen
@@ -3023,7 +3028,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seuraa vihjeitä toimialan mukaan
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Siirry kirjelomakkeisiin
DocType: Item Supplier,Item Supplier,tuote toimittaja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Syötä arvot tarjouksesta {0} tarjoukseen {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,kaikki osoitteet
DocType: Company,Stock Settings,varastoasetukset
@@ -3200,6 +3205,7 @@
DocType: Company,Default Inventory Account,Oletus Inventory Tili
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rivi {0}: Valmis Määrä on oltava suurempi kuin nolla.
DocType: Antibiotic,Antibiotic Name,Antibioottin nimi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Item Code> Item Group> Tuotemerkki
DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Valitse tyyppi ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Linkki kaikkiin maayksiköihin, joissa viljely kasvaa"
@@ -3393,6 +3399,7 @@
DocType: Supplier,Credit Limit,luottoraja
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Keskim. Myynnin hinnasto
DocType: Production Plan Sales Order,Salse Order Date,Salse Tilauksen päivämäärä
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Toimittaja> Toimittajan tyyppi
DocType: Salary Component,Salary Component,Palkanosasta
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Maksu merkinnät {0} ovat un sidottu
DocType: GL Entry,Voucher No,Tosite nro
@@ -3401,7 +3408,7 @@
DocType: Leave Allocation,Leave Allocation,Vapaan kohdistus
DocType: Payment Request,Recipient Message And Payment Details,Vastaanottaja Message ja maksutiedot
DocType: Training Event,Trainer Email,Trainer Sähköposti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Hankintapyyntöjä luotu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Hankintapyyntöjä luotu {0}
DocType: Restaurant Reservation,No of People,Ihmisten määrä
DocType: Production Planning Tool,Include sub-contracted raw materials,Sisällytä alihankintaa raaka
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sopimusehtojen mallipohja
@@ -3465,7 +3472,7 @@
DocType: Production Planning Tool,Create Material Requests,Luo hankintapyyntö
DocType: Employee Education,School/University,Koulu/Yliopisto
DocType: Payment Request,Reference Details,Viite Tietoja
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Odotusarvo jälkeen käyttöiän on oltava alle Gross Purchase Määrä
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Odotusarvo jälkeen käyttöiän on oltava alle Gross Purchase Määrä
DocType: Sales Invoice Item,Available Qty at Warehouse,saatava varaston yksikkömäärä
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,laskutettu
DocType: Asset,Double Declining Balance,Double jäännösarvopoisto
@@ -3477,7 +3484,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Liity sähköpostilistalle
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Tili {2} ei kuulu yhtiön {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Valitse ainakin yksi arvo kustakin attribuutista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Hankintapyyntö {0} on peruttu tai keskeytetty
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Hankintapyyntö {0} on peruttu tai keskeytetty
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Vapaiden hallinta
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,tilin ryhmä
DocType: Sales Order,Fully Delivered,täysin toimitettu
@@ -3488,14 +3495,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Maksettu summa ei voi olla suurempi kuin lainan määrä {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Siirry kohtaan Ohjelmat
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rivi {0} # Sallittu määrä {1} ei voi olla suurempi kuin lunastamaton summa {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Aseta numeerinen sarja osallistumiselle Setup> Numerosarjan kautta
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ostotilauksen numero vaaditaan tuotteelle {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Tuotantotilaus ei luonut
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Aloituspäivän tulee olla ennen päättymispäivää
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
DocType: Asset,Fully Depreciated,täydet poistot
,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Merkitty Läsnäolo HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Lainaukset ovat ehdotuksia, tarjouksia olet lähettänyt asiakkaille"
DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
@@ -3579,7 +3585,7 @@
DocType: Stock Settings,Item Naming By,tuotteen nimeäjä
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},toinen jakson sulkukirjaus {0} on tehty {1} jälkeen
DocType: Production Order,Material Transferred for Manufacturing,Tuotantoon siirretyt materiaalit
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Tiliä {0} ei löydy
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Tiliä {0} ei löydy
DocType: Project,Project Type,projektin tyyppi
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Tätä tehtävää varten on tehtävä lapsesi tehtävä. Et voi poistaa tätä tehtävää.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
@@ -3681,11 +3687,11 @@
DocType: Company,Asset Depreciation Cost Center,Poistojen kustannuspaikka
DocType: Sales Order Item,Sales Order Date,"Myyntitilaus, päivä"
DocType: Sales Invoice Item,Delivered Qty,toimitettu yksikkömäärä
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Kokonaissumma Verottaa
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",Valittuna kaikkien tuotantonimikkeiden alarakenteista luodaan hankintapyynnöt
DocType: Assessment Plan,Assessment Plan,arviointi Plan
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Asiakas {0} luodaan.
DocType: Stock Settings,Limit Percent,raja Prosenttia
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Aseta Instructor Naming System in Education> Koulutusasetukset
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,"Tällä hetkellä ei varastossa,"
,Payment Period Based On Invoice Date,Maksuaikaa perustuu laskun päiväykseen
DocType: Sample Collection,No. of print,Tulosteiden määrä
@@ -3701,12 +3707,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Velalliset ({0})
DocType: Pricing Rule,Margin,Marginaali
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uudet asiakkaat
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,bruttovoitto %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,bruttovoitto %
DocType: Appraisal Goal,Weightage (%),Painoarvo (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Muuta POS-profiilia
DocType: Bank Reconciliation Detail,Clearance Date,tilityspäivä
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Arviointikertomus
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Ostoksen kokonaissumma on pakollinen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross Ostoksen kokonaissumma on pakollinen
DocType: Lead,Address Desc,osoitetiedot
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Osapuoli on pakollinen
DocType: Journal Entry,JV-,JV-
@@ -3738,7 +3744,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Pysyvä nimi
DocType: Stock Entry,Customer or Supplier Details,Asiakkaan tai tavarantoimittajan Tietoja
DocType: Employee Loan Application,Required by Date,Vaaditaan Date
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Loppusumma (Dr - Cr)
DocType: Lead,Lead Owner,Liidin vastuullinen
DocType: Bin,Requested Quantity,pyydetty määrä
DocType: Patient,Marital Status,Siviilisääty
@@ -3752,7 +3757,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Useita vaihtoehtoja
DocType: Sales Invoice,Against Income Account,tulotilin kodistus
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% toimitettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Nimikkeen {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritetty nimikkeelle)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Nimikkeen {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritetty nimikkeelle)
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Ole hyvä ja kirjaudu sisään toisena käyttäjänä.
DocType: Territory,Territory Targets,Aluetavoite
@@ -3851,7 +3856,7 @@
DocType: Serial No,Out of AMC,Ylläpitosopimus ei ole voimassa
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,tee huoltokäynti
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
DocType: Company,Default Cash Account,oletus kassatili
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Tämä perustuu läsnäolo tämän Student
@@ -4001,7 +4006,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ei työntekijöitä mainituilla kriteereillä
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
DocType: Restaurant,Default Customer,Oletusasiakas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Aseta henkilöstön nimeämisjärjestelmä henkilöresursseihin> HR-asetukset
DocType: Assessment Plan,Supervisor Name,ohjaaja Name
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Älä vahvista, onko tapaaminen luotu samalle päivälle"
DocType: Program Enrollment Course,Program Enrollment Course,Ohjelma Ilmoittautuminen kurssi
@@ -4119,7 +4123,7 @@
DocType: BOM,Website Description,Verkkosivuston kuvaus
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettomuutos Equity
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Uusin
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Peru ostolasku {0} ensin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Peru ostolasku {0} ensin
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Sähköpostiosoite täytyy olla yksilöllinen, on jo olemassa {0}"
DocType: Serial No,AMC Expiry Date,Ylläpidon umpeutumispäivä
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,kuitti
@@ -4136,7 +4140,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavirtalaskelma
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lainamäärä voi ylittää suurin lainamäärä on {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lisenssi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Poista lasku {0} C-kaaviosta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Poista lasku {0} C-kaaviosta {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Valitse jatka eteenpäin mikäli haluat sisällyttää edellisen tilikauden taseen tälle tilikaudelle
DocType: GL Entry,Against Voucher Type,tositteen tyyppi kohdistus
DocType: Physician,Phone (R),Puhelin (R)
@@ -4148,7 +4152,7 @@
DocType: Patient,B Negative,B Negatiivinen
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Huoltotila on peruutettava tai tehtävä lähetettäväksi
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Sarjanumeroita peräkkäin {0} ei vastaa lähetysluettelon
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Sarjanumeroita peräkkäin {0} ei vastaa lähetysluettelon
DocType: Student,Guardian Details,Guardian Tietoja
DocType: C-Form,C-Form,C-muoto
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Läsnäolo useita työntekijöitä
@@ -4190,7 +4194,7 @@
DocType: Stock Entry Detail,Basic Amount,Perusmäärät
DocType: Training Event,Exam,Koe
DocType: Complaint,Complaint,Valitus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
DocType: Patient,Alcohol Past Use,Alkoholin aiempi käyttö
DocType: Fertilizer Content,Fertilizer Content,Lannoitteen sisältö
@@ -4315,6 +4319,7 @@
DocType: Salary Detail,Formula,Kaava
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Sarja #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Myynti tili
DocType: Purchase Invoice Item,Total Weight,Kokonaispaino
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,provisio myynti
DocType: Offer Letter Term,Value / Description,Arvo / Kuvaus
@@ -4471,7 +4476,7 @@
DocType: Customer,From Lead,Liidistä
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,tuotantoon luovutetut tilaukset
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
DocType: Program Enrollment Tool,Enroll Students,Ilmoittaudu Opiskelijat
DocType: Lab Test,Approved Date,Hyväksytty päivämäärä
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,perusmyynti
@@ -4547,7 +4552,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Tuotanto tuote
,Employee Information,Työntekijöiden tiedot
DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Tee toimituskykytiedustelu
DocType: Quality Inspection,Incoming,saapuva
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Myynnin ja ostoksen oletusmaksumalleja luodaan.
@@ -4564,7 +4569,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Huomautus: {0}
,Delivery Note Trends,Lähetysten kehitys
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Viikon yhteenveto
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Varastossa Määrä
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Varastossa Määrä
DocType: Delivery Trip,Calculate Estimated Arrival Times,Laske arvioitu saapumisaikasi
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Tiliä {0} voi päivittää vain varastotapahtumien kautta
DocType: Student Group Creation Tool,Get Courses,Get Kurssit
@@ -4580,7 +4585,7 @@
DocType: Material Request,% Ordered,% järjestetty
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kurssille pohjainen opiskelija Groupin Kurssi validoitu jokaiselle oppilaalle päässä kirjoilla Kurssit Program Ilmoittautuminen.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Urakkatyö
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Oston keskihinta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Oston keskihinta
DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
DocType: Employee,History In Company,yrityksen historia
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Uusi viesti {lähettäjältä}
@@ -4628,7 +4633,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rivi {0}: valuutta BOM # {1} pitäisi olla yhtä suuri kuin valittu valuutta {2}
DocType: Journal Entry Account,Exchange Rate,Valuuttakurssi
DocType: Patient,Additional information regarding the patient,Lisätietoja potilaasta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Myyntitilaus {0} ei ole vahvistettu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Myyntitilaus {0} ei ole vahvistettu
DocType: Homepage,Tag Line,Tagirivi
DocType: Fee Component,Fee Component,Fee Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Kaluston hallinta
@@ -4846,7 +4851,7 @@
DocType: Employee Education,Employee Education,työntekijä koulutus
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Monista kohde ryhmä löysi erään ryhmätaulukkoon
DocType: Land Unit,Parent Land Unit,Vanhempainmaan yksikkö
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
DocType: Fertilizer,Fertilizer Name,Lannoitteen nimi
DocType: Salary Slip,Net Pay,Nettomaksu
DocType: Account,Account,tili
@@ -4925,7 +4930,7 @@
DocType: Item Customer Detail,Ref Code,Viite Koodi
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Asiakasryhmä on pakollinen POS-profiilissa
apps/erpnext/erpnext/config/hr.py +12,Employee records.,työntekijä tietue
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
DocType: HR Settings,Payroll Settings,Palkanlaskennan asetukset
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
DocType: POS Settings,POS Settings,POS-asetukset
@@ -5092,7 +5097,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
DocType: Asset Maintenance Task,Last Completion Date,Viimeinen päättymispäivä
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,päivää edellisestä tilauksesta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
DocType: Buying Settings,Naming Series,Nimeä sarjat
DocType: Leave Block List,Leave Block List Name,nimi
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Vakuutus Aloituspäivä pitäisi olla alle Insurance Päättymispäivä
@@ -5218,6 +5223,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Get Payment Merkinnät
DocType: Quotation Item,Against Docname,Dokumentin nimi kohdistus
DocType: SMS Center,All Employee (Active),kaikki työntekijät (aktiiviset)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Asiakas> Asiakasryhmä> Alue
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Näytä nyt
DocType: BOM,Raw Material Cost,Raaka-ainekustannukset
DocType: Item Reorder,Re-Order Level,Täydennystilaustaso
@@ -5316,7 +5322,6 @@
DocType: Room,Seating Capacity,Istumapaikkoja
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Lab testiryhmät
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Asiakas> Asiakasryhmä> Alue
DocType: Project,Total Expense Claim (via Expense Claims),Kulukorvaus yhteensä (kulukorvauksesta)
DocType: GST Settings,GST Summary,GST Yhteenveto
DocType: Assessment Result,Total Score,Kokonaispisteet
@@ -5329,7 +5334,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Seuraavat kurssisuunnitelmat luotiin
DocType: Journal Entry,Total Debit,Debet yhteensä
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Valmiiden tavaroiden oletusvarasto
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Myyjä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Myyjä
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Talousarvio ja kustannuspaikka
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Useita oletusmaksutapoja ei sallita
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,varten
@@ -5502,7 +5507,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,pidetään veroille tai maksuille
DocType: Driver,Driving License Category,Ajokorttiluokka
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} on tällä hetkellä {1} toimittajan tuloskortin seisominen, ja tämän toimittajan antamat ostotilaukset tulisi antaa varoen."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} on tällä hetkellä {1} toimittajan tuloskortin seisominen, ja tämän toimittajan antamat ostotilaukset tulisi antaa varoen."
DocType: Asset Maintenance Team,Asset Maintenance Team,Omaisuudenhoitoyhtiö
DocType: Employee Loan,Loan Type,laina Tyyppi
DocType: Scheduling Tool,Scheduling Tool,Ajoitustyökalun
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 59afed9..e43e4a4 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Trier par prix
,Delay Days,Jours de retard
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Frais de Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de Série: {0} est déjà référencé dans la Facture de Vente: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de Série: {0} est déjà référencé dans la Facture de Vente: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Facture
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Faire une entrée en stock de rétention
DocType: Purchase Invoice Item,Item Weight Details,Détails du poids de l'article
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Référence: {0}, Code de l'article: {1} et Client: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ouverture d'un Emploi.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},La nomenclature n'est pas spécifiée pour l'article de sous-traitance {0} sur la ligne {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},La nomenclature n'est pas spécifiée pour l'article de sous-traitance {0} sur la ligne {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,Résultat {0} soumis
DocType: Item Attribute,Increment,Incrément
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Période
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Non autorisé pour {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obtenir les articles de
DocType: Price List,Price Not UOM Dependant,Prix non UOM Dependent
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produit {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Aucun article référencé
DocType: Asset Repair,Error Description,Erreur de description
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Épicerie
DocType: Quality Inspection Reading,Reading 1,Lecture 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fonds de Pension
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,La Date de l’Amortissement Suivant ne peut pas être avant la Date d’Achat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,La Date de l’Amortissement Suivant ne peut pas être avant la Date d’Achat
DocType: Crop,Perennial,Vivace
DocType: Consultation,Consultation Date,Date de Consultation
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Listes et découverte de produits pour les utilisateurs d'ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","e.g. ""École Primaire"" ou ""Université"""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Rapports de Stock
DocType: Warehouse,Warehouse Detail,Détail de l'Entrepôt
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},La limite de crédit a été franchie pour le client {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},La limite de crédit a été franchie pour le client {0} {1}/{2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,La Date de Fin de Terme ne peut pas être postérieure à la Date de Fin de l'Année Académique à laquelle le terme est lié (Année Académique {}). Veuillez corriger les dates et essayer à nouveau.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article
DocType: Delivery Trip,Departure Time,Heure de départ
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Obtenir les Détails de la Spécification
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Modèles de Classements Fournisseurs.
DocType: Lead,Interested,Intéressé
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Ouverture
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Ouverture
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Du {0} au {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Échec de la configuration des taxes
DocType: Item,Copy From Item Group,Copier Depuis un Groupe d'Articles
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,La Date de Relève doit être postérieure à la Date d’Embauche
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Congés par Année
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ligne {0} : Veuillez vérifier 'Est Avance' sur le compte {1} si c'est une avance.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},L'entrepôt {0} n'appartient pas à la société {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},L'entrepôt {0} n'appartient pas à la société {1}
DocType: Email Digest,Profit & Loss,Profits & Pertes
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),Montant Total des Coûts (via Feuille de Temps)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ceci est basé sur les transactions contre cette Société. Voir le calendrier ci-dessous pour plus de détails
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifier par Email lors de la création automatique de la Demande de Matériel
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Résistant
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi-Devise
DocType: Opening Invoice Creation Tool,Invoice Type,Type de Facture
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Bon de Livraison
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Veuf
DocType: Request for Quotation,Request for Quotation,Appel d'Offre
DocType: Healthcare Settings,Require Lab Test Approval,Nécessite l'Approbation du Test de Laboratoire
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Code de l'article> Groupe de produits> Marque
DocType: Salary Slip Timesheet,Working Hours,Heures de Travail
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total en suspens
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Veuillez entrer un Centre de Coûts
DocType: Drug Prescription,Dosage,Dosage
DocType: Journal Entry Account,Sales Order,Commande Client
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Moy. Taux de vente
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Moy. Taux de vente
DocType: Assessment Plan,Examiner Name,Nom de l'Examinateur
DocType: Lab Test Template,No Result,Aucun Résultat
DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Taux
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Sélectionner la Période de Paie
DocType: Purchase Invoice,Unpaid,Impayé
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Réservé à la Vente
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Veuillez configurer le système de dénomination des employés dans Ressources humaines> Paramètres RH
DocType: Packing Slip,From Package No.,Du N° de Colis
DocType: Item Attribute,To Range,Au Rang
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et Dépôts
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Atelier
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avertir lors de Bons de Commande
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Listez quelques-uns de vos clients. Ils peuvent être des entreprise ou des individus.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Pièces Suffisantes pour Construire
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pièces Suffisantes pour Construire
DocType: POS Profile User,POS Profile User,Utilisateur du profil PDV
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Revenu Direct
DocType: Patient Appointment,Date TIme,Date Heure
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur le Compte , si les lignes sont regroupées par Compte"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur le Compte , si les lignes sont regroupées par Compte"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Agent Administratif
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Création d'entreprise et taxes
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Veuillez sélectionner un Cours
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Compte d’Écart
DocType: Purchase Invoice,Supplier GSTIN,GSTIN du Fournisseur
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Impossible de fermer une tâche si tâche dépendante {0} n'est pas fermée.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Veuillez entrer l’Entrepôt pour lequel une Demande de Matériel sera faite
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Veuillez entrer l’Entrepôt pour lequel une Demande de Matériel sera faite
DocType: Production Order,Additional Operating Cost,Coût d'Exploitation Supplémentaires
DocType: Lab Test Template,Lab Routine,Routine de laboratoire
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Produits de Beauté
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relation avec Tuteur2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Directeur
DocType: Payment Entry,Payment From / To,Paiement De / À
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nouvelle limite de crédit est inférieure à l'encours actuel pour le client. Limite de crédit doit être au moins de {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nouvelle limite de crédit est inférieure à l'encours actuel pour le client. Limite de crédit doit être au moins de {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Veuillez définir un compte dans l'entrepôt {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basé sur' et 'Groupé par' ne peuvent pas être identiques
DocType: Sales Person,Sales Person Targets,Objectifs des Commerciaux
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Nom du Lot
DocType: Fee Validity,Max number of visit,Nombre maximum de visites
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Feuille de Temps créée :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Inscrire
DocType: GST Settings,GST Settings,Paramètres GST
DocType: Selling Settings,Customer Naming By,Client Nommé par
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Budget Pour
DocType: Employee,Cell Number,Numéro de Téléphone
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Il n'y a pas d'employé pour les critères donnés. Vérifiez que les bordereaux de salaire n'ont pas déjà été créés.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Demandes de Matériel Générées Automatiquement
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Demandes de Matériel Générées Automatiquement
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdu
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer le bon actuel dans la colonne 'Pour l'Écriture de Journal'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Réservé pour la Fabrication
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Énergie
DocType: Opportunity,Opportunity From,Opportunité De
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Fiche de paie mensuelle.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ligne {0}: {1} Numéros de série requis pour l'article {2}. Vous en avez fourni {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ligne {0}: {1} Numéros de série requis pour l'article {2}. Vous en avez fourni {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Veuillez sélectionner une table
DocType: BOM,Website Specifications,Spécifications du Site Web
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} est une adresse e-mail invalide dans 'Destinataires'
@@ -1043,7 +1044,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Devis demandé
DocType: Vital Signs,Heart Rate / Pulse,Fréquence Cardiaque / Pouls
DocType: Company,Default Bank Account,Compte Bancaire par Défaut
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Pour filtrer en fonction du Tiers, sélectionnez d’abord le Type de Tiers"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Pour filtrer en fonction du Tiers, sélectionnez d’abord le Type de Tiers"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Mettre à Jour le Stock' ne peut pas être coché car les articles ne sont pas livrés par {0}
DocType: Vehicle,Acquisition Date,Date d'Aquisition
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,N°
@@ -1067,7 +1068,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Téléchargez votre tête de lettre (Gardez-le web comme 900px par 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} : Compte {2} ne peut pas être un Groupe
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ligne d'Article {idx}: {doctype} {docname} n'existe pas dans la table '{doctype}' ci-dessus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,La Feuille de Temps {0} est déjà terminée ou annulée
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,La Feuille de Temps {0} est déjà terminée ou annulée
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Aucune tâche
DocType: Item Variant Settings,Copy Fields to Variant,Copier les Champs dans une Variante
DocType: Asset,Opening Accumulated Depreciation,Amortissement Cumulé d'Ouverture
@@ -1179,9 +1180,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan de matériaux pour les sous-ensembles
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partenaires Commerciaux et Régions
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,LDM {0} doit être active
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Fermeture (ouverture + total)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Fermeture (ouverture + total)
DocType: Journal Entry,Depreciation Entry,Ecriture d’Amortissement
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Veuillez d’abord sélectionner le type de document
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Imprimer dans la devise du compte
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuler les Visites Matérielles {0} avant d'annuler cette Visite de Maintenance
DocType: Crop Cycle,ISO 8016 standard,Norme ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},N° de Série {0} n'appartient pas à l'Article {1}
@@ -1207,7 +1209,7 @@
DocType: Supplier,Default Payable Accounts,Comptes Créditeur par Défaut
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
DocType: Fee Structure,Components,Composants
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Veuillez entrer une Catégorie d'Actif dans la rubrique {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Veuillez entrer une Catégorie d'Actif dans la rubrique {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Variantes de l'Article {0} mises à jour
DocType: Quality Inspection Reading,Reading 6,Lecture 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1259,6 +1261,7 @@
,Company Name,Nom de la Société
DocType: SMS Center,Total Message(s),Total des Messages
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Sélectionner l'Article à Transferer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Veuillez définir la série de dénomination pour {0} via Configuration> Paramètres> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Pourcentage de réduction supplémentaire
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Afficher la liste de toutes les vidéos d'aide
DocType: Agriculture Analysis Criteria,Soil Texture,Texture du sol
@@ -1286,7 +1289,7 @@
DocType: BOM Website Item,BOM Website Item,Article de LDM du Site Internet
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Charger votre en-tête et logo. (vous pouvez les modifier ultérieurement).
DocType: Timesheet Detail,Bill,Facture
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La Date de l’Amortissement Suivant est obligatoire pour un nouvel Actif
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,La Date de l’Amortissement Suivant est obligatoire pour un nouvel Actif
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Blanc
DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ligne {0} : Qté non disponible pour {4} dans l'entrepôt {1} au moment de la comptabilisation de l’écriture ({2} {3})
@@ -1302,7 +1305,7 @@
DocType: Lead,Next Contact Date,Date du Prochain Contact
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Quantité d'Ouverture
DocType: Healthcare Settings,Appointment Reminder,Rappel de Rendez-Vous
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Veuillez entrez un Compte pour le Montant de Change
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Veuillez entrez un Compte pour le Montant de Change
DocType: Program Enrollment Tool Student,Student Batch Name,Nom du Lot d'Étudiants
DocType: Consultation,Doctor,Docteur
DocType: Holiday List,Holiday List Name,Nom de la Liste de Vacances
@@ -1318,6 +1321,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Outil de Répartition des Congés
DocType: Item,Hub Category to Publish,Catégorie du Hub à publier
DocType: Leave Block List,Leave Block List Dates,Dates de la Liste de Blocage des Congés
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Veuillez configurer la série de numéros pour la présence via Setup> Série de numéros
DocType: Sales Invoice,Billing Address GSTIN,Adresse de Facturation GSTIN
DocType: Assessment Plan,Evaluate,Évaluer
DocType: Workstation,Net Hour Rate,Taux Horaire Net
@@ -1351,7 +1355,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Paiement de la Facture de Vente
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Entrepôt Réservé aux Commandes Clients / Entrepôt de Produits Finis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Montant de Vente
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Montant de Vente
DocType: Repayment Schedule,Interest Amount,Montant d'Intérêts
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'Approbateur de Dépenses pour cet enregistrement. Veuillez Mettre à Jour le 'Status' et Enregistrer
DocType: Serial No,Creation Document No,N° du Document de Création
@@ -1442,7 +1446,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Solde d'Ouverture de Comptabilité
,GST Sales Register,Registre de Vente GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Avance sur Facture de Vente
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Aucune requête à effectuer
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Aucune requête à effectuer
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Sélectionnez vos domaines
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un autre enregistrement de Budget '{0}' existe déjà pour {1} '{2}' pour l'exercice {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Les champs seront copiés uniquement au moment de la création.
@@ -1452,11 +1456,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ce sera ajoutée au Code de la Variante de l'Article. Par exemple, si votre abréviation est «SM», et le code de l'article est ""T-SHIRT"", le code de l'article de la variante sera ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Salaire Net (en lettres) sera visible une fois que vous aurez enregistré la Fiche de Paie.
DocType: Purchase Invoice,Is Return,Est un Retour
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Mise en Garde
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Mise en Garde
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Retour / Note de Débit
DocType: Price List Country,Price List Country,Pays de la Liste des Prix
DocType: Item,UOMs,UDMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} numéro de série valide pour l'objet {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} numéro de série valide pour l'objet {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Code de l'Article ne peut pas être modifié pour le Numéro de Série
DocType: Purchase Invoice Item,UOM Conversion Factor,Facteur de Conversion de l'UDM
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Veuillez entrer le Code d'Article pour obtenir le Numéro de Lot
@@ -1560,7 +1564,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Commande Client {0} invalide
DocType: Supplier Scorecard,Warn for new Request for Quotations,Avertir lors d'une nouvelle Demande de Devis
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Les Bons de Commande vous aider à planifier et à assurer le suivi de vos achats
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Désolé, les sociétés ne peuvent pas être fusionnées"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Désolé, les sociétés ne peuvent pas être fusionnées"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescriptions de test de laboratoire
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",La quantité totale d’Émission / Transfert {0} dans la Demande de Matériel {1} \ ne peut pas être supérieure à la quantité demandée {2} pour l’Article {3}
@@ -1598,7 +1602,6 @@
DocType: Warehouse,Warehouse Contact Info,Info de Contact de l'Entrepôt
DocType: Payment Entry,Write Off Difference Amount,Montant de la Différence de la Reprise
DocType: Volunteer,Volunteer Name,Nom du bénévole
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Veuillez configurer le système de nommage de l'instructeur dans Education> Paramètres de l'éducation
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0} : Adresse email de l'employé introuvable : l’email n'a pas été envoyé
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Règle d'expédition non applicable pour le pays {0}
DocType: Item,Foreign Trade Details,Détails du Commerce Extérieur
@@ -1610,7 +1613,7 @@
DocType: Student Group Student,Group Roll Number,Numéro de Groupe
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre écriture de débit"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Le total des poids des tâches doit être égal à 1. Veuillez ajuster les poids de toutes les tâches du Projet en conséquence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,L'article {0} doit être un Article Sous-traité
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capitaux Immobilisés
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La Règle de Tarification est d'abord sélectionnée sur la base du champ ‘Appliquer Sur’, qui peut être un Article, un Groupe d'Articles ou une Marque."
@@ -1635,7 +1638,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Un entrepôt enfant existe pour cet entrepôt. Vous ne pouvez pas supprimer cet entrepôt.
DocType: Item,Website Item Groups,Groupes d'Articles du Site Web
DocType: Purchase Invoice,Total (Company Currency),Total (Devise Société)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Numéro de série {0} est entré plus d'une fois
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Numéro de série {0} est entré plus d'une fois
DocType: Journal Entry,Journal Entry,Écriture de Journal
DocType: Expense Claim Advance,Unclaimed amount,Montant non réclamé
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} articles en cours
@@ -1731,7 +1734,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Journal des communications.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","L’accès au portail est désactivé pour les Appels d’Offres. Pour plus d’informations, vérifiez les réglages du portail."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variable de la Fiche d'Évaluation Fournisseur
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Montant d'Achat
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Montant d'Achat
DocType: Sales Invoice,Shipping Address Name,Nom de l'Adresse de Livraison
DocType: Material Request,Terms and Conditions Content,Contenu des Termes et Conditions
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Des erreurs se sont produites lors de la création du programme
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Basé sur les journaux de ce Véhicule. Voir la chronologie ci-dessous pour plus de détails
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Pour la Facture Fournisseur {0} datée {1}
DocType: Customer,Default Price List,Liste des Prix par Défaut
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Vous ne pouvez pas supprimer l'Exercice {0}. L'exercice {0} est défini par défaut dans les Réglages Globaux
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Un client avec un nom identique existe déjà
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Cela permettra de soumettre des bulletins de salaire et de créer une écriture de journal d'accumulation. Voulez-vous poursuivre?
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Tarification
DocType: Quotation,Term Details,Détails du Terme
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Inscription de plus de {0} étudiants impossible pour ce groupe d'étudiants.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (hors taxes)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Nombre de Prospects
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} doit être supérieur à 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock disponible
@@ -2026,7 +2030,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Délier Paiement à l'Annulation de la Facture
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Le Compteur(kms) Actuel entré devrait être plus grand que le Compteur(kms) initial du Véhicule {0}
DocType: Restaurant Reservation,No Show,Non Présenté
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Veuillez définir la série de dénomination pour {0} via Configuration> Paramètres> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Pays de la Règle de Livraison
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Congés et Présences
DocType: Maintenance Visit,Partially Completed,Partiellement Complété
@@ -2117,7 +2120,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instructeur de Groupe d'Étudiant
DocType: Grant Application,Assessment Mark (Out of 10),Note d'évaluation (sur 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,N° du Mobile du Tuteur 1
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Principal
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe des séries numérotées pour vos transactions
DocType: Employee Attendance Tool,Employees HTML,Employés HTML
@@ -2165,7 +2168,7 @@
DocType: Course,Course Abbreviation,Abréviation du Cours
DocType: Student Leave Application,Student Leave Application,Demande de Congé d'Étudiant
DocType: Item,Will also apply for variants,S'appliquera également pour les variantes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employé {0} sur une demi-journée sur {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Le nombre total d'heures travaillées ne doit pas être supérieur à la durée maximale du travail {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Sur
@@ -2350,9 +2353,10 @@
DocType: Task,Actual End Date (via Time Sheet),Date de Fin Réelle (via la Feuille de Temps)
DocType: Soil Texture,Soil Type,Le type de sol
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Montant {0} {1} pour {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nouveau Message
,Quotation Trends,Tendances des Devis
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Le Groupe d'Articles n'est pas mentionné dans la fiche de l'article pour l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
DocType: Shipping Rule,Shipping Amount,Montant de la Livraison
DocType: Supplier Scorecard Period,Period Score,Score de la Période
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Ajouter des Clients
@@ -2363,7 +2367,7 @@
,Vehicle Expenses,Frais de Véhicule
DocType: Serial No,Invoice Details,Détails de la Facture
DocType: Grant Application,Show on Website,Afficher sur le site Web
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valeur attendue après utilisation complète doit être supérieure ou égale à {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Valeur attendue après utilisation complète doit être supérieure ou égale à {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Démarrer
DocType: Hub Category,Hub Category,Catégorie du Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2394,7 +2398,7 @@
DocType: Patient,B Positive,B Positif
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne #{0} : Qté doit égale à 1, car l’Article est un actif immobilisé. Veuillez utiliser une ligne distincte pour une qté multiple."
DocType: Leave Block List Allow,Leave Block List Allow,Autoriser la Liste de Blocage des Congés
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
DocType: Patient Medical Record,Patient Medical Record,Registre médical du patient
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Groupe vers Non-Groupe
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportif
@@ -2444,6 +2448,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Impossible de lier une Réponse à Appel d'Offres reçue à Aucun Devis
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Déduction Totale
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Sélectionnez un compte à imprimer dans la devise du compte
,Production Analytics,Analyse de la Production
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ceci est basé sur les transactions de ce patient. Voir la chronologie ci-dessous pour plus de détails
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Coût Mise à Jour
@@ -2498,7 +2503,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Sélectionner la Société ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide pour tous les départements
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Type d’emploi (CDI, CDD, Stagiaire, etc.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} est obligatoire pour l’Article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} est obligatoire pour l’Article {1}
DocType: Payroll Entry,Fortnightly,Bimensuel
DocType: Currency Exchange,From Currency,De la Devise
DocType: Vital Signs,Weight (In Kilogram),Poids (En Kilogramme)
@@ -2574,7 +2579,7 @@
DocType: Student,Guardians,Tuteurs
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Les Prix ne seront pas affichés si la Liste de Prix n'est pas définie
DocType: Stock Entry,Total Incoming Value,Valeur Entrante Totale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Compte de Débit Requis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Compte de Débit Requis
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Les Feuilles de Temps aident au suivi du temps, coût et facturation des activités effectuées par votre équipe"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste des Prix d'Achat
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modèles des Variables de Fiche d'Évaluation Fournisseur.
@@ -2675,7 +2680,7 @@
DocType: Company,For Reference Only.,Pour Référence Seulement.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Le médecin {0} n'est pas disponible le {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Sélectionnez le N° de Lot
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalide {0} : {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Invalide {0} : {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Facture de Référence
@@ -2712,8 +2717,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spécifier les opérations, le coût d'exploitation et donner un N° d'Opération unique à vos opérations."
DocType: Water Analysis,Origin,Origine
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ce document excède la limite de {0} {1} pour l’article {4}. Faites-vous un autre {3} contre le même {2} ?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Sélectionner le compte de change
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Sélectionner le compte de change
DocType: Purchase Invoice,Price List Currency,Devise de la Liste de Prix
DocType: Naming Series,User must always select,L'utilisateur doit toujours sélectionner
DocType: Stock Settings,Allow Negative Stock,Autoriser un Stock Négatif
@@ -2769,7 +2774,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Avertir lors des nouveaux Bons de Commande
DocType: Quality Inspection Reading,Reading 9,Lecture 9
DocType: Supplier,Is Frozen,Est Gelé
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Un noeud de groupe d'entrepôt ne peut pas être sélectionné pour les transactions
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Un noeud de groupe d'entrepôt ne peut pas être sélectionné pour les transactions
DocType: Buying Settings,Buying Settings,Réglages d'Achat
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,N° d’Article Produit Fini LDM
DocType: Upload Attendance,Attendance To Date,Présence Jusqu'à
@@ -2783,6 +2788,7 @@
DocType: Grant Application,Organization,Organisation
DocType: BOM Update Tool,BOM Update Tool,Outil de mise à jour de LDM
DocType: SG Creation Tool Course,Student Group Name,Nom du Groupe d'Étudiants
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Afficher la vue éclatée
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Création d'Honoraires
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Veuillez vous assurer que vous voulez vraiment supprimer tous les transactions de cette société. Vos données de base resteront intactes. Cette action ne peut être annulée.
DocType: Room,Room Number,Numéro de la Chambre
@@ -2793,7 +2799,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Créer un modèle d'imposition
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum de l'Utilisateur
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Matières Premières ne peuvent pas être vides.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
DocType: Lab Test Sample,Lab Test Sample,Échantillon de test de laboratoire
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Écriture Rapide dans le Journal
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si la LDM est mentionnée pour un article
@@ -2864,7 +2870,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Faire une Facture
DocType: Selling Settings,Auto close Opportunity after 15 days,Fermer automatiquement les Opportunités après 15 jours
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les Bons de Commande ne sont pas autorisés pour {0} en raison d'une note sur la fiche d'évaluation de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les Bons de Commande ne sont pas autorisés pour {0} en raison d'une note sur la fiche d'évaluation de {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Année de Fin
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Devis / Prospects %
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La Date de Fin de Contrat doit être supérieure à la Date d'Embauche
@@ -2976,7 +2982,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Dessus
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ligne #{0} : L’Écriture de Journal {1} n'a pas le compte {2} ou est déjà réconciliée avec une autre référence
DocType: Supplier Scorecard Criteria,Criteria Weight,Pondération du Critère
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Fournisseur> Type de fournisseur
DocType: Buying Settings,Default Buying Price List,Liste des Prix d'Achat par Défaut
DocType: Payroll Entry,Salary Slip Based on Timesheet,Fiche de Paie basée sur la Feuille de Temps
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Prix d'achat
@@ -3064,7 +3069,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Suivre les Prospects par Type d'Industrie
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Aller aux papiers à en-tête
DocType: Item Supplier,Item Supplier,Fournisseur de l'Article
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Veuillez sélectionner une valeur pour {0} devis à {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toutes les Adresses.
DocType: Company,Stock Settings,Réglages de Stock
@@ -3253,6 +3258,7 @@
DocType: Company,Default Inventory Account,Compte d'Inventaire par Défaut
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ligne {0} : Qté Complétée doit être supérieure à zéro.
DocType: Antibiotic,Antibiotic Name,Nom de l'Antibiotique
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Code de l'article> Groupe de produits> Marque
DocType: Purchase Invoice,Apply Additional Discount On,Appliquer une Remise Supplémentaire Sur
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Sélectionner le Type...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Un lien vers toutes les unités terrestres dans lesquelles la culture se développe
@@ -3446,6 +3452,7 @@
DocType: Supplier,Credit Limit,Limite de crédit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Moyenne de la liste de prix de vente
DocType: Production Plan Sales Order,Salse Order Date,Date de la Commande Client
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Fournisseur> Type de fournisseur
DocType: Salary Component,Salary Component,Composante Salariale
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Écritures de Paiement {0} ne sont pas liées
DocType: GL Entry,Voucher No,N° de Référence
@@ -3454,7 +3461,7 @@
DocType: Leave Allocation,Leave Allocation,Allocation de Congés
DocType: Payment Request,Recipient Message And Payment Details,Message du Destinataire et Détails de Paiement
DocType: Training Event,Trainer Email,Email du Formateur
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Les Demandes de Matérielles {0} créées
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Les Demandes de Matérielles {0} créées
DocType: Restaurant Reservation,No of People,Nbr de Personnes
DocType: Production Planning Tool,Include sub-contracted raw materials,Inclure les matières premières sous-traitées
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Modèle de termes ou de contrat.
@@ -3518,7 +3525,7 @@
DocType: Production Planning Tool,Create Material Requests,Créer des Demandes de Matériel
DocType: Employee Education,School/University,École/Université
DocType: Payment Request,Reference Details,Détails de la Référence
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valeur Attendue Après Utilisation Complète doit être inférieure au Montant d'Achat Brut
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Valeur Attendue Après Utilisation Complète doit être inférieure au Montant d'Achat Brut
DocType: Sales Invoice Item,Available Qty at Warehouse,Qté Disponible à l'Entrepôt
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Montant Facturé
DocType: Asset,Double Declining Balance,Double Solde Dégressif
@@ -3530,7 +3537,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir les Mises à jour
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1} : Compte {2} ne fait pas partie de la Société {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Sélectionnez au moins une valeur de chacun des attributs.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Gestion des Congés
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grouper par Compte
DocType: Sales Order,Fully Delivered,Entièrement Livré
@@ -3541,14 +3548,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Le Montant Remboursé ne peut pas être supérieur au Montant du Prêt {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Aller aux Programmes
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},La ligne {0} # Montant alloué {1} ne peut pas être supérieure au montant non réclamé {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Veuillez configurer la série de numéros pour la présence via Setup> Série de numéros
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numéro de Bon de Commande requis pour l'Article {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Ordre de Production non créé
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',La ‘Date de Début’ doit être antérieure à la ‘Date de Fin’
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Impossible de changer le statut car l'étudiant {0} est lié à la candidature de l'étudiant {1}
DocType: Asset,Fully Depreciated,Complètement Déprécié
,Stock Projected Qty,Qté de Stock Projeté
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,HTML des Présences Validées
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Les devis sont des propositions, offres que vous avez envoyées à vos clients"
DocType: Sales Order,Customer's Purchase Order,N° de Bon de Commande du Client
@@ -3632,7 +3638,7 @@
DocType: Stock Settings,Item Naming By,Nomenclature d'Article Par
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Une autre Entrée de Clôture de Période {0} a été faite après {1}
DocType: Production Order,Material Transferred for Manufacturing,Matériel Transféré pour la Fabrication
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Le compte {0} n'existe pas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Le compte {0} n'existe pas
DocType: Project,Project Type,Type de Projet
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Une tâche enfant existe pour cette tâche. Vous ne pouvez pas supprimer cette tâche.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Soit la qté cible soit le montant cible est obligatoire.
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Centre de Coûts de l'Amortissement d'Actifs
DocType: Sales Order Item,Sales Order Date,Date de la Commande Client
DocType: Sales Invoice Item,Delivered Qty,Qté Livrée
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Total Excl. Impôt
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si cochée, tous les enfants de chaque article de production seront inclus dans les Demandes de Matériel."
DocType: Assessment Plan,Assessment Plan,Plan d'Évaluation
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Le client {0} est créé.
DocType: Stock Settings,Limit Percent,Pourcentage Limite
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Veuillez configurer le système de nommage de l'instructeur dans Education> Paramètres de l'éducation
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,"Actuellement, aucun stock disponible dans aucun entrepôt"
,Payment Period Based On Invoice Date,Période de Paiement basée sur la Date de la Facture
DocType: Sample Collection,No. of print,Nbre d'impressions
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Débiteurs ({0})
DocType: Pricing Rule,Margin,Marge
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nouveaux Clients
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bénéfice Brut %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bénéfice Brut %
DocType: Appraisal Goal,Weightage (%),Poids (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Modifier le profil POS
DocType: Bank Reconciliation Detail,Clearance Date,Date de Compensation
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Rapport d'Évaluation
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Montant d'Achat Brut est obligatoire
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Montant d'Achat Brut est obligatoire
DocType: Lead,Address Desc,Adresse Desc
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Le Tiers est obligatoire
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Nom du Classement
DocType: Stock Entry,Customer or Supplier Details,Détails du Client ou du Fournisseur
DocType: Employee Loan Application,Required by Date,Requis à cette Date
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Solde de clôture (Dr - Cr)
DocType: Lead,Lead Owner,Responsable du Prospect
DocType: Bin,Requested Quantity,Quantité Demandée
DocType: Patient,Marital Status,État Civil
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variantes multiples
DocType: Sales Invoice,Against Income Account,Pour le Compte de Produits
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Livré
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,L'article {0} : Qté commandée {1} ne peut pas être inférieure à la qté de commande minimum {2} (défini dans l'Article).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,L'article {0} : Qté commandée {1} ne peut pas être inférieure à la qté de commande minimum {2} (défini dans l'Article).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Pourcentage de Répartition Mensuelle
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Veuillez vous connecter en tant qu'un autre utilisateur.
DocType: Territory,Territory Targets,Objectifs Régionaux
@@ -3904,7 +3909,7 @@
DocType: Serial No,Out of AMC,Sur AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Effectuer une Visite d'Entretien
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Veuillez contactez l'utilisateur qui a le rôle de Directeur des Ventes {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Veuillez contactez l'utilisateur qui a le rôle de Directeur des Ventes {0}
DocType: Company,Default Cash Account,Compte de Caisse par Défaut
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Données de base de la Société (ni les Clients ni les Fournisseurs)
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basé sur la présence de cet Étudiant
@@ -4054,7 +4059,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Aucun employé pour les critères mentionnés
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
DocType: Restaurant,Default Customer,Client par Défaut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Veuillez configurer le système de dénomination des employés dans Ressources humaines> Paramètres RH
DocType: Assessment Plan,Supervisor Name,Nom du Superviseur
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ne confirmez pas si le rendez-vous est créé pour le même jour
DocType: Program Enrollment Course,Program Enrollment Course,Cours d'Inscription au Programme
@@ -4172,7 +4176,7 @@
DocType: BOM,Website Description,Description du Site Web
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variation Nette de Capitaux Propres
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Plus Récent
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresse Email doit être unique, existe déjà pour {0}"
DocType: Serial No,AMC Expiry Date,Date d'Expiration CMA
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Reçu
@@ -4189,7 +4193,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,États des Flux de Trésorerie
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Le Montant du prêt ne peut pas dépasser le Montant Maximal du Prêt de {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Veuillez sélectionnez Report si vous souhaitez également inclure le solde des congés de l'exercice précédent à cet exercice
DocType: GL Entry,Against Voucher Type,Pour le Type de Bon
DocType: Physician,Phone (R),Téléphone (R)
@@ -4201,7 +4205,7 @@
DocType: Patient,B Negative,B Négatif
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Le statut de maintenance doit être annulé ou complété pour pouvoir être envoyé
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Les Numéros de Série dans la ligne {0} ne correspondent pas au Bon de Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Les Numéros de Série dans la ligne {0} ne correspondent pas au Bon de Livraison
DocType: Student,Guardian Details,Détails du Tuteur
DocType: C-Form,C-Form,Formulaire-C
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Valider la Présence de plusieurs employés
@@ -4243,7 +4247,7 @@
DocType: Stock Entry Detail,Basic Amount,Montant de Base
DocType: Training Event,Exam,Examen
DocType: Complaint,Complaint,Plainte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
DocType: Leave Allocation,Unused leaves,Congés non utilisés
DocType: Patient,Alcohol Past Use,Consommation Passée d'Alcool
DocType: Fertilizer Content,Fertilizer Content,Contenu d'engrais
@@ -4367,6 +4371,7 @@
DocType: Salary Detail,Formula,Formule
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Série #
DocType: Lab Test Template,Lab Test Template,Modèle de test de laboratoire
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Compte de vente
DocType: Purchase Invoice Item,Total Weight,Poids total
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Commission sur les Ventes
DocType: Offer Letter Term,Value / Description,Valeur / Description
@@ -4523,7 +4528,7 @@
DocType: Customer,From Lead,Du Prospect
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Commandes validées pour la production.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Sélectionner Exercice ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
DocType: Program Enrollment Tool,Enroll Students,Inscrire des Étudiants
DocType: Lab Test,Approved Date,Date Approuvée
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vente Standard
@@ -4599,7 +4604,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Article de Production
,Employee Information,Renseignements sur l'Employé
DocType: Stock Entry Detail,Additional Cost,Frais Supplémentaire
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base du N° de Coupon, si les lignes sont regroupées par Coupon"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base du N° de Coupon, si les lignes sont regroupées par Coupon"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Créer un Devis Fournisseur
DocType: Quality Inspection,Incoming,Entrant
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Les modèles de taxe par défaut pour les ventes et les achats sont créés.
@@ -4616,7 +4621,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Note : {0}
,Delivery Note Trends,Tendance des Bordereaux de Livraisons
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Résumé Hebdomadaire
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Qté En Stock
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Qté En Stock
DocType: Delivery Trip,Calculate Estimated Arrival Times,Calculer les heures d'arrivée estimées
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Compte : {0} peut uniquement être mis à jour via les Mouvements de Stock
DocType: Student Group Creation Tool,Get Courses,Obtenir les Cours
@@ -4632,7 +4637,7 @@
DocType: Material Request,% Ordered,% Commandé
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Pour un groupe étudiant basé sur un cours, le cours sera validé pour chaque élève inscrit aux cours du programme."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Travail à la Pièce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Moy. Taux d'achat
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Moy. Taux d'achat
DocType: Task,Actual Time (in Hours),Temps Réel (en Heures)
DocType: Employee,History In Company,Ancienneté dans la Société
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nouveau message de {expéditeur}
@@ -4680,7 +4685,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ligne {0} : La devise de la LDM #{1} doit être égale à la devise sélectionnée {2}
DocType: Journal Entry Account,Exchange Rate,Taux de Change
DocType: Patient,Additional information regarding the patient,Informations complémentaires concernant le patient
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Commande Client {0} n'a pas été transmise
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Commande Client {0} n'a pas été transmise
DocType: Homepage,Tag Line,Ligne de Tag
DocType: Fee Component,Fee Component,Composant d'Honoraires
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestion de Flotte
@@ -4893,7 +4898,7 @@
DocType: Employee Education,Employee Education,Formation de l'Employé
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Groupe d’articles en double trouvé dans la table des groupes d'articles
DocType: Land Unit,Parent Land Unit,Unité Terre-Parent
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Nécessaire pour aller chercher les Détails de l'Article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Nécessaire pour aller chercher les Détails de l'Article.
DocType: Fertilizer,Fertilizer Name,Nom de l'engrais
DocType: Salary Slip,Net Pay,Salaire Net
DocType: Account,Account,Compte
@@ -4972,7 +4977,7 @@
DocType: Item Customer Detail,Ref Code,Code de Réf.
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Le Groupe de Clients est Requis dans le Profil POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Dossiers de l'Employé.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Veuillez définir la Prochaine Date d’Amortissement
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Veuillez définir la Prochaine Date d’Amortissement
DocType: HR Settings,Payroll Settings,Réglages de la Paie
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Rapprocher les Factures non liées avec les Paiements.
DocType: POS Settings,POS Settings,Paramètres PDV
@@ -5139,7 +5144,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Rappel d'Anniversaire pour {0}
DocType: Asset Maintenance Task,Last Completion Date,Dernière date d'achèvement
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jours Depuis la Dernière Commande
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
DocType: Buying Settings,Naming Series,Nom de la Série
DocType: Leave Block List,Leave Block List Name,Nom de la Liste de Blocage des Congés
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Date de Début d'Assurance devrait être antérieure à la Date de Fin d'Assurance
@@ -5265,6 +5270,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Obtenir les Écritures de Paiement
DocType: Quotation Item,Against Docname,Pour le docName
DocType: SMS Center,All Employee (Active),Tous les Employés (Actifs)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Client> Groupe de clients> Territoire
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Voir Maintenant
DocType: BOM,Raw Material Cost,Coût de Matière Première
DocType: Item Reorder,Re-Order Level,Niveau de Réapprovisionnement
@@ -5363,7 +5369,6 @@
DocType: Room,Seating Capacity,Nombre de places
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Groupes de test de laboratoire
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Client> Groupe de clients> Territoire
DocType: Project,Total Expense Claim (via Expense Claims),Total des Notes de Frais (via Notes de Frais)
DocType: GST Settings,GST Summary,Résumé GST
DocType: Assessment Result,Total Score,Score Total
@@ -5376,7 +5381,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Les horaires de cours suivants ont été créés
DocType: Journal Entry,Total Debit,Total Débit
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Entrepôt de Produits Finis par Défaut
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vendeur
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendeur
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Centre de Budget et Coûts
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,De multiples modes de paiement par défaut ne sont pas autorisés
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pour le
@@ -5549,7 +5554,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenir Compte de la Taxe et des Frais pour
DocType: Driver,Driving License Category,Catégorie de permis de conduire
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qté Réelle est obligatoire
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} est actuellement associé avec une fiche d'évaluation fournisseur {1}. Les bons de commande pour ce fournisseur doivent être édités avec précaution.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} est actuellement associé avec une fiche d'évaluation fournisseur {1}. Les bons de commande pour ce fournisseur doivent être édités avec précaution.
DocType: Asset Maintenance Team,Asset Maintenance Team,Équipe de Maintenance des Actifs
DocType: Employee Loan,Loan Type,Type de Prêt
DocType: Scheduling Tool,Scheduling Tool,Outil de Planification
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index 66a7b83..8461290 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,ભાવ દ્વારા સૉર્ટ કરો
,Delay Days,વિલંબ દિવસો
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,સેવા ખર્ચ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,ભરતિયું
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,રીટેન્શન સ્ટોક એન્ટ્રી બનાવો
DocType: Purchase Invoice Item,Item Weight Details,આઇટમ વજન વિગતો
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","સંદર્ભ: {0}, આઇટમ કોડ: {1} અને ગ્રાહક: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,કિલો ગ્રામ
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,નોકરી માટે ખોલીને.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},{1} પંક્તિ {1} પર ઉપ કોન્ટેક્ટિંગ આઇટમ માટે સ્પષ્ટ નથી BOM
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},{1} પંક્તિ {1} પર ઉપ કોન્ટેક્ટિંગ આઇટમ માટે સ્પષ્ટ નથી BOM
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} પરિણામ મળ્યું
DocType: Item Attribute,Increment,વૃદ્ધિ
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,સમય ગાળો
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},માટે પરવાનગી નથી {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,વસ્તુઓ મેળવો
DocType: Price List,Price Not UOM Dependant,ભાવ અમોમ આધારિત નથી
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ઉત્પાદન {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,કોઈ આઇટમ સૂચિબદ્ધ નથી
DocType: Asset Repair,Error Description,ભૂલ વર્ણન
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,કરિયાણા
DocType: Quality Inspection Reading,Reading 1,1 વાંચન
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,પેન્શન ફંડ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,આગળ અવમૂલ્યન તારીખ પહેલાં ખરીદી તારીખ ન હોઈ શકે
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,આગળ અવમૂલ્યન તારીખ પહેલાં ખરીદી તારીખ ન હોઈ શકે
DocType: Crop,Perennial,બારમાસી
DocType: Consultation,Consultation Date,કન્સલ્ટેશન તારીખ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERP નેક્સ્ટ વપરાશકર્તાઓ માટે ઉત્પાદન સૂચિ અને શોધ
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",દા.ત. "પ્રાથમિક શાળા" અથવા "યુનિવર્સિટી"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,સ્ટોક અહેવાલ
DocType: Warehouse,Warehouse Detail,વેરહાઉસ વિગતવાર
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ટર્મ સમાપ્તિ તારીખ કરતાં પાછળથી શૈક્ષણિક વર્ષ સમાપ્તિ તારીખ જે શબ્દ સાથે કડી થયેલ છે હોઈ શકે નહિં (શૈક્ષણિક વર્ષ {}). તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""સ્થિર સંપત્તિ"" અનચેક કરી શકાતી નથી કારણ કે આ વસ્તુ સામે સંપત્તિ વ્યવહાર અસ્તિત્વમાં છે"""
DocType: Delivery Trip,Departure Time,પ્રસ્થાન સમય
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,સ્પષ્ટીકરણ વિગતો મેળવવા
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,સપ્લાયર સ્ટેન્ડિંગના નમૂનાઓ.
DocType: Lead,Interested,રસ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,ખુલી
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,ખુલી
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},પ્રતિ {0} માટે {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,કર સેટ કરવામાં નિષ્ફળ
DocType: Item,Copy From Item Group,વસ્તુ ગ્રુપ નકલ
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,તારીખ રાહત જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,દર વર્ષે પાંદડાં
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,રો {0}: કૃપા કરીને તપાસો એકાઉન્ટ સામે 'અગાઉથી છે' {1} આ એક અગાઉથી પ્રવેશ હોય તો.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},{0} વેરહાઉસ કંપની ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},{0} વેરહાઉસ કંપની ને અનુલક્ષતું નથી {1}
DocType: Email Digest,Profit & Loss,નફો અને નુકસાન
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),કુલ પડતર રકમ (સમયનો શીટ મારફતે)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,આ કંપની સામેના વ્યવહારો પર આધારિત છે. વિગતો માટે નીચેની ટાઇમલાઇન જુઓ
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,આપોઆપ સામગ્રી વિનંતી બનાવટ પર ઇમેઇલ દ્વારા સૂચિત
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,રેઝિસ્ટન્ટ
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,કન્સલ્ટેશન
DocType: Journal Entry,Multi Currency,મલ્ટી કરન્સી
DocType: Opening Invoice Creation Tool,Invoice Type,ભરતિયું પ્રકાર
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,ડિલીવરી નોંધ
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,વિધવા
DocType: Request for Quotation,Request for Quotation,અવતરણ માટે વિનંતી
DocType: Healthcare Settings,Require Lab Test Approval,લેબ ટેસ્ટ મંજૂરીની આવશ્યકતા છે
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,આઇટમ કોડ> આઇટમ ગ્રુપ> બ્રાન્ડ
DocType: Salary Slip Timesheet,Working Hours,કામ નાં કલાકો
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,કુલ ઉત્કૃષ્ટ
DocType: Naming Series,Change the starting / current sequence number of an existing series.,હાલની શ્રેણી શરૂ / વર્તમાન ક્રમ નંબર બદલો.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ખર્ચ કેન્દ્રને દાખલ કરો
DocType: Drug Prescription,Dosage,ડોઝ
DocType: Journal Entry Account,Sales Order,વેચાણ ઓર્ડર
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,સરેરાશ. વેચાણ દર
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,સરેરાશ. વેચાણ દર
DocType: Assessment Plan,Examiner Name,એક્ઝામિનર નામ
DocType: Lab Test Template,No Result,કોઈ પરિણામ
DocType: Purchase Invoice Item,Quantity and Rate,જથ્થો અને દર
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,પગારપત્રક અવધિ પસંદ
DocType: Purchase Invoice,Unpaid,અવેતન
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,વેચાણ માટે આરક્ષિત
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,હ્યુમન રિસોર્સ> એચઆર સેટિંગ્સમાં કર્મચારીનું નામકરણ પદ્ધતિ સેટ કરો
DocType: Packing Slip,From Package No.,પેકેજ નંબર પ્રતિ
DocType: Item Attribute,To Range,શ્રેણી
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,સિક્યોરિટીઝ અને થાપણો
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,વર્કશોપ
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ખરીદ ઓર્ડર ચેતવો
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,તમારા ગ્રાહકો થોડા યાદી આપે છે. તેઓ સંસ્થાઓ અથવા વ્યક્તિઓ હોઈ શકે છે.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,પૂરતી ભાગો બિલ્ડ કરવા માટે
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,પૂરતી ભાગો બિલ્ડ કરવા માટે
DocType: POS Profile User,POS Profile User,POS પ્રોફાઇલ વપરાશકર્તા
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,સીધી આવક
DocType: Patient Appointment,Date TIme,તારીખ સમય
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","એકાઉન્ટ દ્વારા જૂથ, તો એકાઉન્ટ પર આધારિત ફિલ્ટર કરી શકો છો"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","એકાઉન્ટ દ્વારા જૂથ, તો એકાઉન્ટ પર આધારિત ફિલ્ટર કરી શકો છો"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,વહીવટી અધિકારીશ્રી
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,કંપની અને ટેક્સની સ્થાપના
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,કૃપા કરીને અભ્યાસક્રમનો પસંદ
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,તફાવત એકાઉન્ટ
DocType: Purchase Invoice,Supplier GSTIN,પુરવઠોકર્તા GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,તેના આશ્રિત કાર્ય {0} બંધ નથી નજીક કાર્ય નથી કરી શકો છો.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
DocType: Production Order,Additional Operating Cost,વધારાની ઓપરેટીંગ ખર્ચ
DocType: Lab Test Template,Lab Routine,લેબ રાબેતા મુજબનું
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,કોસ્મેટિક્સ
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 સાથે સંબંધ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,વ્યવસ્થાપક
DocType: Payment Entry,Payment From / To,ચુકવણી / to
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},નવું ક્રેડિટ મર્યાદા ગ્રાહક માટે વર્તમાન બાકી રકમ કરતાં ઓછી છે. ક્રેડિટ મર્યાદા ઓછામાં ઓછા હોઈ શકે છે {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},નવું ક્રેડિટ મર્યાદા ગ્રાહક માટે વર્તમાન બાકી રકમ કરતાં ઓછી છે. ક્રેડિટ મર્યાદા ઓછામાં ઓછા હોઈ શકે છે {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},વેરહાઉસમાં એકાઉન્ટ સેટ કરો {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'પર આધારિત' અને 'જૂથ દ્વારા' સમાન ન હોઈ શકે
DocType: Sales Person,Sales Person Targets,વેચાણ વ્યક્તિ લક્ષ્યાંક
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,બેચ નામ
DocType: Fee Validity,Max number of visit,મુલાકાતની મહત્તમ સંખ્યા
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet બનાવવામાં:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,નોંધણી
DocType: GST Settings,GST Settings,જીએસટી સેટિંગ્સ
DocType: Selling Settings,Customer Naming By,કરીને ગ્રાહક નામકરણ
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,બજેટ સામે
DocType: Employee,Cell Number,સેલ સંખ્યા
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,આપેલ માપદંડ માટે કોઈ કર્મચારી નથી. તપાસ કરો કે પગાર સ્લિપ પહેલેથી જ બનાવવામાં આવી નથી.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,ઓટો સામગ્રી અરજીઓ પેદા
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ઓટો સામગ્રી અરજીઓ પેદા
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,લોસ્ટ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,તમે સ્તંભ 'જર્નલ પ્રવેશ સામે વર્તમાન વાઉચર દાખલ નહીં કરી શકો
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,ઉત્પાદન માટે અનામત
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,એનર્જી
DocType: Opportunity,Opportunity From,પ્રતિ તક
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,માસિક પગાર નિવેદન.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,પંક્તિ {0}: {1} વસ્તુ {2} માટે આવશ્યક ક્રમાંક ક્રમાંક. તમે {3} પ્રદાન કરેલ છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,પંક્તિ {0}: {1} વસ્તુ {2} માટે આવશ્યક ક્રમાંક ક્રમાંક. તમે {3} પ્રદાન કરેલ છે
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,કોષ્ટક પસંદ કરો
DocType: BOM,Website Specifications,વેબસાઇટ તરફથી
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} 'પ્રાપ્તકર્તાઓ' માં અયોગ્ય ઇમેઇલ સરનામું છે
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ભાવની વિનંતી કરી
DocType: Vital Signs,Heart Rate / Pulse,હાર્ટ રેટ / પલ્સ
DocType: Company,Default Bank Account,મૂળભૂત બેન્ક એકાઉન્ટ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","પાર્ટી પર આધારિત ફિલ્ટર કરવા માટે, પસંદ પાર્ટી પ્રથમ પ્રકાર"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","પાર્ટી પર આધારિત ફિલ્ટર કરવા માટે, પસંદ પાર્ટી પ્રથમ પ્રકાર"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'અદ્યતન સ્ટોક' ચેક ના કરી શકાય કારણ કે વસ્તુઓ {0}મારફતે વિતરિત કરેલ નથી
DocType: Vehicle,Acquisition Date,સંપાદન તારીખ
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,અમે
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),તમારા અક્ષર વડાને અપલોડ કરો (તેને વેબ તરીકે મૈત્રીપૂર્ણ રાખો 900px દ્વારા 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: એકાઉન્ટ {2} એક જૂથ હોઈ શકે છે
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,વસ્તુ રો {IDX}: {Doctype} {DOCNAME} ઉપર અસ્તિત્વમાં નથી '{Doctype}' ટેબલ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} પહેલેથી જ પૂર્ણ અથવા રદ થયેલ છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} પહેલેથી જ પૂર્ણ અથવા રદ થયેલ છે
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,કોઈ કાર્યો
DocType: Item Variant Settings,Copy Fields to Variant,ફીલ્ડ્સ ટુ વેરિએન્ટને કૉપિ કરો
DocType: Asset,Opening Accumulated Depreciation,ખુલવાનો સંચિત અવમૂલ્યન
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,પેટા-સ્થળોના માટે યોજના સામગ્રી
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,સેલ્સ પાર્ટનર્સ અને પ્રદેશ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),સમાપન (ખુલીને + કુલ)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),સમાપન (ખુલીને + કુલ)
DocType: Journal Entry,Depreciation Entry,અવમૂલ્યન એન્ટ્રી
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,પ્રથમ દસ્તાવેજ પ્રકાર પસંદ કરો
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,એકાઉન્ટ ચલણમાં છાપો
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,આ જાળવણી મુલાકાત લો રદ રદ સામગ્રી મુલાકાત {0}
DocType: Crop Cycle,ISO 8016 standard,આઇએસઓ 8016 સ્ટાન્ડર્ડ
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},સીરીયલ કોઈ {0} વસ્તુ ને અનુલક્ષતું નથી {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,મૂળભૂત ચૂકવવાપાત્ર હિસાબ
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
DocType: Fee Structure,Components,ઘટકો
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
DocType: Quality Inspection Reading,Reading 6,6 વાંચન
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,કંપની નું નામ
DocType: SMS Center,Total Message(s),કુલ સંદેશ (ઓ)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} સેટઅપ> સેટિંગ્સ> નામકરણની શ્રેણી માટે નામકરણ શ્રેણી સેટ કરો
DocType: Purchase Invoice,Additional Discount Percentage,વધારાના ડિસ્કાઉન્ટ ટકાવારી
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,તમામ મદદ વિડિઓઝ યાદી જુઓ
DocType: Agriculture Analysis Criteria,Soil Texture,માટી સંરચના
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM વેબસાઇટ વસ્તુ
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,તમારો પત્ર વડા અને લોગો અપલોડ કરો. (જો તમે પછીથી તેમને ફેરફાર કરી શકો છો).
DocType: Timesheet Detail,Bill,બિલ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,આગળ અવમૂલ્યન તારીખ છેલ્લા તારીખ તરીકે દાખલ થયેલ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,આગળ અવમૂલ્યન તારીખ છેલ્લા તારીખ તરીકે દાખલ થયેલ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,વ્હાઇટ
DocType: SMS Center,All Lead (Open),બધા સીસું (ઓપન)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),રો {0}: Qty માટે ઉપલબ્ધ નથી {4} વેરહાઉસ {1} પ્રવેશ સમયે પોસ્ટ પર ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,આગામી સંપર્ક તારીખ
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty ખુલવાનો
DocType: Healthcare Settings,Appointment Reminder,નિમણૂંક રીમાઇન્ડર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
DocType: Program Enrollment Tool Student,Student Batch Name,વિદ્યાર્થી બેચ નામ
DocType: Consultation,Doctor,ડોક્ટર
DocType: Holiday List,Holiday List Name,રજા યાદી નામ
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ફાળવણી સાધન મૂકો
DocType: Item,Hub Category to Publish,પ્રકાશિત હબ શ્રેણી
DocType: Leave Block List,Leave Block List Dates,બ્લોક યાદી તારીખો છોડો
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,કૃપા કરીને સેટઅપ> ક્રમાંકન શ્રેણી દ્વારા હાજરી માટે શ્રેણી ક્રમાંક સેટ કરો
DocType: Sales Invoice,Billing Address GSTIN,બિલિંગ સરનામું GSTIN
DocType: Assessment Plan,Evaluate,મૂલ્યાંકન કરો
DocType: Workstation,Net Hour Rate,નેટ કલાક દર
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,વેચાણ ભરતિયું ચુકવણી
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,સેલ્સ ઓર્ડર / ફિનિશ્ડ ગૂડ્સ વેરહાઉસ માં અનામત વેરહાઉસ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,વેચાણ રકમ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,વેચાણ રકમ
DocType: Repayment Schedule,Interest Amount,વ્યાજ રકમ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,તમે આ રેકોર્ડ માટે ખર્ચ તાજનો છે. જો 'પરિસ્થિતિ' અને સાચવો અપડેટ કરો
DocType: Serial No,Creation Document No,બનાવટ દસ્તાવેજ કોઈ
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,ખુલવાનો હિસાબી બેલેન્સ
,GST Sales Register,જીએસટી સેલ્સ રજિસ્ટર
DocType: Sales Invoice Advance,Sales Invoice Advance,સેલ્સ ભરતિયું એડવાન્સ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,કંઈ વિનંતી કરવા
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,કંઈ વિનંતી કરવા
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,તમારા ડોમેન્સ પસંદ કરો
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},અન્ય બજેટ રેકોર્ડ '{0}' પહેલાથી જ સામે અસ્તિત્વમાં {1} '{2}' નાણાકીય વર્ષ માટે {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,બનાવટના સમયે જ ક્ષેત્રોની નકલ કરવામાં આવશે.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","આ ચલ વસ્તુ કોડ ઉમેરાવું કરવામાં આવશે. તમારા સંક્ષેપ "શૌન" છે, અને ઉદાહરણ તરીકે, જો આઇટમ કોડ "ટી શર્ટ", "ટી-શર્ટ શૌન" હશે ચલ આઇટમ કોડ છે"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,તમે પગાર કાપલી સેવ વાર (શબ્દોમાં) નેટ પે દૃશ્યમાન થશે.
DocType: Purchase Invoice,Is Return,વળતર છે
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,સાવધાન
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,સાવધાન
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,રીટર્ન / ડેબિટ નોટ
DocType: Price List Country,Price List Country,ભાવ યાદી દેશ
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} વસ્તુ માટે માન્ય સીરીયલ અમે {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} વસ્તુ માટે માન્ય સીરીયલ અમે {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,વસ્તુ કોડ સીરીયલ નંબર માટે બદલી શકાતું નથી
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM રૂપાંતર ફેક્ટર
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,બેચ નંબર મેળવવા માટે વસ્તુ કોડ દાખલ કરો
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
DocType: Supplier Scorecard,Warn for new Request for Quotations,સુવાકયો માટે નવી વિનંતી માટે ચેતવો
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ખરીદી ઓર્ડર કરવાની યોજના ઘડી મદદ અને તમારી ખરીદી પર અનુસરો
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,લેબ ટેસ્ટ પ્રિસ્ક્રિપ્શન્સ
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",કુલ અંક / ટ્રાન્સફર જથ્થો {0} સામગ્રી વિનંતી {1} \ વસ્તુ માટે વિનંતી જથ્થો {2} કરતાં વધારે ન હોઈ શકે {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,વેરહાઉસ સંપર્ક માહિતી
DocType: Payment Entry,Write Off Difference Amount,માંડવાળ તફાવત રકમ
DocType: Volunteer,Volunteer Name,સ્વયંસેવક નામ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,શિક્ષણ> શૈક્ષણિક સેટિંગ્સમાં પ્રશિક્ષક નેમિંગ સિસ્ટમ સેટ કરો
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: કર્મચારીનું ઇમેઇલ મળી નથી, તેથી નથી મોકલવામાં ઇમેઇલ"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},શીપીંગ નિયમ દેશ {0} માટે લાગુ નથી
DocType: Item,Foreign Trade Details,ફોરેન ટ્રેડ વિગતો
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,ગ્રુપ રોલ નંબર
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,બધા કાર્ય વજન કુલ પ્રયત્ન કરીશું 1. મુજબ બધા પ્રોજેક્ટ કાર્યો વજન સંતુલિત કૃપા કરીને
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,વસ્તુ {0} એ પેટા કોન્ટ્રાક્ટ વસ્તુ જ હોવી જોઈએ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,કેપિટલ સાધનો
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","પ્રાઇસીંગ નિયમ પ્રથમ પર આધારિત પસંદ થયેલ વસ્તુ, આઇટમ ગ્રુપ અથવા બ્રાન્ડ બની શકે છે, જે ક્ષેત્ર 'પર લાગુ પડે છે."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,બાળ વેરહાઉસ આ વેરહાઉસ માટે અસ્તિત્વમાં છે. તમે આ વેરહાઉસ કાઢી શકતા નથી.
DocType: Item,Website Item Groups,વેબસાઇટ વસ્તુ જૂથો
DocType: Purchase Invoice,Total (Company Currency),કુલ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,{0} સીરીયલ નંબર એક કરતા વધુ વખત દાખલ
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,{0} સીરીયલ નંબર એક કરતા વધુ વખત દાખલ
DocType: Journal Entry,Journal Entry,જર્નલ પ્રવેશ
DocType: Expense Claim Advance,Unclaimed amount,દાવો ન કરેલા રકમ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} પ્રગતિ વસ્તુઓ
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,કોમ્યુનિકેશન લોગ.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",અવતરણ માટે વિનંતી વધુ ચેક પોર્ટલ સેટિંગ્સ માટે પોર્ટલ ઍક્સેસ અક્ષમ છે.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,સપ્લાયર સ્કોરકાર્ડ સ્કોરિંગ વેરિયેબલ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ખરીદી રકમ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ખરીદી રકમ
DocType: Sales Invoice,Shipping Address Name,શિપિંગ સરનામું નામ
DocType: Material Request,Terms and Conditions Content,નિયમો અને શરતો સામગ્રી
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,કોર્સ શેડ્યૂલ બનાવતી ભૂલો હતી
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,આ વાહન સામે લોગ પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,તમે કાઢી શકતા નથી ફિસ્કલ વર્ષ {0}. ફિસ્કલ વર્ષ {0} વૈશ્વિક સેટિંગ્સ મૂળભૂત તરીકે સુયોજિત છે
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,સમાન નામની ગ્રાહક પહેલેથી હાજર છે
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,આ પગાર સ્લિપ રજૂ કરશે અને એક્ઝ્ર્યુબલ જર્નલ એન્ટ્રી બનાવશે. શું તમે આગળ વધવા માંગો છો?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,પ્રાઇસીંગ
DocType: Quotation,Term Details,શબ્દ વિગતો
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} આ વિદ્યાર્થી જૂથ માટે વિદ્યાર્થીઓ કરતાં વધુ નોંધણી કરી શકતા નથી.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),કુલ (કર વગર)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,લીડ કાઉન્ટ
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 કરતાં મોટી હોવી જ જોઈએ
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,ઉપલબ્ધ સ્ટોક
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ભરતિયું રદ પર ચુકવણી નાપસંદ
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},વર્તમાન ઑડોમીટર વાંચન દાખલ પ્રારંભિક વાહન ઑડોમીટર કરતાં મોટી હોવી જોઈએ {0}
DocType: Restaurant Reservation,No Show,બતાવો નહીં
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} સેટઅપ> સેટિંગ્સ> નામકરણની શ્રેણી માટે નામકરણ શ્રેણી સેટ કરો
DocType: Shipping Rule Country,Shipping Rule Country,શીપીંગ નિયમ દેશ
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,છોડો અને હાજરી
DocType: Maintenance Visit,Partially Completed,આંશિક રીતે પૂર્ણ
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,વિદ્યાર્થીઓની જૂથ પ્રશિક્ષક
DocType: Grant Application,Assessment Mark (Out of 10),આકારણી માર્ક (10 માંથી)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 મોબાઇલ કોઈ
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,મુખ્ય
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,મુખ્ય
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,વેરિએન્ટ
DocType: Naming Series,Set prefix for numbering series on your transactions,તમારા વ્યવહારો પર શ્રેણી નંબર માટે સેટ ઉપસર્ગ
DocType: Employee Attendance Tool,Employees HTML,કર્મચારીઓ HTML
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,કોર્સ સંક્ષેપનો
DocType: Student Leave Application,Student Leave Application,વિદ્યાર્થી છોડો અરજી
DocType: Item,Will also apply for variants,પણ ચલો માટે લાગુ પડશે
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},કર્મચારીનું {0} પર અડધા દિવસ પર {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},કુલ કામના કલાકો મેક્સ કામના કલાકો કરતાં વધારે ન હોવી જોઈએ {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,પર
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),વાસ્તવિક ઓવરને તારીખ (સમયનો શીટ મારફતે)
DocType: Soil Texture,Soil Type,જમીન પ્રકાર
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,નવો સંદેશ
,Quotation Trends,અવતરણ પ્રવાહો
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
DocType: Shipping Rule,Shipping Amount,શીપીંગ રકમ
DocType: Supplier Scorecard Period,Period Score,પીરિયડ સ્કોર
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ગ્રાહકો ઉમેરો
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,વાહન ખર્ચ
DocType: Serial No,Invoice Details,ઇન્વૉઇસ વિગતો
DocType: Grant Application,Show on Website,વેબસાઇટ પર બતાવો
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,પ્રારંભ કરો
DocType: Hub Category,Hub Category,હબ કેટેગરી
DocType: Purchase Invoice,SEZ,સેઝ
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,બી હકારાત્મક
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
DocType: Leave Block List Allow,Leave Block List Allow,બ્લોક પરવાનગી સૂચિ છોડો
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
DocType: Patient Medical Record,Patient Medical Record,પેશન્ટ મેડિકલ રેકોર્ડ
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,બિન-ગ્રુપ ગ્રુપ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,રમતો
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,કોઈ ક્વોટ માટે પ્રાપ્ત કરેલ આરએફક્યુને સેટ કરી શકતા નથી
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,કુલ કપાત
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,એકાઉન્ટ ચલણમાં છાપવા માટે એક એકાઉન્ટ પસંદ કરો
,Production Analytics,ઉત્પાદન ઍનલિટિક્સ
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,આ પેશન્ટ સામેના વ્યવહારો પર આધારિત છે. વિગતો માટે નીચેની ટાઇમલાઇન જુઓ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,કિંમત સુધારાશે
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,કંપની પસંદ કરો ...
DocType: Leave Control Panel,Leave blank if considered for all departments,તમામ વિભાગો માટે ગણવામાં તો ખાલી છોડી દો
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
DocType: Payroll Entry,Fortnightly,પાક્ષિક
DocType: Currency Exchange,From Currency,ચલણ
DocType: Vital Signs,Weight (In Kilogram),વજન (કિલોગ્રામમાં)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,વાલીઓ
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,કિંમતો બતાવવામાં આવશે નહીં તો ભાવ સૂચિ સેટ નથી
DocType: Stock Entry,Total Incoming Value,કુલ ઇનકમિંગ ભાવ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets મદદ તમારી ટીમ દ્વારા કરવામાં activites માટે સમય, ખર્ચ અને બિલિંગ ટ્રેક રાખવા"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ખરીદી ભાવ યાદી
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,સપ્લાયર સ્કોરકાર્ડ ચલોના નમૂનાઓ.
@@ -2653,7 +2658,7 @@
DocType: Company,For Reference Only.,સંદર્ભ માટે માત્ર.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},ફિઝિશિયન {0} {1} પર ઉપલબ્ધ નથી
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,બેચ પસંદ કોઈ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},અમાન્ય {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},અમાન્ય {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,સંદર્ભ INV
@@ -2690,8 +2695,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","કામગીરી, સંચાલન ખર્ચ સ્પષ્ટ અને તમારી કામગીરી કરવા માટે કોઈ એક અનન્ય ઓપરેશન આપે છે."
DocType: Water Analysis,Origin,મૂળ
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,આ દસ્તાવેજ દ્વારા મર્યાદા વધારે છે {0} {1} આઇટમ માટે {4}. તમે બનાવે છે અન્ય {3} જ સામે {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
@@ -2747,7 +2752,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,નવા ખરીદ ઓર્ડર્સ માટે ચેતવણી આપો
DocType: Quality Inspection Reading,Reading 9,9 વાંચન
DocType: Supplier,Is Frozen,સ્થિર છે
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,ગ્રુપ નોડ વેરહાઉસ વ્યવહારો માટે પસંદ કરવા માટે મંજૂરી નથી
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,ગ્રુપ નોડ વેરહાઉસ વ્યવહારો માટે પસંદ કરવા માટે મંજૂરી નથી
DocType: Buying Settings,Buying Settings,ખરીદી સેટિંગ્સ
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,એક ફિનિશ્ડ કોઈ વસ્તુ માટે BOM નંબર
DocType: Upload Attendance,Attendance To Date,તારીખ હાજરી
@@ -2761,6 +2766,7 @@
DocType: Grant Application,Organization,સંસ્થા
DocType: BOM Update Tool,BOM Update Tool,BOM અપડેટ ટૂલ
DocType: SG Creation Tool Course,Student Group Name,વિદ્યાર્થી જૂથ નામ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,વિસ્ફોટ દૃશ્ય બતાવો
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ફી બનાવવી
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,શું તમે ખરેખર આ કંપની માટે તમામ વ્યવહારો કાઢી નાખવા માંગો છો તેની ખાતરી કરો. તે છે તમારા માસ્ટર ડેટા રહેશે. આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.
DocType: Room,Room Number,રૂમ સંખ્યા
@@ -2771,7 +2777,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,કરવેરા નમૂના બનાવો
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,વપરાશકર્તા ફોરમ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
DocType: Lab Test Sample,Lab Test Sample,લેબ ટેસ્ટ નમૂના
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM કોઈપણ વસ્તુ agianst ઉલ્લેખ તો તમે દર બદલી શકતા નથી
@@ -2842,7 +2848,7 @@
DocType: Membership,USD,અમેરીકન ડોલર્સ
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ઇન્વોઇસ બનાવો
DocType: Selling Settings,Auto close Opportunity after 15 days,15 દિવસ પછી ઓટો બંધ તકો
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ના સ્કોરકાર્ડ સ્ટેન્ડને કારણે {0} ખરીદીના ઓર્ડર્સની મંજૂરી નથી.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ના સ્કોરકાર્ડ સ્ટેન્ડને કારણે {0} ખરીદીના ઓર્ડર્સની મંજૂરી નથી.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,સમાપ્તિ વર્ષ
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / લીડ%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,કરારનો અંત તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
@@ -2933,7 +2939,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ઉપર
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,રો # {0}: જર્નલ પ્રવેશ {1} એકાઉન્ટ નથી {2} અથવા પહેલાથી જ બીજા વાઉચર સામે મેળ ખાતી
DocType: Supplier Scorecard Criteria,Criteria Weight,માપદંડ વજન
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,પુરવઠોકર્તા> પુરવઠોકર્તા પ્રકાર
DocType: Buying Settings,Default Buying Price List,ડિફૉલ્ટ ખરીદી ભાવ યાદી
DocType: Payroll Entry,Salary Slip Based on Timesheet,પગાર કાપલી Timesheet પર આધારિત
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,ખરીદ દર
@@ -3021,7 +3026,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ટ્રેક ઉદ્યોગ પ્રકાર દ્વારા દોરી જાય છે.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,લેટરહેડ્સ પર જાઓ
DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,બધા સંબોધે છે.
DocType: Company,Stock Settings,સ્ટોક સેટિંગ્સ
@@ -3198,6 +3203,7 @@
DocType: Company,Default Inventory Account,ડિફૉલ્ટ ઈન્વેન્ટરી એકાઉન્ટ
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,રો {0}: પૂર્ણ Qty શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
DocType: Antibiotic,Antibiotic Name,એન્ટિબાયોટિક નામ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,આઇટમ કોડ> આઇટમ ગ્રુપ> બ્રાન્ડ
DocType: Purchase Invoice,Apply Additional Discount On,વધારાના ડિસ્કાઉન્ટ પર લાગુ પડે છે
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,પ્રકાર પસંદ કરો ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ક્રોપ વધતી જતી તમામ જમીન એકમોની લિંક
@@ -3390,6 +3396,7 @@
DocType: Supplier,Credit Limit,ક્રેડિટ મર્યાદા
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,સરેરાશ ભાવ યાદી દર વેચાણ
DocType: Production Plan Sales Order,Salse Order Date,Salse ઓર્ડર તારીખ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,પુરવઠોકર્તા> પુરવઠોકર્તા પ્રકાર
DocType: Salary Component,Salary Component,પગાર પુન
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,ચુકવણી પ્રવેશો {0} યુએન સાથે જોડાયેલી છે
DocType: GL Entry,Voucher No,વાઉચર કોઈ
@@ -3398,7 +3405,7 @@
DocType: Leave Allocation,Leave Allocation,ફાળવણી છોડો
DocType: Payment Request,Recipient Message And Payment Details,પ્રાપ્તિકર્તા સંદેશ અને ચુકવણી વિગતો
DocType: Training Event,Trainer Email,ટ્રેનર ઇમેઇલ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
DocType: Restaurant Reservation,No of People,લોકોની સંખ્યા
DocType: Production Planning Tool,Include sub-contracted raw materials,પેટા કોન્ટ્રાક્ટ કાચી સામગ્રી સમાવેશ થાય છે
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,શરતો અથવા કરારની ઢાંચો.
@@ -3462,7 +3469,7 @@
DocType: Production Planning Tool,Create Material Requests,સામગ્રી અરજીઓ બનાવો
DocType: Employee Education,School/University,શાળા / યુનિવર્સિટી
DocType: Payment Request,Reference Details,સંદર્ભ વિગતો
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી ગ્રોસ ખરીદી જથ્થો કરતાં ઓછી હોવી જોઈએ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી ગ્રોસ ખરીદી જથ્થો કરતાં ઓછી હોવી જોઈએ
DocType: Sales Invoice Item,Available Qty at Warehouse,વેરહાઉસ ખાતે ઉપલબ્ધ Qty
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ગણાવી રકમ
DocType: Asset,Double Declining Balance,ડબલ કથળતું જતું બેલેન્સ
@@ -3474,7 +3481,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,સુધારાઓ મેળવો
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: એકાઉન્ટ {2} કંપની ને અનુલક્ષતું નથી {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,દરેક લક્ષણોમાંથી ઓછામાં ઓછો એક મૂલ્ય પસંદ કરો
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,સામગ્રી વિનંતી {0} રદ અથવા બંધ છે
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,સામગ્રી વિનંતી {0} રદ અથવા બંધ છે
apps/erpnext/erpnext/config/hr.py +310,Leave Management,મેનેજમેન્ટ છોડો
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,એકાઉન્ટ દ્વારા ગ્રુપ
DocType: Sales Order,Fully Delivered,સંપૂર્ણપણે વિતરિત
@@ -3485,14 +3492,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},વિતરિત રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,પ્રોગ્રામ્સ પર જાઓ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},રો {0} # ફાળવેલ રકમ {1} દાવો ન કરેલા રકમ કરતાં વધુ હોઈ શકતી નથી {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,કૃપા કરીને સેટઅપ> ક્રમાંકન શ્રેણી દ્વારા હાજરી માટે શ્રેણી ક્રમાંક સેટ કરો
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},વસ્તુ માટે જરૂરી ઓર્ડર નંબર ખરીદી {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,ઉત્પાદન ઓર્ડર બનાવવામાં આવી ન
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','તારીખ થી' પછી જ ’તારીખ સુધી’ હોવી જોઈએ
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},વિદ્યાર્થી તરીકે સ્થિતિ બદલી શકાતું નથી {0} વિદ્યાર્થી અરજી સાથે કડી થયેલ છે {1}
DocType: Asset,Fully Depreciated,સંપૂર્ણપણે અવમૂલ્યન
,Stock Projected Qty,સ્ટોક Qty અંદાજિત
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,નોંધપાત્ર હાજરી HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",સુવાકયો દરખાસ્તો બિડ તમે તમારા ગ્રાહકો માટે મોકલી છે
DocType: Sales Order,Customer's Purchase Order,ગ્રાહક ખરીદી ઓર્ડર
@@ -3576,7 +3582,7 @@
DocType: Stock Settings,Item Naming By,આઇટમ દ્વારા નામકરણ
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},અન્ય પીરિયડ બંધ એન્ટ્રી {0} પછી કરવામાં આવી છે {1}
DocType: Production Order,Material Transferred for Manufacturing,સામગ્રી ઉત્પાદન માટે તબદીલ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,એકાઉન્ટ {0} નથી અસ્તિત્વમાં
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,એકાઉન્ટ {0} નથી અસ્તિત્વમાં
DocType: Project,Project Type,પ્રોજેક્ટ પ્રકાર
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,આ કાર્ય માટે બાળ કાર્ય અસ્તિત્વમાં છે. તમે આ ટાસ્કને કાઢી શકતા નથી.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ક્યાં લક્ષ્ય Qty અથવા લક્ષ્ય રકમ ફરજિયાત છે.
@@ -3678,11 +3684,11 @@
DocType: Company,Asset Depreciation Cost Center,એસેટ અવમૂલ્યન કિંમત કેન્દ્ર
DocType: Sales Order Item,Sales Order Date,સેલ્સ ઓર્ડર તારીખ
DocType: Sales Invoice Item,Delivered Qty,વિતરિત Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,કુલ Excl ટેક્સ
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","જો ચકાસાયેલ છે, દરેક ઉત્પાદન વસ્તુ તમામ બાળકો સામગ્રી અરજીઓ સમાવવામાં આવશે."
DocType: Assessment Plan,Assessment Plan,આકારણી યોજના
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,ગ્રાહક {0} બનાવવામાં આવેલ છે
DocType: Stock Settings,Limit Percent,મર્યાદા ટકા
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,શિક્ષણ> શૈક્ષણિક સેટિંગ્સમાં પ્રશિક્ષક નેમિંગ સિસ્ટમ સેટ કરો
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,હાલમાં કોઈ વેરહાઉસમાં કોઈ સ્ટોક ઉપલબ્ધ નથી
,Payment Period Based On Invoice Date,ભરતિયું તારીખ પર આધારિત ચુકવણી સમય
DocType: Sample Collection,No. of print,પ્રિન્ટની સંખ્યા
@@ -3698,12 +3704,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),ડેટર્સ ({0})
DocType: Pricing Rule,Margin,માર્જિન
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,નવા ગ્રાહકો
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,કુલ નફો %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,કુલ નફો %
DocType: Appraisal Goal,Weightage (%),ભારાંકન (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS પ્રોફાઇલ બદલો
DocType: Bank Reconciliation Detail,Clearance Date,ક્લિયરન્સ તારીખ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,આકારણી રિપોર્ટ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,કુલ ખરીદી જથ્થો ફરજિયાત છે
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,કુલ ખરીદી જથ્થો ફરજિયાત છે
DocType: Lead,Address Desc,DESC સરનામું
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,પાર્ટી ફરજિયાત છે
DocType: Journal Entry,JV-,JV-
@@ -3735,7 +3741,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,સ્ટેન્ડીંગ નામ
DocType: Stock Entry,Customer or Supplier Details,ગ્રાહક અથવા સપ્લાયર વિગતો
DocType: Employee Loan Application,Required by Date,તારીખ દ્વારા જરૂરી
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),બંધ બેલેન્સ (ડો - સીઆર)
DocType: Lead,Lead Owner,અગ્ર માલિક
DocType: Bin,Requested Quantity,વિનંતી જથ્થો
DocType: Patient,Marital Status,વૈવાહિક સ્થિતિ
@@ -3749,7 +3754,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,મલ્ટીપલ વેરિયન્ટ્સ
DocType: Sales Invoice,Against Income Account,આવક એકાઉન્ટ સામે
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% વિતરિત
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,વસ્તુ {0}: આદેશ આપ્યો Qty {1} ન્યૂનતમ ક્રમ Qty {2} (વસ્તુ માં વ્યાખ્યાયિત) કરતા ઓછી ન હોઈ શકે.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,વસ્તુ {0}: આદેશ આપ્યો Qty {1} ન્યૂનતમ ક્રમ Qty {2} (વસ્તુ માં વ્યાખ્યાયિત) કરતા ઓછી ન હોઈ શકે.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,માસિક વિતરણ ટકાવારી
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,કૃપા કરીને અન્ય વપરાશકર્તા તરીકે લૉગિન કરો.
DocType: Territory,Territory Targets,પ્રદેશ લક્ષ્યાંક
@@ -3848,7 +3853,7 @@
DocType: Serial No,Out of AMC,એએમસીના આઉટ
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,જાળવણી મુલાકાત કરી
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
DocType: Company,Default Cash Account,ડિફૉલ્ટ કેશ એકાઉન્ટ
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,કંપની (નથી ગ્રાહક અથવા સપ્લાયર) માસ્ટર.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,આ વિદ્યાર્થી હાજરી પર આધારિત છે
@@ -3998,7 +4003,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ઉલ્લેખિત માપદંડ માટે કોઈ કર્મચારી નથી
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
DocType: Restaurant,Default Customer,ડિફૉલ્ટ ગ્રાહક
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,હ્યુમન રિસોર્સ> એચઆર સેટિંગ્સમાં કર્મચારીનું નામકરણ પદ્ધતિ સેટ કરો
DocType: Assessment Plan,Supervisor Name,સુપરવાઇઝર નામ
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ખાતરી કરો કે એ જ દિવસે નિમણૂક બનાવવામાં આવી નથી
DocType: Program Enrollment Course,Program Enrollment Course,કાર્યક્રમ નોંધણી કોર્સ
@@ -4116,7 +4120,7 @@
DocType: BOM,Website Description,વેબસાઇટ વર્ણન
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ઈક્વિટી કુલ ફેરફાર
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,સૌથી નવું
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ઇમેઇલ સરનામું અનન્ય હોવો જોઈએ, પહેલેથી જ અસ્તિત્વમાં છે {0}"
DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,રસીદ
@@ -4133,7 +4137,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,લાઈસન્સ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"તમે પણ અગાઉના નાણાકીય વર્ષમાં બેલેન્સ ચાલુ નાણાકીય વર્ષના નહીં સામેલ કરવા માંગો છો, તો આગળ લઈ પસંદ કરો"
DocType: GL Entry,Against Voucher Type,વાઉચર પ્રકાર સામે
DocType: Physician,Phone (R),ફોન (આર)
@@ -4145,7 +4149,7 @@
DocType: Patient,B Negative,બી નકારાત્મક
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,જાળવણી સ્થિતિ રદ અથવા સબમિટ કરવા સમાપ્ત થાય છે
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,{0} પંક્તિમાં ક્રમાંકોમાં સાથે ડિલીવરી નોંધ મેચ થતો નથી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,{0} પંક્તિમાં ક્રમાંકોમાં સાથે ડિલીવરી નોંધ મેચ થતો નથી
DocType: Student,Guardian Details,ગાર્ડિયન વિગતો
DocType: C-Form,C-Form,સી-ફોર્મ
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,બહુવિધ કર્મચારીઓ માટે માર્ક એટેન્ડન્સ
@@ -4187,7 +4191,7 @@
DocType: Stock Entry Detail,Basic Amount,મૂળભૂત રકમ
DocType: Training Event,Exam,પરીક્ષા
DocType: Complaint,Complaint,ફરિયાદ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
DocType: Patient,Alcohol Past Use,મદ્યાર્ક ભૂતકાળનો ઉપયોગ
DocType: Fertilizer Content,Fertilizer Content,ખાતર સામગ્રી
@@ -4311,6 +4315,7 @@
DocType: Salary Detail,Formula,ફોર્મ્યુલા
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,સીરીયલ #
DocType: Lab Test Template,Lab Test Template,લેબ ટેસ્ટ ઢાંચો
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,સેલ્સ એકાઉન્ટ
DocType: Purchase Invoice Item,Total Weight,કૂલ વજન
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,સેલ્સ પર કમિશન
DocType: Offer Letter Term,Value / Description,ભાવ / વર્ણન
@@ -4467,7 +4472,7 @@
DocType: Customer,From Lead,લીડ પ્રતિ
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ઓર્ડર્સ ઉત્પાદન માટે પ્રકાશિત થાય છે.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ફિસ્કલ વર્ષ પસંદ કરો ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
DocType: Program Enrollment Tool,Enroll Students,વિદ્યાર્થી નોંધણી
DocType: Lab Test,Approved Date,મંજૂર તારીખ
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ધોરણ વેચાણ
@@ -4543,7 +4548,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,ઉત્પાદન વસ્તુ
,Employee Information,કર્મચારીનું માહિતી
DocType: Stock Entry Detail,Additional Cost,વધારાના ખર્ચ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","વાઉચર કોઈ પર આધારિત ફિલ્ટર કરી શકો છો, વાઉચર દ્વારા જૂથ તો"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","વાઉચર કોઈ પર આધારિત ફિલ્ટર કરી શકો છો, વાઉચર દ્વારા જૂથ તો"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
DocType: Quality Inspection,Incoming,ઇનકમિંગ
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,વેચાણ અને ખરીદી માટે ડિફોલ્ટ કર ટેમ્પ્લેટ બનાવવામાં આવે છે.
@@ -4560,7 +4565,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},નોંધ: {0}
,Delivery Note Trends,ડ લવર નોંધ પ્રવાહો
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,આ અઠવાડિયાના સારાંશ
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,સ્ટોક Qty માં
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,સ્ટોક Qty માં
DocType: Delivery Trip,Calculate Estimated Arrival Times,અંદાજિત આગમન ટાઇમ્સની ગણતરી કરો
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ખાતું: {0} માત્ર સ્ટોક વ્યવહારો દ્વારા સુધારી શકાય છે
DocType: Student Group Creation Tool,Get Courses,અભ્યાસક્રમો મેળવો
@@ -4576,7 +4581,7 @@
DocType: Material Request,% Ordered,% આદેશ આપ્યો
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","કોર્સ આધારિત વિદ્યાર્થી જૂથ માટે, કોર્સ કાર્યક્રમ નોંધણી પ્રવેશ અભ્યાસક્રમો થી દરેક વિદ્યાર્થી માટે માન્ય કરવામાં આવશે."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,છૂટક કામ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,સરેરાશ. ખરીદી દર
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,સરેરાશ. ખરીદી દર
DocType: Task,Actual Time (in Hours),(કલાકોમાં) વાસ્તવિક સમય
DocType: Employee,History In Company,કંપની ઇતિહાસ
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{મોકલનાર} તરફથી નવો સંદેશ
@@ -4624,7 +4629,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},રો {0}: બોમ # ચલણ {1} પસંદ ચલણ સમાન હોવું જોઈએ {2}
DocType: Journal Entry Account,Exchange Rate,વિનિમય દર
DocType: Patient,Additional information regarding the patient,દર્દીને લગતી વધારાની માહિતી
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
DocType: Homepage,Tag Line,ટેગ લાઇન
DocType: Fee Component,Fee Component,ફી પુન
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ફ્લીટ મેનેજમેન્ટ
@@ -4836,7 +4841,7 @@
DocType: Employee Education,Employee Education,કર્મચારીનું શિક્ષણ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,નકલી વસ્તુ જૂથ આઇટમ જૂથ ટેબલ મળી
DocType: Land Unit,Parent Land Unit,પિતૃ જમીન એકમ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
DocType: Fertilizer,Fertilizer Name,ખાતરનું નામ
DocType: Salary Slip,Net Pay,નેટ પે
DocType: Account,Account,એકાઉન્ટ
@@ -4915,7 +4920,7 @@
DocType: Item Customer Detail,Ref Code,સંદર્ભ કોડ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS પ્રોફાઇલમાં કસ્ટમર ગ્રુપ જરૂરી છે
apps/erpnext/erpnext/config/hr.py +12,Employee records.,કર્મચારીનું રેકોર્ડ.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,સુયોજિત કરો આગળ અવમૂલ્યન તારીખ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,સુયોજિત કરો આગળ અવમૂલ્યન તારીખ
DocType: HR Settings,Payroll Settings,પગારપત્રક સેટિંગ્સ
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,બિન-કડી ઇનવૉઇસેસ અને ચૂકવણી મેળ ખાય છે.
DocType: POS Settings,POS Settings,સ્થિતિ સેટિંગ્સ
@@ -5082,7 +5087,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
DocType: Asset Maintenance Task,Last Completion Date,છેલ્લું સમાપ્તિ તારીખ
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,છેલ્લે ઓર્ડર સુધીનાં દિવસો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
DocType: Buying Settings,Naming Series,નામકરણ સિરીઝ
DocType: Leave Block List,Leave Block List Name,બ્લોક યાદી મૂકો નામ
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,વીમા પ્રારંભ તારીખ કરતાં વીમા અંતિમ તારીખ ઓછી હોવી જોઈએ
@@ -5208,6 +5213,7 @@
DocType: Bank Reconciliation,Get Payment Entries,ચુકવણી પ્રવેશો મળી
DocType: Quotation Item,Against Docname,Docname સામે
DocType: SMS Center,All Employee (Active),બધા કર્મચારીનું (સક્રિય)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ગ્રાહક> ગ્રાહક જૂથ> પ્રદેશ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,હવે જુઓ
DocType: BOM,Raw Material Cost,કાચો સામગ્રી ખર્ચ
DocType: Item Reorder,Re-Order Level,ફરીથી ઓર્ડર સ્તર
@@ -5306,7 +5312,6 @@
DocType: Room,Seating Capacity,બેઠક ક્ષમતા
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,લેબ ટેસ્ટ જૂથો
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ગ્રાહક> ગ્રાહક જૂથ> પ્રદેશ
DocType: Project,Total Expense Claim (via Expense Claims),કુલ ખર્ચ દાવો (ખર્ચ દાવાઓ મારફતે)
DocType: GST Settings,GST Summary,જીએસટી સારાંશ
DocType: Assessment Result,Total Score,કુલ સ્કોર
@@ -5319,7 +5324,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,નીચેના કોર્સ સમયપત્રક બનાવવામાં આવ્યા હતા
DocType: Journal Entry,Total Debit,કુલ ડેબિટ
DocType: Manufacturing Settings,Default Finished Goods Warehouse,મૂળભૂત ફિનિશ્ડ ગૂડ્સ વેરહાઉસ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,વેચાણ વ્યક્તિ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,વેચાણ વ્યક્તિ
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,બજેટ અને ખર્ચ કેન્દ્ર
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ચુકવણીના બહુવિધ ડિફોલ્ટ મોડને મંજૂરી નથી
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,માટે
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index ba23cce..50f38fe 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -95,7 +95,7 @@
DocType: Patient,Married,נשוי
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},חל איסור על {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,קבל פריטים מ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},מוצרים {0}
DocType: Payment Reconciliation,Reconcile,ליישב
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,מכולת
@@ -111,7 +111,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",למשל "בית הספר היסודי" או "האוניברסיטה"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,דוחות במלאי
DocType: Warehouse,Warehouse Detail,פרט מחסן
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""האם רכוש קבוע" לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
DocType: Tax Rule,Tax Type,סוג המס
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
@@ -122,7 +122,7 @@
apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,החג על {0} הוא לא בין מתאריך ו עד תאריך
DocType: Quality Inspection,Get Specification Details,קבל מפרט פרטים
DocType: Lead,Interested,מעוניין
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,פתיחה
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,פתיחה
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},מ {0} {1}
DocType: Item,Copy From Item Group,העתק מ קבוצת פריט
DocType: Journal Entry,Opening Entry,כניסת פתיחה
@@ -229,7 +229,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,עלים בכל שנה
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם Advance' נגד חשבון {1} אם זה כניסה מראש.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,לִיטר
DocType: Task,Total Costing Amount (via Time Sheet),סה"כ תמחיר הסכום (באמצעות גיליון זמן)
DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
@@ -365,7 +365,7 @@
DocType: Subscription,Yearly,שנתי
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,נא להזין מרכז עלות
DocType: Journal Entry Account,Sales Order,להזמין מכירות
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,ממוצע. שיעור מכירה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ממוצע. שיעור מכירה
DocType: Assessment Plan,Examiner Name,שם הבודק
DocType: Purchase Invoice Item,Quantity and Rate,כמות ושיעור
DocType: Delivery Note,% Installed,% מותקן
@@ -415,12 +415,12 @@
DocType: Pricing Rule,Valid Upto,Upto חוקי
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,הכנסה ישירה
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","לא יכול לסנן על פי חשבון, אם מקובצים לפי חשבון"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","לא יכול לסנן על פי חשבון, אם מקובצים לפי חשבון"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,קצין מנהלי
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +350,Please select Company,אנא בחר חברה
DocType: Stock Entry Detail,Difference Account,חשבון הבדל
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,לא יכולה לסגור משימה כמשימה התלויה {0} אינה סגורה.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
DocType: Production Order,Additional Operating Cost,עלות הפעלה נוספות
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,קוסמטיקה
apps/erpnext/erpnext/stock/doctype/item/item.py +526,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
@@ -533,7 +533,7 @@
DocType: Production Order Operation,In minutes,בדקות
DocType: Issue,Resolution Date,תאריך החלטה
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,גיליון נוצר:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,לְהִרָשֵׁם
DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
DocType: Depreciation Schedule,Depreciation Amount,סכום הפחת
@@ -607,7 +607,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +93,Account with existing transaction cannot be converted to ledger,חשבון עם עסקה הקיימת לא ניתן להמיר לדג'ר
DocType: Delivery Note,Customer's Purchase Order No,להזמין ללא הרכישה של הלקוח
DocType: Employee,Cell Number,מספר סלולארי
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,בקשות אוטומטיות חומר שנוצרו
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,בקשות אוטומטיות חומר שנוצרו
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,איבדתי
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,שמורות לייצור
@@ -663,7 +663,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +218,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,אין אישור
DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"לא ניתן לבדוק את "מלאי עדכון ', כי פריטים אינם מועברים באמצעות {0}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,מס
DocType: Item,Items with higher weightage will be shown higher,פריטים עם weightage גבוה יותר תוכלו לראות גבוהים יותר
@@ -678,7 +678,7 @@
DocType: Item,Website Warehouse,מחסן אתר
DocType: Payment Reconciliation,Minimum Invoice Amount,סכום חשבונית מינימום
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,פריט שורה {idx}: {DOCTYPE} {DOCNAME} אינה קיימת מעל '{DOCTYPE} שולחן
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
DocType: Asset,Opening Accumulated Depreciation,פתיחת פחת שנצבר
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ציון חייב להיות קטן או שווה ל 5
DocType: Program Enrollment Tool,Program Enrollment Tool,כלי הרשמה לתכנית
@@ -769,7 +769,7 @@
DocType: Purchase Receipt,Range,טווח
DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,פריט גרסאות {0} מעודכן
DocType: Quality Inspection Reading,Reading 6,קריאת 6
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +945,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
@@ -864,7 +864,7 @@
DocType: Purchase Receipt,PREC-RET-,PreC-RET-
DocType: POS Profile,Sales Invoice Payment,תשלום חשבוניות מכירות
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,מחסן שמורות במכירות להזמין / סיום מוצרי מחסן
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,סכום מכירה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,סכום מכירה
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
DocType: Serial No,Creation Document No,יצירת מסמך לא
DocType: Issue,Issue,נושא
@@ -931,7 +931,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +421,Finished Item {0} must be entered for Manufacture type entry,פריט סיים {0} יש להזין לכניסת סוג הייצור
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,מאזן חשבונאי פתיחה
DocType: Sales Invoice Advance,Sales Invoice Advance,מכירות חשבונית מראש
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,שום דבר לא לבקש
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,שום דבר לא לבקש
apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,ניהול
DocType: Cheque Print Template,Payer Settings,גדרות משלמות
@@ -940,7 +940,7 @@
DocType: Purchase Invoice,Is Return,האם חזרה
DocType: Price List Country,Price List Country,מחיר מחירון מדינה
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} nos סדרתי תקף עבור פריט {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} nos סדרתי תקף עבור פריט {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,קוד פריט לא ניתן לשנות למס 'סידורי
DocType: Purchase Invoice Item,UOM Conversion Factor,אוני 'מישגן המרת פקטור
DocType: Stock Settings,Default Item Group,קבוצת ברירת מחדל של הפריט
@@ -1013,7 +1013,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",כמות הנפקה / ההעברה הכולל {0} ב בקשת חומר {1} \ לא יכולה להיות גדולה מ כמות מבוקשת {2} עבור פריט {3}
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,קטן
@@ -1046,7 +1046,7 @@
DocType: Serial No,Serial No Details,Serial No פרטים
DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ציוד הון
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
@@ -1065,7 +1065,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,ילד מחסן קיים מחסן זה. אתה לא יכול למחוק את המחסן הזה.
DocType: Item,Website Item Groups,קבוצות פריט באתר
DocType: Purchase Invoice,Total (Company Currency),סה"כ (חברת מטבע)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,מספר סידורי {0} נכנס יותר מפעם אחת
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,מספר סידורי {0} נכנס יותר מפעם אחת
DocType: Journal Entry,Journal Entry,יומן
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} פריטי התקדמות
DocType: Workstation,Workstation Name,שם תחנת עבודה
@@ -1136,7 +1136,7 @@
DocType: Email Digest,For Company,לחברה
apps/erpnext/erpnext/config/support.py +17,Communication log.,יומן תקשורת.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","בקשה להצעת מחיר מושבת לגשת מתוך הפורטל, עבור הגדרות פורטל הצ'ק יותר."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,סכום קנייה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,סכום קנייה
DocType: Sales Invoice,Shipping Address Name,שם כתובת למשלוח
DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,cannot be greater than 100,לא יכול להיות גדול מ 100
@@ -1317,7 +1317,7 @@
DocType: Expense Claim,Total Amount Reimbursed,הסכום כולל החזר
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,אתה לא יכול למחוק את שנת הכספים {0}. שנת הכספים {0} מוגדרת כברירת מחדל ב הגדרות גלובליות
DocType: Journal Entry,Entry Type,סוג הכניסה
,Customer Credit Balance,יתרת אשראי ללקוחות
@@ -1397,7 +1397,7 @@
apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
DocType: Purchase Invoice Item,Batch No,אצווה לא
DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,לאפשר הזמנות ומכירות מרובות נגד הלקוח הזמנת הרכש
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ראשי
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,ראשי
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
DocType: Employee Attendance Tool,Employees HTML,עובד HTML
@@ -1433,7 +1433,7 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},בקשת חומר של מקסימום {0} יכולה להתבצע עבור פריט {1} נגד להזמין מכירות {2}
DocType: Course,Course Abbreviation,קיצור קורס
DocType: Item,Will also apply for variants,תחול גם לגרסות
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ב
apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,פריטי Bundle בעת מכירה.
DocType: Quotation Item,Actual Qty,כמות בפועל
@@ -1566,12 +1566,12 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},סכום {0} {1} נגד {2} {3}
,Quotation Trends,מגמות ציטוט
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
DocType: Shipping Rule,Shipping Amount,סכום משלוח
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,סכום תלוי ועומד
DocType: Purchase Order Item Supplied,Conversion Factor,המרת פקטור
DocType: Purchase Order,Delivered,נמסר
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
DocType: Purchase Receipt,Vehicle Number,מספר רכב
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,עלים כולל שהוקצו {0} לא יכולים להיות פחות מעלים שכבר אושרו {1} לתקופה
DocType: Journal Entry,Accounts Receivable,חשבונות חייבים
@@ -1586,7 +1586,7 @@
DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,קבוצה לקבוצה ללא
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ספורט
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,"סה""כ בפועל"
@@ -1657,7 +1657,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,בחר חברה ...
DocType: Leave Control Panel,Leave blank if considered for all departments,שאר ריק אם תיחשב לכל המחלקות
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
DocType: Currency Exchange,From Currency,ממטבע
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,עלות רכישה חדשה
@@ -1703,7 +1703,7 @@
DocType: C-Form,Received Date,תאריך קבלה
DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
DocType: Stock Entry,Total Incoming Value,"ערך הנכנס סה""כ"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,חיוב נדרש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,חיוב נדרש
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,מחיר מחירון רכישה
DocType: Offer Letter Term,Offer Term,טווח הצעה
DocType: Asset,Quality Manager,מנהל איכות
@@ -1760,7 +1760,7 @@
DocType: Payment Request,Make Sales Invoice,הפוך מכירות חשבונית
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,תוכנות
DocType: Company,For Reference Only.,לעיון בלבד.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},לא חוקי {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},לא חוקי {0}: {1}
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Sales Invoice Advance,Advance Amount,מראש הסכום
DocType: Manufacturing Settings,Capacity Planning,תכנון קיבולת
@@ -1788,7 +1788,7 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +848,Transfer Material,העברת חומר
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,מסמך זה חורג מהמגבלה על ידי {0} {1} עבור פריט {4}. האם אתה גורם אחר {3} נגד אותו {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
DocType: Purchase Invoice,Price List Currency,מטבע מחירון
DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
DocType: Stock Settings,Allow Negative Stock,אפשר מלאי שלילי
@@ -1826,7 +1826,7 @@
DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,פרט לוח זמנים תחזוקה
DocType: Quality Inspection Reading,Reading 9,קריאת 9
DocType: Supplier,Is Frozen,האם קפוא
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,צומת הקבוצה המחסנת אינו רשאי לבחור עבור עסקות
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,צומת הקבוצה המחסנת אינו רשאי לבחור עבור עסקות
DocType: Buying Settings,Buying Settings,הגדרות קנייה
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM מס לפריט טוב מוגמר
DocType: Upload Attendance,Attendance To Date,נוכחות לתאריך
@@ -1843,7 +1843,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +187,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) לא יכול להיות גדול יותר מquanitity המתוכנן ({2}) בהפקה להזמין {3}
DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,מהיר יומן
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
@@ -2019,7 +2019,7 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","אם שלטון תמחור שנבחר הוא עשה עבור 'מחיר', זה יחליף את מחיר מחירון. מחיר כלל תמחור הוא המחיר הסופי, ולכן אין עוד הנחה צריכה להיות מיושמת. מכאן, בעסקות כמו מכירה להזמין, הזמנת רכש וכו ', זה יהיה הביא בשדה' דרג ', ולא בשדה' מחיר מחירון שערי '."
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,צפייה בלידים לפי סוג התעשייה.
DocType: Item Supplier,Item Supplier,ספק פריט
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,כל הכתובות.
DocType: Company,Stock Settings,הגדרות מניות
@@ -2264,7 +2264,7 @@
DocType: GL Entry,Voucher No,שובר לא
DocType: Leave Allocation,Leave Allocation,השאר הקצאה
DocType: Payment Request,Recipient Message And Payment Details,הודעת נמען פרט תשלום
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,בקשות חומר {0} נוצרו
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,בקשות חומר {0} נוצרו
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,תבנית של מונחים או חוזה.
DocType: Purchase Invoice,Address and Contact,כתובת ולתקשר
DocType: Cheque Print Template,Is Account Payable,האם חשבון זכאי
@@ -2312,7 +2312,7 @@
DocType: Production Planning Tool,Create Material Requests,צור בקשות חומר
DocType: Employee Education,School/University,בית ספר / אוניברסיטה
DocType: Payment Request,Reference Details,התייחסות פרטים
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ערך צפוי אחרי החיים השימושיים חייב להיות פחות מ סכום רכישה גרוס
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ערך צפוי אחרי החיים השימושיים חייב להיות פחות מ סכום רכישה גרוס
DocType: Sales Invoice Item,Available Qty at Warehouse,כמות זמינה במחסן
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,סכום חיוב
DocType: Asset,Double Declining Balance,יתרה זוגית ירידה
@@ -2320,7 +2320,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +626,'Update Stock' cannot be checked for fixed asset sale,'עדכון מאגר' לא ניתן לבדוק למכירת נכס קבועה
DocType: Bank Reconciliation,Bank Reconciliation,בנק פיוס
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,קבל עדכונים
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
apps/erpnext/erpnext/config/hr.py +310,Leave Management,השאר ניהול
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,קבוצה על ידי חשבון
DocType: Sales Order,Fully Delivered,נמסר באופן מלא
@@ -2332,7 +2332,7 @@
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
DocType: Asset,Fully Depreciated,לגמרי מופחת
,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,HTML נוכחות ניכרת
DocType: Sales Order,Customer's Purchase Order,הלקוח הזמנת הרכש
apps/erpnext/erpnext/config/stock.py +109,Serial No and Batch,אין ו אצווה סידורי
@@ -2383,7 +2383,7 @@
DocType: Stock Settings,Item Naming By,פריט מתן שמות על ידי
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},עוד כניסת סגירת תקופת {0} נעשתה לאחר {1}
DocType: Production Order,Material Transferred for Manufacturing,חומר הועבר לייצור
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,חשבון {0} אינו קיים
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,חשבון {0} אינו קיים
DocType: Project,Project Type,סוג פרויקט
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,כך או סכום כמות היעד או המטרה הוא חובה.
apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,עלות של פעילויות שונות
@@ -2461,10 +2461,10 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),חייבים ({0})
DocType: Pricing Rule,Margin,Margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,לקוחות חדשים
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,% רווח גולמי
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,% רווח גולמי
DocType: Appraisal Goal,Weightage (%),Weightage (%)
DocType: Bank Reconciliation Detail,Clearance Date,תאריך אישור
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,סכום רכישה גרוס הוא חובה
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,סכום רכישה גרוס הוא חובה
DocType: Lead,Address Desc,כתובת יורד
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,המפלגה היא חובה
DocType: Journal Entry,JV-,JV-
@@ -2490,7 +2490,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,מועד הפרישה חייב להיות גדול מ תאריך ההצטרפות
DocType: Sales Invoice,Against Income Account,נגד חשבון הכנסות
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% נמסר
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,פריט {0}: כמות מסודרת {1} לא יכול להיות פחות מכמות הזמנה מינימאלית {2} (מוגדר בסעיף).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,פריט {0}: כמות מסודרת {1} לא יכול להיות פחות מכמות הזמנה מינימאלית {2} (מוגדר בסעיף).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,אחוז בחתך חודשי
DocType: Territory,Territory Targets,מטרות שטח
DocType: Delivery Note,Transporter Info,Transporter מידע
@@ -2562,7 +2562,7 @@
DocType: Serial No,Out of AMC,מתוך AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,מספר הפחת הוזמן לא יכול להיות גדול ממספרם הכולל של פחת
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,הפוך תחזוקה בקר
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
DocType: Company,Default Cash Account,חשבון מזומנים ברירת מחדל
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,זה מבוסס על הנוכחות של תלמיד זה
@@ -2726,7 +2726,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
DocType: BOM,Website Description,תיאור אתר
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,שינוי נטו בהון עצמי
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
DocType: Serial No,AMC Expiry Date,תאריך תפוגה AMC
,Sales Register,מכירות הרשמה
DocType: Quotation,Quotation Lost Reason,סיבה אבודה ציטוט
@@ -2735,7 +2735,7 @@
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
DocType: Customer Group,Customer Group Name,שם קבוצת הלקוחות
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,דוח על תזרימי המזומנים
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,אנא בחר לשאת קדימה אם אתה גם רוצה לכלול האיזון של שנת כספים הקודמת משאיר לשנה הפיסקלית
DocType: GL Entry,Against Voucher Type,נגד סוג השובר
DocType: Item,Attributes,תכונות
@@ -2766,7 +2766,7 @@
apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,סוגי פעילויות יומני זמן
DocType: Opening Invoice Creation Tool,Sales,מכירות
DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +188,Cr,Cr
DocType: Tax Rule,Billing State,מדינת חיוב
@@ -2956,7 +2956,7 @@
DocType: Customer,From Lead,מליד
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,הזמנות שוחררו לייצור.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,בחר שנת כספים ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
DocType: Program Enrollment Tool,Enroll Students,רשם תלמידים
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,מכירה סטנדרטית
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +148,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
@@ -3012,7 +3012,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,פריט ייצור
,Employee Information,מידע לעובדים
DocType: Stock Entry Detail,Additional Cost,עלות נוספת
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,הפוך הצעת מחיר של ספק
DocType: Quality Inspection,Incoming,נכנסים
DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
@@ -3032,7 +3032,7 @@
DocType: Purchase Order,To Bill,להצעת החוק
DocType: Material Request,% Ordered,% מסודר
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ממוצע. שיעור קנייה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ממוצע. שיעור קנייה
DocType: Task,Actual Time (in Hours),זמן בפועל (בשעות)
DocType: Employee,History In Company,ההיסטוריה בחברה
apps/erpnext/erpnext/config/learn.py +107,Newsletters,ידיעונים
@@ -3059,7 +3059,7 @@
DocType: Task,Total Expense Claim (via Expense Claim),תביעה סה"כ הוצאות (באמצעות תביעת הוצאות)
apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,מארק בהעדר
DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
DocType: Homepage,Tag Line,קו תג
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +968,Add items from,הוספת פריטים מ
DocType: Cheque Print Template,Regular,רגיל
@@ -3188,7 +3188,7 @@
DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","כאשר כל אחת מהעסקאות בדקו ""הוגש"", מוקפץ הדוא""ל נפתח באופן אוטומטי לשלוח דואר אלקטרוני לקשורים ""צור קשר"" בעסקה ש, עם העסקה כקובץ מצורף. המשתמשים יכולים או לא יכולים לשלוח הדואר האלקטרוני."
apps/erpnext/erpnext/config/setup.py +14,Global Settings,הגדרות גלובליות
DocType: Employee Education,Employee Education,חינוך לעובדים
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
DocType: Salary Slip,Net Pay,חבילת נקי
DocType: Account,Account,חשבון
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
@@ -3242,7 +3242,7 @@
DocType: Stock Entry Detail,Actual Qty (at source/target),כמות בפועל (במקור / יעד)
DocType: Item Customer Detail,Ref Code,"נ""צ קוד"
apps/erpnext/erpnext/config/hr.py +12,Employee records.,רשומות עובדים.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,אנא קבע את תאריך פחת הבא
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,אנא קבע את תאריך פחת הבא
DocType: HR Settings,Payroll Settings,הגדרות שכר
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,להזמין מקום
@@ -3356,7 +3356,7 @@
DocType: Item,Customer Code,קוד לקוח
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ימים מאז הזמנה אחרונה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
DocType: Buying Settings,Naming Series,סדרת שמות
DocType: Leave Block List,Leave Block List Name,השאר שם בלוק רשימה
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,נכסים במלאי
@@ -3520,7 +3520,7 @@
apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,לא פג תוקף
DocType: Journal Entry,Total Debit,"חיוב סה""כ"
DocType: Manufacturing Settings,Default Finished Goods Warehouse,מחסן מוצרים מוגמר ברירת מחדל
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,איש מכירות
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,איש מכירות
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,תקציב מרכז עלות
DocType: Vehicle Service,Half Yearly,חצי שנתי
DocType: Lead,Blog Subscriber,Subscriber בלוג
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index a4c5b92..47cf37d 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,मूल्य द्वारा क्रमबद्ध करें
,Delay Days,विलंब दिवस
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा व्यय
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,बीजक
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,प्रतिधारण शेयर प्रवेश करें
DocType: Purchase Invoice Item,Item Weight Details,आइटम वजन विवरण
@@ -149,7 +149,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},अनुमति नहीं {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,से आइटम प्राप्त
DocType: Price List,Price Not UOM Dependant,कीमत नहीं यूओएम निर्भर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पाद {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,कोई आइटम सूचीबद्ध नहीं
DocType: Asset Repair,Error Description,त्रुटि विवरण
@@ -157,7 +157,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,किराना
DocType: Quality Inspection Reading,Reading 1,1 पढ़ना
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,पेंशन फंड
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,अगली मूल्यह्रास की तारीख से पहले खरीद की तिथि नहीं किया जा सकता
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,अगली मूल्यह्रास की तारीख से पहले खरीद की तिथि नहीं किया जा सकता
DocType: Crop,Perennial,चिरस्थायी
DocType: Consultation,Consultation Date,परामर्श दिनांक
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext उपयोगकर्ताओं के लिए उत्पाद प्रविष्टि और खोज
@@ -172,7 +172,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",उदाहरण के लिए "प्राइमरी स्कूल" या "विश्वविद्यालय"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,स्टॉक रिपोर्ट
DocType: Warehouse,Warehouse Detail,वेअरहाउस विस्तार
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,सत्रांत तिथि से बाद में शैक्षणिक वर्ष की वर्ष समाप्ति तिथि है जो करने के लिए शब्द जुड़ा हुआ है नहीं हो सकता है (शैक्षिक वर्ष {})। तारीखों को ठीक करें और फिर कोशिश करें।
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",अनियंत्रित नहीं हो सकता है के रूप में एसेट रिकॉर्ड मद के सामने मौजूद है "निश्चित परिसंपत्ति है"
DocType: Delivery Trip,Departure Time,प्रस्थान समय
@@ -192,7 +192,7 @@
DocType: Quality Inspection,Get Specification Details,विशिष्टता विवरण
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,सप्लायर स्टैंडिंग के टेम्पलेट्स
DocType: Lead,Interested,इच्छुक
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,प्रारंभिक
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,प्रारंभिक
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},से {0} को {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,करों को सेटअप करने में असफल
DocType: Item,Copy From Item Group,आइटम समूह से कॉपी
@@ -363,7 +363,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,प्रति वर्ष पत्तियां
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,पंक्ति {0}: कृपया जाँच खाते के खिलाफ 'अग्रिम है' {1} यह एक अग्रिम प्रविष्टि है।
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},वेयरहाउस {0} से संबंधित नहीं है कंपनी {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},वेयरहाउस {0} से संबंधित नहीं है कंपनी {1}
DocType: Email Digest,Profit & Loss,लाभ हानि
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,लीटर
DocType: Task,Total Costing Amount (via Time Sheet),कुल लागत राशि (समय पत्रक के माध्यम से)
@@ -455,6 +455,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,यह इस कंपनी के विरुद्ध लेनदेन पर आधारित है। विवरण के लिए नीचे समयरेखा देखें
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वचालित सामग्री अनुरोध के निर्माण पर ईमेल द्वारा सूचित करें
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,प्रतिरोधी
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,बहु मुद्रा
DocType: Opening Invoice Creation Tool,Invoice Type,चालान का प्रकार
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,बिलटी
@@ -527,7 +528,6 @@
DocType: Employee,Widowed,विधवा
DocType: Request for Quotation,Request for Quotation,उद्धरण के लिए अनुरोध
DocType: Healthcare Settings,Require Lab Test Approval,लैब टेस्ट अनुमोदन की आवश्यकता है
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,आइटम कोड> आइटम समूह> ब्रांड
DocType: Salary Slip Timesheet,Working Hours,कार्य के घंटे
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,कुल बकाया
DocType: Naming Series,Change the starting / current sequence number of an existing series.,एक मौजूदा श्रृंखला के शुरू / वर्तमान अनुक्रम संख्या बदलें.
@@ -556,7 +556,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,लागत केंद्र दर्ज करें
DocType: Drug Prescription,Dosage,मात्रा बनाने की विधि
DocType: Journal Entry Account,Sales Order,बिक्री आदेश
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,औसत। बिक्री दर
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,औसत। बिक्री दर
DocType: Assessment Plan,Examiner Name,परीक्षक नाम
DocType: Lab Test Template,No Result,कोई परिणाम नही
DocType: Purchase Invoice Item,Quantity and Rate,मात्रा और दर
@@ -604,6 +604,7 @@
DocType: Payroll Entry,Select Payroll Period,पेरोल की अवधि का चयन करें
DocType: Purchase Invoice,Unpaid,अवैतनिक
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,बिक्री के लिए आरक्षित
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली> एचआर सेटिंग्स सेट करें
DocType: Packing Slip,From Package No.,पैकेज सं से
DocType: Item Attribute,To Range,सीमा
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,प्रतिभूति और जमाओं
@@ -628,11 +629,11 @@
DocType: Training Event,Workshop,कार्यशाला
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,खरीद आदेश को चेतावनी दें
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,बहुत हो गया भागों का निर्माण करने के लिए
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,बहुत हो गया भागों का निर्माण करने के लिए
DocType: POS Profile User,POS Profile User,पीओएस प्रोफ़ाइल उपयोगकर्ता
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,प्रत्यक्ष आय
DocType: Patient Appointment,Date TIme,दिनांक समय
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","खाता से वर्गीकृत किया है , तो खाते के आधार पर फ़िल्टर नहीं कर सकते"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","खाता से वर्गीकृत किया है , तो खाते के आधार पर फ़िल्टर नहीं कर सकते"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,प्रशासनिक अधिकारी
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,कंपनी और करों की स्थापना
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स चुनें
@@ -642,7 +643,7 @@
DocType: Stock Entry Detail,Difference Account,अंतर खाता
DocType: Purchase Invoice,Supplier GSTIN,आपूर्तिकर्ता जीएसटीआईएन
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,उसकी निर्भर कार्य {0} बंद नहीं है के रूप में बंद काम नहीं कर सकते हैं।
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
DocType: Production Order,Additional Operating Cost,अतिरिक्त ऑपरेटिंग कॉस्ट
DocType: Lab Test Template,Lab Routine,लैब नियमित
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
@@ -810,7 +811,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 के साथ संबंध
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,मैनेजर
DocType: Payment Entry,Payment From / To,भुगतान से / करने के लिए
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नई क्रेडिट सीमा ग्राहक के लिए वर्तमान बकाया राशि की तुलना में कम है। क्रेडिट सीमा कम से कम हो गया है {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नई क्रेडिट सीमा ग्राहक के लिए वर्तमान बकाया राशि की तुलना में कम है। क्रेडिट सीमा कम से कम हो गया है {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},कृपया वेअरहाउस में खाता सेट करें {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'पर आधारित' और 'समूह द्वारा' दोनों समान नहीं हो सकते हैं
DocType: Sales Person,Sales Person Targets,बिक्री व्यक्ति लक्ष्य
@@ -821,7 +822,7 @@
DocType: Student Batch Name,Batch Name,बैच का नाम
DocType: Fee Validity,Max number of visit,विज़िट की अधिकतम संख्या
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet बनाया:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,भर्ती
DocType: GST Settings,GST Settings,जीएसटी सेटिंग्स
DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
@@ -945,7 +946,7 @@
DocType: Budget,Budget Against,बजट के खिलाफ
DocType: Employee,Cell Number,सेल नंबर
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,दिए गए मानदंडों के लिए कोई कर्मचारी नहीं है जाँच करें कि वेतन स्लिप्स पहले से ही नहीं बनाया गया है।
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,ऑटो सामग्री अनुरोध सृजित
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ऑटो सामग्री अनुरोध सृजित
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,खोया
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,विनिर्माण के लिए आरक्षित
@@ -953,7 +954,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ऊर्जा
DocType: Opportunity,Opportunity From,अवसर से
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक वेतन बयान.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,पंक्ति {0}: {1} आइटम {2} के लिए आवश्यक सीरियल नंबर आपने {3} प्रदान किया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,पंक्ति {0}: {1} आइटम {2} के लिए आवश्यक सीरियल नंबर आपने {3} प्रदान किया है
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,कृपया एक तालिका चुनें
DocType: BOM,Website Specifications,वेबसाइट निर्दिष्टीकरण
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} 'प्राप्तकर्ता' में एक अमान्य ईमेल पता है
@@ -1041,7 +1042,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,उद्धरण अनुरोध
DocType: Vital Signs,Heart Rate / Pulse,हार्ट रेट / पल्स
DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},आइटम के माध्यम से वितरित नहीं कर रहे हैं क्योंकि 'अपडेट स्टॉक' की जाँच नहीं की जा सकती {0}
DocType: Vehicle,Acquisition Date,अधिग्रहण तिथि
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,ओपन स्कूल
@@ -1065,7 +1066,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),अपना लेटर हेड अपलोड करें (यह वेब के अनुकूल 9 00 पीएक्स तक 100px के रूप में रखें)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: खाता {2} एक समूह नहीं हो सकता है
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आइटम पंक्ति {IDX}: {doctype} {} DOCNAME ऊपर में मौजूद नहीं है '{} doctype' तालिका
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} पहले ही पूरा या रद्द कर दिया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} पहले ही पूरा या रद्द कर दिया है
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,कोई कार्य
DocType: Item Variant Settings,Copy Fields to Variant,फ़ील्ड्स को वेरिएंट कॉपी करें
DocType: Asset,Opening Accumulated Depreciation,खुलने संचित मूल्यह्रास
@@ -1177,9 +1178,10 @@
DocType: Production Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,बिक्री भागीदारों और टेरिटरी
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),समापन (उद्घाटन + कुल)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),समापन (उद्घाटन + कुल)
DocType: Journal Entry,Depreciation Entry,मूल्यह्रास एंट्री
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहला दस्तावेज़ प्रकार का चयन करें
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,खाता मुद्रा में प्रिंट करें
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,इस रखरखाव भेंट रद्द करने से पहले सामग्री का दौरा {0} रद्द
DocType: Crop Cycle,ISO 8016 standard,आईएसओ 8016 मानक
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},धारावाहिक नहीं {0} मद से संबंधित नहीं है {1}
@@ -1205,7 +1207,7 @@
DocType: Supplier,Default Payable Accounts,डिफ़ॉल्ट लेखा देय
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
DocType: Fee Structure,Components,अवयव
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1257,6 +1259,7 @@
,Company Name,कंपनी का नाम
DocType: SMS Center,Total Message(s),कुल संदेश (ओं )
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें> सेटिंग> नामकरण श्रृंखला
DocType: Purchase Invoice,Additional Discount Percentage,अतिरिक्त छूट प्रतिशत
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,सभी की मदद वीडियो की एक सूची देखें
DocType: Agriculture Analysis Criteria,Soil Texture,मृदा संरचना
@@ -1284,7 +1287,7 @@
DocType: BOM Website Item,BOM Website Item,बीओएम वेबसाइट मद
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
DocType: Timesheet Detail,Bill,बिल
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,अगली मूल्यह्रास दिनांक अतीत की तारीख के रूप में दर्ज किया जाता है
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,अगली मूल्यह्रास दिनांक अतीत की तारीख के रूप में दर्ज किया जाता है
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,सफेद
DocType: SMS Center,All Lead (Open),सभी लीड (ओपन)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),पंक्ति {0}: मात्रा के लिए उपलब्ध नहीं {4} गोदाम में {1} प्रवेश के समय पोस्टिंग पर ({2} {3})
@@ -1300,7 +1303,7 @@
DocType: Lead,Next Contact Date,अगले संपर्क तिथि
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,खुलने मात्रा
DocType: Healthcare Settings,Appointment Reminder,नियुक्ति अनुस्मारक
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
DocType: Program Enrollment Tool Student,Student Batch Name,छात्र बैच नाम
DocType: Consultation,Doctor,चिकित्सक
DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
@@ -1316,6 +1319,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,आबंटन उपकरण छोड़ दो
DocType: Item,Hub Category to Publish,हब श्रेणी प्रकाशित करने के लिए
DocType: Leave Block List,Leave Block List Dates,ब्लॉक सूची तिथियां छोड़ो
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,कृपया सेटअप> नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
DocType: Sales Invoice,Billing Address GSTIN,बिलिंग पता GSTIN
DocType: Assessment Plan,Evaluate,मूल्यांकन करना
DocType: Workstation,Net Hour Rate,नेट घंटे की दर
@@ -1349,7 +1353,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,बिक्री चालान भुगतान
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,बिक्री आदेश / तैयार माल गोदाम में सुरक्षित गोदाम
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,बेच राशि
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,बेच राशि
DocType: Repayment Schedule,Interest Amount,ब्याज राशि
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
DocType: Serial No,Creation Document No,निर्माण का दस्तावेज़
@@ -1440,7 +1444,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,खुलने का लेखा बैलेंस
,GST Sales Register,जीएसटी बिक्री रजिस्टर
DocType: Sales Invoice Advance,Sales Invoice Advance,बिक्री चालान अग्रिम
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,अपने डोमेन का चयन करें
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},एक और बजट रिकार्ड '{0}' पहले से ही मौजूद है के खिलाफ {1} '{2}' वित्त वर्ष के लिए {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,खेतों के निर्माण के समय ही पर प्रतिलिपि किया जाएगा
@@ -1450,11 +1454,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","इस प्रकार के आइटम कोड के साथ संलग्न किया जाएगा। अपने संक्षिप्त नाम ""एसएम"", और अगर उदाहरण के लिए, मद कोड ""टी शर्ट"", ""टी-शर्ट एस.एम."" हो जाएगा संस्करण के मद कोड है"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,एक बार जब आप को वेतन पर्ची सहेजे शुद्ध वेतन (शब्दों) में दिखाई जाएगी।
DocType: Purchase Invoice,Is Return,वापसी है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,सावधान
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,सावधान
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,वापसी / डेबिट नोट
DocType: Price List Country,Price List Country,मूल्य सूची देश
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},आइटम के लिए {0} वैध धारावाहिक नग {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},आइटम के लिए {0} वैध धारावाहिक नग {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,मद कोड सीरियल नंबर के लिए बदला नहीं जा सकता
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM रूपांतरण फैक्टर
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,बैच नंबर पाने के लिए मद कोड दर्ज करें
@@ -1558,7 +1562,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
DocType: Supplier Scorecard,Warn for new Request for Quotations,कोटेशन के लिए नए अनुरोध के लिए चेतावनी दें
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,खरीद आदेश आप की योजना में मदद मिलेगी और अपनी खरीद पर का पालन करें
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,लैब टेस्ट प्रिस्क्रिप्शन
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",कुल अंक / स्थानांतरण मात्रा {0} सामग्री अनुरोध में {1} \ मद के लिए अनुरोध मात्रा {2} से बड़ा नहीं हो सकता है {3}
@@ -1596,7 +1600,6 @@
DocType: Warehouse,Warehouse Contact Info,वेयरहाउस संपर्क जानकारी
DocType: Payment Entry,Write Off Difference Amount,बंद लिखें अंतर राशि
DocType: Volunteer,Volunteer Name,स्वयंसेवक का नाम
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,कृपया शिक्षा> शिक्षा सेटिंग्स में प्रशिक्षक नामकरण प्रणाली को सेटअप करें
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल नहीं मिला है, इसलिए नहीं भेजा गया ईमेल"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},देश के लिए नौवहन नियम लागू नहीं है {0}
DocType: Item,Foreign Trade Details,विदेश व्यापार विवरण
@@ -1608,7 +1611,7 @@
DocType: Student Group Student,Group Roll Number,समूह रोल संख्या
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सभी कार्य भार की कुल होना चाहिए 1. तदनुसार सभी परियोजना कार्यों के भार को समायोजित करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,राजधानी उपकरणों
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
@@ -1633,7 +1636,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,बाल गोदाम इस गोदाम के लिए मौजूद है। आप इस गोदाम को नष्ट नहीं कर सकते हैं।
DocType: Item,Website Item Groups,वेबसाइट आइटम समूह
DocType: Purchase Invoice,Total (Company Currency),कुल (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,सीरियल नंबर {0} एक बार से अधिक दर्ज किया
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,सीरियल नंबर {0} एक बार से अधिक दर्ज किया
DocType: Journal Entry,Journal Entry,जर्नल प्रविष्टि
DocType: Expense Claim Advance,Unclaimed amount,लावारिस राशि
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} प्रगति में आइटम
@@ -1729,7 +1732,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,संचार लॉग इन करें.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",उद्धरण के लिए अनुरोध अधिक चेक पोर्टल सेटिंग्स के लिए पोर्टल से उपयोग करने में अक्षम है।
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,आपूर्तिकर्ता स्कोरकार्ड स्कोरिंग चर
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,राशि ख़रीदना
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,राशि ख़रीदना
DocType: Sales Invoice,Shipping Address Name,शिपिंग पता नाम
DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,कोर्स की अनुसूची बनाने में त्रुटियां थीं
@@ -1993,7 +1996,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,यह इस वाहन के खिलाफ लॉग पर आधारित है। जानकारी के लिए नीचे समय देखें
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आप नहीं हटा सकते वित्त वर्ष {0}। वित्त वर्ष {0} वैश्विक सेटिंग्स में डिफ़ॉल्ट के रूप में सेट किया गया है
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,एक ही नाम वाला ग्राहक पहले से मौजूद है
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,यह वेतन स्लिप्स जमा कर देगा और एआरआरआर जर्नल एंट्री बनायेगा। क्या आप आगे बढ़ना चाहते हैं?
@@ -2007,6 +2010,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,मूल्य निर्धारण
DocType: Quotation,Term Details,अवधि विवरण
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} इस छात्र समूह के लिए छात्रों की तुलना में अधिक नामांकन नहीं कर सकता।
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),कुल (कर के बिना)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड गणना
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 से अधिक होना चाहिए
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,स्टॉक उपलब्ध
@@ -2025,7 +2029,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,चालान को रद्द करने पर भुगतान अनलिंक
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},वर्तमान ओडोमीटर रीडिंग दर्ज की गई प्रारंभिक वाहन ओडोमीटर से अधिक होना चाहिए {0}
DocType: Restaurant Reservation,No Show,कोई शो नहीं
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें> सेटिंग> नामकरण श्रृंखला
DocType: Shipping Rule Country,Shipping Rule Country,नौवहन नियम देश
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,छोड़ दो और उपस्थिति
DocType: Maintenance Visit,Partially Completed,आंशिक रूप से पूरा
@@ -2116,7 +2119,7 @@
DocType: Student Group Instructor,Student Group Instructor,छात्र समूह के प्रशिक्षक
DocType: Grant Application,Assessment Mark (Out of 10),आकलन चिह्न (10 में से)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,मुख्य
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,प्रकार
DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
DocType: Employee Attendance Tool,Employees HTML,कर्मचारियों एचटीएमएल
@@ -2164,7 +2167,7 @@
DocType: Course,Course Abbreviation,कोर्स संक्षिप्त
DocType: Student Leave Application,Student Leave Application,छात्र लीव आवेदन
DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},कर्मचारी {0} को आधा दिन पर {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},कुल काम के घंटे अधिकतम काम के घंटे से अधिक नहीं होना चाहिए {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,पर
@@ -2349,9 +2352,10 @@
DocType: Task,Actual End Date (via Time Sheet),वास्तविक अंत तिथि (समय पत्रक के माध्यम से)
DocType: Soil Texture,Soil Type,मिट्टी के प्रकार
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,नया संदेश
,Quotation Trends,कोटेशन रुझान
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
DocType: Shipping Rule,Shipping Amount,नौवहन राशि
DocType: Supplier Scorecard Period,Period Score,अवधि स्कोर
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ग्राहक जोड़ें
@@ -2362,7 +2366,7 @@
,Vehicle Expenses,वाहन खर्च
DocType: Serial No,Invoice Details,चालान विवरण
DocType: Grant Application,Show on Website,वेबसाइट पर दिखाएं
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,शुरुआत करना
DocType: Hub Category,Hub Category,हब श्रेणी
DocType: Purchase Invoice,SEZ,सेज
@@ -2393,7 +2397,7 @@
DocType: Patient,B Positive,बी सकारात्मक
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
DocType: Patient Medical Record,Patient Medical Record,रोगी चिकित्सा रिकॉर्ड
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,गैर-समूह के लिए समूह
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,खेल
@@ -2443,6 +2447,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,कोई उद्धरण नहीं प्राप्त करने के लिए प्राप्त आरएफक्यू को सेट नहीं किया जा सकता
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,कुल कटौती
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,खाता मुद्रा में प्रिंट करने के लिए एक खाता चुनें
,Production Analytics,उत्पादन एनालिटिक्स
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,यह इस रोगी के विरुद्ध लेनदेन पर आधारित है। विवरण के लिए नीचे दी गई समयरेखा देखें
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,मूल्य अपडेट
@@ -2497,7 +2502,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,कंपनी का चयन करें ...
DocType: Leave Control Panel,Leave blank if considered for all departments,रिक्त छोड़ अगर सभी विभागों के लिए विचार
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
DocType: Payroll Entry,Fortnightly,पाक्षिक
DocType: Currency Exchange,From Currency,मुद्रा से
DocType: Vital Signs,Weight (In Kilogram),वजन (किलोग्राम में)
@@ -2573,7 +2578,7 @@
DocType: Student,Guardians,रखवालों
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,दाम नहीं दिखाया जाएगा अगर कीमत सूची सेट नहीं है
DocType: Stock Entry,Total Incoming Value,कुल आवक मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,डेबिट करने के लिए आवश्यक है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,डेबिट करने के लिए आवश्यक है
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets मदद से अपनी टीम के द्वारा किया गतिविधियों के लिए समय, लागत और बिलिंग का ट्रैक रखने"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरीद मूल्य सूची
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,आपूर्तिकर्ता स्कोरकार्ड चर के टेम्पलेट्स
@@ -2674,7 +2679,7 @@
DocType: Company,For Reference Only.,केवल संदर्भ के लिए।
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},चिकित्सक {0} {1} पर उपलब्ध नहीं है
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,बैच नंबर का चयन करें
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},अवैध {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},अवैध {0}: {1}
,GSTR-1,GSTR -1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,संदर्भ INV
@@ -2711,8 +2716,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
DocType: Water Analysis,Origin,मूल
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,इस दस्तावेज़ से सीमा से अधिक है {0} {1} आइटम के लिए {4}। आप कर रहे हैं एक और {3} उसी के खिलाफ {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,बदलें चुनें राशि खाते
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,बदलें चुनें राशि खाते
DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
@@ -2768,7 +2773,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,नए क्रय आदेशों के लिए चेतावनी दें
DocType: Quality Inspection Reading,Reading 9,9 पढ़ना
DocType: Supplier,Is Frozen,जम गया है
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,समूह नोड गोदाम के लेन-देन के लिए चयन करने के लिए अनुमति नहीं है
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,समूह नोड गोदाम के लेन-देन के लिए चयन करने के लिए अनुमति नहीं है
DocType: Buying Settings,Buying Settings,सेटिंग्स ख़रीदना
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,एक समाप्त अच्छा आइटम के लिए बीओएम सं.
DocType: Upload Attendance,Attendance To Date,तिथि उपस्थिति
@@ -2782,6 +2787,7 @@
DocType: Grant Application,Organization,संगठन
DocType: BOM Update Tool,BOM Update Tool,BOM अद्यतन उपकरण
DocType: SG Creation Tool Course,Student Group Name,छात्र समूह का नाम
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,विस्फोट दृश्य दिखाएं
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,फीस बनाना
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
DocType: Room,Room Number,कमरा संख्या
@@ -2792,7 +2798,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,कर टेम्पलेट करें
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,उपयोगकर्ता मंच
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
DocType: Lab Test Sample,Lab Test Sample,लैब टेस्ट नमूना
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
@@ -2863,7 +2869,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,चालान बनाएं
DocType: Selling Settings,Auto close Opportunity after 15 days,15 दिनों के बाद ऑटो बंद के मौके
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} के स्कोरकार्ड की स्थिति के कारण {0} के लिए खरीद ऑर्डर की अनुमति नहीं है।
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} के स्कोरकार्ड की स्थिति के कारण {0} के लिए खरीद ऑर्डर की अनुमति नहीं है।
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,अंत वर्ष
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,कोट / लीड%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
@@ -2974,7 +2980,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 से ऊपर
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,पंक्ति # {0}: जर्नल प्रविष्टि {1} खाता नहीं है {2} या पहले से ही एक और वाउचर के खिलाफ मिलान
DocType: Supplier Scorecard Criteria,Criteria Weight,मापदंड वजन
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,आपूर्तिकर्ता> प्रदायक प्रकार
DocType: Buying Settings,Default Buying Price List,डिफ़ॉल्ट खरीद मूल्य सूची
DocType: Payroll Entry,Salary Slip Based on Timesheet,वेतन पर्ची के आधार पर Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,खरीदना दर
@@ -3062,7 +3067,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ट्रैक उद्योग प्रकार के द्वारा होता है .
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Letterheads पर जाएं
DocType: Item Supplier,Item Supplier,आइटम प्रदायक
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सभी पते.
DocType: Company,Stock Settings,स्टॉक सेटिंग्स
@@ -3251,6 +3256,7 @@
DocType: Company,Default Inventory Account,डिफ़ॉल्ट इन्वेंटरी अकाउंट
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,पंक्ति {0}: पूर्ण मात्रा शून्य से अधिक होना चाहिए।
DocType: Antibiotic,Antibiotic Name,एंटीबायोटिक नाम
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,आइटम कोड> आइटम समूह> ब्रांड
DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त छूट पर लागू होते हैं
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,प्रकार चुनें...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,सभी भूमि इकाइयों के लिए एक लिंक जिसमें फसल बढ़ रही है
@@ -3443,6 +3449,7 @@
DocType: Supplier,Credit Limit,साख सीमा
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,औसत। मूल्य सूची दर बेचना
DocType: Production Plan Sales Order,Salse Order Date,Salse आदेश दिनांक
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,आपूर्तिकर्ता> प्रदायक प्रकार
DocType: Salary Component,Salary Component,वेतन घटक
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,भुगतान प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हैं
DocType: GL Entry,Voucher No,कोई वाउचर
@@ -3451,7 +3458,7 @@
DocType: Leave Allocation,Leave Allocation,आबंटन छोड़ दो
DocType: Payment Request,Recipient Message And Payment Details,प्राप्तकर्ता संदेश और भुगतान की जानकारी
DocType: Training Event,Trainer Email,ट्रेनर ईमेल
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,सामग्री अनुरोध {0} बनाया
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,सामग्री अनुरोध {0} बनाया
DocType: Restaurant Reservation,No of People,लोगों की संख्या
DocType: Production Planning Tool,Include sub-contracted raw materials,उप अनुबंधित कच्चे माल को शामिल करें
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,शब्दों या अनुबंध के टेम्पलेट.
@@ -3515,7 +3522,7 @@
DocType: Production Planning Tool,Create Material Requests,सामग्री अनुरोध बनाएँ
DocType: Employee Education,School/University,स्कूल / विश्वविद्यालय
DocType: Payment Request,Reference Details,संदर्भ विवरण
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,उम्मीद मूल्य उपयोगी जीवन के बाद सकल खरीद की गई राशि से कम होना चाहिए
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,उम्मीद मूल्य उपयोगी जीवन के बाद सकल खरीद की गई राशि से कम होना चाहिए
DocType: Sales Invoice Item,Available Qty at Warehouse,गोदाम में उपलब्ध मात्रा
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,बिल की राशि
DocType: Asset,Double Declining Balance,डबल गिरावट का संतुलन
@@ -3527,7 +3534,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अपडेट प्राप्त करे
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: खाता {2} कंपनी से संबंधित नहीं है {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,प्रत्येक विशेषताओं से कम से कम एक मान चुनें
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
apps/erpnext/erpnext/config/hr.py +310,Leave Management,प्रबंधन छोड़ दो
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,खाता द्वारा समूह
DocType: Sales Order,Fully Delivered,पूरी तरह से वितरित
@@ -3538,14 +3545,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित राशि ऋण राशि से अधिक नहीं हो सकता है {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,कार्यक्रम पर जाएं
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},पंक्ति {0} # आवंटित राशि {1} लावारिस राशि से अधिक नहीं हो सकती {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,कृपया सेटअप> नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,उत्पादन आदेश नहीं बनाया
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तिथि तक' 'तिथि से' के बाद होनी चाहिए
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},छात्र के रूप में स्थिति को बदल नहीं सकते {0} छात्र आवेदन के साथ जुड़ा हुआ है {1}
DocType: Asset,Fully Depreciated,पूरी तरह से घिस
,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,उल्लेखनीय उपस्थिति एचटीएमएल
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","कोटेशन प्रस्तावों, बोलियों आप अपने ग्राहकों के लिए भेजा है रहे हैं"
DocType: Sales Order,Customer's Purchase Order,ग्राहक के क्रय आदेश
@@ -3629,7 +3635,7 @@
DocType: Stock Settings,Item Naming By,द्वारा नामकरण आइटम
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},अन्य समयावधि अंतिम लेखा {0} के बाद किया गया है {1}
DocType: Production Order,Material Transferred for Manufacturing,सामग्री विनिर्माण के लिए स्थानांतरित
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,खाता {0} करता नहीं मौजूद है
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,खाता {0} करता नहीं मौजूद है
DocType: Project,Project Type,परियोजना के प्रकार
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,इस कार्य के लिए बाल कार्य मौजूद है आप इस कार्य को नहीं हटा सकते।
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है .
@@ -3731,11 +3737,11 @@
DocType: Company,Asset Depreciation Cost Center,संपत्ति मूल्यह्रास लागत केंद्र
DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
DocType: Sales Invoice Item,Delivered Qty,वितरित मात्रा
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,कुल Excl कर
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","अगर जाँच की है, प्रत्येक उत्पादन आइटम के सभी बच्चों को सामग्री अनुरोधों में शामिल कर दिया जाएगा।"
DocType: Assessment Plan,Assessment Plan,आकलन योजना
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,ग्राहक {0} बनाया गया है
DocType: Stock Settings,Limit Percent,सीमा प्रतिशत
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,कृपया शिक्षा> शिक्षा सेटिंग्स में प्रशिक्षक नामकरण प्रणाली को सेटअप करें
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,वर्तमान में किसी भी गोदाम में कोई स्टॉक उपलब्ध नहीं है
,Payment Period Based On Invoice Date,चालान तिथि के आधार पर भुगतान की अवधि
DocType: Sample Collection,No. of print,प्रिंट की संख्या
@@ -3751,12 +3757,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),देनदार ({0})
DocType: Pricing Rule,Margin,हाशिया
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नए ग्राहकों
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,सकल लाभ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,सकल लाभ%
DocType: Appraisal Goal,Weightage (%),वेटेज (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,पीओएस प्रोफ़ाइल बदलें
DocType: Bank Reconciliation Detail,Clearance Date,क्लीयरेंस तिथि
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,आकलन रिपोर्ट
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,सकल खरीद राशि अनिवार्य है
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,सकल खरीद राशि अनिवार्य है
DocType: Lead,Address Desc,जानकारी पता करने के लिए
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,पार्टी अनिवार्य है
DocType: Journal Entry,JV-,JV-
@@ -3788,7 +3794,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,स्थायी नाम
DocType: Stock Entry,Customer or Supplier Details,ग्राहक या आपूर्तिकर्ता विवरण
DocType: Employee Loan Application,Required by Date,दिनांक द्वारा आवश्यक
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),समापन शेष (डॉ - सीआर)
DocType: Lead,Lead Owner,मालिक लीड
DocType: Bin,Requested Quantity,अनुरोध मात्रा
DocType: Patient,Marital Status,वैवाहिक स्थिति
@@ -3802,7 +3807,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,एकाधिक विविधताएं
DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% वितरित
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आइटम {0}: आदेश दिया मात्रा {1} न्यूनतम आदेश मात्रा {2} (मद में परिभाषित) की तुलना में कम नहीं हो सकता।
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आइटम {0}: आदेश दिया मात्रा {1} न्यूनतम आदेश मात्रा {2} (मद में परिभाषित) की तुलना में कम नहीं हो सकता।
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण का प्रतिशत
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,कृपया अन्य उपयोगकर्ता के रूप में लॉगिन करें।
DocType: Territory,Territory Targets,टेरिटरी लक्ष्य
@@ -3901,7 +3906,7 @@
DocType: Serial No,Out of AMC,एएमसी के बाहर
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,रखरखाव भेंट बनाओ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
DocType: Company,Default Cash Account,डिफ़ॉल्ट नकद खाता
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,यह इस छात्र की उपस्थिति पर आधारित है
@@ -4051,7 +4056,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,निर्दिष्ट मानदंडों के लिए कोई कर्मचारी नहीं
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
DocType: Restaurant,Default Customer,डिफ़ॉल्ट ग्राहक
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली> एचआर सेटिंग्स सेट करें
DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक का नाम
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,पुष्टि न करें कि नियुक्ति उसी दिन के लिए बनाई गई है
DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नामांकन पाठ्यक्रम
@@ -4169,7 +4173,7 @@
DocType: BOM,Website Description,वेबसाइट विवरण
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,इक्विटी में शुद्ध परिवर्तन
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,नवीनतम
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ईमेल एड्रेस अद्वितीय होना चाहिए, पहले से ही के लिए मौजूद है {0}"
DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,रसीद
@@ -4186,7 +4190,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,नकदी प्रवाह विवरण
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,लाइसेंस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,का चयन करें कृपया आगे ले जाना है अगर तुम भी शामिल करना चाहते हैं पिछले राजकोषीय वर्ष की शेष राशि इस वित्त वर्ष के लिए छोड़ देता है
DocType: GL Entry,Against Voucher Type,वाउचर प्रकार के खिलाफ
DocType: Physician,Phone (R),फ़ोन (आर)
@@ -4198,7 +4202,7 @@
DocType: Patient,B Negative,बी नकारात्मक
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,रखरखाव स्थिति को रद्द करने या प्रस्तुत करने के लिए पूरा किया जाना चाहिए
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,{0} पंक्ति में सीरियल नंबर डिलिवरी नोट से मेल नहीं खाती
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,{0} पंक्ति में सीरियल नंबर डिलिवरी नोट से मेल नहीं खाती
DocType: Student,Guardian Details,गार्जियन विवरण
DocType: C-Form,C-Form,सी - फार्म
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,कई कर्मचारियों के लिए मार्क उपस्थिति
@@ -4240,7 +4244,7 @@
DocType: Stock Entry Detail,Basic Amount,मूल राशि
DocType: Training Event,Exam,परीक्षा
DocType: Complaint,Complaint,शिकायत
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
DocType: Patient,Alcohol Past Use,शराब विगत का प्रयोग करें
DocType: Fertilizer Content,Fertilizer Content,उर्वरक सामग्री
@@ -4364,6 +4368,7 @@
DocType: Salary Detail,Formula,सूत्र
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,सीरियल #
DocType: Lab Test Template,Lab Test Template,लैब टेस्ट टेम्पलेट
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,विक्रय खाता
DocType: Purchase Invoice Item,Total Weight,कुल वजन
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,बिक्री पर कमीशन
DocType: Offer Letter Term,Value / Description,मूल्य / विवरण
@@ -4521,7 +4526,7 @@
DocType: Customer,From Lead,लीड से
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,उत्पादन के लिए आदेश जारी किया.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
DocType: Program Enrollment Tool,Enroll Students,छात्रों को भर्ती
DocType: Lab Test,Approved Date,स्वीकृत दिनांक
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक बेच
@@ -4596,7 +4601,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,उत्पादन आइटम
,Employee Information,कर्मचारी जानकारी
DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
DocType: Quality Inspection,Incoming,आवक
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,विक्रय और खरीद के लिए डिफ़ॉल्ट कर टेम्पलेट बनाए गए हैं
@@ -4613,7 +4618,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},नोट : {0}
,Delivery Note Trends,डिलिवरी नोट रुझान
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,इस सप्ताह की सारांश
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,शेयर मात्रा में
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,शेयर मात्रा में
DocType: Delivery Trip,Calculate Estimated Arrival Times,अनुमानित आगमन टाइम्स की गणना करें
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,खाता: {0} केवल शेयर लेनदेन के माध्यम से अद्यतन किया जा सकता है
DocType: Student Group Creation Tool,Get Courses,पाठ्यक्रम जाओ
@@ -4629,7 +4634,7 @@
DocType: Material Request,% Ordered,% का आदेश दिया
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","कोर्स आधारित छात्र समूह के लिए, पाठ्यक्रम नामांकन कार्यक्रमों में प्रत्येक छात्र के लिए कार्यक्रम नामांकन में मान्य किया जाएगा।"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ठेका
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,औसत। क्रय दर
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,औसत। क्रय दर
DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
DocType: Employee,History In Company,कंपनी में इतिहास
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{प्रेषक} का नया संदेश
@@ -4677,7 +4682,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},पंक्ति {0}: बीओएम # की मुद्रा {1} चयनित मुद्रा के बराबर होना चाहिए {2}
DocType: Journal Entry Account,Exchange Rate,विनिमय दर
DocType: Patient,Additional information regarding the patient,रोगी के बारे में अतिरिक्त जानकारी
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
DocType: Homepage,Tag Line,टैग लाइन
DocType: Fee Component,Fee Component,शुल्क घटक
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,बेड़े प्रबंधन
@@ -4889,7 +4894,7 @@
DocType: Employee Education,Employee Education,कर्मचारी शिक्षा
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,डुप्लिकेट आइटम समूह मद समूह तालिका में पाया
DocType: Land Unit,Parent Land Unit,अभिभावक भूमि इकाई
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
DocType: Fertilizer,Fertilizer Name,उर्वरक का नाम
DocType: Salary Slip,Net Pay,शुद्ध वेतन
DocType: Account,Account,खाता
@@ -4968,7 +4973,7 @@
DocType: Item Customer Detail,Ref Code,रेफरी कोड
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,पीओएस प्रोफ़ाइल में ग्राहक समूह की आवश्यकता है
apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रिकॉर्ड.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,सेट कृपया अगले मूल्यह्रास दिनांक
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,सेट कृपया अगले मूल्यह्रास दिनांक
DocType: HR Settings,Payroll Settings,पेरोल सेटिंग्स
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,न-जुड़े चालान और भुगतान का मिलान.
DocType: POS Settings,POS Settings,स्थिति सेटिंग्स
@@ -5135,7 +5140,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
DocType: Asset Maintenance Task,Last Completion Date,अंतिम समापन तिथि
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,दिनों से पिछले आदेश
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
DocType: Buying Settings,Naming Series,श्रृंखला का नामकरण
DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,बीमा प्रारंभ दिनांक से बीमा समाप्ति की तारीख कम होना चाहिए
@@ -5262,6 +5267,7 @@
DocType: Bank Reconciliation,Get Payment Entries,भुगतान प्रविष्टियां प्राप्त
DocType: Quotation Item,Against Docname,Docname खिलाफ
DocType: SMS Center,All Employee (Active),सभी कर्मचारी (सक्रिय)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ग्राहक> ग्राहक समूह> क्षेत्र
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,अब देखें
DocType: BOM,Raw Material Cost,कच्चे माल की लागत
DocType: Item Reorder,Re-Order Level,स्तर पुनः क्रमित करें
@@ -5360,7 +5366,6 @@
DocType: Room,Seating Capacity,बैठने की क्षमता
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,लैब टेस्ट समूह
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ग्राहक> ग्राहक समूह> क्षेत्र
DocType: Project,Total Expense Claim (via Expense Claims),कुल खर्च दावा (खर्च का दावा के माध्यम से)
DocType: GST Settings,GST Summary,जीएसटी सारांश
DocType: Assessment Result,Total Score,कुल स्कोर
@@ -5373,7 +5378,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,निम्नलिखित पाठ्यक्रम कार्यक्रम बनाए गए थे
DocType: Journal Entry,Total Debit,कुल डेबिट
DocType: Manufacturing Settings,Default Finished Goods Warehouse,डिफ़ॉल्ट तैयार माल गोदाम
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,बिक्री व्यक्ति
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,बिक्री व्यक्ति
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,बजट और लागत केंद्र
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,भुगतान के कई डिफ़ॉल्ट मोड की अनुमति नहीं है
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,के लिए
@@ -5546,7 +5551,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,टैक्स या प्रभार के लिए पर विचार
DocType: Driver,Driving License Category,ड्राइविंग लाइसेंस श्रेणी
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक मात्रा अनिवार्य है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} वर्तमान में एक {1} सप्लायर स्कोरकार्ड खड़ा है, और इस आपूर्तिकर्ता को खरीद आदेश सावधानी के साथ जारी किए जाने चाहिए।"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} वर्तमान में एक {1} सप्लायर स्कोरकार्ड खड़ा है, और इस आपूर्तिकर्ता को खरीद आदेश सावधानी के साथ जारी किए जाने चाहिए।"
DocType: Asset Maintenance Team,Asset Maintenance Team,संपत्ति रखरखाव टीम
DocType: Employee Loan,Loan Type,प्रकार के ऋण
DocType: Scheduling Tool,Scheduling Tool,शेड्यूलिंग उपकरण
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index ba76bd0..412cb4d 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Poredaj po cijeni
,Delay Days,Dani odgode
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,usluga Rashodi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Učini pričuve za zadržavanje
DocType: Purchase Invoice Item,Item Weight Details,Detalji o težini stavke
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, šifra stavke: {1} i klijent: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otvaranje za posao.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM nije određen za podugovaranje stavku {0} u redak {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM nije određen za podugovaranje stavku {0} u redak {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Rezultat poslan
DocType: Item Attribute,Increment,Pomak
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Vremenski raspon
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nije dopušteno {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Nabavite stavke iz
DocType: Price List,Price Not UOM Dependant,Cijena nije ovisna o UOM-u
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nema navedenih stavki
DocType: Asset Repair,Error Description,Opis pogreške
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Trgovina prehrambenom robom
DocType: Quality Inspection Reading,Reading 1,Čitanje 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Mirovinski fondovi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija Datum ne može biti prije Datum kupnje
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija Datum ne može biti prije Datum kupnje
DocType: Crop,Perennial,višegodišnji
DocType: Consultation,Consultation Date,Datum konzultacije
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Popis proizvoda i otkriće za korisnike ERP-a
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",npr "Osnovna škola" ili "Sveučilište"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,dionica izvješća
DocType: Warehouse,Warehouse Detail,Detalji o skladištu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Datum Pojam završetka ne može biti kasnije od godine datum završetka školske godine u kojoj je pojam vezan (Akademska godina {}). Ispravite datume i pokušajte ponovno.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""je nepokretna imovina"" se ne može ne označiti, jer postoji zapis o Imovini nad navedenom stavkom"
DocType: Delivery Trip,Departure Time,Vrijeme polaska
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Predlošci stanja dobavljača.
DocType: Lead,Interested,Zainteresiran
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Otvaranje
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Od {0} do {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Postavljanje poreza nije uspjelo
DocType: Item,Copy From Item Group,Primjerak iz točke Group
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Ostavlja godišnje
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Red {0}: Provjerite 'Je li Advance ""protiv nalog {1} Ako je to unaprijed ulaz."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
DocType: Email Digest,Profit & Loss,Gubitak profita
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),Ukupno troška Iznos (preko vremenska tablica)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,To se temelji na transakcijama protiv ove tvrtke. Pojedinosti potražite u nastavku
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijest putem maila prilikom stvaranja automatskog Zahtjeva za robom
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,otporan
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Više valuta
DocType: Opening Invoice Creation Tool,Invoice Type,Tip fakture
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Otpremnica
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Udovički
DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
DocType: Healthcare Settings,Require Lab Test Approval,Potrebno odobrenje laboratorijskog ispitivanja
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Šifra stavke> Skupina stavke> Brand
DocType: Salary Slip Timesheet,Working Hours,Radnih sati
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Ukupno izvanredno
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Unesite troška
DocType: Drug Prescription,Dosage,Doziranje
DocType: Journal Entry Account,Sales Order,Narudžba kupca
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Prosječna prodajna cijena
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Prosječna prodajna cijena
DocType: Assessment Plan,Examiner Name,Naziv ispitivač
DocType: Lab Test Template,No Result,Nema rezultata
DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Odaberite Platne razdoblje
DocType: Purchase Invoice,Unpaid,Neplaćen
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervirano za prodaju
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Postavite Sustav imenovanja zaposlenika u ljudskim resursima> HR postavke
DocType: Packing Slip,From Package No.,Iz paketa broj
DocType: Item Attribute,To Range,U rasponu
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Radionica
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozorite narudžbenice
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dosta Dijelovi za izgradnju
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosta Dijelovi za izgradnju
DocType: POS Profile User,POS Profile User,Korisnik POS profila
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Izravni dohodak
DocType: Patient Appointment,Date TIme,Datum vrijeme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa, ako je grupirano po računu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa, ako je grupirano po računu"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrativni službenik
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Postavljanje tvrtke i poreza
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Odaberite Tečaj
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Račun razlike
DocType: Purchase Invoice,Supplier GSTIN,Dobavljač GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Ne može zatvoriti zadatak kao njegova ovisna zadatak {0} nije zatvoren.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
DocType: Production Order,Additional Operating Cost,Dodatni trošak
DocType: Lab Test Template,Lab Routine,Laboratorijska rutina
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,kozmetika
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Odnos s Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Upravitelj
DocType: Payment Entry,Payment From / To,Plaćanje Od / Do
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manja od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manja od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Postavite račun u skladištu {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Temelji se na' i 'Grupiranje po' ne mogu biti isti
DocType: Sales Person,Sales Person Targets,Prodajni plan prodavača
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Batch Name
DocType: Fee Validity,Max number of visit,Maksimalni broj posjeta
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet stvorio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Upisati
DocType: GST Settings,GST Settings,Postavke GST-a
DocType: Selling Settings,Customer Naming By,Imenovanje kupca prema
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,proračun protiv
DocType: Employee,Cell Number,Mobitel Broj
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Za određene kriterije nema zaposlenika. Provjerite da Plaća Slips još nisu stvorena.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Automatski zahtjev za materijalom odobren
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automatski zahtjev za materijalom odobren
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervirano za proizvodnju
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energija
DocType: Opportunity,Opportunity From,Prilika od
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Redak {0}: {1} Serijski brojevi potrebni za stavku {2}. Naveli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Redak {0}: {1} Serijski brojevi potrebni za stavku {2}. Naveli ste {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Odaberite tablicu
DocType: BOM,Website Specifications,Web Specifikacije
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je nevažeća adresa e-pošte u "Primatelji"
@@ -1042,7 +1043,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Zatraženo pitanje
DocType: Vital Signs,Heart Rate / Pulse,Puls / srčane frekvencije
DocType: Company,Default Bank Account,Zadani bankovni račun
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},Opcija 'Ažuriraj zalihe' nije dostupna jer stavke nisu dostavljene putem {0}
DocType: Vehicle,Acquisition Date,Datum akvizicije
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,kom
@@ -1066,7 +1067,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Prenesite glavu slova (Držite ga prijateljskim webom kao 900 piksela za 100 px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Račun {2} ne može biti grupa
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka retka {idx}: {DOCTYPE} {DOCNAME} ne postoji u gore '{DOCTYPE}' stol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nema zadataka
DocType: Item Variant Settings,Copy Fields to Variant,Kopiranje polja u inačicu
DocType: Asset,Opening Accumulated Depreciation,Otvaranje Akumulirana amortizacija
@@ -1178,9 +1179,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan materijal za pod-sklopova
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i Županija
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} mora biti aktivna
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Zatvaranje (otvaranje + ukupno)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Zatvaranje (otvaranje + ukupno)
DocType: Journal Entry,Depreciation Entry,Amortizacija Ulaz
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Ispiši u valuti računa
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
@@ -1206,7 +1208,7 @@
DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
DocType: Fee Structure,Components,Komponente
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Stavka Varijante {0} ažurirani
DocType: Quality Inspection Reading,Reading 6,Čitanje 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1258,6 +1260,7 @@
,Company Name,Ime tvrtke
DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Postavite Serija za imenovanje {0} putem postavke> Postavke> Serija za imenovanje
DocType: Purchase Invoice,Additional Discount Percentage,Dodatni Postotak Popust
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pregled popisa svih pomoć videa
DocType: Agriculture Analysis Criteria,Soil Texture,Tekstura tla
@@ -1285,7 +1288,7 @@
DocType: BOM Website Item,BOM Website Item,BOM web stranica predmeta
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati kasnije).
DocType: Timesheet Detail,Bill,Račun
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sljedeća Amortizacija Datum upisuje kao prošlih dana
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Sljedeća Amortizacija Datum upisuje kao prošlih dana
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bijela
DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Kol nisu dostupni za {4} u skladištu {1} na objavljivanje vrijeme upisa ({2} {3})
@@ -1301,7 +1304,7 @@
DocType: Lead,Next Contact Date,Sljedeći datum kontakta
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Otvaranje Kol
DocType: Healthcare Settings,Appointment Reminder,Podsjetnik za sastanak
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Unesite račun za promjene visine
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Unesite račun za promjene visine
DocType: Program Enrollment Tool Student,Student Batch Name,Studentski Batch Name
DocType: Consultation,Doctor,Liječnik
DocType: Holiday List,Holiday List Name,Ime popisa praznika
@@ -1317,6 +1320,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Alat za raspodjelu odsustva
DocType: Item,Hub Category to Publish,Kategorija hub za objavljivanje
DocType: Leave Block List,Leave Block List Dates,Datumi popisa neodobrenih odsustava
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Postavite serijske brojeve za prisustvovanje putem Setup> Serija numeriranja
DocType: Sales Invoice,Billing Address GSTIN,Adresa za naplatu GSTIN
DocType: Assessment Plan,Evaluate,procijeniti
DocType: Workstation,Net Hour Rate,Neto sat cijena
@@ -1350,7 +1354,7 @@
DocType: Purchase Receipt,PREC-RET-,Prec-RET-
DocType: POS Profile,Sales Invoice Payment,Prodaja fakture za plaćanje
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Prodaja Iznos
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodaja Iznos
DocType: Repayment Schedule,Interest Amount,Iznos kamata
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vi ste osoba za odobrenje rashoda za ovaj zapis. Molimo ažurirajte status i spremite
DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Otvori računovodstveno stanje
,GST Sales Register,GST registar prodaje
DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ništa za zatražiti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ništa za zatražiti
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Odaberite svoje domene
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Još jedan proračun rekord '{0}' već postoji od {1} '{2}' za fiskalnu godinu {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Polja će biti kopirana samo u trenutku stvaranja.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To će biti dodan u šifra varijante. Na primjer, ako je vaš naziv je ""SM"", a točka kod ""T-shirt"", stavka kod varijante će biti ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
DocType: Purchase Invoice,Is Return,Je li povratak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Oprez
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Oprez
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Povratak / debitna Napomena
DocType: Price List Country,Price List Country,Država cjenika
DocType: Item,UOMs,J. MJ.
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} valjani serijski nos za Stavka {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} valjani serijski nos za Stavka {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod proizvoda ne može se mijenjati za serijski broj.
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM konverzijski faktor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Unesite Šifra dobiti broj serije
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
DocType: Supplier Scorecard,Warn for new Request for Quotations,Upozorenje za novi zahtjev za ponudu
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na Vašoj kupnji
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Ispitivanje laboratorijskih ispitivanja
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Ukupna količina Pitanje / Prijenos {0} u materijalnim Zahtjevu {1} \ ne može biti veća od tražene količine {2} za točki {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
DocType: Payment Entry,Write Off Difference Amount,Otpis razlika visine
DocType: Volunteer,Volunteer Name,Ime volontera
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Postavite instruktor imenovanja sustava u obrazovanju> Postavke obrazovanja
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Radnik email nije pronađen, stoga ne e-mail poslan"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pravilo isporuke nije primjenjivo za zemlju {0}
DocType: Item,Foreign Trade Details,Vanjskotrgovinska Detalji
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Broj grupe grupa
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupan svih radnih težina bi trebala biti 1. Podesite vage svih zadataka projekta u skladu s tim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalni oprema
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dijete skladište postoji za ovaj skladište. Ne možete izbrisati ovaj skladište.
DocType: Item,Website Item Groups,Grupe proizvoda web stranice
DocType: Purchase Invoice,Total (Company Currency),Ukupno (Društvo valuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
DocType: Journal Entry,Journal Entry,Temeljnica
DocType: Expense Claim Advance,Unclaimed amount,Neotkriveni iznos
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} stavke u tijeku
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevnik mailova
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zahtjev za ponudu je onemogućen pristup sa portala, za više postavki provjere portal."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavljačka tabela ocjena varijable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Iznos kupnje
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iznos kupnje
DocType: Sales Invoice,Shipping Address Name,Dostava Adresa Ime
DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Došlo je do pogrešaka prilikom izrade tečaja Raspored
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To se temelji na zapisima protiv tog vozila. Pogledajte vremensku crtu ispod za detalje
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
DocType: Customer,Default Price List,Zadani cjenik
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati Fiskalna godina {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Kupac s istim imenom već postoji
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,To će poslati Plaće Slips i stvoriti obračunski dnevnik unos. Želiš li nastaviti?
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Cijena
DocType: Quotation,Term Details,Oročeni Detalji
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ne može se prijaviti više od {0} studenata za ovaj grupe studenata.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Ukupno (Bez poreza)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Olovni broj
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Dostupno
@@ -2026,7 +2030,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Prekini vezu Plaćanje o otkazu fakture
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno stanje kilometraže ušao bi trebala biti veća od početne vozila kilometraže {0}
DocType: Restaurant Reservation,No Show,Nema prikazivanja
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Postavite Serija za imenovanje {0} putem postavke> Postavke> Serija za imenovanje
DocType: Shipping Rule Country,Shipping Rule Country,Pravilo dostava Država
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ostavi i posjećenost
DocType: Maintenance Visit,Partially Completed,Djelomično završeni
@@ -2117,7 +2120,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instruktor grupe studenata
DocType: Grant Application,Assessment Mark (Out of 10),Ocjena ocjenjivanja (od 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Ne
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Glavni
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Glavni
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varijanta
DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
DocType: Employee Attendance Tool,Employees HTML,Zaposlenici HTML
@@ -2165,7 +2168,7 @@
DocType: Course,Course Abbreviation,naziv predmeta
DocType: Student Leave Application,Student Leave Application,Studentski Ostavite aplikacija
DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenik {0} na pola dana na {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Ukupno radno vrijeme ne smije biti veći od max radnog vremena {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
@@ -2350,9 +2353,10 @@
DocType: Task,Actual End Date (via Time Sheet),Stvarni Datum završetka (putem vremenska tablica)
DocType: Soil Texture,Soil Type,Vrsta tla
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Iznos {0} {1} od {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nova poruka
,Quotation Trends,Trend ponuda
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Stavka proizvoda se ne spominje u master artiklu za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
DocType: Shipping Rule,Shipping Amount,Dostava Iznos
DocType: Supplier Scorecard Period,Period Score,Ocjena razdoblja
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj korisnike
@@ -2363,7 +2367,7 @@
,Vehicle Expenses,Troškovi vozila
DocType: Serial No,Invoice Details,Pojedinosti fakture
DocType: Grant Application,Show on Website,Pokaži na web stranici
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon životnog vijeka mora biti veća od ili jednaka do {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon životnog vijeka mora biti veća od ili jednaka do {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Započnite
DocType: Hub Category,Hub Category,Kategorija hubova
DocType: Purchase Invoice,SEZ,SEZ
@@ -2394,7 +2398,7 @@
DocType: Patient,B Positive,B Pozitivan
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti jedan, jer predmet je fiksni kapital. Molimo koristite poseban red za više kom."
DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupa ne-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,sportovi
@@ -2444,6 +2448,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Nije moguće postaviti primljeni RFQ na nijedan citat
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Ukupno Odbitak
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Odaberite račun za ispis u valuti računa
,Production Analytics,Proizvodnja Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To se temelji na transakcijama protiv ovog pacijenta. Pojedinosti potražite u nastavku
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Trošak Ažurirano
@@ -2498,7 +2503,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Odaberite tvrtku ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako se odnosi na sve odjele
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
DocType: Payroll Entry,Fortnightly,četrnaestodnevni
DocType: Currency Exchange,From Currency,Od novca
DocType: Vital Signs,Weight (In Kilogram),Težina (u kilogramu)
@@ -2574,7 +2579,7 @@
DocType: Student,Guardians,čuvari
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Cijene neće biti prikazana ako Cjenik nije postavljena
DocType: Stock Entry,Total Incoming Value,Ukupno Dolazni vrijednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Zaduženja je potrebno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Zaduženja je potrebno
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vrijeme, troškove i naplatu za aktivnostima obavljaju unutar vašeg tima"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupovni cjenik
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Predlošci varijabli s rezultatima dobavljača.
@@ -2675,7 +2680,7 @@
DocType: Company,For Reference Only.,Za samo kao referenca.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Liječnik {0} nije dostupan na {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Odaberite šifra serije
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Pogrešna {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Pogrešna {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Referenca Inv
@@ -2712,8 +2717,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
DocType: Water Analysis,Origin,Podrijetlo
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Jeste li što drugo {3} protiv iste {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Iznos računa Odaberi promjene
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Iznos računa Odaberi promjene
DocType: Purchase Invoice,Price List Currency,Valuta cjenika
DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -2769,7 +2774,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Upozorenje za nove narudžbenice
DocType: Quality Inspection Reading,Reading 9,Čitanje 9
DocType: Supplier,Is Frozen,Je Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Čvor Grupa skladište ne smije odabrati za transakcije
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Čvor Grupa skladište ne smije odabrati za transakcije
DocType: Buying Settings,Buying Settings,Ppostavke nabave
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM broj za Gotovi Dobar točki
DocType: Upload Attendance,Attendance To Date,Gledanost do danas
@@ -2783,6 +2788,7 @@
DocType: Grant Application,Organization,Organizacija
DocType: BOM Update Tool,BOM Update Tool,Alat za ažuriranje BOM-a
DocType: SG Creation Tool Course,Student Group Name,Naziv grupe studenata
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Prikaži eksplodirao pogled
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Stvaranje naknada
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo provjerite da li stvarno želite izbrisati sve transakcije za ovu tvrtku. Vaši matični podaci će ostati kao što je to. Ova radnja se ne može poništiti.
DocType: Room,Room Number,Broj sobe
@@ -2793,7 +2799,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Napravite predložak poreza
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum za korisnike
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
DocType: Lab Test Sample,Lab Test Sample,Uzorak laboratorija
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Brzo Temeljnica
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
@@ -2864,7 +2870,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Napravi račun
DocType: Selling Settings,Auto close Opportunity after 15 days,Automatski zatvori Priliku nakon 15 dana
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Narudžbenice za zabavu nisu dozvoljene za {0} zbog položaja ocjene bodova {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Narudžbenice za zabavu nisu dozvoljene za {0} zbog položaja ocjene bodova {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Godina završetka
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kvota / olovo%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
@@ -2976,7 +2982,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Red # {0}: časopis za ulazak {1} nema računa {2} ili već usklađeni protiv drugog bona
DocType: Supplier Scorecard Criteria,Criteria Weight,Težina kriterija
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dobavljač> Vrsta dobavljača
DocType: Buying Settings,Default Buying Price List,Zadani kupovni cjenik
DocType: Payroll Entry,Salary Slip Based on Timesheet,Plaća proklizavanja temelju timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Stopa kupnje
@@ -3064,7 +3069,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Praćenje potencijalnih kupaca prema vrsti industrije.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Idi na zaglavlje
DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
DocType: Company,Stock Settings,Postavke skladišta
@@ -3253,6 +3258,7 @@
DocType: Company,Default Inventory Account,Zadani račun oglasnog prostora
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završen količina mora biti veća od nule.
DocType: Antibiotic,Antibiotic Name,Ime antibiotika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Šifra stavke> Skupina stavke> Brand
DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Odaberite vrstu ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Veza na sve Zemljišne jedinice u kojima raste usjeva
@@ -3446,6 +3452,7 @@
DocType: Supplier,Credit Limit,Kreditni limit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Prosječni. Prodajni cjenovni popisi
DocType: Production Plan Sales Order,Salse Order Date,Datum Salse narudžbe
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dobavljač> Vrsta dobavljača
DocType: Salary Component,Salary Component,Plaća Komponenta
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Prijave plaćanja {0} su UN-linked
DocType: GL Entry,Voucher No,Bon Ne
@@ -3454,7 +3461,7 @@
DocType: Leave Allocation,Leave Allocation,Raspodjela odsustva
DocType: Payment Request,Recipient Message And Payment Details,Primatelj poruke i podatke o plaćanju
DocType: Training Event,Trainer Email,trener Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Zahtjevi za robom {0} kreirani
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Zahtjevi za robom {0} kreirani
DocType: Restaurant Reservation,No of People,Ne od ljudi
DocType: Production Planning Tool,Include sub-contracted raw materials,Uključi pod-ugovorene sirovine
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predložak izraza ili ugovora.
@@ -3518,7 +3525,7 @@
DocType: Production Planning Tool,Create Material Requests,Zahtjevnica za nabavu
DocType: Employee Education,School/University,Škola / Sveučilište
DocType: Payment Request,Reference Details,Referentni Detalji
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost nakon korisnog vijeka trajanja mora biti manja od bruto iznosa kupnje
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost nakon korisnog vijeka trajanja mora biti manja od bruto iznosa kupnje
DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Naplaćeni iznos
DocType: Asset,Double Declining Balance,Dvaput padu Stanje
@@ -3530,7 +3537,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nabavite ažuriranja
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada Društvu {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Odaberite barem jednu vrijednost iz svakog od atributa.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Ostavite upravljanje
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupa po računu
DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
@@ -3541,14 +3548,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni Iznos ne može biti veća od iznos kredita {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Idite na Programs (Programi)
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Red {0} # Dodijeljeni iznos {1} ne može biti veći od neimenovanog iznosa {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Postavite serijske brojeve za prisustvovanje putem Setup> Serija numeriranja
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Proizvodnja Narudžba nije stvorio
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Ne može se promijeniti status studenta {0} je povezan sa studentskom primjene {1}
DocType: Asset,Fully Depreciated,potpuno amortizirana
,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Gledatelja HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali na svoje klijente"
DocType: Sales Order,Customer's Purchase Order,Kupca narudžbenice
@@ -3632,7 +3638,7 @@
DocType: Stock Settings,Item Naming By,Proizvod imenovan po
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
DocType: Production Order,Material Transferred for Manufacturing,Materijal Preneseni za Manufacturing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Račun {0} ne postoji
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Račun {0} ne postoji
DocType: Project,Project Type,Vrsta projekta
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Dijete Zadatak postoji za ovu Zadatak. Ne možete izbrisati ovu Zadatak.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Imovina Centar Amortizacija troškova
DocType: Sales Order Item,Sales Order Date,Datum narudžbe (kupca)
DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Ukupno ne. Porez
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ako je označeno, sva djeca svaku stavku proizvodnje će biti uključeni u materijalu zahtjeve."
DocType: Assessment Plan,Assessment Plan,plan Procjena
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Korisnik {0} je stvoren.
DocType: Stock Settings,Limit Percent,Ograničenje posto
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Postavite instruktor imenovanja sustava u obrazovanju> Postavke obrazovanja
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno nema dostupnih dionica u bilo kojem skladištu
,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
DocType: Sample Collection,No. of print,Broj ispisa
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Dužnici ({0})
DocType: Pricing Rule,Margin,Marža
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi kupci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruto dobit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto dobit%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Promjena POS profila
DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Izvješće o procjeni
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Iznos narudžbe je obavezno
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruto Iznos narudžbe je obavezno
DocType: Lead,Address Desc,Adresa silazno
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Stranka je obvezna
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stalni naziv
DocType: Stock Entry,Customer or Supplier Details,Kupca ili dobavljača Detalji
DocType: Employee Loan Application,Required by Date,Potrebna po datumu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Završni saldo (Dr - Cr)
DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
DocType: Bin,Requested Quantity,Tražena količina
DocType: Patient,Marital Status,Bračni status
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Višestruke inačice
DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Isporučeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Stavka {0}: Ž Količina Jedinična {1} ne može biti manja od minimalne narudžbe kom {2} (definiranom u točki).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni postotak distribucije
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Prijavite se kao drugi korisnik.
DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
@@ -3904,7 +3909,7 @@
DocType: Serial No,Out of AMC,Od AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
DocType: Company,Default Cash Account,Zadani novčani račun
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
@@ -4054,7 +4059,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nema zaposlenika za navedene kriterije
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
DocType: Restaurant,Default Customer,Zadani kupac
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Postavite Imenovanje zaposlenika u ljudskim resursima> HR postavke
DocType: Assessment Plan,Supervisor Name,Naziv Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Nemojte potvrditi je li sastanak izrađen za isti dan
DocType: Program Enrollment Course,Program Enrollment Course,Tečaj za upis na program
@@ -4172,7 +4176,7 @@
DocType: BOM,Website Description,Opis web stranice
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto promjena u kapitalu
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnoviji
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
DocType: Serial No,AMC Expiry Date,AMC Datum isteka
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Priznanica
@@ -4189,7 +4193,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanom tijeku
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od maksimalnog iznosa zajma {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
DocType: Physician,Phone (R),Telefon (R)
@@ -4201,7 +4205,7 @@
DocType: Patient,B Negative,Negativan
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Status održavanja mora biti poništen ili dovršen za slanje
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u retku {0} ne podudaraju se s dostavom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u retku {0} ne podudaraju se s dostavom
DocType: Student,Guardian Details,Guardian Detalji
DocType: C-Form,C-Form,C-obrazac
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Gledatelja za više radnika
@@ -4243,7 +4247,7 @@
DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
DocType: Training Event,Exam,Ispit
DocType: Complaint,Complaint,prigovor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
DocType: Patient,Alcohol Past Use,Prethodna upotreba alkohola
DocType: Fertilizer Content,Fertilizer Content,Sadržaj gnojiva
@@ -4367,6 +4371,7 @@
DocType: Salary Detail,Formula,Formula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serijski #
DocType: Lab Test Template,Lab Test Template,Predložak testa laboratorija
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Račun prodaje
DocType: Purchase Invoice Item,Total Weight,Totalna tezina
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisija za prodaju
DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
@@ -4524,7 +4529,7 @@
DocType: Customer,From Lead,Od Olovo
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
DocType: Program Enrollment Tool,Enroll Students,upisati studenti
DocType: Lab Test,Approved Date,Odobreni datum
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
@@ -4600,7 +4605,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Proizvodni proizvod
,Employee Information,Informacije o zaposleniku
DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Napravi ponudu dobavljaču
DocType: Quality Inspection,Incoming,Dolazni
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Osnovni su predlošci poreza za prodaju i kupnju.
@@ -4617,7 +4622,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Napomena: {0}
,Delivery Note Trends,Trend otpremnica
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ovaj tjedan Sažetak
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na skladištu Kol
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Na skladištu Kol
DocType: Delivery Trip,Calculate Estimated Arrival Times,Izračunajte procijenjene vrijeme dolaska
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} može se ažurirati samo preko Stock promet
DocType: Student Group Creation Tool,Get Courses,dobiti Tečajevi
@@ -4633,7 +4638,7 @@
DocType: Material Request,% Ordered,% Naručeno
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za Studentsku grupu na tečaju, tečaj će biti validiran za svakog studenta iz upisanih kolegija u upisu na program."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Rad po komadu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Prosječna nabavna cijena
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Prosječna nabavna cijena
DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
DocType: Employee,History In Company,Povijest tvrtke
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nova poruka od {sender}
@@ -4681,7 +4686,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Red {0}: Valuta sastavnice # {1} bi trebao biti jednak odabranoj valuti {2}
DocType: Journal Entry Account,Exchange Rate,Tečaj
DocType: Patient,Additional information regarding the patient,Dodatne informacije o pacijentu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
DocType: Homepage,Tag Line,Tag linija
DocType: Fee Component,Fee Component,Naknada Komponenta
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Mornarički menađer
@@ -4893,7 +4898,7 @@
DocType: Employee Education,Employee Education,Obrazovanje zaposlenika
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dvostruki stavke skupina nalaze se u tablici stavke grupe
DocType: Land Unit,Parent Land Unit,Roditeljska jedinica
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
DocType: Fertilizer,Fertilizer Name,Ime gnojiva
DocType: Salary Slip,Net Pay,Neto plaća
DocType: Account,Account,Račun
@@ -4972,7 +4977,7 @@
DocType: Item Customer Detail,Ref Code,Ref. Šifra
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Grupa korisnika je obavezna u POS profilu
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Evidencija zaposlenih.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Molimo postavite Next Amortizacija Date
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Molimo postavite Next Amortizacija Date
DocType: HR Settings,Payroll Settings,Postavke plaće
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
DocType: POS Settings,POS Settings,POS Postavke
@@ -5139,7 +5144,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
DocType: Asset Maintenance Task,Last Completion Date,Datum posljednjeg dovršetka
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
DocType: Buying Settings,Naming Series,Imenovanje serije
DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Osiguranje Datum početka mora biti manja od osiguranja datum završetka
@@ -5266,6 +5271,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Dobiti Ulaz plaćanja
DocType: Quotation Item,Against Docname,Protiv Docname
DocType: SMS Center,All Employee (Active),Svi zaposlenici (aktivni)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kupac> Grupa kupaca> Teritorij
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pogledaj sada
DocType: BOM,Raw Material Cost,Troškova sirovine
DocType: Item Reorder,Re-Order Level,Ponovno bi razini
@@ -5364,7 +5370,6 @@
DocType: Room,Seating Capacity,Sjedenje Kapacitet
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Lab test grupe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kupac> Grupa kupaca> Teritorij
DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi Zatraži (preko Rashodi potraživanja)
DocType: GST Settings,GST Summary,GST Sažetak
DocType: Assessment Result,Total Score,Ukupni rezultat
@@ -5377,7 +5382,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Izrađeni su sljedeći raspored tečajeva
DocType: Journal Entry,Total Debit,Ukupno zaduženje
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Zadane gotovih proizvoda Skladište
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Prodajna osoba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodajna osoba
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Proračun i Centar Cijena
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Višestruki zadani način plaćanja nije dopušten
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
@@ -5550,7 +5555,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
DocType: Driver,Driving License Category,Kategorija licence za vožnju
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Količina je obavezno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutačno ima stajalište dobavljača rezultata {1}, a narudžbenice za ovaj dobavljač trebaju biti izdane s oprezom."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} trenutačno ima stajalište dobavljača rezultata {1}, a narudžbenice za ovaj dobavljač trebaju biti izdane s oprezom."
DocType: Asset Maintenance Team,Asset Maintenance Team,Tim za održavanje imovine
DocType: Employee Loan,Loan Type,Vrsta kredita
DocType: Scheduling Tool,Scheduling Tool,alat za raspoređivanje
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 57000bc..bb8c32a 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Rendezés ár szerint
,Delay Days,Késleltetési napok
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Szolgáltatás költsége
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorozat szám: {0} már hivatkozott ezen az Értékesítési számlán: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorozat szám: {0} már hivatkozott ezen az Értékesítési számlán: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Számla
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Készlet megőrzési bejegyzés létrehozás
DocType: Purchase Invoice Item,Item Weight Details,Tétel súly részletei
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, pont kód: {1} és az ügyfél: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Nyitott állások.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},ANYAGJ nincs megadva az alvállalkozó {0} tételéhez a(z) {1} sorban
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},ANYAGJ nincs megadva az alvállalkozó {0} tételéhez a(z) {1} sorban
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Eredmény benyújtva
DocType: Item Attribute,Increment,Növekmény
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Időtartam
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nem engedélyezett erre {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Tételeket kér le innen
DocType: Price List,Price Not UOM Dependant,Ár nem Mértékegység függő
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Gyártmány {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nincsenek listázott elemek
DocType: Asset Repair,Error Description,Hiba leírás
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Élelmiszerbolt
DocType: Quality Inspection Reading,Reading 1,Olvasás 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Következő értékcsökkenés dátuma nem lehet korábbi a vásárlás dátumánál
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Következő értékcsökkenés dátuma nem lehet korábbi a vásárlás dátumánál
DocType: Crop,Perennial,Állandó
DocType: Consultation,Consultation Date,Konzultációs dátum
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Termékinformáció és felfedezés az ERPNext felhasználói részére
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","pl. ""általános iskola"" vagy ""egyetem"""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Készlet jelentések
DocType: Warehouse,Warehouse Detail,Raktár részletek
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeretet már átlépte az ügyfél {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeretet már átlépte az ügyfél {0} {1}/{2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A feltétel végső dátuma nem lehet későbbi, mint a tanév év végi időpontja, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez tárgyi eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
DocType: Delivery Trip,Departure Time,Indulás ideje
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Részletek lekérdezése
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Beszállító állományainak sablonjai.
DocType: Lead,Interested,Érdekelt
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Megnyitott
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Megnyitott
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Feladó {0} {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Sikertelen az adók beállítása
DocType: Item,Copy From Item Group,Másolás tétel csoportból
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Távollétek évente
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Sor {0}: Kérjük ellenőrizze, hogy 'ez előleg' a {1} számlához, tényleg egy előleg bejegyzés."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},{0} raktár nem tartozik a(z) {1} céghez
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},{0} raktár nem tartozik a(z) {1} céghez
DocType: Email Digest,Profit & Loss,Profit & veszteség
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Liter
DocType: Task,Total Costing Amount (via Time Sheet),Összes költség összeg ((Idő nyilvántartó szerint)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ez a Vállalkozással szembeni tranzakciókra épül. Lásd az alábbi idővonalat a részletekért
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Email értesítő létrehozása automatikus Anyag igény létrehozásához
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Ellenálló
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Több pénznem
DocType: Opening Invoice Creation Tool,Invoice Type,Számla típusa
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Szállítólevél
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Özvegy
DocType: Request for Quotation,Request for Quotation,Ajánlatkérés
DocType: Healthcare Settings,Require Lab Test Approval,Laboratóriumi teszt jóváhagyása szükséges
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Tételkód> Tételcsoport> Márka
DocType: Salary Slip Timesheet,Working Hours,Munkaidő
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Teljes fennálló kintlévő
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Megváltoztatni a kezdő / aktuális sorszámot egy meglévő sorozatban.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Kérjük, adja meg a Költséghelyet"
DocType: Drug Prescription,Dosage,Adagolás
DocType: Journal Entry Account,Sales Order,Vevői rendelés
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Átlagos eladási ár
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Átlagos eladási ár
DocType: Assessment Plan,Examiner Name,Vizsgáztató neve
DocType: Lab Test Template,No Result,Nincs eredmény
DocType: Purchase Invoice Item,Quantity and Rate,Mennyiség és ár
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Válasszon Bérszámfejtési Időszakot
DocType: Purchase Invoice,Unpaid,Fizetetlen
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Fenntartott eladó
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Kérjük, állítsa be az alkalmazottak elnevezési rendszerét az emberi erőforrás> HR beállításoknál"
DocType: Packing Slip,From Package No.,Csomag számból
DocType: Item Attribute,To Range,Tartományhoz
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Műhely
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Vevői rendelések figyelmeztetése
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Felsorol egy pár vevőt. Ők lehetnek szervezetek vagy magánszemélyek.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Elég alkatrészek a megépítéshez
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Elég alkatrészek a megépítéshez
DocType: POS Profile User,POS Profile User,POS profil felhasználója
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Közvetlen jövedelem
DocType: Patient Appointment,Date TIme,Dátum Idő
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nem tudja szűrni számla alapján, ha számlánként csoportosított"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Nem tudja szűrni számla alapján, ha számlánként csoportosított"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Igazgatási tisztviselő
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Vállalkozás és adók létrehozása
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Kérjük, válasszon pályát"
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Különbség főkönyvi számla
DocType: Purchase Invoice,Supplier GSTIN,Beszállító GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nem zárható feladat, mivel a hozzá fűződő feladat: {0} nincs lezárva."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja meg a Raktárat, amelyekre anyag igénylés keletkezett"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja meg a Raktárat, amelyekre anyag igénylés keletkezett"
DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
DocType: Lab Test Template,Lab Routine,Labor rutin
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kozmetikum
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Összefüggés Helyettesítő2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Menedzser
DocType: Payment Entry,Payment From / To,Fizetési Honnan / Hova
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},"Új hitelkeret kevesebb, mint a jelenlegi fennálló összeget a vevő számára. Hitelkeretnek minimum ennyinek kell lennie {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},"Új hitelkeret kevesebb, mint a jelenlegi fennálló összeget a vevő számára. Hitelkeretnek minimum ennyinek kell lennie {0}"
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Kérjük, állítson be fiókot a {0}"
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Az 'Ez alapján' 'és a 'Csoport szerint' nem lehet azonos
DocType: Sales Person,Sales Person Targets,Értékesítői személy célok
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Köteg neve
DocType: Fee Validity,Max number of visit,Látogatások max. száma
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Munkaidő jelenléti ív nyilvántartás létrehozva:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a Fizetési módban {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a Fizetési módban {0}"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Beiratkozás
DocType: GST Settings,GST Settings,GST Beállítások
DocType: Selling Settings,Customer Naming By,Vevő elnevezés típusa
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Költségvetés ellenszámla
DocType: Employee,Cell Number,Mobilszám
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Az adott kritériumra nincs alkalmazott. Ellenőrizze, hogy a Bérlapok még nincsenek-e létrehozva."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Anyagigénylés létrehozott
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Anyagigénylés létrehozott
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tudja bevinni a jelenlegi utalványt az ""Ismételt Naplókönyvelés"" oszlopba"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Fenntartott gyártás
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
DocType: Opportunity,Opportunity From,Lehetőség tőle
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Havi kimutatást.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} sor: {1} A {2} tételhez szükséges sorozatszámok. Ön ezt adta meg {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} sor: {1} A {2} tételhez szükséges sorozatszámok. Ön ezt adta meg {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Kérem, válasszon egy táblát"
DocType: BOM,Website Specifications,Weboldal részletek
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} egy érvénytelen e-mail cím a 'Címzettek' közt
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Ajánlatkérés igényelve
DocType: Vital Signs,Heart Rate / Pulse,Pulzusszám / pulzus
DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Az Ügyfél alapján kiszűrni, válasszuk ki az Ügyfél típpust először"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Az Ügyfél alapján kiszűrni, válasszuk ki az Ügyfél típpust először"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Készlet frissítés' nem ellenőrizhető, mert a tételek nem lettek elszállítva ezzel: {0}"
DocType: Vehicle,Acquisition Date,Beszerzés dátuma
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Darabszám
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Töltsd fel levél fejlécét (tartsd webhez megfelelően 900px-ról 100px-ig)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: fiók {2} nem lehet csoport
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Tétel sor {idx}: {doctype} {docname} nem létezik a fenti '{doctype}' táblában
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Jelenléti ív {0} már befejezett vagy törölt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Jelenléti ív {0} már befejezett vagy törölt
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nincsenek feladatok
DocType: Item Variant Settings,Copy Fields to Variant,Másolási mezők a változathoz
DocType: Asset,Opening Accumulated Depreciation,Nyitó halmozott ÉCS
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,Terv anyag a részegységekre
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vevő partnerek és Területek
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,ANYGJZ: {0} aktívnak kell lennie
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Záró (nyitó + összes)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Záró (nyitó + összes)
DocType: Journal Entry,Depreciation Entry,ÉCS bejegyzés
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Kérjük, válassza ki a dokumentum típusát először"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Nyomtassa ki a számla pénznemét
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Törölje az anyag szemlét: {0}mielőtt törölné ezt a karbantartási látogatást
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 szabvány
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Széria sz {0} nem tartozik ehhez a tételhez {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,Alapértelmezett kifizetendő számlák
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"Alkalmazott {0} nem aktív, vagy nem létezik"
DocType: Fee Structure,Components,Alkatrészek
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy Kategóriát ebben a tételben: {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy Kategóriát ebben a tételben: {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Tétel változatok {0} frissített
DocType: Quality Inspection Reading,Reading 6,Olvasás 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,Válallkozás neve
DocType: SMS Center,Total Message(s),Összes üzenet(ek)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Válassza ki a tételt az átmozgatáshoz
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Állítsa be a Naming sorozat {0} beállítását a Beállítás> Beállítások> Nevezési sorozatok segítségével
DocType: Purchase Invoice,Additional Discount Percentage,További kedvezmény százalék
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Minden súgó video megtekintése
DocType: Agriculture Analysis Criteria,Soil Texture,Talaj textúra
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,Anyagjegyzék honlap tétel
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Kérjük töltse fel levele fejlécét és logo-ját. (Ezeket később szerkesztheti).
DocType: Timesheet Detail,Bill,Számla
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Következő értékcsökkenés dátumaként múltbeli dátumot tüntettek fel
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Következő értékcsökkenés dátumaként múltbeli dátumot tüntettek fel
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Fehér
DocType: SMS Center,All Lead (Open),Összes Érdeklődés (Nyitott)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Sor {0}: Mennyiség nem áll rendelkezésre {4} raktárban {1} a kiküldetés idején a bejegyzést ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,Következő megbeszélés dátuma
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Nyitó Mennyiség
DocType: Healthcare Settings,Appointment Reminder,Vizit időpont emlékeztető
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz összeghez"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz összeghez"
DocType: Program Enrollment Tool Student,Student Batch Name,Tanuló kötegnév
DocType: Consultation,Doctor,Orvos
DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Távollét Lefoglaló Eszköz
DocType: Item,Hub Category to Publish,Közzétételi Hub kategória
DocType: Leave Block List,Leave Block List Dates,Távollét blokk lista dátumok
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Kérjük, állítsa be a számozási sorozatot a részvételhez a Beállítás> Számozási sorozatok segítségével"
DocType: Sales Invoice,Billing Address GSTIN,Számlázási cím GSTIN
DocType: Assessment Plan,Evaluate,értékelje
DocType: Workstation,Net Hour Rate,Nettó óra bér
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,BESZBEV-ELLEN-
DocType: POS Profile,Sales Invoice Payment,Kimenő értékesítési számla kifizetése
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Fenntartott Raktár a Vevői rendelésben / készáru raktárban
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Értékesítési összeg
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Értékesítési összeg
DocType: Repayment Schedule,Interest Amount,Kamatösszeg
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Te vagy a költség Jóváhagyó erre a bejegyzésre. Kérjük ""Állapot"" frissítsen és ""Mentés"""
DocType: Serial No,Creation Document No,Létrehozott Dokumentum sz.
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Nyitó Könyvelési egyenleg
,GST Sales Register,GST értékesítés regisztráció
DocType: Sales Invoice Advance,Sales Invoice Advance,Kimenő értékesítési számla előleg
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nincs mit igényelni
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nincs mit igényelni
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Válassza ki a domainjeit
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},"Egy másik költségvetési rekord ""{0}"" már létezik az {1} '{2}' ellen, ebben a pénzügyi évben {3}"
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,A mezők csak a létrehozás idején lesznek átmásolva.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ez lesz hozzáfűzve a termék egy varióciájához. Például, ha a rövidítés ""SM"", és a tételkód ""T-shirt"", a tétel kód variánsa ez lesz ""SM feliratú póló"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó fizetés (szavakkal) lesz látható, ha mentette a Bérpapírt."
DocType: Purchase Invoice,Is Return,Ez visszáru
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Vigyázat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Vigyázat
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Vissza / terhelési értesítés
DocType: Price List Country,Price List Country,Árlista Országa
DocType: Item,UOMs,Mértékegységek
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},"{0} érvényes sorozatszámok, a(z) {1} tételhez"
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},"{0} érvényes sorozatszámok, a(z) {1} tételhez"
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Tételkódot nem lehet lecserélni Széria számmá
DocType: Purchase Invoice Item,UOM Conversion Factor,ME konverziós tényező
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Kérjük, adja meg a tételkódot, hogy megkapja a köteg számot"
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Vevői rendelés {0} nem érvényes
DocType: Supplier Scorecard,Warn for new Request for Quotations,Figyelmeztetés az új Ajánlatkéréshez
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Beszerzési megrendelések segítenek megtervezni és követni a beszerzéseket
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Laboratóriumi teszt rendelvények
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}","A teljes Probléma / Átvitt mennyiség {0} ebben az Anyaga igénylésben: {1} \ nem lehet nagyobb, mint az igényelt mennyiség: {2} erre a tételre: {3}"
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
DocType: Payment Entry,Write Off Difference Amount,Leíró Eltérés összeg
DocType: Volunteer,Volunteer Name,Önkéntes neve
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Kérjük, állítsd be az oktatónevezési rendszert az oktatásban> Oktatási beállítások"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Alkalmazott email nem található, ezért nem küldte email"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},A szállítási szabály nem vonatkozik erre ozországra: {0}
DocType: Item,Foreign Trade Details,Külkereskedelem Részletei
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Csoport regisztrációs száma
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0} -hoz, csak jóváírási számlákat lehet kapcsolni a másik ellen terheléshez"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Összesen feladat súlyozása legyen 1. Kérjük, állítsa a súlyozást minden projekt feladataira ennek megfelelően"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Tétel {0} kell egy Alvállalkozásban Elem
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Alap Felszereltség
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Árképzési szabályt először 'Alkalmazza ezen' mező alapján kiválasztott, ami lehet tétel, pont-csoport vagy a márka."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Al raktár létezik ebben a raktárban. Nem lehet törölni a raktárban.
DocType: Item,Website Item Groups,Weboldal tétel Csoportok
DocType: Purchase Invoice,Total (Company Currency),Összesen (a cég pénznemében)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Széria sz. {0} többször bevitt
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Széria sz. {0} többször bevitt
DocType: Journal Entry,Journal Entry,Könyvelési tétel
DocType: Expense Claim Advance,Unclaimed amount,Nem követelt összeg
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} tétel(ek) folyamatban
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikációs napló.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Ajánlatkérés le van tiltva a portálon keresztüli hozzáférésre, továbbiakhoz ellenőrizze a portál beállításokat."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Beszállító mutatószámok pontozási változója
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Beszerzési mennyiség
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Beszerzési mennyiség
DocType: Sales Invoice,Shipping Address Name,Szállítási cím neve
DocType: Material Request,Terms and Conditions Content,Általános szerződési feltételek tartalma
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Hiba történt a kurzus ütemezés során
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ennek alapja a naplók ehhez a járműhöz. Lásd az alábbi idővonalat a részletehez
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Beszállító Ellenszámla {0} dátuma {1}
DocType: Customer,Default Price List,Alapértelmezett árlista
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Nem törölheti ezt a Pénzügyi évet: {0}. Pénzügyi év: {0} az alapértelmezett beállítás, a Globális beállításokban"
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Már létezik egy azonos nevű vásárló
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ez Bérpapírt küld és létrehoz egy aktuális naplóbejegyzést. Akarod folytatni?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Árazás
DocType: Quotation,Term Details,ÁSZF részletek
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,"Nem lehet regisztrálni, több mint {0} diákot erre a diákcsoportra."
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Összesen (adó nélkül)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Érdeklődés számláló
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0} nagyobbnak kell lennie, mint 0"
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Raktáron lévő
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fizetetlen számlához tartozó Fizetés megszüntetése
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Jelenlegi leolvasott kilométerállásnak nagyobbnak kell lennie, mint a Jármű kezdeti kilométeróra állása {0}"
DocType: Restaurant Reservation,No Show,Nincs megjelenítés
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Állítsa be a Naming sorozat {0} beállítását a Beállítás> Beállítások> Nevezési sorozatok segítségével
DocType: Shipping Rule Country,Shipping Rule Country,Szállítási szabály Ország
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Távollét és jelenlét
DocType: Maintenance Visit,Partially Completed,Részben befejezett
@@ -2098,7 +2101,7 @@
DocType: Student Group Instructor,Student Group Instructor,Diák csoport oktató
DocType: Grant Application,Assessment Mark (Out of 10),Értékelés jelölés (10-ből)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Helyettesítő2 Mobil szám
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Legfontosabb
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Legfontosabb
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Változat
DocType: Naming Series,Set prefix for numbering series on your transactions,Sorozat számozás előtag beállítása a tranzakciókhoz
DocType: Employee Attendance Tool,Employees HTML,Alkalmazottak HTML
@@ -2146,7 +2149,7 @@
DocType: Course,Course Abbreviation,Tanfolyam rövidítés
DocType: Student Leave Application,Student Leave Application,Diák távollét alkalmazás
DocType: Item,Will also apply for variants,Változatokra is alkalmazni fogja
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Vagyoneszköz nem törölhető, mivel ez már {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Vagyoneszköz nem törölhető, mivel ez már {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Alkalmazott {0} félműszakos ekkor {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Teljes munkaidő nem lehet nagyobb, mint a max munkaidő {0}"
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Tovább
@@ -2330,9 +2333,10 @@
DocType: Task,Actual End Date (via Time Sheet),Tényleges befejezés dátuma (Idő nyilvántartó szerint)
DocType: Soil Texture,Soil Type,Talaj típus
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellenéből {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Új üzenet
,Quotation Trends,Árajánlatok alakulása
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Tétel Csoport nem említett a tétel törzsadatban erre a tételre: {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Tartozás megterhelés számlának bevételi számlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Tartozás megterhelés számlának bevételi számlának kell lennie
DocType: Shipping Rule,Shipping Amount,Szállítandó mennyiség
DocType: Supplier Scorecard Period,Period Score,Időszak pontszám
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Vevők hozzáadása
@@ -2343,7 +2347,7 @@
,Vehicle Expenses,Jármű költségek
DocType: Serial No,Invoice Details,Számla részletei
DocType: Grant Application,Show on Website,Megjelenítés a weboldalon
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Várható érték a hasznos élettartam után nagyobbnak kell lennie, vagy egyenlő, mint {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},"Várható érték a hasznos élettartam után nagyobbnak kell lennie, vagy egyenlő, mint {0}"
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Kezdés ekkor
DocType: Hub Category,Hub Category,Hub kategória
DocType: Purchase Invoice,SEZ,áruszállítás
@@ -2374,7 +2378,7 @@
DocType: Patient,B Positive,B Pozitív
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Sor # {0}: Mennyiség legyen 1, a tétel egy tárgyi eszköz. Használjon külön sort több menny."
DocType: Leave Block List Allow,Leave Block List Allow,Távollét blokk lista engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
DocType: Patient Medical Record,Patient Medical Record,Beteg orvosi kartonja
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Csoport Csoporton kívülire
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportok
@@ -2424,6 +2428,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,"Nem állítható be beérkezettnek az Árajánlatkérés , nincs Árajánlat"
DocType: Quotation,QTN-,AJ-
DocType: Salary Slip,Total Deduction,Összesen levonva
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Válasszon ki egy fiókot a számla pénznemére történő nyomtatáshoz
,Production Analytics,Termelési elemzések
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ez a betegekkel szembeni tranzakciókra épül. Lásd az alábbi idővonalat a részletekért
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Költség Frissítve
@@ -2478,7 +2483,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Válasszon vállalkozást...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Hagyja üresen, ha figyelembe veszi az összes szervezeti egységen"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Alkalmazott foglalkoztatás típusa (munkaidős, szerződéses, gyakornok stb)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
DocType: Payroll Entry,Fortnightly,Kéthetenkénti
DocType: Currency Exchange,From Currency,Pénznemből
DocType: Vital Signs,Weight (In Kilogram),Súly (kilogrammban)
@@ -2554,7 +2559,7 @@
DocType: Student,Guardians,Helyettesítők
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Az árak nem jelennek meg, ha Árlista nincs megadva"
DocType: Stock Entry,Total Incoming Value,Beérkező össz Érték
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Tartozás megterhelése szükséges
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Tartozás megterhelése szükséges
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Munkaidő jelenléti ív segít nyomon követni az idő, költség és számlázási tevékenységeit a csoportjának."
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Beszerzési árlista
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,A beszállító eredménymutató-változóinak sablonjai.
@@ -2655,7 +2660,7 @@
DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},A {0} orvos nem érhető el ezen {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Válasszon köteg sz.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Érvénytelen {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Érvénytelen {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,BESZSZ-ELLEN-
DocType: Fee Validity,Reference Inv,Szla. referencia
@@ -2692,8 +2697,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a műveletet, a működési költségeket, és adjon meg egy egyedi műveletet a műveletekhez."
DocType: Water Analysis,Origin,Származás
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ez a dokumentum túlcsordult ennyivel {0} {1} erre a tételre {4}. Létrehoz egy másik {3} ugyanazon {2} helyett?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Válasszon váltópénz összeg számlát
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Válasszon váltópénz összeg számlát
DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
DocType: Naming Series,User must always select,Felhasználónak mindig választani kell
DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
@@ -2749,7 +2754,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Figyelmeztetés az új Vevői megrendelésekre
DocType: Quality Inspection Reading,Reading 9,Olvasás 9
DocType: Supplier,Is Frozen,Ez zárolt
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Csoport csomópont raktár nem választhatók a tranzakciókhoz
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Csoport csomópont raktár nem választhatók a tranzakciókhoz
DocType: Buying Settings,Buying Settings,Beszerzési Beállítások
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Késztermék Anyagjegyzék száma
DocType: Upload Attendance,Attendance To Date,Részvétel befejezés dátuma
@@ -2763,6 +2768,7 @@
DocType: Grant Application,Organization,Szervezet
DocType: BOM Update Tool,BOM Update Tool,ANYAGJ frissítő eszköz
DocType: SG Creation Tool Course,Student Group Name,Diák csoport neve
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Ropsztatott nézet megjelenítése
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Díjak létrehozása
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kérjük, győződjön meg róla, hogy valóban törölni szeretné az összes tranzakció ennél a vállalatnál. Az Ön törzsadati megmaradnak. Ez a művelet nem vonható vissza."
DocType: Room,Room Number,Szoba szám
@@ -2773,7 +2779,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Adózási sablon létrehozása
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Felhasználói fórum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
DocType: Lab Test Sample,Lab Test Sample,Labor teszt minta
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Gyors Naplókönyvelés
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni az árat, ha az említett ANYGJZ összefügg már egy tétellel"
@@ -2844,7 +2850,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Számla készítése
DocType: Selling Settings,Auto close Opportunity after 15 days,Automatikus lezárása az ügyeknek 15 nap után
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Vásárlási rendelések nem engedélyezettek erre: {0}, mivel az eredménymutatók értéke: {1}."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Vásárlási rendelések nem engedélyezettek erre: {0}, mivel az eredménymutatók értéke: {1}."
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Befejező év
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Áraj / Lehet %
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint a Csatlakozás dátuma"
@@ -2936,7 +2942,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 felett
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"Sor # {0}: Naplókönyvelés {1} nem rendelkezik {2} számlával, vagy már összeegyeztetett egy másik utalvánnyal"
DocType: Supplier Scorecard Criteria,Criteria Weight,Kritérium Súlyozás
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Szállító> Szállító típusa
DocType: Buying Settings,Default Buying Price List,Alapértelmezett Vásárlási árjegyzék
DocType: Payroll Entry,Salary Slip Based on Timesheet,Bérpapirok a munkaidő jelenléti ív alapján
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Beszerzési érték
@@ -3024,7 +3029,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Ipari típusonkénti Érdeklődés nyomonkövetése.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Menjen a Fejlécekhez
DocType: Item Supplier,Item Supplier,Tétel Beszállító
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} ehhez az árajánlathoz {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Összes cím.
DocType: Company,Stock Settings,Készlet beállítások
@@ -3201,6 +3206,7 @@
DocType: Company,Default Inventory Account,Alapértelmezett készlet számla
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,"Sor {0}: Befejezve Mennyiség nagyobbnak kell lennie, mint nulla."
DocType: Antibiotic,Antibiotic Name,Antibiotikum neve
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Tételkód> Tételcsoport> Márka
DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazzon további kedvezmény ezen
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Válasszon típust...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Egy link az összes föld területre, ahol a termés növekszik"
@@ -3394,6 +3400,7 @@
DocType: Supplier,Credit Limit,Követelés limit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Átl. értékesítési árlista
DocType: Production Plan Sales Order,Salse Order Date,Vevői rendelés Dátuma
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Szállító> Szállító típusa
DocType: Salary Component,Salary Component,Bér összetevői
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,"Fizetési bejegyzések {0}, melyek nem-kedveltek"
DocType: GL Entry,Voucher No,Bizonylatszám
@@ -3402,7 +3409,7 @@
DocType: Leave Allocation,Leave Allocation,Távollét lefoglalása
DocType: Payment Request,Recipient Message And Payment Details,Címzett üzenet és fizetési részletek
DocType: Training Event,Trainer Email,Képző Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,{0} anyagigénylés létrejött
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,{0} anyagigénylés létrejött
DocType: Restaurant Reservation,No of People,Emberek száma
DocType: Production Planning Tool,Include sub-contracted raw materials,Tartalmazza az alvállalkozók nyersanyagait
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sablon a feltételekre vagy szerződésre.
@@ -3466,7 +3473,7 @@
DocType: Production Planning Tool,Create Material Requests,Anyagigénylés létrehozása
DocType: Employee Education,School/University,Iskola / Egyetem
DocType: Payment Request,Reference Details,Hivatkozó Részletek
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Várható érték a hasznos élettartam után kevesebbnek kell lennie, mint a bruttó beszerzés összege"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,"Várható érték a hasznos élettartam után kevesebbnek kell lennie, mint a bruttó beszerzés összege"
DocType: Sales Invoice Item,Available Qty at Warehouse,Elérhető mennyiség a raktárban
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Számlázott összeg
DocType: Asset,Double Declining Balance,Progresszív leírási modell egyenleg
@@ -3478,7 +3485,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Változások lekérdezése
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: fiók {2} nem tartozik ehhez a vállalkozáshoz {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Válasszon ki legalább egy értéket az egyes jellemzőkből.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Távollét kezelő
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Számla által csoportosítva
DocType: Sales Order,Fully Delivered,Teljesen leszállítva
@@ -3489,14 +3496,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Folyósított összeg nem lehet nagyobb, a kölcsön összegénél {0}"
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Menjen a Programokhoz
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"{0} sor # A lekötött összeg {1} nem lehet nagyobb, mint a nem követelt összeg {2}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Kérjük, állítsa be a számozási sorozatot a részvételhez a Beállítás> Számozási sorozatok segítségével"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Beszerzési megrendelés száma szükséges ehhez az elemhez {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Gyártási rendelés nincs létrehozva
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" értéknek későbbinek kell lennie a ""Dátumig"" értéknél"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},"Nem lehet megváltoztatni az állapotát, mivel a hallgató: {0} hozzá van fűzve ehhez az alkalmazáshoz: {1}"
DocType: Asset,Fully Depreciated,Teljesen amortizálódott
,Stock Projected Qty,Készlet kivetített Mennyiség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Vevő {0} nem tartozik ehhez a projekthez {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Vevő {0} nem tartozik ehhez a projekthez {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Jelzett Nézőszám HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Árajánlatok mind javaslatok, a vásárlói részére kiküldött ajánlatok"
DocType: Sales Order,Customer's Purchase Order,Vevői Beszerzési megrendelés
@@ -3580,7 +3586,7 @@
DocType: Stock Settings,Item Naming By,Tétel elnevezés típusa
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Egy újabb Időszak záró bejegyzés {0} létre lett hozva ez után: {1}
DocType: Production Order,Material Transferred for Manufacturing,Anyag átrakva gyártáshoz
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,A {0} számla nem létezik
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,A {0} számla nem létezik
DocType: Project,Project Type,Projekt téma típusa
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Al feladat létezik erre a feladatra. Ezt a feladatot nem törölheti.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Vagy előirányzott Menny. vagy előirányzott összeg kötelező
@@ -3682,11 +3688,11 @@
DocType: Company,Asset Depreciation Cost Center,Vagyoneszköz Értékcsökkenés Költséghely
DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
DocType: Sales Invoice Item,Delivered Qty,Kiszállított mennyiség
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Összesen Adó
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ha be van jelölve, az összes gyártási tétel al tétele bekerül az anyag igénylés kérésekbe."
DocType: Assessment Plan,Assessment Plan,Értékelés terv
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Az ügyfél {0} létrehozva.
DocType: Stock Settings,Limit Percent,Limit Percent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Kérjük, állítsd be az oktatónevezési rendszert az oktatásban> Oktatási beállítások"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Jelenleg nincs raktárkészlet egyik raktárban sem
,Payment Period Based On Invoice Date,Fizetési határidő számla dátuma alapján
DocType: Sample Collection,No. of print,Nyomtatás száma
@@ -3702,12 +3708,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Követelések ({0})
DocType: Pricing Rule,Margin,Árkülönbözet
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Új Vevők
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruttó nyereség %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruttó nyereség %
DocType: Appraisal Goal,Weightage (%),Súlyozás (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS profil megváltoztatása
DocType: Bank Reconciliation Detail,Clearance Date,Végső dátum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Értékelés jelentés
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttó vásárlási összeg kötelező
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruttó vásárlási összeg kötelező
DocType: Lead,Address Desc,Cím leírása
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Ügyfél kötelező
DocType: Journal Entry,JV-,KT-
@@ -3739,7 +3745,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Állandó név
DocType: Stock Entry,Customer or Supplier Details,Vevő vagy Beszállító részletei
DocType: Employee Loan Application,Required by Date,Kötelező dátumonként
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Záró egyenleg (ÉCS - Köv)
DocType: Lead,Lead Owner,Érdeklődés tulajdonosa
DocType: Bin,Requested Quantity,kért mennyiség
DocType: Patient,Marital Status,Családi állapot
@@ -3753,7 +3758,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Több változat
DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% szállítva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Tétel {0}: Rendelet Mennyisége: {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (Tételnél meghatározott)."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,"Tétel {0}: Rendelet Mennyisége: {1} nem lehet kevesebb, mint a minimális rendelési mennyiség {2} (Tételnél meghatározott)."
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi Felbontás százaléka
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,"Kérjük, lépjen be mint másik felhasználó."
DocType: Territory,Territory Targets,Területi célok
@@ -3852,7 +3857,7 @@
DocType: Serial No,Out of AMC,ÉKSz időn túl
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Karbantartási látogatás készítés
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználóval, akinek van Értékesítési törzsadat kezelő {0} beosztása"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználóval, akinek van Értékesítési törzsadat kezelő {0} beosztása"
DocType: Company,Default Cash Account,Alapértelmezett készpénzforgalmi számla
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Vállalkozás (nem vevő vagy beszállító) törzsadat.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ez a Tanuló jelenlétén alapszik
@@ -4002,7 +4007,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Az említett kritériumok alapján nincsenek alkalmazottak
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
DocType: Restaurant,Default Customer,Alapértelmezett vevő
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Kérjük, állítsa be az alkalmazottak elnevezési rendszerét az emberi erőforrás> HR beállításoknál"
DocType: Assessment Plan,Supervisor Name,Felügyelő neve
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ne erősítse meg, hogy ugyanazon a napra már van találkozója"
DocType: Program Enrollment Course,Program Enrollment Course,Program Jelentkezés kurzus
@@ -4120,7 +4124,7 @@
DocType: BOM,Website Description,Weboldal leírása
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettó változás a saját tőkében
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Legújabb
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail címnek egyedinek kell lennie, ez már létezik: {0}"
DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Nyugta
@@ -4137,7 +4141,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pénzforgalmi kimutatás
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális kölcsön összegét {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenc
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kérjük, válassza ki az átvitelt, ha Ön is szeretné az előző pénzügyi év mérlege ágait erre a költségvetési évre áthozni"
DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
DocType: Physician,Phone (R),Telefon (Otthoni)
@@ -4149,7 +4153,7 @@
DocType: Patient,B Negative,B Negatív
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Karbantartási állapotot törölni vagy befejezni kell a küldéshez
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},A {0}számlához nem tartozik a {1} vállalat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Sorozatszámok ebben a sorban {0} nem egyezik a szállítólevéllel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Sorozatszámok ebben a sorban {0} nem egyezik a szállítólevéllel
DocType: Student,Guardian Details,Helyettesítő részletei
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Jelölje a Jelenlétet több alkalmazotthoz
@@ -4191,7 +4195,7 @@
DocType: Stock Entry Detail,Basic Amount,Alapösszege
DocType: Training Event,Exam,Vizsga
DocType: Complaint,Complaint,Panasz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
DocType: Leave Allocation,Unused leaves,A fel nem használt távollétek
DocType: Patient,Alcohol Past Use,Korábbi alkoholfogyasztás
DocType: Fertilizer Content,Fertilizer Content,Műtrágya tartalma
@@ -4315,6 +4319,7 @@
DocType: Salary Detail,Formula,Képlet
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Szériasz #
DocType: Lab Test Template,Lab Test Template,Labor teszt sablon
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Értékesítési számla
DocType: Purchase Invoice Item,Total Weight,Össz súly
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Értékesítések jutalékai
DocType: Offer Letter Term,Value / Description,Érték / Leírás
@@ -4471,7 +4476,7 @@
DocType: Customer,From Lead,Érdeklődésből
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Megrendelések gyártásra bocsátva.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Válasszon pénzügyi évet ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
DocType: Program Enrollment Tool,Enroll Students,Diákok felvétele
DocType: Lab Test,Approved Date,Jóváhagyás dátuma
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Alapértelmezett értékesítési
@@ -4547,7 +4552,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Gyártási tétel
,Employee Information,Alkalmazott adatok
DocType: Stock Entry Detail,Additional Cost,Járulékos költség
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja szűrni utalvány szám alapján, ha utalványonként csoportosított"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja szűrni utalvány szám alapján, ha utalványonként csoportosított"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Beszállítói ajánlat létrehozás
DocType: Quality Inspection,Incoming,Bejövő
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Az értékesítés és a vásárlás alapértelmezett adómintáit hozták létre.
@@ -4564,7 +4569,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Megjegyzés: {0}
,Delivery Note Trends,Szállítólevelek alakulása
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Összefoglaló erről a hétről
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Készleten mennyiség
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Készleten mennyiség
DocType: Delivery Trip,Calculate Estimated Arrival Times,Számítsa ki a becsült érkezési időket
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Számla: {0} csak Készlet tranzakciókkal frissíthető
DocType: Student Group Creation Tool,Get Courses,Tanfolyamok lekérése
@@ -4580,7 +4585,7 @@
DocType: Material Request,% Ordered,% Rendezve
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Tanfolyam alapú Tanuló csoport, a Tanfolyamon érvényesítésre kerül minden hallgató aki beiratkozott a tanfolyamra a Program beiratkozáskor."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Darabszámra fizetett munka
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Átlagos vásárlási érték
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Átlagos vásárlási érték
DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
DocType: Employee,History In Company,Előzmények a cégnél
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Új üzenet {sender} -től
@@ -4628,7 +4633,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Sor {0}: Anyagjegyzés BOM pénzneme #{1} egyeznie kell a kiválasztott pénznemhez {2}
DocType: Journal Entry Account,Exchange Rate,Átváltási arány
DocType: Patient,Additional information regarding the patient,További információk a beteggel kapcsolatban
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Vevői rendelés {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Vevői rendelés {0} nem nyújtják be
DocType: Homepage,Tag Line,Jelmondat sor
DocType: Fee Component,Fee Component,Díj komponens
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Flotta kezelés
@@ -4840,7 +4845,7 @@
DocType: Employee Education,Employee Education,Alkalmazott képzése
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Ismétlődő elem csoport található a csoport táblázatában
DocType: Land Unit,Parent Land Unit,Fő föld terület
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
DocType: Fertilizer,Fertilizer Name,Műtrágya neve
DocType: Salary Slip,Net Pay,Nettó fizetés
DocType: Account,Account,Számla
@@ -4919,7 +4924,7 @@
DocType: Item Customer Detail,Ref Code,Hiv. kód
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Az ügyfélcsoport szükséges a POS profilban
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Alkalmazotti nyilvántartó adatok.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Kérjük, állítsa be a Következő Értékcsökkenés dátumát"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Kérjük, állítsa be a Következő Értékcsökkenés dátumát"
DocType: HR Settings,Payroll Settings,Bérszámfejtés Beállítások
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Egyeztesse az összeköttetésben nem álló számlákat és a kifizetéseket.
DocType: POS Settings,POS Settings,POS beállításai
@@ -5086,7 +5091,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Születésnapi emlékeztető {0}
DocType: Asset Maintenance Task,Last Completion Date,Utolsó befejezés dátuma
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Utolsó rendeléstől eltel napok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
DocType: Buying Settings,Naming Series,Sorszámozási csoportok
DocType: Leave Block List,Leave Block List Name,Távollét blokk lista neve
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Biztosítás kezdeti dátumának kisebbnek kell lennie, mint a biztosítás befejezés dátuma"
@@ -5212,6 +5217,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Fizetési bejegyzések lekérése
DocType: Quotation Item,Against Docname,Ellen Doknév
DocType: SMS Center,All Employee (Active),Összes alkalmazott (Aktív)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Ügyfél> Ügyfélcsoport> Terület
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Megtekintés most
DocType: BOM,Raw Material Cost,Nyersanyagköltsége
DocType: Item Reorder,Re-Order Level,Újra-rendelési szint
@@ -5310,7 +5316,6 @@
DocType: Room,Seating Capacity,Ülőhely kapacitás
DocType: Issue,ISS-,PROBL-
DocType: Lab Test Groups,Lab Test Groups,Labor Teszt csoportok
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Ügyfél> Ügyfélcsoport> Terület
DocType: Project,Total Expense Claim (via Expense Claims),Teljes Költség Követelés (költségtérítési igényekkel)
DocType: GST Settings,GST Summary,GST Összefoglaló
DocType: Assessment Result,Total Score,Összesített pontszám
@@ -5323,7 +5328,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,A következő kurzus ütemezések készültek el
DocType: Journal Entry,Total Debit,Tartozás összesen
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Alapértelmezett készáru raktár
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Értékesítő
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Értékesítő
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Költségvetés és költséghely
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Több alapértelmezett fizetési mód nem engedélyezett
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,a
@@ -5496,7 +5501,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Fontolja meg az adókat és díjakat erre
DocType: Driver,Driving License Category,Vezetői engedély kategóriája
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tényleges Mennyiség ami kötelező
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","A(z) {0} jelenleg {1} Szállítói mutatószámmal rendelkezik, ezért a vevői rendeléseket ennek a szállítónak óvatosan kell kiadni."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","A(z) {0} jelenleg {1} Szállítói mutatószámmal rendelkezik, ezért a vevői rendeléseket ennek a szállítónak óvatosan kell kiadni."
DocType: Asset Maintenance Team,Asset Maintenance Team,Eszközkarbantartó csoport
DocType: Employee Loan,Loan Type,Hitel típus
DocType: Scheduling Tool,Scheduling Tool,Ütemező eszköz
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index cdf3fad..d330c41 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Urutkan berdasarkan harga
,Delay Days,Tunda hari
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Beban layanan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktur
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Buat Entri Stok Retensi
DocType: Purchase Invoice Item,Item Weight Details,Rincian Berat Item
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referensi: {0}, Kode Item: {1} dan Pelanggan: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Lowongan untuk Pekerjaan.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM belum ditentukan untuk subkontrak barang {0} pada baris {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM belum ditentukan untuk subkontrak barang {0} pada baris {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Hasil terkirim
DocType: Item Attribute,Increment,Kenaikan
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Rentang waktu
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Tidak diizinkan untuk {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Mendapatkan Stok Barang-Stok Barang dari
DocType: Price List,Price Not UOM Dependant,Harga UOM Tidak Tergantung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Persediaan tidak dapat diperbarui terhadap Nota Pengiriman {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Persediaan tidak dapat diperbarui terhadap Nota Pengiriman {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Tidak ada item yang terdaftar
DocType: Asset Repair,Error Description,Deskripsi kesalahan
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Toko Kelontongan
DocType: Quality Inspection Reading,Reading 1,Membaca 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Dana pensiun
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Berikutnya Penyusutan Tanggal tidak boleh sebelum Tanggal Pembelian
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Berikutnya Penyusutan Tanggal tidak boleh sebelum Tanggal Pembelian
DocType: Crop,Perennial,Abadi
DocType: Consultation,Consultation Date,Tanggal Konsultasi
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Daftar produk dan penemuan untuk pengguna ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",misalnya "Sekolah Dasar" atau "Universitas"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Laporan Persediaan
DocType: Warehouse,Warehouse Detail,Detail Gudang
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah terlampaui untuk Pelanggan {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah terlampaui untuk Pelanggan {0} {1}/{2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Jangka Tanggal Akhir tidak bisa lebih lambat dari Akhir Tahun Tanggal Tahun Akademik yang istilah terkait (Tahun Akademik {}). Perbaiki tanggal dan coba lagi.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Aset Tetap"" tidak dapat tidak dicentang, karena ada data Asset terhadap barang"
DocType: Delivery Trip,Departure Time,Waktu keberangkatan
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Detail
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Template dari klasemen pemasok.
DocType: Lead,Interested,Tertarik
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Pembukaan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Pembukaan
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Dari {0} ke {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Gagal menyetorkan pajak
DocType: Item,Copy From Item Group,Salin Dari Grup Stok Barang
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,cuti per Tahun
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
DocType: Email Digest,Profit & Loss,Rugi laba
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Liter
DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Jumlah (via Waktu Lembar)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Hal ini didasarkan pada transaksi terhadap Perusahaan ini. Lihat garis waktu di bawah untuk rinciannya
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Beritahu melalui Surel pada pembuatan Permintaan Material otomatis
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Tahan
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Konsultasi
DocType: Journal Entry,Multi Currency,Multi Mata Uang
DocType: Opening Invoice Creation Tool,Invoice Type,Tipe Faktur
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Nota Pengiriman
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Janda
DocType: Request for Quotation,Request for Quotation,Permintaan Quotation
DocType: Healthcare Settings,Require Lab Test Approval,Memerlukan Lab Test Approval
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Item Code> Item Group> Brand
DocType: Salary Slip Timesheet,Working Hours,Jam Kerja
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total Posisi
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mengubah mulai / nomor urut saat ini dari seri yang ada.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Harap Masukan Jenis Biaya Pusat
DocType: Drug Prescription,Dosage,Dosis
DocType: Journal Entry Account,Sales Order,Order Penjualan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Harga Jual Rata-rata
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Harga Jual Rata-rata
DocType: Assessment Plan,Examiner Name,Nama pemeriksa
DocType: Lab Test Template,No Result,Tidak ada hasil
DocType: Purchase Invoice Item,Quantity and Rate,Kuantitas dan Harga
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Pilih Payroll Periode
DocType: Purchase Invoice,Unpaid,Tunggakan
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Dicadangkan untuk dijual
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Silakan setup Employee Naming System di Human Resource> HR Settings
DocType: Packing Slip,From Package No.,Dari Package No
DocType: Item Attribute,To Range,Berkisar
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Efek Saham dan Deposit
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Bengkel
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Peringatkan untuk Pesanan Pembelian
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan anda. Bisa organisasi atau individu.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Bagian yang cukup untuk Membangun
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Bagian yang cukup untuk Membangun
DocType: POS Profile User,POS Profile User,Profil Pengguna POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Pendapatan Langsung
DocType: Patient Appointment,Date TIme,Tanggal Waktu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Petugas Administrasi
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Menyiapkan perusahaan dan pajak
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Silakan pilih Kursus
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Perbedaan Akun
DocType: Purchase Invoice,Supplier GSTIN,Pemasok GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Tidak bisa tugas sedekat tugas yang tergantung {0} tidak tertutup.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
DocType: Production Order,Additional Operating Cost,Biaya Operasi Tambahan
DocType: Lab Test Template,Lab Routine,Lab Rutin
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetik
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Hubungan dengan Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manajer
DocType: Payment Entry,Payment From / To,Pembayaran Dari / Untuk
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},batas kredit baru kurang dari jumlah yang luar biasa saat ini bagi pelanggan. batas kredit harus minimal {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},batas kredit baru kurang dari jumlah yang luar biasa saat ini bagi pelanggan. batas kredit harus minimal {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Harap setel akun di Gudang {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan' dan 'Kelompokkan Menurut' tidak boleh sama
DocType: Sales Person,Sales Person Targets,Target Sales Person
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Nama Kumpulan
DocType: Fee Validity,Max number of visit,Jumlah kunjungan maksimal
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Absen dibuat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Mendaftar
DocType: GST Settings,GST Settings,Pengaturan GST
DocType: Selling Settings,Customer Naming By,Penamaan Pelanggan Dengan
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,anggaran Terhadap
DocType: Employee,Cell Number,Nomor HP
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Tidak ada karyawan untuk kriteria yang diberikan. Periksa bahwa Slip Gaji belum pernah dibuat.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Pembuatan Form Permintaan Material Otomatis
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Pembuatan Form Permintaan Material Otomatis
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kalah
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Terhadap Entri Jurnal'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Dicadangkan untuk manufaktur
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energi
DocType: Opportunity,Opportunity From,Peluang Dari
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Laporan gaji bulanan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nomor seri diperlukan untuk Item {2}. Anda telah memberikan {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nomor seri diperlukan untuk Item {2}. Anda telah memberikan {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Silahkan pilih sebuah tabel
DocType: BOM,Website Specifications,Website Spesifikasi
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} adalah alamat email yang tidak valid di 'Penerima'
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Permintaan Kutipan
DocType: Vital Signs,Heart Rate / Pulse,Heart Rate / Pulse
DocType: Company,Default Bank Account,Standar Rekening Bank
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik terlebih dahulu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik terlebih dahulu"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Pembaruan Persediaan’ tidak dapat dipilih karena barang tidak dikirim melalui {0}
DocType: Vehicle,Acquisition Date,Tanggal akuisisi
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Upload kepala surat Anda (Jaga agar web semudah 900px dengan 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akun {2} tidak boleh Kelompok
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {idx}: {doctype} {DOCNAME} tidak ada di atas '{doctype}' table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Tidak ada tugas
DocType: Item Variant Settings,Copy Fields to Variant,Copy Fields ke Variant
DocType: Asset,Opening Accumulated Depreciation,Membuka Penyusutan Akumulasi
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,Planning Material untuk Barang Rakitan
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Mitra Penjualan dan Wilayah
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} harus aktif
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Penutupan (Pembukaan + Total)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Penutupan (Pembukaan + Total)
DocType: Journal Entry,Depreciation Entry,penyusutan Masuk
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Silakan pilih jenis dokumen terlebih dahulu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Cetak dalam Mata Uang Akun
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Kunjungan Material {0} sebelum membatalkan ini Maintenance Visit
DocType: Crop Cycle,ISO 8016 standard,Standar ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial ada {0} bukan milik Stok Barang {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,Standar Akun Hutang
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
DocType: Fee Structure,Components,komponen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Varian Barang {0} diperbarui
DocType: Quality Inspection Reading,Reading 6,Membaca 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,Nama Perusahaan
DocType: SMS Center,Total Message(s),Total Pesan (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Harap tentukan Seri Penamaan untuk {0} melalui Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Persentase Diskon Tambahan
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat daftar semua bantuan video
DocType: Agriculture Analysis Criteria,Soil Texture,Tekstur Tanah
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Situs Persediaan
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Unggah kop surat dan logo. (Anda dapat mengubahnya nanti).
DocType: Timesheet Detail,Bill,Tagihan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Berikutnya Penyusutan Tanggal dimasukkan sebagai tanggal terakhir
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Berikutnya Penyusutan Tanggal dimasukkan sebagai tanggal terakhir
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Putih
DocType: SMS Center,All Lead (Open),Semua Prospek (Terbuka)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty tidak tersedia untuk {4} di gudang {1} pada postingan kali entri ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,Tanggal Komunikasi Selanjutnya
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty Pembukaan
DocType: Healthcare Settings,Appointment Reminder,Pengingat Penunjukan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
DocType: Program Enrollment Tool Student,Student Batch Name,Mahasiswa Nama Batch
DocType: Consultation,Doctor,Dokter
DocType: Holiday List,Holiday List Name,Daftar Nama Hari Libur
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Alat Alokasi Cuti
DocType: Item,Hub Category to Publish,Kategori Hub untuk Publikasikan
DocType: Leave Block List,Leave Block List Dates,Tanggal Blok List Cuti
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Silakan setup seri penomoran untuk Kehadiran melalui Setup> Numbering Series
DocType: Sales Invoice,Billing Address GSTIN,Alamat Penagihan GSTIN
DocType: Assessment Plan,Evaluate,Evaluasi
DocType: Workstation,Net Hour Rate,Jumlah Jam Bersih
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,Prec-RET-
DocType: POS Profile,Sales Invoice Payment,Pembayaran Faktur Penjualan
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Gudang di Sales Order / Stok Barang Jadi Gudang
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Nilai Penjualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Nilai Penjualan
DocType: Repayment Schedule,Interest Amount,Jumlah bunga
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Penyetuju data ini. Harap Perbarui 'Status' dan Simpan
DocType: Serial No,Creation Document No,Nomor Dokumen
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Saldo Pembukaan Akuntansi
,GST Sales Register,Daftar Penjualan GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Uang Muka Faktur Penjualan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Tidak ada Permintaan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Tidak ada Permintaan
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Pilih Domain Anda
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},record Anggaran lain '{0}' sudah ada terhadap {1} '{2}' untuk tahun fiskal {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Fields akan disalin hanya pada saat penciptaan.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan ditambahkan ke Item Code dari varian. Sebagai contoh, jika Anda adalah singkatan ""SM"", dan kode Stok Barang adalah ""T-SHIRT"", kode item varian akan ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Bersih (dalam kata-kata) akan terlihat setelah Anda menyimpan Slip Gaji.
DocType: Purchase Invoice,Is Return,Retur Barang
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Peringatan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Peringatan
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Nota Retur / Debit
DocType: Price List Country,Price List Country,Negara Daftar Harga
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} nomor seri berlaku untuk Item {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} nomor seri berlaku untuk Item {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code tidak dapat diubah untuk Serial Number
DocType: Purchase Invoice Item,UOM Conversion Factor,Faktor Konversi UOM
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Masukkan Item Code untuk mendapatkan Nomor Batch
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
DocType: Supplier Scorecard,Warn for new Request for Quotations,Peringatkan untuk Permintaan Kuotasi baru
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu Anda merencanakan dan menindaklanjuti pembelian Anda
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Resep Uji Lab
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Total Issue / transfer kuantitas {0} Material Permintaan {1} \ tidak dapat lebih besar dari yang diminta kuantitas {2} untuk Item {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Info Kontak Gudang
DocType: Payment Entry,Write Off Difference Amount,Menulis Off Perbedaan Jumlah
DocType: Volunteer,Volunteer Name,Nama Relawan
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Silakan setup Sistem Penamaan Instruktur di Pendidikan> Pengaturan Pendidikan
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: email Karyawan tidak ditemukan, maka email tidak dikirim"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Aturan pengiriman tidak berlaku untuk negara {0}
DocType: Item,Foreign Trade Details,Rincian Perdagangan Luar Negeri
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Nomor roll grup
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total semua bobot tugas harus 1. Sesuaikan bobot dari semua tugas Proyek sesuai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Perlengkapan Modal
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga terlebih dahulu dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Stok Barang, Stok Barang Grup atau Merek."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,gudang anak ada untuk gudang ini. Anda tidak dapat menghapus gudang ini.
DocType: Item,Website Item Groups,Situs Grup Stok Barang
DocType: Purchase Invoice,Total (Company Currency),Total (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serial number {0} masuk lebih dari sekali
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serial number {0} masuk lebih dari sekali
DocType: Journal Entry,Journal Entry,Jurnal Entri
DocType: Expense Claim Advance,Unclaimed amount,Jumlah yang tidak diklaim
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} item berlangsung
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Permintaan Quotation dinonaktifkan untuk akses dari portal, untuk pengaturan Portal cek lagi."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabel Scorecard Supplier Variabel
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Jumlah Pembelian
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Jumlah Pembelian
DocType: Sales Invoice,Shipping Address Name,Alamat Pengiriman
DocType: Material Request,Terms and Conditions Content,Syarat dan Ketentuan Konten
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Ada kesalahan dalam membuat Jadwal Kursus
@@ -1975,7 +1978,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Hal ini didasarkan pada log terhadap kendaraan ini. Lihat timeline di bawah untuk rincian
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Terhadap Faktur Supplier {0} di tanggal {1}
DocType: Customer,Default Price List,Standar List Harga
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak dapat menghapus Tahun Anggaran {0}. Tahun Fiskal {0} diatur sebagai default di Pengaturan Global
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Pelanggan dengan nama yang sama sudah ada
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ini akan mengirimkan Slip Gaji dan membuat Entri Jurnal akrual. Apakah kamu ingin melanjutkan?
@@ -1989,6 +1992,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,harga
DocType: Quotation,Term Details,Rincian Term
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,tidak bisa mendaftar lebih dari {0} siswa untuk kelompok siswa ini.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (Tanpa Pajak)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Jumlah Prospek
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} harus lebih besar dari 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stok Tersedia
@@ -2007,7 +2011,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Membatalkan tautan Pembayaran pada Pembatalan Faktur
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Odometer membaca saat masuk harus lebih besar dari awal Kendaraan Odometer {0}
DocType: Restaurant Reservation,No Show,Tidak menunjukkan
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Harap tentukan Seri Penamaan untuk {0} melalui Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Aturan Pengiriman – Negara
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Tinggalkan dan Kehadiran
DocType: Maintenance Visit,Partially Completed,Selesai Sebagian
@@ -2098,7 +2101,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instruktur Kelompok Mahasiswa
DocType: Grant Application,Assessment Mark (Out of 10),Tanda Penilaian (Dari 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Ponsel Tidak
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Utama
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varian
DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
DocType: Employee Attendance Tool,Employees HTML,Karyawan HTML
@@ -2146,7 +2149,7 @@
DocType: Course,Course Abbreviation,Singkatan saja
DocType: Student Leave Application,Student Leave Application,Mahasiswa Cuti Aplikasi
DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Karyawan {0} tentang Half hari {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak boleh lebih besar dari max jam kerja {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Nyala
@@ -2331,9 +2334,10 @@
DocType: Task,Actual End Date (via Time Sheet),Tanggal Akhir Aktual (dari Lembar Waktu)
DocType: Soil Texture,Soil Type,Jenis tanah
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Jumlah {0} {1} terhadap {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Pesan baru
,Quotation Trends,Trend Penawaran
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master Stok Barang untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
DocType: Shipping Rule,Shipping Amount,Jumlah Pengiriman
DocType: Supplier Scorecard Period,Period Score,Skor Periode
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Tambahkan Pelanggan
@@ -2344,7 +2348,7 @@
,Vehicle Expenses,Beban kendaraan
DocType: Serial No,Invoice Details,Detail faktur
DocType: Grant Application,Show on Website,Tampilkan di Website
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Mulai dari
DocType: Hub Category,Hub Category,Kategori Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2375,7 +2379,7 @@
DocType: Patient,B Positive,B Positif
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty harus 1, sebagai item aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
DocType: Leave Block List Allow,Leave Block List Allow,Cuti Block List Izinkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
DocType: Patient Medical Record,Patient Medical Record,Catatan Medis Pasien
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Kelompok Non-kelompok
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Olahraga
@@ -2425,6 +2429,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Tidak dapat mengatur RFQ yang diterima ke No Quote
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Jumlah Deduksi
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Pilih akun yang akan dicetak dalam mata uang akun
,Production Analytics,Analytics produksi
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Hal ini didasarkan pada transaksi melawan Pasien ini. Lihat garis waktu di bawah untuk rinciannya
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Biaya Diperbarui
@@ -2479,7 +2484,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pilih Perusahaan ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Biarkan kosong jika dianggap untuk semua departemen
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
DocType: Payroll Entry,Fortnightly,sekali dua minggu
DocType: Currency Exchange,From Currency,Dari mata uang
DocType: Vital Signs,Weight (In Kilogram),Berat (dalam Kilogram)
@@ -2555,7 +2560,7 @@
DocType: Student,Guardians,Penjaga
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan ditampilkan jika Harga Daftar tidak diatur
DocType: Stock Entry,Total Incoming Value,Total nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debit Untuk diperlukan
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu melacak waktu, biaya dan penagihan untuk kegiatan yang dilakukan oleh tim Anda"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Daftar Harga
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Template dari variabel scorecard pemasok.
@@ -2656,7 +2661,7 @@
DocType: Company,For Reference Only.,Untuk referensi saja.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Dokter {0} tidak tersedia di {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Pilih Batch No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Valid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Valid {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Referensi Inv
@@ -2693,8 +2698,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tentukan operasi, biaya operasi dan memberikan Operation unik ada pada operasi Anda."
DocType: Water Analysis,Origin,Asal
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini adalah lebih dari batas oleh {0} {1} untuk item {4}. Apakah Anda membuat yang lain {3} terhadap yang sama {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Pilih akun berubah jumlah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Pilih akun berubah jumlah
DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
DocType: Naming Series,User must always select,Pengguna harus selalu pilih
DocType: Stock Settings,Allow Negative Stock,Izinkan persediaan negatif
@@ -2750,7 +2755,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Peringatkan untuk Pesanan Pembelian baru
DocType: Quality Inspection Reading,Reading 9,Membaca 9
DocType: Supplier,Is Frozen,Dibekukan
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,gudang kelompok simpul tidak diperbolehkan untuk memilih untuk transaksi
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,gudang kelompok simpul tidak diperbolehkan untuk memilih untuk transaksi
DocType: Buying Settings,Buying Settings,Setting Pembelian
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,No. BOM untuk Barang Jadi
DocType: Upload Attendance,Attendance To Date,Kehadiran Sampai Tanggal
@@ -2764,6 +2769,7 @@
DocType: Grant Application,Organization,Organisasi
DocType: BOM Update Tool,BOM Update Tool,Alat Pembaruan BOM
DocType: SG Creation Tool Course,Student Group Name,Nama Kelompok Mahasiswa
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Tampilkan tampilan yang meledak
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Menciptakan Biaya
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Pastikan Anda benar-benar ingin menghapus semua transaksi untuk perusahaan ini. Data master Anda akan tetap seperti itu. Tindakan ini tidak bisa dibatalkan.
DocType: Room,Room Number,Nomor kamar
@@ -2774,7 +2780,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Buat Template Pajak
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Tidak bisa memperbarui persediaan, faktur berisi barang titipan."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Tidak bisa memperbarui persediaan, faktur berisi barang titipan."
DocType: Lab Test Sample,Lab Test Sample,Sampel Uji Lab
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Jurnal Entry Cepat
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
@@ -2845,7 +2851,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Membuat Invoice
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Peluang dekat setelah 15 hari
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pesanan Pembelian tidak diizinkan untuk {0} karena kartu skor berdiri {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pesanan Pembelian tidak diizinkan untuk {0} karena kartu skor berdiri {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,akhir Tahun
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Penawaran/Prospek %
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
@@ -2957,7 +2963,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ke atas
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entri {1} tidak memiliki akun {2} atau sudah cocok dengan voucher lain
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteria Berat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Supplier> Supplier Type
DocType: Buying Settings,Default Buying Price List,Standar Membeli Daftar Harga
DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip Gaji Berdasarkan Daftar Absen
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tingkat pembelian
@@ -3045,7 +3050,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Lacak Prospek menurut Jenis Industri.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Pergi ke kop surat
DocType: Item Supplier,Item Supplier,Item Supplier
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat
DocType: Company,Stock Settings,Pengaturan Persediaan
@@ -3222,6 +3227,7 @@
DocType: Company,Default Inventory Account,Akun Inventaris Default
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Selesai Qty harus lebih besar dari nol.
DocType: Antibiotic,Antibiotic Name,Nama Antibiotik
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Item Code> Item Group> Brand
DocType: Purchase Invoice,Apply Additional Discount On,Terapkan tambahan Diskon Pada
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Pilih Jenis ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Tautan ke semua Unit Tanah tempat Tanaman tumbuh
@@ -3415,6 +3421,7 @@
DocType: Supplier,Credit Limit,Batas Kredit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Rata-rata Tarif Daftar Harga Jual
DocType: Production Plan Sales Order,Salse Order Date,Salse Urutan Tanggal
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Supplier> Supplier Type
DocType: Salary Component,Salary Component,Komponen gaji
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Entries pembayaran {0} adalah un-linked
DocType: GL Entry,Voucher No,Voucher Tidak ada
@@ -3423,7 +3430,7 @@
DocType: Leave Allocation,Leave Allocation,Alokasi Cuti
DocType: Payment Request,Recipient Message And Payment Details,Penerima Pesan Dan Rincian Pembayaran
DocType: Training Event,Trainer Email,Email Pelatih
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Permintaan Material {0} dibuat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Permintaan Material {0} dibuat
DocType: Restaurant Reservation,No of People,Tidak ada orang
DocType: Production Planning Tool,Include sub-contracted raw materials,Termasuk bahan baku sub-kontrak
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template istilah atau kontrak.
@@ -3487,7 +3494,7 @@
DocType: Production Planning Tool,Create Material Requests,Buat Order Permintaan Material
DocType: Employee Education,School/University,Sekolah / Universitas
DocType: Payment Request,Reference Details,Detail referensi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai diharapkan Setelah Hidup Berguna harus kurang dari Gross Jumlah Pembelian
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai diharapkan Setelah Hidup Berguna harus kurang dari Gross Jumlah Pembelian
DocType: Sales Invoice Item,Available Qty at Warehouse,Jumlah Tersedia di Gudang
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Nilai Tagihan
DocType: Asset,Double Declining Balance,Ganda Saldo Menurun
@@ -3499,7 +3506,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Perbaruan
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akun {2} bukan milik Perusahaan {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Pilih setidaknya satu nilai dari masing-masing atribut.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Manajemen Cuti
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Group by Akun
DocType: Sales Order,Fully Delivered,Sepenuhnya Terkirim
@@ -3510,14 +3517,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Dicairkan Jumlah tidak dapat lebih besar dari Jumlah Pinjaman {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Buka Program
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Baris {0} # Jumlah alokasi {1} tidak boleh lebih besar dari jumlah yang tidak diklaim {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Silakan setup seri penomoran untuk Kehadiran melalui Setup> Numbering Series
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Pesanan produksi tidak diciptakan
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},tidak dapat mengubah status sebagai mahasiswa {0} terkait dengan aplikasi mahasiswa {1}
DocType: Asset,Fully Depreciated,sepenuhnya disusutkan
,Stock Projected Qty,Proyeksi Jumlah Persediaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Pelanggan {0} tidak termasuk proyek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Pelanggan {0} tidak termasuk proyek {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ditandai HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Penawaran adalah proposal, tawaran yang anda kirim kepada pelanggan"
DocType: Sales Order,Customer's Purchase Order,Order Pembelian Pelanggan
@@ -3601,7 +3607,7 @@
DocType: Stock Settings,Item Naming By,Item Penamaan Dengan
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Lain Periode Pendaftaran penutupan {0} telah dibuat setelah {1}
DocType: Production Order,Material Transferred for Manufacturing,Bahan Ditransfer untuk Manufaktur
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Akun {0} tidak ada
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Akun {0} tidak ada
DocType: Project,Project Type,Jenis proyek
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Tugas Anak ada untuk Tugas ini. Anda tidak dapat menghapus tugas ini.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Entah Target qty atau jumlah target adalah wajib.
@@ -3703,11 +3709,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Pusat Penyusutan Biaya
DocType: Sales Order Item,Sales Order Date,Tanggal Nota Penjualan
DocType: Sales Invoice Item,Delivered Qty,Qty Terkirim
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Total Excl. Pajak
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jika dicentang, semua anak-anak dari setiap item produksi akan dimasukkan dalam Permintaan Material."
DocType: Assessment Plan,Assessment Plan,Rencana penilaian
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Pelanggan {0} dibuat
DocType: Stock Settings,Limit Percent,batas Persen
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Silakan setup Sistem Penamaan Instruktur di Pendidikan> Pengaturan Pendidikan
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Saat ini tidak ada persediaan di gudang manapun
,Payment Period Based On Invoice Date,Masa Pembayaran Berdasarkan Faktur Tanggal
DocType: Sample Collection,No. of print,Jumlah cetak
@@ -3723,12 +3729,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Debitur ({0})
DocType: Pricing Rule,Margin,Margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Pelanggan baru
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Laba Kotor%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Laba Kotor%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Ubah Profil POS
DocType: Bank Reconciliation Detail,Clearance Date,Izin Tanggal
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Laporan Penilaian
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Jumlah Pembelian kotor adalah wajib
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Jumlah Pembelian kotor adalah wajib
DocType: Lead,Address Desc,Deskripsi Alamat
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Partai adalah wajib
DocType: Journal Entry,JV-,JV-
@@ -3760,7 +3766,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Nama berdiri
DocType: Stock Entry,Customer or Supplier Details,Rincian Pelanggan atau Pemasok
DocType: Employee Loan Application,Required by Date,Dibutuhkan oleh Tanggal
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Saldo Penutupan (Dr - Cr)
DocType: Lead,Lead Owner,Pemilik Prospek
DocType: Bin,Requested Quantity,diminta Kuantitas
DocType: Patient,Marital Status,Status Perkawinan
@@ -3774,7 +3779,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Beberapa varian
DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Terkirim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order {2} (didefinisikan dalam Butir).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Silahkan login sebagai pengguna lain.
DocType: Territory,Territory Targets,Target Wilayah
@@ -3873,7 +3878,7 @@
DocType: Serial No,Out of AMC,Dari AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Membuat Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
DocType: Company,Default Cash Account,Standar Rekening Kas
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Perusahaan (bukan Pelanggan atau Pemasok) Utama.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Hal ini didasarkan pada kehadiran mahasiswa ini
@@ -4023,7 +4028,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Tidak ada karyawan untuk kriteria tersebut
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
DocType: Restaurant,Default Customer,Pelanggan default
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Silakan setup Employee Naming System di Human Resource> HR Settings
DocType: Assessment Plan,Supervisor Name,Nama pengawas
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Jangan mengkonfirmasi jika janji dibuat untuk hari yang sama
DocType: Program Enrollment Course,Program Enrollment Course,Kursus Pendaftaran Program
@@ -4141,7 +4145,7 @@
DocType: BOM,Website Description,Website Description
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Perubahan Bersih Ekuitas
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Terbaru
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat Email harus unik, sudah ada untuk {0}"
DocType: Serial No,AMC Expiry Date,Tanggal Kadaluarsa AMC
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Penerimaan
@@ -4158,7 +4162,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Laporan arus kas
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak dapat melebihi Jumlah pinjaman maksimum {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisensi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Silakan pilih Carry Teruskan jika Anda juga ingin menyertakan keseimbangan fiskal tahun sebelumnya cuti tahun fiskal ini
DocType: GL Entry,Against Voucher Type,Terhadap Tipe Voucher
DocType: Physician,Phone (R),Telepon (R)
@@ -4170,7 +4174,7 @@
DocType: Patient,B Negative,B Negatif
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Status Pemeliharaan harus Dibatalkan atau Selesai untuk Dikirim
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akun {0} bukan milik perusahaan {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Nomor Seri di baris {0} tidak cocok dengan Catatan Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Nomor Seri di baris {0} tidak cocok dengan Catatan Pengiriman
DocType: Student,Guardian Details,Detail wali
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Kehadiran untuk beberapa karyawan
@@ -4212,7 +4216,7 @@
DocType: Stock Entry Detail,Basic Amount,Nilai Dasar
DocType: Training Event,Exam,Ujian
DocType: Complaint,Complaint,Keluhan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Gudang diperlukan untuk Barang Persediaan{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Gudang diperlukan untuk Barang Persediaan{0}
DocType: Leave Allocation,Unused leaves,cuti terpakai
DocType: Patient,Alcohol Past Use,Penggunaan Alkohol yang Telah Lalu
DocType: Fertilizer Content,Fertilizer Content,Isi pupuk
@@ -4336,6 +4340,7 @@
DocType: Salary Detail,Formula,Rumus
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Akun penjualan
DocType: Purchase Invoice Item,Total Weight,Berat keseluruhan
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisi Penjualan
DocType: Offer Letter Term,Value / Description,Nilai / Keterangan
@@ -4492,7 +4497,7 @@
DocType: Customer,From Lead,Dari Prospek
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order dirilis untuk produksi.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
DocType: Program Enrollment Tool,Enroll Students,Daftarkan Siswa
DocType: Lab Test,Approved Date,Tanggal yang Disetujui
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Jual
@@ -4568,7 +4573,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produksi Stok Barang
,Employee Information,Informasi Karyawan
DocType: Stock Entry Detail,Additional Cost,Biaya tambahan
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Membuat Pemasok Quotation
DocType: Quality Inspection,Incoming,Incoming
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Template pajak default untuk penjualan dan pembelian telah dibuat.
@@ -4585,7 +4590,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Catatan: {0}
,Delivery Note Trends,Tren pengiriman Note
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ringkasan minggu ini
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Jumlah tersedia
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Jumlah tersedia
DocType: Delivery Trip,Calculate Estimated Arrival Times,Hitung Perkiraan Waktu Kedatangan
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Akun: {0} hanya dapat diperbarui melalui Transaksi Persediaan
DocType: Student Group Creation Tool,Get Courses,Dapatkan Program
@@ -4601,7 +4606,7 @@
DocType: Material Request,% Ordered,% Tersusun
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Untuk Kelompok Siswa Berbasis Kursus, Kursus akan divalidasi untuk setiap Siswa dari Program Pendaftaran Pendaftaran Program yang terdaftar."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Harga Beli Rata-rata
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Harga Beli Rata-rata
DocType: Task,Actual Time (in Hours),Waktu Aktual (dalam Jam)
DocType: Employee,History In Company,Sejarah Dalam Perusahaan
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Pesan baru dari {sender}
@@ -4649,7 +4654,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Mata dari BOM # {1} harus sama dengan mata uang yang dipilih {2}
DocType: Journal Entry Account,Exchange Rate,Nilai Tukar
DocType: Patient,Additional information regarding the patient,Informasi tambahan mengenai pasien
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
DocType: Homepage,Tag Line,klimaks
DocType: Fee Component,Fee Component,biaya Komponen
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Manajemen armada
@@ -4861,7 +4866,7 @@
DocType: Employee Education,Employee Education,Pendidikan Karyawan
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Kelompok barang duplikat yang ditemukan dalam tabel grup item
DocType: Land Unit,Parent Land Unit,Unit Induk Tanah
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
DocType: Fertilizer,Fertilizer Name,Nama pupuk
DocType: Salary Slip,Net Pay,Nilai Bersih Terbayar
DocType: Account,Account,Akun
@@ -4940,7 +4945,7 @@
DocType: Item Customer Detail,Ref Code,Ref Kode
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Grup Pelanggan Diperlukan di Profil POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Catatan karyawan.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Silahkan mengatur Berikutnya Penyusutan Tanggal
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Silahkan mengatur Berikutnya Penyusutan Tanggal
DocType: HR Settings,Payroll Settings,Pengaturan Payroll
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Cocokkan Faktur non-linked dan Pembayaran.
DocType: POS Settings,POS Settings,Pengaturan POS
@@ -5107,7 +5112,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Birthday Reminder untuk {0}
DocType: Asset Maintenance Task,Last Completion Date,Tanggal penyelesaian terakhir
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jumlah Hari Semenjak Order Terakhir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
DocType: Buying Settings,Naming Series,Series Penamaan
DocType: Leave Block List,Leave Block List Name,Cuti Nama Block List
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tanggal asuransi mulai harus kurang dari tanggal asuransi End
@@ -5234,6 +5239,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Dapatkan Entries Pembayaran
DocType: Quotation Item,Against Docname,Terhadap Docname
DocType: SMS Center,All Employee (Active),Semua Karyawan (Aktif)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Pelanggan> Grup Pelanggan> Wilayah
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
DocType: BOM,Raw Material Cost,Biaya Bahan Baku
DocType: Item Reorder,Re-Order Level,Tingkat Re-order
@@ -5332,7 +5338,6 @@
DocType: Room,Seating Capacity,Kapasitas tempat duduk
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Kelompok Uji Lab
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Pelanggan> Grup Pelanggan> Wilayah
DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Klaim Beban (via Klaim Beban)
DocType: GST Settings,GST Summary,Ringkasan GST
DocType: Assessment Result,Total Score,Skor total
@@ -5345,7 +5350,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Jadwal kursus berikut telah dibuat
DocType: Journal Entry,Total Debit,Jumlah Debit
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Gudang bawaan Selesai Stok Barang
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Anggaran dan Pusat Biaya
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Beberapa modus pembayaran default tidak diperbolehkan
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,Untuk
@@ -5518,7 +5523,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Pajak atau Biaya untuk
DocType: Driver,Driving License Category,Kategori Lisensi Mengemudi
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qty Aktual wajib diisi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} saat ini memiliki posisi Scorecard Pemasok {1}, Pesanan Pembelian untuk pemasok ini harus dikeluarkan dengan hati-hati."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} saat ini memiliki posisi Scorecard Pemasok {1}, Pesanan Pembelian untuk pemasok ini harus dikeluarkan dengan hati-hati."
DocType: Asset Maintenance Team,Asset Maintenance Team,Tim Pemeliharaan Aset
DocType: Employee Loan,Loan Type,Jenis pinjaman
DocType: Scheduling Tool,Scheduling Tool,Alat penjadwalan
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index 5192042..c9ce6f4 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Raða eftir Verð
,Delay Days,Frestur daga
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,þjónusta Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,reikningur
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Gerðu varðveisluvörslu
DocType: Purchase Invoice Item,Item Weight Details,Vara þyngd upplýsingar
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tilvísun: {0}, Liður: {1} og Viðskiptavinur: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Opnun fyrir Job.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM er ekki tilgreint fyrir undirverktaka atriði {0} í röð {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM er ekki tilgreint fyrir undirverktaka atriði {0} í röð {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Niðurstöður sendar inn
DocType: Item Attribute,Increment,vöxtur
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tímabil
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ekki leyft {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Fá atriði úr
DocType: Price List,Price Not UOM Dependant,Verð ekki UOM háð
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Vara {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Engin atriði skráð
DocType: Asset Repair,Error Description,Villa lýsing
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,matvöruverslun
DocType: Quality Inspection Reading,Reading 1,lestur 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,lífeyrissjóðir
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Næsta Afskriftir Dagsetning má ekki vera áður kaupdegi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Næsta Afskriftir Dagsetning má ekki vera áður kaupdegi
DocType: Crop,Perennial,Ævarandi
DocType: Consultation,Consultation Date,Samráðsdagur
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Vörulisti og uppgötvun fyrir ERPNext notendur
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",td "Primary School" eða "University"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,lager Skýrslur
DocType: Warehouse,Warehouse Detail,Warehouse Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Hámarksupphæð hefur verið yfir fyrir viðskiptavin {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Hámarksupphæð hefur verið yfir fyrir viðskiptavin {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Hugtakið Lokadagur getur ekki verið síðar en árslok Dagsetning skólaárið sem hugtakið er tengt (skólaárið {}). Vinsamlega leiðréttu dagsetningar og reyndu aftur.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Er Fast Asset" getur ekki verið valið, eins Asset met hendi á móti hlut"
DocType: Delivery Trip,Departure Time,Brottfaratími
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Fá upplýsingar eru
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Sniðmát af birgðastöðu.
DocType: Lead,Interested,áhuga
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,opnun
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,opnun
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Frá {0} til {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Mistókst að setja upp skatta
DocType: Item,Copy From Item Group,Afrita Frá Item Group
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Létta Dagsetning verður að vera hærri en Dagsetning Tengja
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Leaves á ári
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vinsamlegast athugaðu 'Er Advance' gegn reikninginn {1} ef þetta er fyrirfram færslu.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Warehouse {0} ekki tilheyra félaginu {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Warehouse {0} ekki tilheyra félaginu {1}
DocType: Email Digest,Profit & Loss,Hagnaður & Tap
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),Total kostnaðarútreikninga Magn (með Time Sheet)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Þetta byggist á viðskiptum gegn þessu fyrirtæki. Sjá tímalínu fyrir neðan til að fá nánari upplýsingar
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Tilkynna með tölvupósti á sköpun sjálfvirka Material Beiðni
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Þola
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Samráð
DocType: Journal Entry,Multi Currency,multi Gjaldmiðill
DocType: Opening Invoice Creation Tool,Invoice Type,Reikningar Type
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Afhendingarseðilinn
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Ekkja
DocType: Request for Quotation,Request for Quotation,Beiðni um tilvitnun
DocType: Healthcare Settings,Require Lab Test Approval,Krefjast samþykkis Lab Test
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Vörunúmer> Liðurhópur> Vörumerki
DocType: Salary Slip Timesheet,Working Hours,Vinnutími
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Samtals framúrskarandi
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Breyta upphafsdegi / núverandi raðnúmer núverandi röð.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vinsamlegast sláðu Kostnaður Center
DocType: Drug Prescription,Dosage,Skammtar
DocType: Journal Entry Account,Sales Order,Sölupöntun
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. sölugengi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. sölugengi
DocType: Assessment Plan,Examiner Name,prófdómari Name
DocType: Lab Test Template,No Result,engin Niðurstaða
DocType: Purchase Invoice Item,Quantity and Rate,Magn og Rate
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Veldu Launaskrá Tímabil
DocType: Purchase Invoice,Unpaid,ógreitt
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Frátekið til sölu
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði> HR-stillingar
DocType: Packing Slip,From Package No.,Frá pakkinn nr
DocType: Item Attribute,To Range,til Hóflegt
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verðbréfa
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Workshop
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varið innkaupapantanir
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Listi nokkrar af viðskiptavinum þínum. Þeir gætu verið stofnanir eða einstaklingar.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Nóg Varahlutir til að byggja
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nóg Varahlutir til að byggja
DocType: POS Profile User,POS Profile User,POS prófíl notandi
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,bein Tekjur
DocType: Patient Appointment,Date TIme,Dagsetning Tími
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Getur ekki síað byggð á reikning, ef flokkaðar eftir reikningi"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Getur ekki síað byggð á reikning, ef flokkaðar eftir reikningi"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrative Officer
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Uppsetning fyrirtækja og skatta
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vinsamlegast veldu Námskeið
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,munurinn Reikningur
DocType: Purchase Invoice,Supplier GSTIN,Birgir GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Get ekki loka verkefni eins háð verkefni hennar {0} er ekki lokað.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vinsamlegast sláðu Warehouse sem efni Beiðni verði hækkað
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Vinsamlegast sláðu Warehouse sem efni Beiðni verði hækkað
DocType: Production Order,Additional Operating Cost,Viðbótarupplýsingar rekstrarkostnaður
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,snyrtivörur
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Tengsl Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,framkvæmdastjóri
DocType: Payment Entry,Payment From / To,Greiðsla Frá / Til
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ný hámarksupphæð er minna en núverandi útistandandi upphæð fyrir viðskiptavininn. Hámarksupphæð þarf að vera atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ný hámarksupphæð er minna en núverandi útistandandi upphæð fyrir viðskiptavininn. Hámarksupphæð þarf að vera atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vinsamlegast settu inn reikning í vörugeymslu {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Byggt á' og 'hópað eftir' getur ekki verið það sama"
DocType: Sales Person,Sales Person Targets,Velta Person markmið
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,hópur Name
DocType: Fee Validity,Max number of visit,Hámarksfjöldi heimsókna
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet búið:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,innritast
DocType: GST Settings,GST Settings,GST Stillingar
DocType: Selling Settings,Customer Naming By,Viðskiptavinur Nafngift By
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Budget Against
DocType: Employee,Cell Number,Cell Number
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Það er engin starfsmaður fyrir tiltekin skilyrði. Athugaðu að launagreiðslur hafi ekki þegar verið búnar til.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Efni Beiðnir Myndað
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Efni Beiðnir Myndað
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Þú getur ekki slá núverandi skírteini í "Against dagbókarfærslu 'dálki
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Frátekið fyrir framleiðslu
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Orka
DocType: Opportunity,Opportunity From,tækifæri Frá
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mánaðarlaun yfirlýsingu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Raðnúmer er nauðsynlegt fyrir lið {2}. Þú hefur veitt {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Raðnúmer er nauðsynlegt fyrir lið {2}. Þú hefur veitt {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vinsamlegast veldu töflu
DocType: BOM,Website Specifications,Vefsíða Upplýsingar
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er ógilt netfang í 'viðtakendum'
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Tilvitnun
DocType: Vital Signs,Heart Rate / Pulse,Hjartsláttur / púls
DocType: Company,Default Bank Account,Sjálfgefið Bank Account
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Að sía byggt á samningsaðila, velja Party Sláðu fyrst"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Að sía byggt á samningsaðila, velja Party Sláðu fyrst"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Uppfæra Stock' Ekki er hægt að athuga vegna þess að hlutir eru ekki send með {0}
DocType: Vehicle,Acquisition Date,yfirtökudegi
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,nos
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Hladdu bréfshöfuðinu þínu (Haltu því á vefnum vingjarnlegur og 900px með 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} getur ekki verið Group
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Liður Row {idx}: {DOCTYPE} {DOCNAME} er ekki til í að ofan '{DOCTYPE}' borð
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Engin verkefni
DocType: Item Variant Settings,Copy Fields to Variant,Afritaðu reiti í afbrigði
DocType: Asset,Opening Accumulated Depreciation,Opnun uppsöfnuðum afskriftum
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan efni fyrir undireiningum
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Velta Partners og Territory
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} verður að vera virkt
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Lokun (Opnun + Samtals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Lokun (Opnun + Samtals)
DocType: Journal Entry,Depreciation Entry,Afskriftir Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vinsamlegast veldu tegund skjals fyrst
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Prenta í reiknings Gjaldmiðill
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hætta Efni Heimsóknir {0} áður hætta þessu Viðhald Farðu
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 staðall
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Nei {0} ekki tilheyra lið {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,Sjálfgefin greiðast reikningar
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Starfsmaður {0} er ekki virkur eða er ekki til
DocType: Fee Structure,Components,Hluti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
DocType: Quality Inspection Reading,Reading 6,lestur 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,nafn fyrirtækis
DocType: SMS Center,Total Message(s),Total Message (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Veldu Atriði til flutnings
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vinsamlegast settu Nöfnunarröð fyrir {0} í gegnum Skipulag> Stillingar> Nöfnunarröð
DocType: Purchase Invoice,Additional Discount Percentage,Viðbótarupplýsingar Afsláttur Hlutfall
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skoða lista yfir öll hjálparefni myndbönd
DocType: Agriculture Analysis Criteria,Soil Texture,Jarðvegur áferð
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website Item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Hlaða bréf höfuðið og merki. (Þú getur breytt þeim síðar).
DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Næsta Afskriftir Date er færður sem síðasta dags
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Næsta Afskriftir Date er færður sem síðasta dags
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,White
DocType: SMS Center,All Lead (Open),Allt Lead (Open)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Magn er ekki í boði fyrir {4} í vöruhús {1} á að senda sinn færslunnar ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,Næsta samband við þann
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,opnun Magn
DocType: Healthcare Settings,Appointment Reminder,Tilnefning tilnefningar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
DocType: Program Enrollment Tool Student,Student Batch Name,Student Hópur Name
DocType: Consultation,Doctor,Læknir
DocType: Holiday List,Holiday List Name,Holiday List Nafn
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Skildu Úthlutun Tól
DocType: Item,Hub Category to Publish,Hub Flokkur til birtingar
DocType: Leave Block List,Leave Block List Dates,Skildu Block Listi Dagsetningar
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag> Numbers Series
DocType: Sales Invoice,Billing Address GSTIN,Innheimtu Heimilisfang GSTIN
DocType: Assessment Plan,Evaluate,Meta
DocType: Workstation,Net Hour Rate,Net Hour Rate
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Velta Invoice Greiðsla
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Frátekin Warehouse í Velta Order / Finished Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,selja Upphæð
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,selja Upphæð
DocType: Repayment Schedule,Interest Amount,vextir Upphæð
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Þú ert kostnað samþykkjari fyrir þessa færslu. Uppfærðu 'Staða' og Vista
DocType: Serial No,Creation Document No,Creation Skjal nr
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Opnun Bókhald Balance
,GST Sales Register,GST söluskrá
DocType: Sales Invoice Advance,Sales Invoice Advance,Velta Invoice Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ekkert til að biðja
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ekkert til að biðja
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Veldu lénin þín
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Annar Budget met '{0}' er þegar til á móti {1} '{2}' fyrir reikningsár {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Fields verður afritað aðeins á upphafinu.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Þetta verður bætt við Item Code afbrigði. Til dæmis, ef skammstöfun er "SM", og hluturinn kóða er "T-bolur", hluturinn kóðann um afbrigði verður "T-bolur-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Borga (í orðum) verður sýnileg þegar þú hefur vistað Laun Slip.
DocType: Purchase Invoice,Is Return,er aftur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Varúð
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Varúð
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Return / skuldfærslu Note
DocType: Price List Country,Price List Country,Verðskrá Country
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} gild raðnúmer nos fyrir lið {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} gild raðnúmer nos fyrir lið {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code er ekki hægt að breyta fyrir Raðnúmer
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM viðskipta Factor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vinsamlegast sláðu Item Code til að fá lotunúmer
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Velta Order {0} er ekki gilt
DocType: Supplier Scorecard,Warn for new Request for Quotations,Varið við nýja beiðni um tilboðsyfirlit
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Kaup pantanir hjálpa þér að skipuleggja og fylgja eftir kaupum þínum
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Heildarkostnaður Issue / Transfer magn {0} í efni Beiðni {1} \ má ekki vera meiri en óskað magn {2} fyrir lið {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Warehouse Contact Info
DocType: Payment Entry,Write Off Difference Amount,Skrifaðu Off Mismunur Upphæð
DocType: Volunteer,Volunteer Name,Sjálfboðaliðanöfn
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vinsamlegast skipulag kennari Nafnakerfi í menntun> Menntun
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Starfsmaður tölvupósti fannst ekki, þess vegna email ekki sent"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Sendingarregla gildir ekki fyrir land {0}
DocType: Item,Foreign Trade Details,Foreign Trade Upplýsingar
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Group Roll Number
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Fyrir {0}, aðeins kredit reikninga er hægt að tengja við aðra gjaldfærslu"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Alls öllum verkefni lóðum skal vera 1. Stilltu vigta allar verkefni verkefni í samræmi við
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Liður {0} verður að vera Sub-dregist Item
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital útbúnaður
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Verðlagning Regla er fyrst valið byggist á 'Virkja Á' sviði, sem getur verið Item, Item Group eða Brand."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barnið vöruhús er til fyrir þetta vöruhús. Þú getur ekki eytt þessari vöruhús.
DocType: Item,Website Item Groups,Vefsíða Item Hópar
DocType: Purchase Invoice,Total (Company Currency),Total (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Raðnúmer {0} inn oftar en einu sinni
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Raðnúmer {0} inn oftar en einu sinni
DocType: Journal Entry,Journal Entry,Dagbókarfærsla
DocType: Expense Claim Advance,Unclaimed amount,Óhæfð upphæð
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} atriði í gangi
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Samskipti þig.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Beiðni um tilvitnun er óvirk til að fá aðgang frá vefsíðunni, fyrir meira Check vefgáttinni stillingar."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Birgir Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Kaup Upphæð
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kaup Upphæð
DocType: Sales Invoice,Shipping Address Name,Sendingar Address Nafn
DocType: Material Request,Terms and Conditions Content,Skilmálar og skilyrði Content
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Það voru villur að búa til námskeiði
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Þetta er byggt á logs gegn þessu ökutæki. Sjá tímalínu hér fyrir nánari upplýsingar
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Gegn Birgir Invoice {0} dagsett {1}
DocType: Customer,Default Price List,Sjálfgefið Verðskrá
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Þú getur ekki eytt Fiscal Year {0}. Reikningsár {0} er sett sem sjálfgefið í Global Settings
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Viðskiptavinur með sama nafni er þegar til
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Þetta mun leggja inn launakostnað og búa til dagbókarfærslu. Viltu halda áfram?
@@ -1988,6 +1991,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,verðlagning
DocType: Quotation,Term Details,Term Upplýsingar
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ekki er hægt að innritast meira en {0} nemendum fyrir þessum nemendahópi.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Samtals (án skatta)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Leiða Count
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} verður að vera hærri en 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Tilboð í boði
@@ -2006,7 +2010,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Aftengja greiðsla á niðurfellingar Invoice
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Núverandi kílómetramæli lestur inn ætti að vera hærri en upphaflega Ökutæki Kílómetrastaða {0}
DocType: Restaurant Reservation,No Show,Engin sýning
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vinsamlegast settu Nöfnunarröð fyrir {0} í gegnum Skipulag> Stillingar> Nöfnunarröð
DocType: Shipping Rule Country,Shipping Rule Country,Sendingar Regla Country
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leyfi og Mæting
DocType: Maintenance Visit,Partially Completed,hluta Lokið
@@ -2097,7 +2100,7 @@
DocType: Student Group Instructor,Student Group Instructor,Nemandi hópur kennari
DocType: Grant Application,Assessment Mark (Out of 10),Námsmat (af 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Main
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Setja forskeyti fyrir númerakerfi röð á viðskiptum þínum
DocType: Employee Attendance Tool,Employees HTML,starfsmenn HTML
@@ -2145,7 +2148,7 @@
DocType: Course,Course Abbreviation,Auðvitað Skammstöfun
DocType: Student Leave Application,Student Leave Application,Student Leave Umsókn
DocType: Item,Will also apply for variants,Mun einnig gilda fyrir afbrigði
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Starfsmaður {0} á hálfan dag á {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Samtals vinnutími ætti ekki að vera meiri en max vinnutíma {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Á
@@ -2329,9 +2332,10 @@
DocType: Task,Actual End Date (via Time Sheet),Raunveruleg End Date (með Time Sheet)
DocType: Soil Texture,Soil Type,Jarðvegsgerð
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Upphæð {0} {1} gegn {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Ný skilaboð
,Quotation Trends,Tilvitnun Trends
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Item Group ekki getið í master lið fyrir lið {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
DocType: Shipping Rule,Shipping Amount,Sendingar Upphæð
DocType: Supplier Scorecard Period,Period Score,Tímabilsstig
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Bæta við viðskiptavinum
@@ -2342,7 +2346,7 @@
,Vehicle Expenses,ökutæki Útgjöld
DocType: Serial No,Invoice Details,Reikningsupplýsingar
DocType: Grant Application,Show on Website,Sýna á heimasíðu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Væntanlegur gildi eftir nýtingartíma skal vera meiri en eða jafnt og {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Væntanlegur gildi eftir nýtingartíma skal vera meiri en eða jafnt og {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Byrjaðu á
DocType: Hub Category,Hub Category,Hub Flokkur
DocType: Purchase Invoice,SEZ,SEZ
@@ -2373,7 +2377,7 @@
DocType: Patient,B Positive,B Jákvæð
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, eins atriði er fastur eign. Notaðu sérstaka röð fyrir margar Magn."
DocType: Leave Block List Allow,Leave Block List Allow,Skildu Block List Leyfa
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
DocType: Patient Medical Record,Patient Medical Record,Sjúkratryggingaskrá
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Group Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Íþróttir
@@ -2423,6 +2427,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Ekki er hægt að stilla móttekið RFQ til neins vitna
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Samtals Frádráttur
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Veldu reikning til að prenta í reiknings gjaldmiðli
,Production Analytics,framleiðslu Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Þetta byggist á viðskiptum gegn þessum sjúklingum. Sjá tímalínu fyrir neðan til að fá nánari upplýsingar
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,kostnaður Uppfært
@@ -2477,7 +2482,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Veldu Company ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Skildu eftir autt ef það er talið að öllum deildum
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tegundir ráðninga (varanleg, samningur, nemi o.fl.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
DocType: Payroll Entry,Fortnightly,hálfsmánaðarlega
DocType: Currency Exchange,From Currency,frá Gjaldmiðill
DocType: Vital Signs,Weight (In Kilogram),Þyngd (í kílógramm)
@@ -2553,7 +2558,7 @@
DocType: Student,Guardians,forráðamenn
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Verð verður ekki sýnd ef verðskrá er ekki sett
DocType: Stock Entry,Total Incoming Value,Alls Komandi Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Skuldfærslu Til er krafist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Skuldfærslu Til er krafist
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets að halda utan um tíma, kostnað og innheimtu fyrir athafnir gert með lið"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kaupverðið List
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Sniðmát af birgðatölumörkum.
@@ -2654,7 +2659,7 @@
DocType: Company,For Reference Only.,Til viðmiðunar aðeins.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Læknir {0} ekki fáanleg á {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Veldu lotu nr
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ógild {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Ógild {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Tilvísun Inv
@@ -2691,8 +2696,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tilgreina rekstur, rekstrarkostnaði og gefa einstakt notkun eigi að rekstri þínum."
DocType: Water Analysis,Origin,Uppruni
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Þetta skjal er yfir mörkum með {0} {1} fyrir lið {4}. Ert þú að gera annað {3} gegn sama {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Veldu breyting upphæð reiknings
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Veldu breyting upphæð reiknings
DocType: Purchase Invoice,Price List Currency,Verðskrá Gjaldmiðill
DocType: Naming Series,User must always select,Notandi verður alltaf að velja
DocType: Stock Settings,Allow Negative Stock,Leyfa Neikvæð lager
@@ -2748,7 +2753,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Varið við nýjar innkaupapantanir
DocType: Quality Inspection Reading,Reading 9,lestur 9
DocType: Supplier,Is Frozen,er frosinn
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Group hnút vöruhús er ekki leyft að velja fyrir viðskipti
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Group hnút vöruhús er ekki leyft að velja fyrir viðskipti
DocType: Buying Settings,Buying Settings,Kaup Stillingar
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Nei fyrir Finished Good Item
DocType: Upload Attendance,Attendance To Date,Aðsókn að Dagsetning
@@ -2762,6 +2767,7 @@
DocType: Grant Application,Organization,Skipulag
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Student Group Name
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Sýna sprauta skjá
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Búa til gjöld
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Vinsamlegast vertu viss um að þú viljir virkilega að eyða öllum viðskiptum fyrir þetta fyrirtæki. stofngögn haldast eins og það er. Þessi aðgerð er ekki hægt að afturkalla.
DocType: Room,Room Number,Room Number
@@ -2772,7 +2778,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Gerðu skattmálsgrein
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Hráefni má ekki vera auður.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
DocType: Lab Test Sample,Lab Test Sample,Lab Test Dæmi
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick Journal Entry
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Þú getur ekki breytt hlutfall ef BOM getið agianst hvaða atriði
@@ -2843,7 +2849,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Gerðu innheimtu
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto nálægt Tækifæri eftir 15 daga
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Innkaupapantanir eru ekki leyfðar fyrir {0} vegna punkta sem standa upp á {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Innkaupapantanir eru ekki leyfðar fyrir {0} vegna punkta sem standa upp á {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,árslok
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Samningur Lokadagur verður að vera hærri en Dagsetning Tengja
@@ -2935,7 +2941,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} hefur ekki reikning {2} eða þegar samsvarandi gegn öðrum skírteini
DocType: Supplier Scorecard Criteria,Criteria Weight,Viðmiðunarþyngd
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Birgir> Birgir Tegund
DocType: Buying Settings,Default Buying Price List,Sjálfgefið Buying Verðskrá
DocType: Payroll Entry,Salary Slip Based on Timesheet,Laun Slip Byggt á tímaskráningar
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kaupgengi
@@ -3023,7 +3028,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Vísbendingar um Industry tegund.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Farðu í Letterheads
DocType: Item Supplier,Item Supplier,Liður Birgir
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Vinsamlegast veldu gildi fyrir {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Öllum vistföngum.
DocType: Company,Stock Settings,lager Stillingar
@@ -3200,6 +3205,7 @@
DocType: Company,Default Inventory Account,Sjálfgefin birgðareikningur
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Lokið Magn verður að vera hærri en núll.
DocType: Antibiotic,Antibiotic Name,Name Sýklalyf
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Vörunúmer> Liðurhópur> Vörumerki
DocType: Purchase Invoice,Apply Additional Discount On,Berið Viðbótarupplýsingar afsláttur á
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Veldu tegund ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Tengill til allra landsdeilda þar sem skógurinn er að vaxa
@@ -3393,6 +3399,7 @@
DocType: Supplier,Credit Limit,Skuldfærsluhámark
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Meðaltal Selja Verðskrá Rate
DocType: Production Plan Sales Order,Salse Order Date,Salse Röð Dagsetning
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Birgir> Birgir Tegund
DocType: Salary Component,Salary Component,laun Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Greiðsla Færslur {0} eru un-tengd
DocType: GL Entry,Voucher No,skírteini nr
@@ -3401,7 +3408,7 @@
DocType: Leave Allocation,Leave Allocation,Skildu Úthlutun
DocType: Payment Request,Recipient Message And Payment Details,Viðtakandinn Message og greiðsluskilmálar
DocType: Training Event,Trainer Email,þjálfari Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Efni Beiðnir {0} búnar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Efni Beiðnir {0} búnar
DocType: Restaurant Reservation,No of People,Ekkert fólk
DocType: Production Planning Tool,Include sub-contracted raw materials,Fela undirverktaka hráefni
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Snið af skilmálum eða samningi.
@@ -3465,7 +3472,7 @@
DocType: Production Planning Tool,Create Material Requests,Búa Efni beiðnum
DocType: Employee Education,School/University,Skóli / University
DocType: Payment Request,Reference Details,Tilvísun Upplýsingar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Væntanlegur Value Eftir nýtingartíma verður að vera minna en Gross kaupverði
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Væntanlegur Value Eftir nýtingartíma verður að vera minna en Gross kaupverði
DocType: Sales Invoice Item,Available Qty at Warehouse,Laus Magn á Lager
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,billed Upphæð
DocType: Asset,Double Declining Balance,Tvöfaldur Minnkandi Balance
@@ -3477,7 +3484,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,fá uppfærslur
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ekki tilheyra félaginu {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Veldu að minnsta kosti eitt gildi af hverju eiginleiki.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Efni Beiðni {0} er aflýst eða henni hætt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Efni Beiðni {0} er aflýst eða henni hætt
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Skildu Stjórnun
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Group eftir reikningi
DocType: Sales Order,Fully Delivered,Alveg Skilað
@@ -3488,14 +3495,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Andvirði lánsins getur ekki verið hærri en Lánsupphæðir {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Fara í forrit
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rú {0} # Úthlutað magn {1} getur ekki verið hærra en óunnið magn {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag> Numbers Series
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Innkaupapöntunarnúmeri þarf fyrir lið {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Framleiðsla Order ekki búin
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Frá Dagsetning 'verður að vera eftir' Til Dagsetning '
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Get ekki breytt stöðu sem nemandi {0} er tengd við beitingu nemandi {1}
DocType: Asset,Fully Depreciated,Alveg afskrifaðar
,Stock Projected Qty,Stock Áætlaðar Magn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Aðsókn HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",Tilvitnanir eru tillögur tilboðum þú sendir til viðskiptavina þinna
DocType: Sales Order,Customer's Purchase Order,Viðskiptavinar Purchase Order
@@ -3579,7 +3585,7 @@
DocType: Stock Settings,Item Naming By,Liður Nöfn By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Annar Tímabil Lokar Entry {0} hefur verið gert eftir {1}
DocType: Production Order,Material Transferred for Manufacturing,Efni flutt til framleiðslu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Reikningur {0} er ekki til
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Reikningur {0} er ekki til
DocType: Project,Project Type,Project Type
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Barnaskipti er til fyrir þetta verkefni. Þú getur ekki eytt þessu verkefni.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Annaðhvort miða Magn eða miða upphæð er nauðsynlegur.
@@ -3681,11 +3687,11 @@
DocType: Company,Asset Depreciation Cost Center,Eignastýring Afskriftir Kostnaður Center
DocType: Sales Order Item,Sales Order Date,Velta Order Dagsetning
DocType: Sales Invoice Item,Delivered Qty,Skilað Magn
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Samtals Excl. Skattur
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",Ef hakað öll börn hverri framleiðslueiningu atriði verður með í efninu beiðnir.
DocType: Assessment Plan,Assessment Plan,mat Plan
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Viðskiptavinur {0} er búinn til.
DocType: Stock Settings,Limit Percent,Limit Percent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vinsamlegast skipulag kennari Nafnakerfi í menntun> Menntun
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Eins og er ekki birgðir í boði á hvaða vöruhúsi
,Payment Period Based On Invoice Date,Greiðsla Tímabil Byggt á reikningi Dagsetning
DocType: Sample Collection,No. of print,Fjöldi prenta
@@ -3701,12 +3707,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Skuldarar ({0})
DocType: Pricing Rule,Margin,spássía
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ný Viðskiptavinir
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Framlegð%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Framlegð%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Breyta POS Profile
DocType: Bank Reconciliation Detail,Clearance Date,úthreinsun Dagsetning
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Matsskýrsla
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Purchase Upphæð er nauðsynlegur
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross Purchase Upphæð er nauðsynlegur
DocType: Lead,Address Desc,Heimilisfang karbósýklískan
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party er nauðsynlegur
DocType: Journal Entry,JV-,JV-
@@ -3738,7 +3744,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stöðugt nafn
DocType: Stock Entry,Customer or Supplier Details,Viðskiptavina eða Birgir Upplýsingar
DocType: Employee Loan Application,Required by Date,Krafist af Dagsetning
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Lokajöfnuður (Dr - Cr)
DocType: Lead,Lead Owner,Lead Eigandi
DocType: Bin,Requested Quantity,Umbeðin Magn
DocType: Patient,Marital Status,Hjúskaparstaða
@@ -3752,7 +3757,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Margfeldi afbrigði
DocType: Sales Invoice,Against Income Account,Against þáttatekjum
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Skilað
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Liður {0}: Pantaði Magn {1} má ekki vera minna en lágmarks röð Fjöldi {2} (sem skilgreindur er í lið).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Liður {0}: Pantaði Magn {1} má ekki vera minna en lágmarks röð Fjöldi {2} (sem skilgreindur er í lið).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mánaðarleg Dreifing Hlutfall
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Vinsamlegast skráðu þig inn sem annar notandi.
DocType: Territory,Territory Targets,Territory markmið
@@ -3851,7 +3856,7 @@
DocType: Serial No,Out of AMC,Út af AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gera Viðhald Heimsókn
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Vinsamlegast hafðu samband við til notanda sem hefur sala Master Manager {0} hlutverki
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Vinsamlegast hafðu samband við til notanda sem hefur sala Master Manager {0} hlutverki
DocType: Company,Default Cash Account,Sjálfgefið Cash Reikningur
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ekki viðskiptamenn eða birgja) skipstjóri.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Þetta er byggt á mætingu þessa Student
@@ -4001,7 +4006,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Engar starfsmenn fyrir nefndar viðmiðanir
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
DocType: Restaurant,Default Customer,Sjálfgefið viðskiptavinur
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði> HR-stillingar
DocType: Assessment Plan,Supervisor Name,Umsjón Name
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Ekki staðfestu ef skipun er búin til fyrir sama dag
DocType: Program Enrollment Course,Program Enrollment Course,Forritunarnámskeið
@@ -4119,7 +4123,7 @@
DocType: BOM,Website Description,Vefsíða Lýsing
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Net breyting á eigin fé
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nýjasta
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
DocType: Serial No,AMC Expiry Date,AMC Fyrningardagsetning
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,kvittun
@@ -4136,7 +4140,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Sjóðstreymi
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lánið upphæð mega vera Hámarkslán af {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,License
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vinsamlegast veldu Yfirfæranlegt ef þú vilt líka að fela jafnvægi fyrra reikningsári er fer að þessu fjárhagsári
DocType: GL Entry,Against Voucher Type,Against Voucher Tegund
DocType: Physician,Phone (R),Sími (R)
@@ -4148,7 +4152,7 @@
DocType: Patient,B Negative,B neikvæð
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Viðhald Staða verður að vera Hætt eða lokið til að senda inn
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Reikningur {0} er ekki tilheyrir fyrirtækinu {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Raðnúmer í röð {0} samsvarar ekki við Afhendingartilkynningu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Raðnúmer í röð {0} samsvarar ekki við Afhendingartilkynningu
DocType: Student,Guardian Details,Guardian Upplýsingar
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Mæting fyrir margar starfsmenn
@@ -4190,7 +4194,7 @@
DocType: Stock Entry Detail,Basic Amount,grunnfjárhæð
DocType: Training Event,Exam,Exam
DocType: Complaint,Complaint,Kvörtun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
DocType: Leave Allocation,Unused leaves,ónotuð leyfi
DocType: Patient,Alcohol Past Use,Áfengisnotkun áfengis
DocType: Fertilizer Content,Fertilizer Content,Áburður innihaldsefni
@@ -4314,6 +4318,7 @@
DocType: Salary Detail,Formula,Formula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Lab Test Sniðmát
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Sölureikningur
DocType: Purchase Invoice Item,Total Weight,Heildarþyngd
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Þóknun á sölu
DocType: Offer Letter Term,Value / Description,Gildi / Lýsing
@@ -4470,7 +4475,7 @@
DocType: Customer,From Lead,frá Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pantanir út fyrir framleiðslu.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Veldu fjárhagsársins ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
DocType: Program Enrollment Tool,Enroll Students,innritast Nemendur
DocType: Lab Test,Approved Date,Samþykkt dagsetning
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selja
@@ -4546,7 +4551,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,framleiðsla Item
,Employee Information,starfsmaður Upplýsingar
DocType: Stock Entry Detail,Additional Cost,aukakostnaðar
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",Getur ekki síað byggð á skírteini nr ef flokkaðar eftir skírteini
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",Getur ekki síað byggð á skírteini nr ef flokkaðar eftir skírteini
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Gera Birgir Tilvitnun
DocType: Quality Inspection,Incoming,Komandi
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Sjálfgefin skatta sniðmát fyrir sölu og kaup eru búnar til.
@@ -4562,7 +4567,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Ath: {0}
,Delivery Note Trends,Afhending Ath Trends
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Samantekt Í þessari viku er
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Á lager Magn
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Á lager Magn
DocType: Delivery Trip,Calculate Estimated Arrival Times,Reikna áætlaðan komutíma
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Reikningur: {0} Aðeins er hægt að uppfæra í gegnum lager Viðskipti
DocType: Student Group Creation Tool,Get Courses,fá Námskeið
@@ -4578,7 +4583,7 @@
DocType: Material Request,% Ordered,% Pantaði
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Fyrir námsmiðaðan nemendahóp verður námskeiðið valið fyrir alla nemenda frá skráðum námskeiðum í námskrá.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ákvæðisvinnu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. kaupgengi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. kaupgengi
DocType: Task,Actual Time (in Hours),Tíminn (í klst)
DocType: Employee,History In Company,Saga In Company
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Ný skilaboð frá {sendanda}
@@ -4626,7 +4631,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Gjaldmiðill af BOM # {1} ætti að vera jafn völdu gjaldmiðil {2}
DocType: Journal Entry Account,Exchange Rate,Exchange Rate
DocType: Patient,Additional information regarding the patient,Viðbótarupplýsingar um sjúklinginn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
DocType: Homepage,Tag Line,tag Line
DocType: Fee Component,Fee Component,Fee Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Lo Stjórn
@@ -4838,7 +4843,7 @@
DocType: Employee Education,Employee Education,starfsmaður Menntun
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Afrit atriði hópur í lið töflunni
DocType: Land Unit,Parent Land Unit,Móðurhlutdeild
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
DocType: Fertilizer,Fertilizer Name,Áburður Nafn
DocType: Salary Slip,Net Pay,Net Borga
DocType: Account,Account,Reikningur
@@ -4917,7 +4922,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Viðskiptavinahópur er krafist í POS Profile
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Employee færslur.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vinsamlegast settu Next Afskriftir Dagsetning
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Vinsamlegast settu Next Afskriftir Dagsetning
DocType: HR Settings,Payroll Settings,launaskrá Stillingar
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Passa non-tengd og greiðslur.
DocType: POS Settings,POS Settings,POS stillingar
@@ -5084,7 +5089,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Afmæli Áminning fyrir {0}
DocType: Asset Maintenance Task,Last Completion Date,Síðasti lokadagur
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar frá síðustu Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
DocType: Buying Settings,Naming Series,nafngiftir Series
DocType: Leave Block List,Leave Block List Name,Skildu Block List Nafn
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tryggingar Start dagsetning ætti að vera minna en tryggingar lokadagsetning
@@ -5210,6 +5215,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Fá greiðslu færslur
DocType: Quotation Item,Against Docname,Against DOCNAME
DocType: SMS Center,All Employee (Active),Allt Starfsmaður (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Viðskiptavinur> Viðskiptavinahópur> Territory
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,skoða Now
DocType: BOM,Raw Material Cost,Raw Material Kostnaður
DocType: Item Reorder,Re-Order Level,Re-Order Level
@@ -5308,7 +5314,6 @@
DocType: Room,Seating Capacity,sætafjölda
DocType: Issue,ISS-,Út-
DocType: Lab Test Groups,Lab Test Groups,Lab Test Groups
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Viðskiptavinur> Viðskiptavinahópur> Territory
DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Krafa (með kostnað kröfum)
DocType: GST Settings,GST Summary,GST Yfirlit
DocType: Assessment Result,Total Score,Total Score
@@ -5321,7 +5326,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Eftirfarandi námskeið voru búnar til
DocType: Journal Entry,Total Debit,alls skuldfærsla
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Sjálfgefin fullunnum Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sölufulltrúa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sölufulltrúa
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Fjárhagsáætlun og kostnaður Center
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Margfeldi sjálfgefið greiðslumáti er ekki leyfilegt
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,fyrir
@@ -5494,7 +5499,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Íhuga skatta og álaga fyrir
DocType: Driver,Driving License Category,Ökuskírteini Flokkur
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Raunveruleg Magn er nauðsynlegur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} er nú með {1} Birgir Stuðningskort og kauptilboð til þessa birgis skulu gefin út með varúð.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} er nú með {1} Birgir Stuðningskort og kauptilboð til þessa birgis skulu gefin út með varúð.
DocType: Asset Maintenance Team,Asset Maintenance Team,Eignastýringarteymi
DocType: Employee Loan,Loan Type,lán Type
DocType: Scheduling Tool,Scheduling Tool,Tímasetningar Tool
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 314faa1..401a9b9 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ordina per Prezzo
,Delay Days,Giorni di ritardo
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,spese per servizi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Fattura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Effettua la registrazione di stock di conservazione
DocType: Purchase Invoice Item,Item Weight Details,Dettagli peso articolo
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Riferimento: {0}, codice dell'articolo: {1} e cliente: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura di un lavoro.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},La distinta componenti non viene specificata per l'articolo conto terzi {0} alla riga {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},La distinta componenti non viene specificata per l'articolo conto terzi {0} alla riga {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Risultato inviato
DocType: Item Attribute,Increment,Incremento
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Arco di tempo
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Non consentito per {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Ottenere elementi dal
DocType: Price List,Price Not UOM Dependant,Prezzo non dipendente da UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prodotto {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nessun elemento elencato
DocType: Asset Repair,Error Description,Descrizione dell'errore
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Drogheria
DocType: Quality Inspection Reading,Reading 1,Lettura 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fondi Pensione
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,La data di ammortamento successivo non puó essere prima della Data di acquisto
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,La data di ammortamento successivo non puó essere prima della Data di acquisto
DocType: Crop,Perennial,Perenne
DocType: Consultation,Consultation Date,Data di consultazione
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Elenco e scoperta di prodotti per gli utenti di ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","ad esempio, ""Scuola Elementare"" o ""Università"""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Reports Magazzino
DocType: Warehouse,Warehouse Detail,Dettagli Magazzino
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Il Data Terminologia fine non può essere successiva alla data di fine anno dell'anno accademico a cui il termine è legata (Anno Accademico {}). Si prega di correggere le date e riprovare.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""E' un Asset"" non può essere deselezionato, in quanto esiste già un movimento collegato"
DocType: Delivery Trip,Departure Time,Orario di partenza
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Ottieni Specifiche Dettagli
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Modelli di classifica dei fornitori.
DocType: Lead,Interested,Interessati
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Apertura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Da {0} a {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Impossibile impostare le tasse
DocType: Item,Copy From Item Group,Copia da Gruppo Articoli
@@ -268,7 +268,7 @@
DocType: BOM Update Tool,New BOM,Nuova Distinta Base
apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,Show only POS,Mostra solo POS
DocType: Driver,Driving License Categories,Categorie di patenti di guida
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Inserisci la data di consegna
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Inserisci la Data di Consegna
DocType: Depreciation Schedule,Make Depreciation Entry,Crea una scrittura per l'ammortamento
DocType: Appraisal Template Goal,KRA,KRA
DocType: Lead,Request Type,Tipo di richiesta
@@ -296,7 +296,7 @@
apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Le modalità di applicazione di prezzi e sconti .
DocType: Physician Schedule,Time Slots,Fasce orarie
apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prezzo di listino deve essere applicabile per l'acquisto o la vendita di
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data di installazione non può essere prima della data di consegna per la voce {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},La data di installazione non può essere precedente alla data di consegna per l'Articolo {0}
DocType: Pricing Rule,Discount on Price List Rate (%),Sconto su Prezzo di Listino (%)
apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Modello di oggetto
apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Biochimica
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Ferie per Anno
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Riga {0}: Abilita 'è Advance' contro Account {1} se questa è una voce di anticipo.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Deposito {0} non appartiene alla società {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Deposito {0} non appartiene alla società {1}
DocType: Email Digest,Profit & Loss,Profit & Loss
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litro
DocType: Task,Total Costing Amount (via Time Sheet),Totale Costing Importo (tramite Time Sheet)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Questo si basa sulle transazioni contro questa Azienda. Vedere la sequenza temporale qui sotto per i dettagli
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica tramite e-mail sulla creazione di Richiesta automatica Materiale
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistente
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi valuta
DocType: Opening Invoice Creation Tool,Invoice Type,Tipo Fattura
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Documento Di Trasporto
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Vedovo
DocType: Request for Quotation,Request for Quotation,Richiesta di offerta
DocType: Healthcare Settings,Require Lab Test Approval,Richiede l'approvazione di un test di laboratorio
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Codice articolo> Gruppo articoli> Marca
DocType: Salary Slip Timesheet,Working Hours,Orari di lavoro
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Assolutamente stupendo
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Cambia l'inizio/numero sequenza corrente per una serie esistente
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Inserisci Centro di costo
DocType: Drug Prescription,Dosage,Dosaggio
DocType: Journal Entry Account,Sales Order,Ordine di vendita
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. Tasso di vendita
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Tasso di vendita
DocType: Assessment Plan,Examiner Name,Nome Examiner
DocType: Lab Test Template,No Result,Nessun risultato
DocType: Purchase Invoice Item,Quantity and Rate,Quantità e Prezzo
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Seleziona Periodo Busta Paga
DocType: Purchase Invoice,Unpaid,Non pagata
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Riservato per la vendita
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane> Impostazioni HR
DocType: Packing Slip,From Package No.,Da Pacchetto N.
DocType: Item Attribute,To Range,Per Intervallo
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,I titoli e depositi
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Laboratorio
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avvisa gli ordini di acquisto
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Parti abbastanza per costruire
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parti abbastanza per costruire
DocType: POS Profile User,POS Profile User,Profilo utente POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,reddito diretta
DocType: Patient Appointment,Date TIme,Appuntamento
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Non è possibile filtrare sulla base di conto , se raggruppati per conto"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Non è possibile filtrare sulla base di conto , se raggruppati per conto"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,responsabile amministrativo
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Impostare società e tasse
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Seleziona Corso
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,account differenza
DocType: Purchase Invoice,Supplier GSTIN,Fornitore GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere l'attività; esistono attività dipendenti {0} non completate.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
DocType: Production Order,Additional Operating Cost,Ulteriori costi di esercizio
DocType: Lab Test Template,Lab Routine,Laboratorio di routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,cosmetici
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Rapporto con Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
DocType: Payment Entry,Payment From / To,Pagamento da / a
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Il Nuovo limite di credito è inferiore all'attuale importo dovuto dal cliente. Il limite di credito deve essere almeno {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Il Nuovo limite di credito è inferiore all'attuale importo dovuto dal cliente. Il limite di credito deve essere almeno {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Imposta l'account in Magazzino {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basato Su' e 'Raggruppato Per' non può essere lo stesso
DocType: Sales Person,Sales Person Targets,Sales Person Obiettivi
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Batch Nome
DocType: Fee Validity,Max number of visit,Numero massimo di visite
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Scheda attività creata:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Iscriversi
DocType: GST Settings,GST Settings,Impostazioni GST
DocType: Selling Settings,Customer Naming By,Creare il Nome Cliente da
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,budget contro
DocType: Employee,Cell Number,Numero di Telefono
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Non ci sono dipendenti per i criteri indicati. Verifica che gli Scivoli salariali non siano già stati creati.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Richieste Materiale Auto generata
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Richieste Materiale Auto generata
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perso
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile inserire il buono nella colonna 'Against Journal Entry'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Riservato per la produzione
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
DocType: Opportunity,Opportunity From,Opportunità da
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Busta Paga Mensile.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riga {0}: {1} Numeri di serie necessari per l'articolo {2}. Hai fornito {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riga {0}: {1} Numeri di serie necessari per l'articolo {2}. Hai fornito {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Seleziona una tabella
DocType: BOM,Website Specifications,Website Specifiche
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} è un indirizzo email non valido in 'Destinatari'
@@ -1042,7 +1043,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Quotazione richiesta
DocType: Vital Signs,Heart Rate / Pulse,Frequenza cardiaca / impulso
DocType: Company,Default Bank Account,Conto Banca Predefinito
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrare sulla base del Partner, selezionare prima il tipo di Partner"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Per filtrare sulla base del Partner, selezionare prima il tipo di Partner"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Aggiorna Scorte' non può essere selezionato perché gli articoli non vengono recapitati tramite {0}
DocType: Vehicle,Acquisition Date,Data Acquisizione
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,nos
@@ -1066,7 +1067,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Carica la tua testata (Rendila web friendly come 900px per 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Il conto {2} non può essere un gruppo
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Articolo Row {} IDX: {DOCTYPE} {} docname non esiste nel precedente '{} doctype' tavolo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,La scheda attività {0} è già stata completata o annullata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,La scheda attività {0} è già stata completata o annullata
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nessuna attività
DocType: Item Variant Settings,Copy Fields to Variant,Copia campi in variante
DocType: Asset,Opening Accumulated Depreciation,Apertura del deprezzamento accumulato
@@ -1178,9 +1179,10 @@
DocType: Production Order,Plan material for sub-assemblies,Materiale Piano per sub-assemblaggi
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,I partner di vendita e Territorio
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} deve essere attivo
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Chiusura (apertura + totale)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Chiusura (apertura + totale)
DocType: Journal Entry,Depreciation Entry,Ammortamenti Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si prega di selezionare il tipo di documento prima
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Stampa nella valuta dell'account
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annulla Visite Materiale {0} prima di annullare questa visita di manutenzione
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} non appartiene alla voce {1}
@@ -1206,7 +1208,7 @@
DocType: Supplier,Default Payable Accounts,Contabilità Fornitori Predefinita
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
DocType: Fee Structure,Components,componenti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Voce Varianti {0} aggiornato
DocType: Quality Inspection Reading,Reading 6,Lettura 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1258,6 +1260,7 @@
,Company Name,Nome Azienda
DocType: SMS Center,Total Message(s),Totale Messaggi
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Impostare Serie di denominazione per {0} tramite Impostazione> Impostazioni> Serie di denominazione
DocType: Purchase Invoice,Additional Discount Percentage,Percentuale di sconto Aggiuntivo
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visualizzare un elenco di tutti i video di aiuto
DocType: Agriculture Analysis Criteria,Soil Texture,Texture del suolo
@@ -1285,7 +1288,7 @@
DocType: BOM Website Item,BOM Website Item,Distinta Base dell'Articolo sul Sito Web
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento).
DocType: Timesheet Detail,Bill,Conto
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Successivo ammortamento Data viene inserita come data passata
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Successivo ammortamento Data viene inserita come data passata
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bianco
DocType: SMS Center,All Lead (Open),Tutti i Lead (Aperti)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riga {0}: Qtà non disponibile per {4} in magazzino {1} al momento della pubblicazione della voce ({2} {3})
@@ -1301,7 +1304,7 @@
DocType: Lead,Next Contact Date,Data del contatto successivo
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Quantità di apertura
DocType: Healthcare Settings,Appointment Reminder,Appuntamento promemoria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
DocType: Program Enrollment Tool Student,Student Batch Name,Studente Batch Nome
DocType: Consultation,Doctor,Medico
DocType: Holiday List,Holiday List Name,Nome elenco vacanza
@@ -1317,6 +1320,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Strumento Allocazione Permessi
DocType: Item,Hub Category to Publish,Categoria Hub per pubblicare
DocType: Leave Block List,Leave Block List Dates,Lascia Blocco Elenco date
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Configurare le serie di numerazione per Presenze tramite Setup> Numerazione serie
DocType: Sales Invoice,Billing Address GSTIN,Indirizzo di fatturazione GSTIN
DocType: Assessment Plan,Evaluate,Valutare
DocType: Workstation,Net Hour Rate,Tasso Netto Orario
@@ -1350,7 +1354,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Pagamento Fattura di vendita
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Riservato a ordini di vendita / Magazzino prodotti finiti
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Importo di vendita
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Importo di vendita
DocType: Repayment Schedule,Interest Amount,Ammontare Interessi
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu sei il Responsabile approvazione spese per questo record. Aggiorna lo Stato e salva
DocType: Serial No,Creation Document No,Creazione di documenti No
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura bilancio contabile
,GST Sales Register,Registro delle vendite GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Fattura di vendita (anticipata)
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Niente da chiedere
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Niente da chiedere
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Seleziona i tuoi domini
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altro record di bilancio '{0}' esiste già contro {1} '{2}' per l'anno fiscale {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,I campi verranno copiati solo al momento della creazione.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Questo sarà aggiunto al codice articolo della variante. Ad esempio, se la sigla è ""SM"", e il codice articolo è ""T-SHIRT"", il codice articolo della variante sarà ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Paga Netta (in lettere) sarà visibile una volta che si salva la busta paga.
DocType: Purchase Invoice,Is Return,È Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Attenzione
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Attenzione
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Reso / Nota di Debito
DocType: Price List Country,Price List Country,Listino Prezzi Nazione
DocType: Item,UOMs,Unità di Misure
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} numeri di serie validi per l'articolo {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} numeri di serie validi per l'articolo {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Codice Articolo non può essere modificato per N. di Serie
DocType: Purchase Invoice Item,UOM Conversion Factor,Fattore di conversione Unità di Misura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Inserisci Codice Articolo per ottenere il numero di lotto
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Sales Order {0} non è valido
DocType: Supplier Scorecard,Warn for new Request for Quotations,Avvisa per la nuova richiesta per le citazioni
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Gli ordini di acquisto ti aiutano a pianificare e monitorare i tuoi acquisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescrizioni di laboratorio
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",La quantità emissione / trasferimento totale {0} in Materiale Richiesta {1} \ non può essere maggiore di quantità richiesta {2} per la voce {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Contatti Magazzino
DocType: Payment Entry,Write Off Difference Amount,Importo a differenza Svalutazione
DocType: Volunteer,Volunteer Name,Nome del volontario
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Installa il Sistema di denominazione degli istruttori in Istruzione> Impostazioni istruzione
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Indirizzo e-mail del dipendente non trovato, e-mail non inviata"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Regola di spedizione non applicabile per il paese {0}
DocType: Item,Foreign Trade Details,Commercio Estero Dettagli
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Numero di rotolo di gruppo
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totale di tutti i pesi delle attività dovrebbe essere 1. Modificare i pesi di tutte le attività del progetto di conseguenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Attrezzature Capital
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regola Prezzi viene prima selezionato in base al 'applicare sul campo', che può essere prodotto, Articolo di gruppo o di marca."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Esiste magazzino Bambino per questo magazzino. Non è possibile eliminare questo magazzino.
DocType: Item,Website Item Groups,Sito gruppi di articoli
DocType: Purchase Invoice,Total (Company Currency),Totale (Valuta Società)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Numero di serie {0} è entrato più di una volta
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Numero di serie {0} è entrato più di una volta
DocType: Journal Entry,Journal Entry,Registrazione Contabile
DocType: Expense Claim Advance,Unclaimed amount,Importo non reclamato
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} articoli in lavorazione
@@ -1665,7 +1668,7 @@
DocType: Purchase Invoice,Supplier Invoice Date,Data Fattura Fornitore
apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,È necessario abilitare Carrello
-DocType: Payment Entry,Writeoff,Cancellare
+DocType: Payment Entry,Writeoff,Svalutazione
DocType: Stock Settings,Naming Series Prefix,Prefisso serie di denominazione
DocType: Appraisal Template Goal,Appraisal Template Goal,Valutazione Modello Obiettivo
DocType: Salary Component,Earning,Rendimento
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicazione
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Richiesta di offerta disabilitata per l'accesso dal portale, verificare le configurazioni del portale"
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variabile di punteggio dei punteggi dei fornitori
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Importo Acquisto
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Importo Acquisto
DocType: Sales Invoice,Shipping Address Name,Destinazione
DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Si sono verificati degli errori durante la creazione del programma del corso
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Questo si basa su tronchi contro questo veicolo. Vedere cronologia sotto per i dettagli
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Al ricevimento della Fattura Fornitore {0} datata {1}
DocType: Customer,Default Price List,Listino Prezzi Predefinito
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,record di Asset Movimento {0} creato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,record di Asset Movimento {0} creato
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Non è possibile cancellare l'anno fiscale {0}. Anno fiscale {0} è impostato in modo predefinito in Impostazioni globali
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Esiste già un cliente con lo stesso nome
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Questo invierà Salary Slips e creerà la registrazione ufficiale. Vuoi procedere?
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Prezzi
DocType: Quotation,Term Details,Dettagli Termini
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Non possono iscriversi più di {0} studenti per questo gruppo di studenti.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Totale (senza tasse)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conto di piombo
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} deve essere maggiore di 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Disponibile a magazzino
@@ -2026,7 +2030,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Scollegare il pagamento per la cancellazione della fattura
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},lettura corrente dell'odometro inserito deve essere maggiore di contachilometri iniziale veicolo {0}
DocType: Restaurant Reservation,No Show,Nessuno spettacolo
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Impostare Serie di denominazione per {0} tramite Impostazione> Impostazioni> Serie di denominazione
DocType: Shipping Rule Country,Shipping Rule Country,Tipo di Spedizione per Nazione
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Permessi e Presenze
DocType: Maintenance Visit,Partially Completed,Parzialmente completato
@@ -2117,7 +2120,7 @@
DocType: Student Group Instructor,Student Group Instructor,Istruttore del gruppo di studenti
DocType: Grant Application,Assessment Mark (Out of 10),Segno di valutazione (su 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,principale
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,principale
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
DocType: Employee Attendance Tool,Employees HTML,Dipendenti HTML
@@ -2165,7 +2168,7 @@
DocType: Course,Course Abbreviation,Abbreviazione corso
DocType: Student Leave Application,Student Leave Application,Student Leave Application
DocType: Item,Will also apply for variants,Si applica anche per le varianti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} sulla mezza giornata su {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},l'orario di lavoro totale non deve essere maggiore di ore di lavoro max {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,On
@@ -2350,9 +2353,10 @@
DocType: Task,Actual End Date (via Time Sheet),Data di fine effettiva (da Time Sheet)
DocType: Soil Texture,Soil Type,Tipo di terreno
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Importo {0} {1} contro {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nuovo messaggio
,Quotation Trends,Tendenze di preventivo
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Gruppo Articoli non menzionato nell'Articolo principale per l'Articolo {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
DocType: Shipping Rule,Shipping Amount,Importo spedizione
DocType: Supplier Scorecard Period,Period Score,Punteggio periodo
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Aggiungi clienti
@@ -2363,7 +2367,7 @@
,Vehicle Expenses,Spese del veicolo
DocType: Serial No,Invoice Details,Dettagli della fattura
DocType: Grant Application,Show on Website,Mostra sul sito web
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valore atteso dopo la vita utile deve essere maggiore o uguale a {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Valore atteso dopo la vita utile deve essere maggiore o uguale a {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Inizia
DocType: Hub Category,Hub Category,Categoria Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2394,7 +2398,7 @@
DocType: Patient,B Positive,B Positivo
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantità deve essere 1, poiche' si tratta di un Bene Strumentale. Si prega di utilizzare riga separata per quantita' multiple."
DocType: Leave Block List Allow,Leave Block List Allow,Lascia permesso blocco lista
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
DocType: Patient Medical Record,Patient Medical Record,Registro medico paziente
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Gruppo di Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,sportivo
@@ -2444,6 +2448,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Impossibile impostare un RFQ ricevuto su No Quote
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Deduzione totale
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Seleziona un account per stampare nella valuta dell'account
,Production Analytics,Analytics di produzione
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Questo è basato sulle transazioni contro questo paziente. Per dettagli vedere la sequenza temporale qui sotto
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Costo Aggiornato
@@ -2498,7 +2503,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleziona Company ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Lasciare vuoto se considerato per tutti i reparti
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
DocType: Payroll Entry,Fortnightly,Quindicinale
DocType: Currency Exchange,From Currency,Da Valuta
DocType: Vital Signs,Weight (In Kilogram),Peso (in chilogrammo)
@@ -2574,7 +2579,7 @@
DocType: Student,Guardians,Guardiani
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,I prezzi non verranno visualizzati se listino non è impostata
DocType: Stock Entry,Total Incoming Value,Totale Valore Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debito A è richiesto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debito A è richiesto
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Schede attività per tenere traccia del tempo, i costi e la fatturazione per attività fatta per tua squadra"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Acquisto Listino Prezzi
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelli delle variabili dei scorecard fornitori.
@@ -2675,7 +2680,7 @@
DocType: Company,For Reference Only.,Per riferimento soltanto.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Medico {0} non disponibile in {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Seleziona il numero di lotto
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Non valido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Non valido {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Riferimento Inv
@@ -2712,8 +2717,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specificare le operazioni, costi operativi e dare una gestione unica di no a vostre operazioni."
DocType: Water Analysis,Origin,Origine
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Questo documento è oltre il limite da {0} {1} per item {4}. State facendo un altro {3} contro lo stesso {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,conto importo Selezionare cambiamento
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,conto importo Selezionare cambiamento
DocType: Purchase Invoice,Price List Currency,Prezzo di listino Valuta
DocType: Naming Series,User must always select,L'utente deve sempre selezionare
DocType: Stock Settings,Allow Negative Stock,Permetti Scorte Negative
@@ -2769,7 +2774,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Avvisa per i nuovi ordini di acquisto
DocType: Quality Inspection Reading,Reading 9,Lettura 9
DocType: Supplier,Is Frozen,È Congelato
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,magazzino nodo di gruppo non è permesso di selezionare per le transazioni
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,magazzino nodo di gruppo non è permesso di selezionare per le transazioni
DocType: Buying Settings,Buying Settings,Impostazioni Acquisto
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,N. BOM per quantità buona completata
DocType: Upload Attendance,Attendance To Date,Data Fine Frequenza
@@ -2783,6 +2788,7 @@
DocType: Grant Application,Organization,Organizzazione
DocType: BOM Update Tool,BOM Update Tool,Strumento di aggiornamento BOM
DocType: SG Creation Tool Course,Student Group Name,Nome gruppo Student
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Mostra vista esplosa
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creazione di tariffe
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Assicurati di voler cancellare tutte le transazioni di questa azienda. I dati anagrafici rimarranno così com'è. Questa azione non può essere annullata.
DocType: Room,Room Number,Numero di Camera
@@ -2793,7 +2799,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Crea modello fiscale
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utente
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
DocType: Lab Test Sample,Lab Test Sample,Campione di prova del laboratorio
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Breve diario
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
@@ -2840,7 +2846,7 @@
apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Segna come Presente
DocType: Project,% Complete Method,% Completamento
apps/erpnext/erpnext/healthcare/setup.py +181,Drug,Droga
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla consegna del Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla data di consegna del Nº di Serie {0}
DocType: Production Order,Actual End Date,Data di fine effettiva
DocType: BOM,Operating Cost (Company Currency),Costi di funzionamento (Società di valuta)
DocType: Purchase Invoice,PINV-,PINV-
@@ -2864,7 +2870,7 @@
DocType: Membership,USD,Dollaro statunitense
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Crea Fattura
DocType: Selling Settings,Auto close Opportunity after 15 days,Chiudi automaticamente Opportunità dopo 15 giorni
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Gli ordini di acquisto non sono consentiti per {0} a causa di una posizione di scorecard di {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Gli ordini di acquisto non sono consentiti per {0} a causa di una posizione di scorecard di {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,fine Anno
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
@@ -2976,7 +2982,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Sopra
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: diario {1} non ha conto {2} o già confrontato con un altro buono
DocType: Supplier Scorecard Criteria,Criteria Weight,Criteri Peso
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Fornitore> Tipo di fornitore
DocType: Buying Settings,Default Buying Price List,Predefinito acquisto Prezzo di listino
DocType: Payroll Entry,Salary Slip Based on Timesheet,Stipendio slip Sulla base di Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tasso di acquisto
@@ -3064,7 +3069,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Monitora i Leads per settore.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Vai a carta intestata
DocType: Item Supplier,Item Supplier,Articolo Fornitore
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tutti gli indirizzi.
DocType: Company,Stock Settings,Impostazioni Giacenza
@@ -3253,6 +3258,7 @@
DocType: Company,Default Inventory Account,Account di inventario predefinito
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Riga {0}: Quantità compilato deve essere maggiore di zero.
DocType: Antibiotic,Antibiotic Name,Nome antibiotico
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Codice articolo> Gruppo articoli> Marca
DocType: Purchase Invoice,Apply Additional Discount On,Applicare lo Sconto Aggiuntivo su
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Seleziona tipo ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Un link a tutte le unità di terra in cui cresce il raccolto
@@ -3388,7 +3394,7 @@
DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Inserisci il nome della Campagna se la sorgente di indagine è la campagna
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,Editori Giornali
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Selezionare l'anno fiscale
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +115,Expected Delivery Date should be after Sales Order Date,La data di consegna prevista dovrebbe essere dopo la data di ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +115,Expected Delivery Date should be after Sales Order Date,La data di consegna prevista dovrebbe essere successiva alla data dell'Ordine di Vendita
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Riordina Level
DocType: Company,Chart Of Accounts Template,Modello del Piano dei Conti
DocType: Attendance,Attendance Date,Data Presenza
@@ -3446,6 +3452,7 @@
DocType: Supplier,Credit Limit,Limite Credito
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Tasso di listino prezzi di vendita
DocType: Production Plan Sales Order,Salse Order Date,Salse Data ordine
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Fornitore> Tipo di fornitore
DocType: Salary Component,Salary Component,stipendio Componente
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,I Pagamenti {0} non sono collegati
DocType: GL Entry,Voucher No,Voucher No
@@ -3454,7 +3461,7 @@
DocType: Leave Allocation,Leave Allocation,Lascia Allocazione
DocType: Payment Request,Recipient Message And Payment Details,Destinatario del Messaggio e Modalità di Pagamento
DocType: Training Event,Trainer Email,Trainer-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Richieste di materiale {0} creato
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Richieste di materiale {0} creato
DocType: Restaurant Reservation,No of People,No di persone
DocType: Production Planning Tool,Include sub-contracted raw materials,Includere le materie prime in subappalto
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template di termini o di contratto.
@@ -3518,7 +3525,7 @@
DocType: Production Planning Tool,Create Material Requests,Creare Richieste Materiale
DocType: Employee Education,School/University,Scuola / Università
DocType: Payment Request,Reference Details,Riferimento Dettagli
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Il valore atteso dopo la durata utile deve essere inferiore all' importo di acquisto lordo
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Il valore atteso dopo la durata utile deve essere inferiore all' importo di acquisto lordo
DocType: Sales Invoice Item,Available Qty at Warehouse,Quantità Disponibile a magazzino
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Importo Fatturato
DocType: Asset,Double Declining Balance,Doppia valori residui
@@ -3530,7 +3537,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Ricevi aggiornamenti
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Il conto {2} non appartiene alla società {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Seleziona almeno un valore da ciascuno degli attributi.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Richiesta materiale {0} è stato annullato o interrotto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Richiesta materiale {0} è stato annullato o interrotto
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Lascia Gestione
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Raggruppa per Conto
DocType: Sales Order,Fully Delivered,Completamente Consegnato
@@ -3541,14 +3548,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Importo erogato non può essere superiore a prestito Importo {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Vai a Programmi
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Riga {0} # L'importo assegnato {1} non può essere maggiore dell'importo non reclamato {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Configurare le serie di numerazione per Presenze tramite Setup> Numerazione serie
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Ordine di produzione non ha creato
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Impossibile cambiare status di studente {0} è collegata con l'applicazione studente {1}
DocType: Asset,Fully Depreciated,completamente ammortizzato
,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Marcata presenze HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Le quotazioni sono proposte, offerte che hai inviato ai tuoi clienti"
DocType: Sales Order,Customer's Purchase Order,Ordine di Acquisto del Cliente
@@ -3632,7 +3638,7 @@
DocType: Stock Settings,Item Naming By,Creare il Nome Articolo da
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Un'altra voce periodo di chiusura {0} è stato fatto dopo {1}
DocType: Production Order,Material Transferred for Manufacturing,Materiale trasferito per produzione
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Il Conto {0} non esiste
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Il Conto {0} non esiste
DocType: Project,Project Type,Tipo di progetto
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Non è possibile eliminare questa attività; esiste un'altra Attività dipendente da questa.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Sia qty destinazione o importo obiettivo è obbligatoria .
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Centro di ammortamento dei costi
DocType: Sales Order Item,Sales Order Date,Ordine di vendita Data
DocType: Sales Invoice Item,Delivered Qty,Q.tà Consegnata
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Totale escl. Imposta
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Se selezionato, tutti i figli di ogni elemento di produzione saranno inclusi nelle Request materiali."
DocType: Assessment Plan,Assessment Plan,Piano di valutazione
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Il cliente {0} viene creato.
DocType: Stock Settings,Limit Percent,limite percentuale
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Installa il Sistema di denominazione degli istruttori in Istruzione> Impostazioni istruzione
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Articolo attualmente non presente in nessun magazzino
,Payment Period Based On Invoice Date,Periodo di pagamento basati su Data fattura
DocType: Sample Collection,No. of print,Numero di stampa
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Debitori ({0})
DocType: Pricing Rule,Margin,Margine
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuovi clienti
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Utile lordo %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Utile lordo %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Cambia profilo POS
DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidazione
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Rapporto di valutazione
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Importo acquisto è obbligatoria
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross Importo acquisto è obbligatoria
DocType: Lead,Address Desc,Desc. indirizzo
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Il Partner è obbligatorio
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Nome permanente
DocType: Stock Entry,Customer or Supplier Details,Dettagli Cliente o Fornitore
DocType: Employee Loan Application,Required by Date,Richiesto per data
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Saldo finale (Dr - Cr)
DocType: Lead,Lead Owner,Responsabile Lead
DocType: Bin,Requested Quantity,la quantita 'richiesta
DocType: Patient,Marital Status,Stato civile
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Varianti multiple
DocType: Sales Invoice,Against Income Account,Per Reddito Conto
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Consegnato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Articolo {0}: Qtà ordinata {1} non può essere inferiore a Qtà minima per ordine {2} (definita per l'Articolo).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Articolo {0}: Qtà ordinata {1} non può essere inferiore a Qtà minima per ordine {2} (definita per l'Articolo).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentuale Distribuzione Mensile
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Accedi come un altro utente.
DocType: Territory,Territory Targets,Obiettivi Territorio
@@ -3905,7 +3910,7 @@
DocType: Serial No,Out of AMC,Fuori di AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Aggiungi visita manutenzione
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
DocType: Company,Default Cash Account,Conto cassa predefinito
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Questo si basa sulla presenza di questo Student
@@ -4022,7 +4027,7 @@
DocType: Purchase Invoice Item,Serial No,Serial No
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Rimborso mensile non può essere maggiore di prestito Importo
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Inserisci Maintaince dettagli prima
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Riga # {0}: Data di consegna prevista non può essere prima dell'ordine di acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Riga # {0}: la Data di Consegna Prevista non può essere precedente all'Ordine di Acquisto
DocType: Purchase Invoice,Print Language,Lingua di Stampa
DocType: Salary Slip,Total Working Hours,Orario di lavoro totali
DocType: Subscription,Next Schedule Date,Data di pianificazione successiva
@@ -4055,7 +4060,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nessun dipendente per i criteri indicati
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
DocType: Restaurant,Default Customer,Cliente predefinito
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane> Impostazioni HR
DocType: Assessment Plan,Supervisor Name,Nome supervisore
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Non confermare se l'appuntamento è stato creato per lo stesso giorno
DocType: Program Enrollment Course,Program Enrollment Course,Corso di iscrizione al programma
@@ -4173,7 +4177,7 @@
DocType: BOM,Website Description,Descrizione del sito
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variazione netta Patrimonio
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,i più nuovi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","l' indirizzo e-mail deve essere univoco, esiste già per {0}"
DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Ricevuta
@@ -4190,7 +4194,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rendiconto finanziario
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Importo del prestito non può superare il massimo importo del prestito {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Si prega di selezionare il riporto se anche voi volete includere equilibrio precedente anno fiscale di parte per questo anno fiscale
DocType: GL Entry,Against Voucher Type,Per tipo Tagliando
DocType: Physician,Phone (R),Telefono (R)
@@ -4202,7 +4206,7 @@
DocType: Patient,B Negative,B Negativo
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Lo stato di manutenzione deve essere annullato o completato per inviare
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Il Conto {0} non appartiene alla società {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,I numeri seriali nella riga {0} non corrispondono alla nota di consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,I numeri seriali nella riga {0} non corrispondono alla nota di consegna
DocType: Student,Guardian Details,Guardiano Dettagli
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Segna come Presenze per più Dipendenti
@@ -4244,7 +4248,7 @@
DocType: Stock Entry Detail,Basic Amount,Importo di base
DocType: Training Event,Exam,Esame
DocType: Complaint,Complaint,Denuncia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
DocType: Leave Allocation,Unused leaves,Ferie non godute
DocType: Patient,Alcohol Past Use,Utilizzo passato di alcool
DocType: Fertilizer Content,Fertilizer Content,Contenuto di fertilizzanti
@@ -4368,12 +4372,13 @@
DocType: Salary Detail,Formula,Formula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Modello di prova del laboratorio
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Conto vendita
DocType: Purchase Invoice Item,Total Weight,Peso totale
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Commissione sulle vendite
DocType: Offer Letter Term,Value / Description,Valore / Descrizione
apps/erpnext/erpnext/controllers/accounts_controller.py +629,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
DocType: Tax Rule,Billing Country,Nazione di fatturazione
-DocType: Purchase Order Item,Expected Delivery Date,Data prevista di consegna
+DocType: Purchase Order Item,Expected Delivery Date,Data di Consegna Prevista
DocType: Restaurant Order Entry,Restaurant Order Entry,Inserimento ordine del ristorante
apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dare e Avere non uguale per {0} # {1}. La differenza è {2}.
DocType: Asset Maintenance Task,Assign To Name,Assegna al nome
@@ -4524,7 +4529,7 @@
DocType: Customer,From Lead,Da Contatto
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Gli ordini rilasciati per la produzione.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selezionare l'anno fiscale ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
DocType: Program Enrollment Tool,Enroll Students,iscrivere gli studenti
DocType: Lab Test,Approved Date,Data approvata
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Listino di Vendita
@@ -4600,7 +4605,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produzione Voce
,Employee Information,Informazioni Dipendente
DocType: Stock Entry Detail,Additional Cost,Costo aggiuntivo
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Non è possibile filtrare sulla base di Voucher No , se raggruppati per Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Non è possibile filtrare sulla base di Voucher No , se raggruppati per Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Crea un Preventivo Fornitore
DocType: Quality Inspection,Incoming,In arrivo
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Vengono creati modelli di imposta predefiniti per vendite e acquisti.
@@ -4617,14 +4622,14 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Nota : {0}
,Delivery Note Trends,Tendenze Documenti di Trasporto
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Sintesi di questa settimana
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Qtà in Stock
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Qtà in Stock
DocType: Delivery Trip,Calculate Estimated Arrival Times,Calcola i tempi di arrivo stimati
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} può essere aggiornato solo tramite documenti di magazzino
DocType: Student Group Creation Tool,Get Courses,Ottieni Corsi
DocType: GL Entry,Party,Partner
DocType: Healthcare Settings,Patient Name,Nome paziente
DocType: Variant Field,Variant Field,Campo di variante
-DocType: Sales Order,Delivery Date,Data Consegna
+DocType: Sales Order,Delivery Date,Data di Consegna
DocType: Opportunity,Opportunity Date,Data Opportunità
DocType: Purchase Receipt,Return Against Purchase Receipt,Ricevuta di Ritorno contro Ricevuta di Acquisto
DocType: Water Analysis,Person Responsible,Persona responsabile
@@ -4633,7 +4638,7 @@
DocType: Material Request,% Ordered,% Ordinato
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per il corso del corso, il Corso sarà convalidato per ogni Studente dai corsi iscritti in iscrizione al programma."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,lavoro a cottimo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Buying Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Buying Rate
DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
DocType: Employee,History In Company,Storia aziendale
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nuovo messaggio da {sender}
@@ -4681,7 +4686,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Riga {0}: Valuta del BOM # {1} deve essere uguale alla valuta selezionata {2}
DocType: Journal Entry Account,Exchange Rate,Tasso di cambio:
DocType: Patient,Additional information regarding the patient,Ulteriori informazioni sul paziente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,L'ordine di vendita {0} non è stato presentato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,L'ordine di vendita {0} non è stato presentato
DocType: Homepage,Tag Line,Tag Linea
DocType: Fee Component,Fee Component,Fee Componente
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestione della flotta
@@ -4893,7 +4898,7 @@
DocType: Employee Education,Employee Education,Istruzione Dipendente
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,gruppo di articoli duplicato trovato nella tabella gruppo articoli
DocType: Land Unit,Parent Land Unit,Unità territoriale genitore
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,E 'necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,E 'necessario per recuperare Dettagli elemento.
DocType: Fertilizer,Fertilizer Name,Nome del fertilizzante
DocType: Salary Slip,Net Pay,Retribuzione Netta
DocType: Account,Account,Account
@@ -4910,7 +4915,7 @@
DocType: Email Digest,Email Digest,Email di Sintesi
DocType: Delivery Note,Billing Address Name,Destinatario
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,Grandi magazzini
-,Item Delivery Date,Data di consegna dell'articolo
+,Item Delivery Date,Data di Consegna dell'Articolo
DocType: Warehouse,PIN,PIN
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +125,Error '{0}' occured. Arguments {1}.,Errore "{0}". Argomenti {1}.
DocType: Bin,Reserved Qty for sub contract,Qtà riservata per il subappalto
@@ -4972,7 +4977,7 @@
DocType: Item Customer Detail,Ref Code,Codice Rif
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Il gruppo di clienti è richiesto nel profilo POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Informazioni Dipendente.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Si prega di impostare Successivo Ammortamenti Data
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Si prega di impostare Successivo Ammortamenti Data
DocType: HR Settings,Payroll Settings,Impostazioni Payroll
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Partita Fatture non collegati e pagamenti.
DocType: POS Settings,POS Settings,Impostazioni POS
@@ -5139,7 +5144,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Promemoria Compleanno per {0}
DocType: Asset Maintenance Task,Last Completion Date,Ultima data di completamento
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Giorni dall'ultimo ordine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
DocType: Buying Settings,Naming Series,Denominazione Serie
DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Assicurazione Data di inizio deve essere inferiore a Assicurazione Data Fine
@@ -5208,7 +5213,7 @@
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installare i preset
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +67,No Delivery Note selected for Customer {},Nessuna nota di consegna selezionata per il cliente {}
apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM sostituita
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1041,Select Items based on Delivery Date,Selezionare gli elementi in base alla data di consegna
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1041,Select Items based on Delivery Date,Selezionare gli elementi in base alla Data di Consegna
DocType: Grant Application,Has any past Grant Record,Ha un record di sovvenzione passato
,Sales Analytics,Analisi dei dati di vendita
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Disponibile {0}
@@ -5265,6 +5270,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Ottenere i Pagamenti
DocType: Quotation Item,Against Docname,Per Nome Doc
DocType: SMS Center,All Employee (Active),Tutti Dipendenti (Attivi)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Cliente> Gruppo clienti> Territorio
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Guarda ora
DocType: BOM,Raw Material Cost,Costo Materie Prime
DocType: Item Reorder,Re-Order Level,Livello Ri-ordino
@@ -5363,7 +5369,6 @@
DocType: Room,Seating Capacity,posti a sedere
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Gruppi di test del laboratorio
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Cliente> Gruppo clienti> Territorio
DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via rimborsi spese)
DocType: GST Settings,GST Summary,Riepilogo GST
DocType: Assessment Result,Total Score,Punteggio totale
@@ -5376,7 +5381,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Sono stati creati i seguenti programmi del corso
DocType: Journal Entry,Total Debit,Debito totale
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Deposito beni ultimati
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Addetto alle vendite
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Addetto alle vendite
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Bilancio e Centro di costo
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Non è consentito il modo di pagamento multiplo predefinito
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,per il
@@ -5549,7 +5554,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considera Tasse o Costo per
DocType: Driver,Driving License Category,Categoria di patente di guida
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La q.tà reale è obbligatoria
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ha attualmente una posizione di valutazione del fornitore {1} e gli ordini di acquisto a questo fornitore dovrebbero essere rilasciati con cautela.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ha attualmente una posizione di valutazione del fornitore {1} e gli ordini di acquisto a questo fornitore dovrebbero essere rilasciati con cautela.
DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
DocType: Employee Loan,Loan Type,Tipo di prestito
DocType: Scheduling Tool,Scheduling Tool,Strumento di pianificazione
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index b142792..2e1d6bd 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,価格で並べ替え
,Delay Days,遅延日数
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,サービス費用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号：{0}は既に販売請求書：{1}で参照されています
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号：{0}は既に販売請求書：{1}で参照されています
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,請求
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,保持在庫エントリを作成する
DocType: Purchase Invoice Item,Item Weight Details,アイテムの重量の詳細
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参照：{0}、商品コード：{1}、顧客：{2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,欠員
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},明細{0}の行{1}でBOMが指定されていません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},明細{0}の行{1}でBOMが指定されていません
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0}結果がサブミットされました
DocType: Item Attribute,Increment,増分
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,期間
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} は許可されていません
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,からアイテムを取得します
DocType: Price List,Price Not UOM Dependant,UOMに依存しない価格
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},製品{0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,リストされたアイテム
DocType: Asset Repair,Error Description,エラーの説明
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,食料品
DocType: Quality Inspection Reading,Reading 1,報告要素1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,年金基金
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,次の減価償却日付は購入日の前にすることはできません
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,次の減価償却日付は購入日の前にすることはできません
DocType: Crop,Perennial,多年生
DocType: Consultation,Consultation Date,相談日
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNextユーザー向けの製品リストおよび検出
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",例えば、「小学校」や「大学」
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,在庫レポート
DocType: Warehouse,Warehouse Detail,倉庫の詳細
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,期間終了日は、後の項が（アカデミック・イヤー{}）リンクされている年度の年度終了日を超えることはできません。日付を訂正して、もう一度お試しください。
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
DocType: Delivery Trip,Departure Time,出発時間
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,仕様詳細を取得
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,サプライヤー順位のテンプレート。
DocType: Lead,Interested,関心あり
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,期首
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,期首
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},{0}から{1}へ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,税金の設定に失敗しました
DocType: Item,Copy From Item Group,項目グループからコピーする
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,年次休暇
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：前払エントリである場合、アカウント{1}に対する「前払」をご確認ください
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
DocType: Email Digest,Profit & Loss,利益損失
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,リットル
DocType: Task,Total Costing Amount (via Time Sheet),（タイムシートを介して）総原価計算量
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,これは、この会社に対する取引に基づいています。詳細は以下のタイムラインをご覧ください
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自動的な資材要求の作成時にメールで通知
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,耐性
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,相談
DocType: Journal Entry,Multi Currency,複数通貨
DocType: Opening Invoice Creation Tool,Invoice Type,請求書タイプ
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,納品書
@@ -529,7 +530,6 @@
DocType: Employee,Widowed,死別
DocType: Request for Quotation,Request for Quotation,見積依頼
DocType: Healthcare Settings,Require Lab Test Approval,ラボテスト承認が必要
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品コード>商品グループ>ブランド
DocType: Salary Slip Timesheet,Working Hours,労働時間
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,残高の総額
DocType: Naming Series,Change the starting / current sequence number of an existing series.,既存のシリーズについて、開始／現在の連続番号を変更します。
@@ -558,7 +558,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,「コストセンター」を入力してください
DocType: Drug Prescription,Dosage,投薬量
DocType: Journal Entry Account,Sales Order,受注
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,平均販売レート
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均販売レート
DocType: Assessment Plan,Examiner Name,審査官の名前
DocType: Lab Test Template,No Result,検索結果はありません
DocType: Purchase Invoice Item,Quantity and Rate,数量とレート
@@ -606,6 +606,7 @@
DocType: Payroll Entry,Select Payroll Period,給与計算期間を選択
DocType: Purchase Invoice,Unpaid,未払い
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,販売のために予約済み
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,従業員の命名システムを人事管理> HR設定で設定してください
DocType: Packing Slip,From Package No.,参照元梱包番号
DocType: Item Attribute,To Range,範囲対象
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,有価証券および預金
@@ -630,11 +631,11 @@
DocType: Training Event,Workshop,ワークショップ
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,購入注文を警告する
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,制作するのに十分なパーツ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,制作するのに十分なパーツ
DocType: POS Profile User,POS Profile User,POSプロファイルユーザー
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接利益
DocType: Patient Appointment,Date TIme,日付時刻
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",アカウント別にグループ化されている場合、アカウントに基づいてフィルタリングすることはできません
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",アカウント別にグループ化されている場合、アカウントに基づいてフィルタリングすることはできません
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,管理担当者
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,会社と税金の設定
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,コースを選択してください
@@ -644,7 +645,7 @@
DocType: Stock Entry Detail,Difference Account,差損益
DocType: Purchase Invoice,Supplier GSTIN,サプライヤーGSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,依存するタスク{0}がクローズされていないため、タスクをクローズできません
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
DocType: Production Order,Additional Operating Cost,追加の営業費用
DocType: Lab Test Template,Lab Routine,ラボルーチン
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化粧品
@@ -812,7 +813,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2との関係
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,マネージャー
DocType: Payment Entry,Payment From / To,/からへの支払い
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新たな与信限度は、顧客の現在の残高よりも少ないです。与信限度は、少なくとも{0}である必要があります
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新たな与信限度は、顧客の現在の残高よりも少ないです。与信限度は、少なくとも{0}である必要があります
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},倉庫{0}にアカウントを設定してください
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,「参照元」と「グループ元」は同じにすることはできません
DocType: Sales Person,Sales Person Targets,営業担当者の目標
@@ -823,7 +824,7 @@
DocType: Student Batch Name,Batch Name,バッチ名
DocType: Fee Validity,Max number of visit,訪問の最大数
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,タイムシートを作成しました：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,登録します
DocType: GST Settings,GST Settings,GSTの設定
DocType: Selling Settings,Customer Naming By,顧客名設定
@@ -947,7 +948,7 @@
DocType: Budget,Budget Against,予算に対する
DocType: Employee,Cell Number,携帯電話の番号
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,与えられた基準の従業員はいません。給与明細がまだ作成されていないことを確認します。
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,自動資材要求生成済
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,自動資材要求生成済
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,失われた
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,製造業のために予約済み
@@ -955,7 +956,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,エネルギー
DocType: Opportunity,Opportunity From,機会元
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月次給与計算書。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}アイテム{2}に必要なシリアル番号。あなたは{3}を提供しました。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}アイテム{2}に必要なシリアル番号。あなたは{3}を提供しました。
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,テーブルを選択してください
DocType: BOM,Website Specifications,ウェブサイトの仕様
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}は「受信者」のメールアドレスが無効です
@@ -1050,7 +1051,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,見積もり依頼
DocType: Vital Signs,Heart Rate / Pulse,心拍数/パルス
DocType: Company,Default Bank Account,デフォルト銀行口座
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},アイテムが{0}経由で配送されていないため、「在庫更新」はチェックできません
DocType: Vehicle,Acquisition Date,取得日
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,番号
@@ -1074,7 +1075,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),あなたの手紙の頭をアップロードしてください（900pxで100pxとしてウェブフレンドリーにしてください）
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}：アカウント{2}グループにすることはできません
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,アイテム行{idxの}：{DOCTYPE} {DOCNAME}上に存在しない '{文書型}'テーブル
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,タイムシート{0}はすでに完了またはキャンセルされます
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,タイムシート{0}はすでに完了またはキャンセルされます
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,いいえタスクはありません
DocType: Item Variant Settings,Copy Fields to Variant,フィールドをバリアントにコピー
DocType: Asset,Opening Accumulated Depreciation,減価償却累計額を開きます
@@ -1186,9 +1187,10 @@
DocType: Production Order,Plan material for sub-assemblies,部分組立品資材計画
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,販売パートナーと地域
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,部品表{0}はアクティブでなければなりません
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),終了（オープニング+合計）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),終了（オープニング+合計）
DocType: Journal Entry,Depreciation Entry,減価償却エントリ
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,文書タイプを選択してください
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,アカウント通貨で印刷
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,このメンテナンス訪問をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
DocType: Crop Cycle,ISO 8016 standard,ISO 8016規格
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},アイテム {1} に関連付けが無いシリアル番号 {0}
@@ -1214,7 +1216,7 @@
DocType: Supplier,Default Payable Accounts,デフォルト買掛金勘定
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
DocType: Fee Structure,Components,コンポーネント
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
DocType: Quality Inspection Reading,Reading 6,報告要素6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1266,6 +1268,7 @@
,Company Name,（会社名）
DocType: SMS Center,Total Message(s),全メッセージ
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,セットアップ>設定>ネーミングシリーズで{0}のネーミングシリーズを設定してください
DocType: Purchase Invoice,Additional Discount Percentage,追加割引パーセンテージ
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ヘルプ動画リストを表示
DocType: Agriculture Analysis Criteria,Soil Texture,土壌テクスチャ
@@ -1293,7 +1296,7 @@
DocType: BOM Website Item,BOM Website Item,BOMのウェブサイトのアイテム
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
DocType: Timesheet Detail,Bill,ビル
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,次の減価償却日は過去の日付として入力され、
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,次の減価償却日は過去の日付として入力され、
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ホワイト
DocType: SMS Center,All Lead (Open),全リード（オープン）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：（{2} {3}）エントリの時間を掲示で{1}倉庫内の{4}の数量は利用できません
@@ -1311,7 +1314,7 @@
DocType: Lead,Next Contact Date,次回連絡日
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,数量を開く
DocType: Healthcare Settings,Appointment Reminder,アポイントメントリマインダ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
DocType: Program Enrollment Tool Student,Student Batch Name,学生バッチ名
DocType: Consultation,Doctor,医師
DocType: Holiday List,Holiday List Name,休日リストの名前
@@ -1327,6 +1330,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,休暇割当ツール
DocType: Item,Hub Category to Publish,公開するハブカテゴリ
DocType: Leave Block List,Leave Block List Dates,休暇リスト日付
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,セットアップ>ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
DocType: Sales Invoice,Billing Address GSTIN,請求先住所GSTIN
DocType: Assessment Plan,Evaluate,評価する
DocType: Workstation,Net Hour Rate,時給総計
@@ -1360,7 +1364,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,売上請求書の支払い
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,受注の予約倉庫／完成品倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,販売額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,販売額
DocType: Repayment Schedule,Interest Amount,利息額
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
DocType: Serial No,Creation Document No,作成ドキュメントNo
@@ -1451,7 +1455,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,期首残高
,GST Sales Register,GSTセールスレジスタ
DocType: Sales Invoice Advance,Sales Invoice Advance,前払金
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,要求するものがありません
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,要求するものがありません
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,あなたのドメインを選択してください
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},別の予算レコードは、 '{0}'は既にに対して存在します{1} '{2}'年度の{3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,フィールドは作成時にのみコピーされます。
@@ -1461,11 +1465,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",これはバリエーションのアイテムコードに追加されます。あなたの略称が「SM」であり、アイテムコードが「T-SHIRT」である場合は、バリエーションのアイテムコードは、「T-SHIRT-SM」になります
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,給与伝票を保存すると給与が表示されます。
DocType: Purchase Invoice,Is Return,返品
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,あぶない
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,あぶない
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,リターン/デビットノート
DocType: Price List Country,Price List Country,価格表内の国
DocType: Item,UOMs,数量単位
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},アイテム {1} の有効なシリアル番号 {0}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},アイテム {1} の有効なシリアル番号 {0}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,アイテムコードはシリアル番号に付け替えることができません
DocType: Purchase Invoice Item,UOM Conversion Factor,数量単位の変換係数
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,バッチ番号を取得するために、商品コードを入力してください
@@ -1569,7 +1573,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,受注{0}は有効ではありません
DocType: Supplier Scorecard,Warn for new Request for Quotations,新しい見積もり要求を警告する
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,購買発注は、あなたの購入を計画し、フォローアップに役立ちます
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",企業はマージできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",企業はマージできません
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ラボテストの処方箋
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",素材要求の総発行/転送量{0}が{1} \項目のための要求数量{2}を超えることはできません{3}
@@ -1607,7 +1611,6 @@
DocType: Warehouse,Warehouse Contact Info,倉庫連絡先情報
DocType: Payment Entry,Write Off Difference Amount,差額をオフ書きます
DocType: Volunteer,Volunteer Name,ボランティア名
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,インストラクターの教育におけるネーミングシステムの設定>教育の設定
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}：したがって、電子メールで送信されないことがわかっていない従業員の電子メール、
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},国{0}に配送規則が適用されない
DocType: Item,Foreign Trade Details,外国貿易詳細
@@ -1619,7 +1622,7 @@
DocType: Student Group Student,Group Roll Number,グループロール番号
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,すべてのタスクの重みの合計は1に応じて、すべてのプロジェクトのタスクの重みを調整してくださいする必要があります
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,納品書{0}は提出されていません
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,資本設備
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
@@ -1644,7 +1647,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,子供の倉庫は、この倉庫のために存在します。あなたはこの倉庫を削除することはできません。
DocType: Item,Website Item Groups,ウェブサイトのアイテムグループ
DocType: Purchase Invoice,Total (Company Currency),計（会社通貨）
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,シリアル番号{0}は複数回入力されています
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,シリアル番号{0}は複数回入力されています
DocType: Journal Entry,Journal Entry,仕訳
DocType: Expense Claim Advance,Unclaimed amount,未請求金額
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,進行中の{0}アイテム
@@ -1740,7 +1743,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,通信ログ。
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",見積依頼は、複数のチェックポータルの設定のために、ポータルからのアクセスに無効になっています。
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,サプライヤスコアカードスコアリング変数
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,購入金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,購入金額
DocType: Sales Invoice,Shipping Address Name,配送先住所
DocType: Material Request,Terms and Conditions Content,規約の内容
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,コーススケジュールを作成中にエラーが発生しました
@@ -2005,7 +2008,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,これは、この車両に対するログに基づいています。詳細については、以下のタイムラインを参照してください。
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
DocType: Customer,Default Price List,デフォルト価格表
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,資産運動レコード{0}を作成
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,資産運動レコード{0}を作成
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,あなたは年度{0}を削除することはできません。年度{0}はグローバル設定でデフォルトとして設定されています
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,同じ名前の顧客が既に存在している
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,これにより、給与伝票が提出され、見越ジャーナルエントリが作成されます。続行しますか？
@@ -2019,6 +2022,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,価格設定
DocType: Quotation,Term Details,用語解説
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,この学生グループのため{0}の学生よりも多くを登録することはできません。
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),合計（税なし）
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,リードカウント
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} は0より大きくなければなりません
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,在庫有ります
@@ -2037,7 +2041,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,請求書のキャンセルにお支払いのリンクを解除
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},入力された現在の走行距離計の読みは、初期の車両走行距離よりも大きくなければなりません{0}
DocType: Restaurant Reservation,No Show,全く見せない
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,セットアップ>設定>ネーミングシリーズで{0}のネーミングシリーズを設定してください
DocType: Shipping Rule Country,Shipping Rule Country,国の出荷ルール
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ままにして、出席
DocType: Maintenance Visit,Partially Completed,一部完了
@@ -2129,7 +2132,7 @@
DocType: Student Group Instructor,Student Group Instructor,学生グループインストラクター
DocType: Grant Application,Assessment Mark (Out of 10),アセスメントマーク（10のうち）
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2モバイルはありません
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,メイン
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,メイン
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,バリエーション
DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
DocType: Employee Attendance Tool,Employees HTML,従業員HTML
@@ -2177,7 +2180,7 @@
DocType: Course,Course Abbreviation,コースの略
DocType: Student Leave Application,Student Leave Application,学生休業申出
DocType: Item,Will also apply for variants,バリエーションについても適用されます
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},上半分の日に従業員{0} {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},総労働時間は最大労働時間よりも大きくてはいけません{0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,オン
@@ -2362,9 +2365,10 @@
DocType: Task,Actual End Date (via Time Sheet),（タイムシートを介して）実際の終了日
DocType: Soil Texture,Soil Type,土壌タイプ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,新しいメッセージ
,Quotation Trends,見積傾向
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
DocType: Shipping Rule,Shipping Amount,出荷量
DocType: Supplier Scorecard Period,Period Score,期間スコア
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,顧客を追加する
@@ -2375,7 +2379,7 @@
,Vehicle Expenses,車両費
DocType: Serial No,Invoice Details,請求書の詳細
DocType: Grant Application,Show on Website,ウェブサイトに表示
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,始める
DocType: Hub Category,Hub Category,ハブカテゴリ
DocType: Purchase Invoice,SEZ,SEZ
@@ -2406,7 +2410,7 @@
DocType: Patient,B Positive,Bポジティブ
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：項目は固定資産であるとして数量は、1でなければなりません。複数の数量のための個別の行を使用してください。
DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
DocType: Patient Medical Record,Patient Medical Record,患者の医療記録
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,グループから非グループ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,スポーツ
@@ -2456,6 +2460,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,受信RFQをいいえ引用符に設定できません
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,控除合計
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,口座通貨で印刷する口座を選択してください
,Production Analytics,生産分析
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,これは、この患者に対する取引に基づいています。詳細は以下のタイムラインを参照してください
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,費用更新
@@ -2510,7 +2515,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,会社を選択...
DocType: Leave Control Panel,Leave blank if considered for all departments,全部門が対象の場合は空白のままにします
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
DocType: Payroll Entry,Fortnightly,2週間ごとの
DocType: Currency Exchange,From Currency,通貨から
DocType: Vital Signs,Weight (In Kilogram),重量（キログラム）
@@ -2586,7 +2591,7 @@
DocType: Student,Guardians,ガーディアン
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,価格表が設定されていない場合の価格は表示されません
DocType: Stock Entry,Total Incoming Value,収入価値合計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,デビットへが必要とされます
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,デビットへが必要とされます
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",タイムシートは、あなたのチームによって行わのactivitesのための時間、コストおよび課金を追跡するのに役立ち
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,仕入価格表
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,サプライヤスコアカード変数のテンプレート。
@@ -2687,7 +2692,7 @@
DocType: Company,For Reference Only.,参考用
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},医者{0}は{1}で利用できません
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,バッチ番号を選択
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無効な{0}：{1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},無効な{0}：{1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,参照Inv
@@ -2724,8 +2729,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
DocType: Water Analysis,Origin,原点
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,この文書では、アイテム{4}の{0} {1}によって限界を超えています。あなたが作っている同じに対して別の{3} {2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,保存した後、繰り返し設定をしてください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,変化量のアカウントを選択
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,保存した後、繰り返し設定をしてください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,変化量のアカウントを選択
DocType: Purchase Invoice,Price List Currency,価格表の通貨
DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
@@ -2782,7 +2787,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,新規購買発注の警告
DocType: Quality Inspection Reading,Reading 9,報告要素9
DocType: Supplier,Is Frozen,凍結
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,グループノード倉庫が取引のために選択することが許可されていません
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,グループノード倉庫が取引のために選択することが許可されていません
DocType: Buying Settings,Buying Settings,購入設定
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,完成品アイテムの部品表番号
DocType: Upload Attendance,Attendance To Date,出勤日
@@ -2796,6 +2801,7 @@
DocType: Grant Application,Organization,組織
DocType: BOM Update Tool,BOM Update Tool,BOM更新ツール
DocType: SG Creation Tool Course,Student Group Name,学生グループ名
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,分解されたビューを表示する
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,手数料の作成
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
DocType: Room,Room Number,部屋番号
@@ -2806,7 +2812,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,税テンプレートを作る
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ユーザーフォーラム
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,原材料は空白にできません。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
DocType: Lab Test Sample,Lab Test Sample,ラボテストサンプル
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,クイック仕訳エントリー
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
@@ -2877,7 +2883,7 @@
DocType: Membership,USD,米ドル
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,請求書を作成
DocType: Selling Settings,Auto close Opportunity after 15 days,15日後にオートクローズ機会
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,スコアカードが{1}のため、購買発注は{0}には許可されません。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,スコアカードが{1}のため、購買発注は{0}には許可されません。
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,終了年
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,見積もり/リード％
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
@@ -2996,7 +3002,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：仕訳は、{1}アカウント{2}を持っているか、すでに別のバウチャーに対して一致しません
DocType: Supplier Scorecard Criteria,Criteria Weight,基準重量
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,サプライヤ>サプライヤタイプ
DocType: Buying Settings,Default Buying Price List,デフォルト購入価格表
DocType: Payroll Entry,Salary Slip Based on Timesheet,タイムシートに基づいて給与スリップ
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,購入率
@@ -3084,7 +3089,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,業種によってリードを追跡
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,レターヘッドに行く
DocType: Item Supplier,Item Supplier,アイテムサプライヤー
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,全ての住所。
DocType: Company,Stock Settings,在庫設定
@@ -3272,6 +3277,7 @@
DocType: Company,Default Inventory Account,デフォルトの在庫アカウント
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,行{0}：完了数量はゼロより大きくなければなりません。
DocType: Antibiotic,Antibiotic Name,抗生物質名
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品コード>商品グループ>ブランド
DocType: Purchase Invoice,Apply Additional Discount On,追加割引に適用
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,タイプを選択...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,作物が成長しているすべての土地単位へのリンク
@@ -3465,6 +3471,7 @@
DocType: Supplier,Credit Limit,与信限度
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,平均販売価格リストレート
DocType: Production Plan Sales Order,Salse Order Date,受注日
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,サプライヤ>サプライヤタイプ
DocType: Salary Component,Salary Component,給与コンポーネント
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,支払エントリ{0}は未リンクされています
DocType: GL Entry,Voucher No,伝票番号
@@ -3473,7 +3480,7 @@
DocType: Leave Allocation,Leave Allocation,休暇割当
DocType: Payment Request,Recipient Message And Payment Details,受信者のメッセージと支払いの詳細
DocType: Training Event,Trainer Email,トレーナーメール
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,資材要求{0}は作成済
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,資材要求{0}は作成済
DocType: Restaurant Reservation,No of People,人々の数
DocType: Production Planning Tool,Include sub-contracted raw materials,下請け原料を含めます
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,規約・契約用テンプレート
@@ -3537,7 +3544,7 @@
DocType: Production Planning Tool,Create Material Requests,資材要求を作成
DocType: Employee Education,School/University,学校/大学
DocType: Payment Request,Reference Details,リファレンス詳細
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,残存価額は購入総額未満でなければなりません
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,残存価額は購入総額未満でなければなりません
DocType: Sales Invoice Item,Available Qty at Warehouse,倉庫の利用可能数量
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,請求金額
DocType: Asset,Double Declining Balance,ダブル定率
@@ -3549,7 +3556,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,アップデートを入手
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}：アカウントは、{2}会社に所属していない{3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,各属性から少なくとも1つの値を選択します。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
apps/erpnext/erpnext/config/hr.py +310,Leave Management,休暇管理
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,勘定によるグループ
DocType: Sales Order,Fully Delivered,全て納品済
@@ -3560,14 +3567,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支出額は、ローン額を超えることはできません{0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,プログラムに行く
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}＃割り当てられた金額{1}は請求されていない金額{2}より大きくすることはできません
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,セットアップ>ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,製造指図が作成されていません
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',「終了日」は「開始日」の後にしてください。
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},学生としてのステータスを変更することはできません{0}学生のアプリケーションとリンクされている{1}
DocType: Asset,Fully Depreciated,完全に減価償却
,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
DocType: Employee Attendance Tool,Marked Attendance HTML,著しい出席HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",名言は、あなたの顧客に送られてきた入札提案されています
DocType: Sales Order,Customer's Purchase Order,顧客の購入注文
@@ -3651,7 +3657,7 @@
DocType: Stock Settings,Item Naming By,アイテム命名
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},別の期間の決算仕訳 {0} が {1} の後に作成されています
DocType: Production Order,Material Transferred for Manufacturing,製造用移設資材
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,アカウント{0}が存在しません
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,アカウント{0}が存在しません
DocType: Project,Project Type,プロジェクトタイプ
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,このタスクの子タスクが存在します。このタスクは削除できません。
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ターゲット数量や目標量のどちらかが必須です。
@@ -3753,11 +3759,11 @@
DocType: Company,Asset Depreciation Cost Center,資産減価償却コストセンター
DocType: Sales Order Item,Sales Order Date,受注日
DocType: Sales Invoice Item,Delivered Qty,納品済数量
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,合計Excl。税金
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",チェックした場合、各生産アイテムのすべての子供たちは、素材の要求に含まれます。
DocType: Assessment Plan,Assessment Plan,評価計画
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,顧客{0}が作成されました。
DocType: Stock Settings,Limit Percent,リミットパーセント
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,インストラクターの教育におけるネーミングシステムの設定>教育の設定
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,現在、どの倉庫でも在庫がありません
,Payment Period Based On Invoice Date,請求書の日付に基づく支払期間
DocType: Sample Collection,No. of print,印刷枚数
@@ -3773,12 +3779,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),債務者（{0}）
DocType: Pricing Rule,Margin,マージン
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新規顧客
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,粗利益％
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,粗利益％
DocType: Appraisal Goal,Weightage (%),重み付け（％）
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POSプロファイルの変更
DocType: Bank Reconciliation Detail,Clearance Date,決済日
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,アセスメントレポート
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,購入総額は必須です
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,購入総額は必須です
DocType: Lead,Address Desc,住所種別
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,党は必須です
DocType: Journal Entry,JV-,JV-
@@ -3810,7 +3816,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,立っている名前
DocType: Stock Entry,Customer or Supplier Details,顧客またはサプライヤー詳細
DocType: Employee Loan Application,Required by Date,日によって必要とされます
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),クローズバランス（Dr-Cr）
DocType: Lead,Lead Owner,リード所有者
DocType: Bin,Requested Quantity,要求された数量
DocType: Patient,Marital Status,配偶者の有無
@@ -3824,7 +3829,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,複数のバリアント
DocType: Sales Invoice,Against Income Account,対損益勘定
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}％配送済
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,アイテム{0}：発注数量{1}は最小注文数量{2}（アイテム内で定義）より小さくすることはできません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,アイテム{0}：発注数量{1}は最小注文数量{2}（アイテム内で定義）より小さくすることはできません
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月次配分割合
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,別のユーザーとしてログインしてください。
DocType: Territory,Territory Targets,ターゲット地域
@@ -3923,7 +3928,7 @@
DocType: Serial No,Out of AMC,年間保守契約外
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,メンテナンス訪問を作成
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
DocType: Company,Default Cash Account,デフォルトの現金勘定
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,会社（顧客・サプライヤーではない）のマスター
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,これは、この生徒の出席に基づいています
@@ -4073,7 +4078,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,上記基準の従業員はいません
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,製造する部品表（BOM）を持つアイテムいいえ
DocType: Restaurant,Default Customer,デフォルト顧客
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,従業員の命名システムを人事管理> HR設定で設定してください
DocType: Assessment Plan,Supervisor Name,上司の名前
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,予定が同じ日に作成されているかどうかを確認しない
DocType: Program Enrollment Course,Program Enrollment Course,プログラム入学コース
@@ -4191,7 +4195,7 @@
DocType: BOM,Website Description,ウェブサイトの説明
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,資本の純変動
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,最新
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子メールアドレスは一意である必要があり、すでに{0}のために存在します
DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,領収書
@@ -4208,7 +4212,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,キャッシュフロー計算書
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ライセンス
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,過去の会計年度の残高を今年度に含めて残したい場合は「繰り越す」を選択してください
DocType: GL Entry,Against Voucher Type,対伝票タイプ
DocType: Physician,Phone (R),電話（R）
@@ -4220,7 +4224,7 @@
DocType: Patient,B Negative,Bネガティブ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,メンテナンスステータスをキャンセルするか、送信完了する必要があります
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,行{0}のシリアル番号が配達メモと一致しません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,行{0}のシリアル番号が配達メモと一致しません
DocType: Student,Guardian Details,ガーディアン詳細
DocType: C-Form,C-Form,C-フォーム
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,複数の従業員のためのマーク出席
@@ -4262,7 +4266,7 @@
DocType: Stock Entry Detail,Basic Amount,基本額
DocType: Training Event,Exam,試験
DocType: Complaint,Complaint,苦情
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
DocType: Leave Allocation,Unused leaves,未使用の休暇
DocType: Patient,Alcohol Past Use,アルコールの過去使用
DocType: Fertilizer Content,Fertilizer Content,肥料の内容
@@ -4386,6 +4390,7 @@
DocType: Salary Detail,Formula,式
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,シリアル番号
DocType: Lab Test Template,Lab Test Template,ラボテストテンプレート
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,セールスアカウント
DocType: Purchase Invoice Item,Total Weight,総重量
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,販売手数料
DocType: Offer Letter Term,Value / Description,値／説明
@@ -4542,7 +4547,7 @@
DocType: Customer,From Lead,リードから
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,製造の指示
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,年度選択...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
DocType: Program Enrollment Tool,Enroll Students,学生を登録
DocType: Lab Test,Approved Date,承認日
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準販売
@@ -4619,7 +4624,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,生産アイテム
,Employee Information,従業員の情報
DocType: Stock Entry Detail,Additional Cost,追加費用
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,サプライヤ見積を作成
DocType: Quality Inspection,Incoming,収入
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,販売および購買のデフォルト税テンプレートが登録されます。
@@ -4636,7 +4641,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},注：{0}
,Delivery Note Trends,納品書の動向
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,今週の概要
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,在庫数量で
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,在庫数量で
DocType: Delivery Trip,Calculate Estimated Arrival Times,推定到着時間の計算
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,アカウント：{0}のみ株式取引を介して更新することができます
DocType: Student Group Creation Tool,Get Courses,コースを取得
@@ -4652,7 +4657,7 @@
DocType: Material Request,% Ordered,％注文済
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",コースベースの学生グループの場合、コースはプログラム登録のコースからすべての生徒のために検証されます。
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,出来高制
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,平均購入レート
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,平均購入レート
DocType: Task,Actual Time (in Hours),実際の時間（時）
DocType: Employee,History In Company,会社での履歴
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{送信者}からの新しいメッセージ
@@ -4700,7 +4705,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOMの＃の通貨は、{1}選択した通貨と同じでなければなりません{2}
DocType: Journal Entry Account,Exchange Rate,為替レート
DocType: Patient,Additional information regarding the patient,患者に関する追加情報
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,受注{0}は提出されていません
DocType: Homepage,Tag Line,タグライン
DocType: Fee Component,Fee Component,手数料コンポーネント
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,フリート管理
@@ -4912,7 +4917,7 @@
DocType: Employee Education,Employee Education,従業員教育
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,項目グループテーブルで見つかった重複するアイテム群
DocType: Land Unit,Parent Land Unit,親土地単位
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
DocType: Fertilizer,Fertilizer Name,肥料名
DocType: Salary Slip,Net Pay,給与総計
DocType: Account,Account,アカウント
@@ -4991,7 +4996,7 @@
DocType: Item Customer Detail,Ref Code,参照コード
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POSプロファイルで得意先グループが必要
apps/erpnext/erpnext/config/hr.py +12,Employee records.,従業員レコード
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,次の減価償却日を設定してください
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,次の減価償却日を設定してください
DocType: HR Settings,Payroll Settings,給与計算の設定
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,リンクされていない請求書と支払を照合
DocType: POS Settings,POS Settings,POS設定
@@ -5158,7 +5163,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},{0}のための誕生日リマインダー
DocType: Asset Maintenance Task,Last Completion Date,最終完了日
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,最新注文からの日数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
DocType: Buying Settings,Naming Series,シリーズ名を付ける
DocType: Leave Block List,Leave Block List Name,休暇リスト名
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保険開始日は、保険終了日未満でなければなりません
@@ -5286,6 +5291,7 @@
DocType: Bank Reconciliation,Get Payment Entries,支払エントリを取得します。
DocType: Quotation Item,Against Docname,文書名に対して
DocType: SMS Center,All Employee (Active),全ての従業員（アクティブ）
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,顧客>顧客グループ>テリトリー
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,表示
DocType: BOM,Raw Material Cost,原材料費
DocType: Item Reorder,Re-Order Level,再注文レベル
@@ -5384,7 +5390,6 @@
DocType: Room,Seating Capacity,座席定員
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,ラボテストグループ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,顧客>顧客グループ>テリトリー
DocType: Project,Total Expense Claim (via Expense Claims),総経費請求（経費請求経由）
DocType: GST Settings,GST Summary,GSTサマリー
DocType: Assessment Result,Total Score,合計スコア
@@ -5397,7 +5402,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,その後、コースのスケジュールが作成されました
DocType: Journal Entry,Total Debit,借方合計
DocType: Manufacturing Settings,Default Finished Goods Warehouse,デフォルト完成品倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,営業担当
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,営業担当
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,予算とコストセンター
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,複数のデフォルトの支払い方法は許可されていません
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,のために
@@ -5570,7 +5575,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,税金・料金を考慮
DocType: Driver,Driving License Category,運転免許証カテゴリ
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,実際の数量は必須です
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}には現在、{1}サプライヤスコアカードがあり、このサプライヤへの購入注文は慎重に発行する必要があります。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}には現在、{1}サプライヤスコアカードがあり、このサプライヤへの購入注文は慎重に発行する必要があります。
DocType: Asset Maintenance Team,Asset Maintenance Team,資産管理チーム
DocType: Employee Loan,Loan Type,ローンの種類
DocType: Scheduling Tool,Scheduling Tool,スケジューリングツール
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index c370b0f..ef4f2af 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,តម្រៀបតាមតម្លៃ
,Delay Days,ពន្យារពេល
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ការចំណាយសេវា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,វិក័យប័ត្រ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,ធ្វើឱ្យធាតុរក្សាទុក
DocType: Purchase Invoice Item,Item Weight Details,ព័ត៌មានលម្អិតទម្ងន់
@@ -149,7 +149,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,ទទួលបានធាតុពី
DocType: Price List,Price Not UOM Dependant,តម្លៃមិនមែន UOM អ្នកអាស្រ័យ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ផលិតផល {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,គ្មានធាតុដែលបានរាយ
DocType: Asset Repair,Error Description,កំហុសការពិពណ៌នា
@@ -157,7 +157,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,គ្រឿងទេស
DocType: Quality Inspection Reading,Reading 1,ការអានទី 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,មូលនិធិសោធននិវត្តន៍
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,រំលស់បន្ទាប់កាលបរិច្ឆេទមិនអាចមុនពេលទិញកាលបរិច្ឆេទ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,រំលស់បន្ទាប់កាលបរិច្ឆេទមិនអាចមុនពេលទិញកាលបរិច្ឆេទ
DocType: Crop,Perennial,មានអាយុច្រើនឆ្នាំ
DocType: Consultation,Consultation Date,កាលបរិច្ឆេទពិគ្រោះ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ការចុះបញ្ជីនិងការរកឃើញផលិតផលសម្រាប់អ្នកប្រើ ERPNext
@@ -172,7 +172,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",ឧទាហរណ៍ "សាលាបឋមសិក្សា" ឬ "សាកលវិទ្យាល័យ"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,របាយការណ៍ភាគហ៊ុន
DocType: Warehouse,Warehouse Detail,ពត៌មានលំអិតឃ្លាំង
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,កាលបរិច្ឆេទបញ្ចប់រយៈពេលមិនអាចមាននៅពេលក្រោយជាងឆ្នាំបញ្ចប់កាលបរិច្ឆេទនៃឆ្នាំសិក្សាដែលរយៈពេលនេះត្រូវបានតភ្ជាប់ (អប់រំឆ្នាំ {}) ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",«តើអចលន "មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
DocType: Delivery Trip,Departure Time,មោងចាកចេញ
@@ -192,7 +192,7 @@
DocType: Quality Inspection,Get Specification Details,ទទួលបានព័ត៌មានលម្អិតជាក់លាក់
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,គំរូនៃចំណាត់ថ្នាក់ក្រុមហ៊ុនផ្គត់ផ្គង់។
DocType: Lead,Interested,មានការចាប់អារម្មណ៍
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,ពិធីបើក
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,ពិធីបើក
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},ពី {0} ទៅ {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,បានបរាជ័យក្នុងការដំឡើងពន្ធ
DocType: Item,Copy From Item Group,ការចម្លងពីធាតុគ្រុប
@@ -363,7 +363,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,ស្លឹកមួយឆ្នាំ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ជួរដេក {0}: សូមពិនិត្យមើលតើជាមុនប្រឆាំងគណនី {1} ប្រសិនបើនេះជាធាតុជាមុន។
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},ឃ្លាំង {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},ឃ្លាំង {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
DocType: Email Digest,Profit & Loss,ប្រាក់ចំណេញនិងការបាត់បង់
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),សរុបការចំណាយចំនួនទឹកប្រាក់ (តាមរយៈសន្លឹកម៉ោង)
@@ -455,6 +455,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,នេះគឺផ្អែកទៅលើប្រតិបត្តិការប្រឆាំងនឹងក្រុមហ៊ុននេះ។ សូមមើលតារាងពេលវេលាខាងក្រោមសម្រាប់ព័ត៌មានលំអិត
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ជូនដំណឹងដោយអ៊ីមែលនៅលើការបង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,មានភាពធន់ទ្រាំ
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
DocType: Opening Invoice Creation Tool,Invoice Type,ប្រភេទវិក័យប័ត្រ
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,ដឹកជញ្ជូនចំណាំ
@@ -527,7 +528,6 @@
DocType: Employee,Widowed,មេម៉ាយ
DocType: Request for Quotation,Request for Quotation,សំណើរសម្រាប់សម្រង់
DocType: Healthcare Settings,Require Lab Test Approval,តម្រូវឱ្យមានការធ្វើតេស្តសាកល្បង
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,លេខកូដធាតុ> ក្រុមធាតុ> ម៉ាក
DocType: Salary Slip Timesheet,Working Hours,ម៉ោងធ្វើការ
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,ចំនួនឆ្នើមសរុប
DocType: Naming Series,Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។
@@ -556,7 +556,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
DocType: Drug Prescription,Dosage,កិតើ
DocType: Journal Entry Account,Sales Order,សណ្តាប់ធ្នាប់ការលក់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,ជាមធ្យម។ អត្រាការលក់
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ជាមធ្យម។ អត្រាការលក់
DocType: Assessment Plan,Examiner Name,ពិនិត្យឈ្មោះ
DocType: Lab Test Template,No Result,គ្មានលទ្ធផល
DocType: Purchase Invoice Item,Quantity and Rate,បរិមាណនិងអត្រាការប្រាក់
@@ -604,6 +604,7 @@
DocType: Payroll Entry,Select Payroll Period,ជ្រើសរយៈពេលបើកប្រាក់បៀវត្ស
DocType: Purchase Invoice,Unpaid,គ្មានប្រាក់ខែ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,បានបម្រុងទុកសម្រាប់លក់
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស> ការកំណត់ធនធានមនុស្ស
DocType: Packing Slip,From Package No.,ពីលេខកញ្ចប់
DocType: Item Attribute,To Range,ដើម្បីជួរ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,មូលបត្រនិងប្រាក់បញ្ញើ
@@ -628,11 +629,11 @@
DocType: Training Event,Workshop,សិក្ខាសាលា
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ព្រមានការបញ្ជាទិញ
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,រាយមួយចំនួននៃអតិថិជនរបស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,ផ្នែកគ្រប់គ្រាន់ដើម្បីកសាង
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ផ្នែកគ្រប់គ្រាន់ដើម្បីកសាង
DocType: POS Profile User,POS Profile User,អ្នកប្រើប្រាស់បណ្តាញ POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ប្រាក់ចំណូលដោយផ្ទាល់
DocType: Patient Appointment,Date TIme,ពេលណាត់ជួប
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","មិនអាចត្រងដោយផ្អែកលើគណនី, ប្រសិនបើការដាក់ជាក្រុមតាមគណនី"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","មិនអាចត្រងដោយផ្អែកលើគណនី, ប្រសិនបើការដាក់ជាក្រុមតាមគណនី"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,មន្រ្តីរដ្ឋបាល
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ការបង្កើតក្រុមហ៊ុននិងពន្ធ
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,សូមជ្រើសវគ្គសិក្សា
@@ -642,7 +643,7 @@
DocType: Stock Entry Detail,Difference Account,គណនីមានភាពខុសគ្នា
DocType: Purchase Invoice,Supplier GSTIN,GSTIN ក្រុមហ៊ុនផ្គត់ផ្គង់
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,មិនអាចភារកិច្ចជិតស្និទ្ធដូចជាការពឹងផ្អែករបស់ខ្លួនមានភារកិច្ច {0} គឺមិនត្រូវបានបិទ។
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
DocType: Production Order,Additional Operating Cost,ចំណាយប្រតិបត្តិការបន្ថែម
DocType: Lab Test Template,Lab Routine,មន្ទីរពិសោធន៍ជាទម្លាប់
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
@@ -810,7 +811,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ទំនាក់ទំនងជាមួយ Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,កម្មវិធីគ្រប់គ្រង
DocType: Payment Entry,Payment From / To,ការទូទាត់ពី / ទៅ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},កំណត់ឥណទានថ្មីនេះគឺមានចំនួនតិចជាងប្រាក់ដែលលេចធ្លោនាពេលបច្ចុប្បន្នសម្រាប់អតិថិជន។ ចំនួនកំណត់ឥណទានមានដើម្បីឱ្យមានយ៉ាងហោចណាស់ {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},កំណត់ឥណទានថ្មីនេះគឺមានចំនួនតិចជាងប្រាក់ដែលលេចធ្លោនាពេលបច្ចុប្បន្នសម្រាប់អតិថិជន។ ចំនួនកំណត់ឥណទានមានដើម្បីឱ្យមានយ៉ាងហោចណាស់ {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},សូមកំណត់គណនីនៅក្នុងឃ្លាំង {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"'ដោយផ្អែកលើ ""និង"" ក្រុមដោយ' មិនអាចដូចគ្នា"
DocType: Sales Person,Sales Person Targets,ការលក់មនុស្សគោលដៅ
@@ -821,7 +822,7 @@
DocType: Student Batch Name,Batch Name,ឈ្មោះបាច់
DocType: Fee Validity,Max number of visit,ចំនួនអតិបរមានៃដំណើរទស្សនកិច្ច
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet បង្កើត:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ចុះឈ្មោះ
DocType: GST Settings,GST Settings,ការកំណត់ជីអេសធី
DocType: Selling Settings,Customer Naming By,ឈ្មោះអតិថិជនដោយ
@@ -945,7 +946,7 @@
DocType: Budget,Budget Against,ថវិកាប្រឆាំងនឹង
DocType: Employee,Cell Number,លេខទូរស័ព្ទ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,មិនមាននិយោជិតណាសម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានផ្តល់ទេ។ សូមពិនិត្យមើលថាប្រាក់ខែប្រាក់ខែមិនទាន់ត្រូវបានបង្កើតទេ។
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,សម្ភារៈដោយស្វ័យប្រវត្តិសំណើបង្កើត
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,សម្ភារៈដោយស្វ័យប្រវត្តិសំណើបង្កើត
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ការបាត់បង់
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ "ជួរឈរ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,បានបម្រុងទុកសម្រាប់ការផលិត
@@ -953,7 +954,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ថាមពល
DocType: Opportunity,Opportunity From,ឱកាសការងារពី
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ជួរដេក {0}: {1} លេខរៀងដែលទាមទារសម្រាប់ធាតុ {2} ។ អ្នកបានផ្តល់ {3} ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ជួរដេក {0}: {1} លេខរៀងដែលទាមទារសម្រាប់ធាតុ {2} ។ អ្នកបានផ្តល់ {3} ។
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,សូមជ្រើសរើសតារាង
DocType: BOM,Website Specifications,ជាក់លាក់វេបសាយ
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} គឺជាអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវនៅក្នុង 'អ្នកទទួល'
@@ -1022,7 +1023,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,សំណូមពរដែលបានស្នើ
DocType: Vital Signs,Heart Rate / Pulse,អត្រាចង្វាក់បេះដូង / បេះដូង
DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Update ស្តុក 'មិនអាចជ្រើសរើសបាន ដោយសារ មុខទំនិញមិនត្រូវបានដឹកជញ្ជូនតាមរយៈ {0}"
DocType: Vehicle,Acquisition Date,ការទិញយកកាលបរិច្ឆេទ
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,nos
@@ -1046,7 +1047,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),ផ្ទុកឡើងក្បាលសំបុត្ររបស់អ្នក (រក្សាទុកវារួមមានលក្ខណៈងាយស្រួលតាមបណ្ដាញ 900px ដោយ 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: គណនី {2} មិនអាចជាក្រុមមួយ
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ធាតុជួរដេក {idx}: {} {DOCNAME DOCTYPE} មិនមាននៅក្នុងខាងលើ '{DOCTYPE}' តុ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} ត្រូវបានបញ្ចប់រួចទៅហើយឬលុបចោល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} ត្រូវបានបញ្ចប់រួចទៅហើយឬលុបចោល
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,គ្មានភារកិច្ច
DocType: Item Variant Settings,Copy Fields to Variant,ចម្លងវាលទៅវ៉ារ្យង់
DocType: Asset,Opening Accumulated Depreciation,រំលស់បង្គរបើក
@@ -1158,9 +1159,10 @@
DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ដៃគូលក់និងដែនដី
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),ការបិទ (បើក + សរុប)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),ការបិទ (បើក + សរុប)
DocType: Journal Entry,Depreciation Entry,ចូលរំលស់
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,សូមជ្រើសប្រភេទឯកសារនេះជាលើកដំបូង
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,បោះពុម្ពជារូបិយប័ណ្ណគណនី
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,បោះបង់ការមើលសម្ភារៈ {0} មុនពេលលុបចោលដំណើរទស្សនកិច្ចនេះជួសជុល
DocType: Crop Cycle,ISO 8016 standard,ស្តង់ដារ ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ធាតុ {1}
@@ -1186,7 +1188,7 @@
DocType: Supplier,Default Payable Accounts,គណនីទូទាត់លំនាំដើម
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,បុគ្គលិក {0} គឺមិនសកម្មឬមិនមានទេ
DocType: Fee Structure,Components,សមាសភាគ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
DocType: Quality Inspection Reading,Reading 6,ការអាន 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1238,6 +1240,7 @@
,Company Name,ឈ្មោះក្រុមហ៊ុន
DocType: SMS Center,Total Message(s),សារសរុប (s បាន)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,សូមកំណត់ស៊ុមឈ្មោះសម្រាប់ {0} តាម Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,ការបញ្ចុះតម្លៃបន្ថែមទៀតភាគរយ
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,មើលបញ្ជីនៃការជួយវីដេអូទាំងអស់
DocType: Agriculture Analysis Criteria,Soil Texture,វាយនភាពដី
@@ -1265,7 +1268,7 @@
DocType: BOM Website Item,BOM Website Item,ធាតុគេហទំព័រ Bom
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។
DocType: Timesheet Detail,Bill,វិក័យប័ត្រ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,រំលស់ត្រូវបានបញ្ចូលកាលបរិច្ឆេទបន្ទាប់កាលបរិច្ឆេទកន្លងមកដែលជា
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,រំលស់ត្រូវបានបញ្ចូលកាលបរិច្ឆេទបន្ទាប់កាលបរិច្ឆេទកន្លងមកដែលជា
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,សេត
DocType: SMS Center,All Lead (Open),អ្នកដឹកនាំការទាំងអស់ (ការបើកចំហ)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ជួរដេក {0}: Qty មិនមានសម្រាប់ {4} នៅក្នុងឃ្លាំង {1} នៅក្នុងប្រកាសពេលនៃធាតុ ({2} {3})
@@ -1281,7 +1284,7 @@
DocType: Lead,Next Contact Date,ទំនាក់ទំនងបន្ទាប់កាលបរិច្ឆេទ
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,បើក Qty
DocType: Healthcare Settings,Appointment Reminder,ការរំលឹកការណាត់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
DocType: Program Enrollment Tool Student,Student Batch Name,ឈ្មោះបាច់សិស្ស
DocType: Consultation,Doctor,វេជ្ជបណ្ឌិត
DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
@@ -1297,6 +1300,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ទុកឱ្យឧបករណ៍បម្រុងទុក
DocType: Item,Hub Category to Publish,ប្រភេទមជ្ឈមណ្ឌលសម្រាប់បោះពុម្ព
DocType: Leave Block List,Leave Block List Dates,ទុកឱ្យប្លុកថ្ងៃបញ្ជី
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup> Serial Number
DocType: Sales Invoice,Billing Address GSTIN,អាសយដ្ឋានវិក័យប័ត្រ GSTIN
DocType: Assessment Plan,Evaluate,វាយតម្លៃ
DocType: Workstation,Net Hour Rate,អត្រាហួរសុទ្ធ
@@ -1330,7 +1334,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,ទូទាត់វិក័យប័ត្រលក់
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ឃ្លាំងត្រូវបានបម្រុងទុកនៅក្នុងការលក់លំដាប់ / ឃ្លាំងទំនិញបានបញ្ចប់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,ចំនួនលក់
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ចំនួនលក់
DocType: Repayment Schedule,Interest Amount,ចំនួនការប្រាក់
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,អ្នកគឺជាអ្នកដែលមានការយល់ព្រមចំណាយសម្រាប់កំណត់ត្រានេះ។ សូមធ្វើឱ្យទាន់សម័យនេះ 'ស្ថានភាព' និងរក្សាទុក
DocType: Serial No,Creation Document No,ការបង្កើតឯកសារគ្មាន
@@ -1421,7 +1425,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,បើកសមតុល្យគណនី
,GST Sales Register,ជីអេសធីលក់ចុះឈ្មោះ
DocType: Sales Invoice Advance,Sales Invoice Advance,ការលក់វិក័យប័ត្រជាមុន
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,ជ្រើសដែនរបស់អ្នក
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},កំណត់ត្រាថវិកាមួយផ្សេងទៀត '{0}' រួចហើយប្រឆាំងនឹង {1} '{2} "សម្រាប់ឆ្នាំសារពើពន្ធ {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,វាលនឹងត្រូវបានចំលងតែនៅពេលនៃការបង្កើតប៉ុណ្ណោះ។
@@ -1431,11 +1435,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","នេះនឹងត្រូវបានបន្ថែមទៅក្នុងក្រមធាតុនៃវ៉ារ្យ៉ង់នោះ។ ឧទាហរណ៍ប្រសិនបើអក្សរកាត់របស់អ្នកគឺ "ផលិតកម្ម SM" និងលេខកូដធាតុគឺ "អាវយឺត", លេខកូដធាតុនៃវ៉ារ្យ៉ង់នេះនឹងត្រូវបាន "អាវយឺត-ផលិតកម្ម SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ប្រាក់ចំណេញសុទ្ធ (និយាយម្យ៉ាង) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកប័ណ្ណប្រាក់បៀវត្ស។
DocType: Purchase Invoice,Is Return,តើការវិលត្រឡប់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,ប្រយ័ត្ន
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,ប្រយ័ត្ន
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,ការវិលត្រឡប់ / ឥណពន្ធចំណាំ
DocType: Price List Country,Price List Country,បញ្ជីតម្លៃប្រទេស
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} បាន NOS សម្គាល់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} បាន NOS សម្គាល់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ក្រមធាតុមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM កត្តាប្រែចិត្តជឿ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបានលេខបាច់
@@ -1539,7 +1543,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
DocType: Supplier Scorecard,Warn for new Request for Quotations,ព្រមានសម្រាប់សំណើថ្មីសម្រាប់សម្រង់
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ការបញ្ជាទិញជួយអ្នកមានគម្រោងនិងតាមដាននៅលើការទិញរបស់អ្នក
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,វេជ្ជបញ្ជាសាកល្បង
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",បរិមាណបញ្ហា / សេវាផ្ទេរប្រាក់សរុប {0} នៅក្នុងសំណើសម្ភារៈ {1} \ មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
@@ -1577,7 +1581,6 @@
DocType: Warehouse,Warehouse Contact Info,ឃ្លាំងពត៌មានទំនាក់ទំនង
DocType: Payment Entry,Write Off Difference Amount,សរសេរបិទចំនួនទឹកប្រាក់ផ្សេងគ្នា
DocType: Volunteer,Volunteer Name,ឈ្មោះស្ម័គ្រចិត្ត
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,សូមបង្កើតប្រព័ន្ធដាក់ឈ្មោះគ្រូបង្រៀននៅក្នុងការអប់រំ> ការកំណត់អប់រំ
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: រកមិនឃើញអ៊ីម៉ែលបុគ្គលិក, ហេតុនេះមិនបានចាត់អ៊ីមែល"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},ច្បាប់ដឹកជញ្ជូនមិនអាចអនុវត្តបានសម្រាប់ប្រទេស {0}
DocType: Item,Foreign Trade Details,សេចក្ដីលម្អិតពាណិជ្ជកម្មបរទេស
@@ -1589,7 +1592,7 @@
DocType: Student Group Student,Group Roll Number,លេខវិលគ្រុប
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,សរុបនៃភារកិច្ចទាំងអស់គួរតែមានទម្ងន់ 1. សូមលៃតម្រូវត្រូវមានភារកិច្ចគម្រោងទម្ងន់ទាំងអស់ទៅតាម
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,ធាតុ {0} ត្រូវតែជាធាតុអនុចុះកិច្ចសន្យា
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ឧបករណ៍រាជធានី
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ 'អនុវត្តនៅលើ' វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
@@ -1614,7 +1617,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,ឃ្លាំងកុមារមានសម្រាប់ឃ្លាំងនេះ។ អ្នកមិនអាចលុបឃ្លាំងនេះ។
DocType: Item,Website Item Groups,ក្រុមធាតុវេបសាយ
DocType: Purchase Invoice,Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,លេខសម្គាល់ {0} បានចូលច្រើនជាងមួយដង
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,លេខសម្គាល់ {0} បានចូលច្រើនជាងមួយដង
DocType: Journal Entry,Journal Entry,ធាតុទិនានុប្បវត្តិ
DocType: Expense Claim Advance,Unclaimed amount,ចំនួនទឹកប្រាក់មិនបានទាមទារ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ធាតុនៅក្នុងការរីកចំរើន
@@ -1710,7 +1713,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,កំណត់ហេតុនៃការទំនាក់ទំនង។
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",សំណើរសម្រាប់សម្រង់ត្រូវបានបិទដើម្បីចូលដំណើរការបានពីវិបផតថលសម្រាប់ការកំណត់វិបផតថលពិនិត្យបន្ថែមទៀត។
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ប័ណ្ណពិន្ទុរបស់អ្នកផ្គត់ផ្គង់អង្កេតអថេរ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ចំនួនទឹកប្រាក់នៃការទិញ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ចំនួនទឹកប្រាក់នៃការទិញ
DocType: Sales Invoice,Shipping Address Name,ការដឹកជញ្ជូនឈ្មោះអាសយដ្ឋាន
DocType: Material Request,Terms and Conditions Content,លក្ខខណ្ឌមាតិកា
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,មានកំហុសក្នុងការបង្កើតកាលវិភាគវគ្គសិក្សា
@@ -1973,7 +1976,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,នេះផ្អែកលើកំណត់ហេតុប្រឆាំងនឹងរថយន្តនេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},ប្រឆាំងនឹងការផ្គត់ផ្គង់វិក័យប័ត្រ {0} {1} ចុះកាលបរិច្ឆេទ
DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,អ្នកមិនអាចលុបឆ្នាំសារពើពន្ធ {0} ។ ឆ្នាំសារពើពន្ធ {0} ត្រូវបានកំណត់ជាលំនាំដើមនៅក្នុងការកំណត់សកល
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,អតិថិជនដែលមានឈ្មោះដូចគ្នាមានរួចហើយ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,នេះនឹងបង្ហាញប្រាក់បៀវត្សរ៍និងបង្កើតប្រាក់ចំណូលចូលក្នុង Journal Entry ។ តើអ្នកចង់បន្តទេ?
@@ -1987,6 +1990,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,ការកំណត់តម្លៃ
DocType: Quotation,Term Details,ពត៌មានលំអិតរយៈពេល
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,មិនអាចចុះឈ្មោះចូលរៀនច្រើនជាង {0} សិស្សសម្រាប់ក្រុមនិស្សិតនេះ។
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),សរុប (ដោយគ្មានពន្ធ)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,អ្នកដឹកនាំការរាប់
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ត្រូវតែធំជាង 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,មានភាគហ៊ុន
@@ -2005,7 +2009,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ដោះតំណទូទាត់វិក័យប័ត្រនៅលើការលុបចោល
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},បច្ចុប្បន្នប្រដាប់វាស់ចម្ងាយបានចូលអានគួរតែត្រូវបានរថយន្តធំជាងដំបូង {0} ប្រដាប់វាស់ចម្ងាយ
DocType: Restaurant Reservation,No Show,គ្មានការបង្ហាញ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,សូមកំណត់ស៊ុមឈ្មោះសម្រាប់ {0} តាម Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,វិធានការដឹកជញ្ជូនក្នុងប្រទេស
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ទុកឱ្យនិងការចូលរួម
DocType: Maintenance Visit,Partially Completed,បានបញ្ចប់ដោយផ្នែក
@@ -2096,7 +2099,7 @@
DocType: Student Group Instructor,Student Group Instructor,ក្រុមនិស្សិតគ្រូបង្រៀន
DocType: Grant Application,Assessment Mark (Out of 10),ការវាយតម្លៃសម្គាល់ (ក្នុងចំណោម 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ទូរស័ព្ទដៃគ្មាន
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ដើមចម្បង
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,ដើមចម្បង
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,វ៉ារ្យ៉ង់
DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
DocType: Employee Attendance Tool,Employees HTML,និយោជិករបស់ HTML
@@ -2144,7 +2147,7 @@
DocType: Course,Course Abbreviation,អក្សរកាត់ការពិតណាស់
DocType: Student Leave Application,Student Leave Application,កម្មវិធីទុកឱ្យសិស្ស
DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},បុគ្គលិក {0} នៅថ្ងៃពាក់កណ្តាលនៅលើ {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ម៉ោងធ្វើការសរុបមិនគួរត្រូវបានធំជាងម៉ោងធ្វើការអតិបរមា {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,នៅថ្ងៃទី
@@ -2328,9 +2331,10 @@
DocType: Task,Actual End Date (via Time Sheet),បញ្ចប់ពិតប្រាកដកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង)
DocType: Soil Texture,Soil Type,ប្រភេទដី
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,សារថ្មី
,Quotation Trends,សម្រង់និន្នាការ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
DocType: Shipping Rule,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
DocType: Supplier Scorecard Period,Period Score,កំឡុងពេលកំណត់
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,បន្ថែមអតិថិជន
@@ -2341,7 +2345,7 @@
,Vehicle Expenses,ចំណាយយានយន្ត
DocType: Serial No,Invoice Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
DocType: Grant Application,Show on Website,បង្ហាញនៅលើគេហទំព័រ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ចាប់ផ្ដើម
DocType: Hub Category,Hub Category,ប្រភេទ Hub
DocType: Purchase Invoice,SEZ,តំបន់សេដ្ឋកិច្ចពិសេស
@@ -2372,7 +2376,7 @@
DocType: Patient,B Positive,B វិជ្ជមាន
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
DocType: Patient Medical Record,Patient Medical Record,កំណត់ត្រាវេជ្ជសាស្រ្តរបស់អ្នកជម្ងឺ
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,ជាក្រុមការមិនគ្រុប
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,កីឡា
@@ -2422,6 +2426,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,មិនអាចកំណត់ RFQ ដែលបានទទួលដើម្បីគ្មានសម្រង់
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,ការកាត់សរុប
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,ជ្រើសគណនីដើម្បីបោះពុម្ពជារូបិយប័ណ្ណគណនី
,Production Analytics,វិភាគផលិតកម្ម
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,នេះគឺផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងអ្នកជម្ងឺនេះ។ សូមមើលតារាងពេលវេលាខាងក្រោមសម្រាប់ព័ត៌មានលំអិត
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ការចំណាយបន្ទាន់សម័យ
@@ -2476,7 +2481,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ជ្រើសក្រុមហ៊ុន ...
DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
DocType: Payroll Entry,Fortnightly,ពីរសប្តាហ៍
DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
DocType: Vital Signs,Weight (In Kilogram),ទំងន់ (ក្នុងគីឡូក្រាម)
@@ -2552,7 +2557,7 @@
DocType: Student,Guardians,អាណាព្យាបាល
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,តម្លៃនេះនឹងមិនត្រូវបានបង្ហាញទេប្រសិនបើបញ្ជីតម្លៃគឺមិនត្រូវបានកំណត់
DocType: Stock Entry,Total Incoming Value,តម្លៃចូលសរុប
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ជួយរក្សាដាននៃពេលវេលាការចំណាយនិងវិក័យប័ត្រសំរាប់ការសកម្មភាពដែលបានធ្វើដោយក្រុមរបស់អ្នក
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,បញ្ជីតម្លៃទិញ
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,គំរូនៃអថេរពិន្ទុនៃក្រុមហ៊ុនផ្គត់ផ្គង់។
@@ -2653,7 +2658,7 @@
DocType: Company,For Reference Only.,ឯកសារយោងប៉ុណ្ណោះ។
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},គ្រូពេទ្យ {0} មិនមាននៅលើ {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,ជ្រើសបាច់គ្មាន
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},មិនត្រឹមត្រូវ {0} {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},មិនត្រឹមត្រូវ {0} {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,សេចក្តីយោងឯកសារ Inv
@@ -2690,8 +2695,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
DocType: Water Analysis,Origin,ប្រភពដើម
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ឯកសារនេះលើសកំណត់ដោយ {0} {1} សម្រាប់ធាតុ {4} ។ តើអ្នកបង្កើត {3} ផ្សេងទៀតប្រឆាំងនឹង {2} ដូចគ្នាដែរឬទេ?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យមានស្តុកអវិជ្ជមាន
@@ -2747,7 +2752,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,ព្រមានសម្រាប់ការបញ្ជាទិញថ្មី
DocType: Quality Inspection Reading,Reading 9,ការអាន 9
DocType: Supplier,Is Frozen,ត្រូវបានជាប់គាំង
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,ឃ្លាំងថ្នាំងជាក្រុមមិនត្រូវបានអនុញ្ញាតដើម្បីជ្រើសសម្រាប់ប្រតិបត្តិការ
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,ឃ្លាំងថ្នាំងជាក្រុមមិនត្រូវបានអនុញ្ញាតដើម្បីជ្រើសសម្រាប់ប្រតិបត្តិការ
DocType: Buying Settings,Buying Settings,ការកំណត់ការទិញ
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,លេខ Bom សម្រាប់ធាតុល្អបានបញ្ចប់
DocType: Upload Attendance,Attendance To Date,ចូលរួមកាលបរិច្ឆេទ
@@ -2761,6 +2766,7 @@
DocType: Grant Application,Organization,អង្គការ
DocType: BOM Update Tool,BOM Update Tool,ឧបករណ៍ធ្វើបច្ចុប្បន្នភាពមាត្រដ្ឋាន
DocType: SG Creation Tool Course,Student Group Name,ឈ្មោះក្រុមសិស្ស
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,បង្ហាញទិដ្ឋភាពដែលបានផ្ទុះ
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,បង្កើតកម្រៃ
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
DocType: Room,Room Number,លេខបន្ទប់
@@ -2771,7 +2777,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,បង្កើតគំរូពន្ធ
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,វេទិកាអ្នកប្រើ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
DocType: Lab Test Sample,Lab Test Sample,គំរូតេស្តមន្ទីរពិសោធន៍
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
@@ -2842,7 +2848,7 @@
DocType: Membership,USD,ដុល្លារអាមេរិក
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ធ្វើឱ្យមានការវិក័យប័ត្រ
DocType: Selling Settings,Auto close Opportunity after 15 days,ដោយស្វ័យប្រវត្តិបន្ទាប់ពីឱកាសយ៉ាងជិតស្និទ្ធ 15 ថ្ងៃ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,ការបញ្ជាទិញមិនត្រូវបានអនុញ្ញាតសម្រាប់ {0} ដោយសារតែពិន្ទុពិន្ទុនៃ {1} ។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,ការបញ្ជាទិញមិនត្រូវបានអនុញ្ញាតសម្រាប់ {0} ដោយសារតែពិន្ទុពិន្ទុនៃ {1} ។
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ឆ្នាំបញ្ចប់
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot / នាំមុខ%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,កិច្ចសន្យាដែលកាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
@@ -2934,7 +2940,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ខាងលើ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ជួរដេក # {0}: Journal Entry {1} មិនមានគណនី {2} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
DocType: Supplier Scorecard Criteria,Criteria Weight,លក្ខណៈវិនិច្ឆ័យទំងន់
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,អ្នកផ្គត់ផ្គង់> ប្រភេទអ្នកផ្គត់ផ្គង់
DocType: Buying Settings,Default Buying Price List,តារាងតម្លៃទិញលំនាំដើម & ‧;
DocType: Payroll Entry,Salary Slip Based on Timesheet,ប័ណ្ណប្រាក់ខែដោយផ្អែកលើ Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,អត្រាការទិញ
@@ -3022,7 +3027,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,ទៅកាន់ក្បាលអក្សរ
DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,អាសយដ្ឋានទាំងអស់។
DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
@@ -3199,6 +3204,7 @@
DocType: Company,Default Inventory Account,គណនីសារពើភ័ណ្ឌលំនាំដើម
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ជួរដេក {0}: Qty បានបញ្ចប់ត្រូវតែធំជាងសូន្យ។
DocType: Antibiotic,Antibiotic Name,ឈ្មោះថ្នាំអង់ទីប៊ីយោទិច
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,លេខកូដធាតុ> ក្រុមធាតុ> ម៉ាក
DocType: Purchase Invoice,Apply Additional Discount On,អនុវត្តបន្ថែមការបញ្ចុះតម្លៃនៅលើ
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,ជ្រើសរើសប្រភេទ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,តំណភ្ជាប់ទៅនឹងដីទាំងអស់ដែលដំណាំកំពុងកើនឡើង
@@ -3392,6 +3398,7 @@
DocType: Supplier,Credit Limit,ដែនកំណត់ឥណទាន
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,មធ្យម អត្រាលក់បញ្ជីតំលៃ
DocType: Production Plan Sales Order,Salse Order Date,កាលបរិច្ឆេទ Salse លំដាប់
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,អ្នកផ្គត់ផ្គង់> ប្រភេទអ្នកផ្គត់ផ្គង់
DocType: Salary Component,Salary Component,សមាសភាគប្រាក់ខែ
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,ធាតុការទូទាត់ {0} គឺជាតំណភ្ជាប់របស់អង្គការសហប្រជាជាតិ
DocType: GL Entry,Voucher No,កាតមានទឹកប្រាក់គ្មាន
@@ -3400,7 +3407,7 @@
DocType: Leave Allocation,Leave Allocation,ទុកឱ្យការបម្រុងទុក
DocType: Payment Request,Recipient Message And Payment Details,សារអ្នកទទួលនិងលម្អិតការបង់ប្រាក់
DocType: Training Event,Trainer Email,គ្រូបង្គោលអ៊ីម៉ែល
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,សំណើសម្ភារៈ {0} បង្កើតឡើង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,សំណើសម្ភារៈ {0} បង្កើតឡើង
DocType: Restaurant Reservation,No of People,ចំនួនប្រជាជន
DocType: Production Planning Tool,Include sub-contracted raw materials,រួមបញ្ចូលវត្ថុធាតុដើមចុះកិច្ចសន្យាជាមួយ
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ទំព័រគំរូនៃពាក្យឬកិច្ចសន្យា។
@@ -3465,7 +3472,7 @@
DocType: Production Planning Tool,Create Material Requests,បង្កើតសម្ភារៈសំណើ
DocType: Employee Education,School/University,សាលា / សាកលវិទ្យាល័យ University
DocType: Payment Request,Reference Details,សេចក្តីយោងលំអិត
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែមានតិចជាងចំនួនទឹកប្រាក់ទិញសរុប
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែមានតិចជាងចំនួនទឹកប្រាក់ទិញសរុប
DocType: Sales Invoice Item,Available Qty at Warehouse,ដែលអាចប្រើបាន Qty នៅឃ្លាំង
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្សព្វផ្សាយ
DocType: Asset,Double Declining Balance,ការធ្លាក់ចុះទ្វេដងតុល្យភាព
@@ -3477,7 +3484,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ទទួលបានការធ្វើឱ្យទាន់សម័យ
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: គណនី {2} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,ជ្រើសរើសតម្លៃយ៉ាងហោចណាស់មួយពីគុណលក្ខណៈនីមួយៗ។
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,សម្ភារៈសំណើ {0} ត្រូវបានលុបចោលឬបញ្ឈប់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,សម្ភារៈសំណើ {0} ត្រូវបានលុបចោលឬបញ្ឈប់
apps/erpnext/erpnext/config/hr.py +310,Leave Management,ទុកឱ្យការគ្រប់គ្រង
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,ក្រុមតាមគណនី
DocType: Sales Order,Fully Delivered,ផ្តល់ឱ្យបានពេញលេញ
@@ -3488,14 +3495,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ចំនួនទឹកប្រាក់ដែលបានចំណាយមិនអាចមានប្រាក់កម្ចីចំនួនធំជាង {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,ចូលទៅកាន់កម្មវិធី
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ជួរដេក {0} # ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក {1} មិនអាចធំជាងចំនួនទឹកប្រាក់ដែលមិនបានទទួល {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup> Serial Number
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ទិញចំនួនលំដាប់ដែលបានទាមទារសម្រាប់ធាតុ {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,លំដាប់ផលិតកម្មមិនត្រូវបានបង្កើត
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""ពីកាលបរិច្ឆេទ"" ត្រូវតែនៅបន្ទាប់ ""ដល់កាលបរិច្ឆេទ"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},មិនអាចផ្លាស់ប្តូរស្ថានភាពជានិស្សិត {0} ត្រូវបានផ្សារភ្ជាប់ជាមួយនឹងកម្មវិធីនិស្សិត {1}
DocType: Asset,Fully Depreciated,ធ្លាក់ថ្លៃយ៉ាងពេញលេញ
,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,វត្តមានដែលបានសម្គាល់ជា HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",ដកស្រង់សំណើដេញថ្លៃដែលអ្នកបានផ្ញើទៅឱ្យអតិថិជនរបស់អ្នក
DocType: Sales Order,Customer's Purchase Order,ទិញលំដាប់របស់អតិថិជន
@@ -3579,7 +3585,7 @@
DocType: Stock Settings,Item Naming By,ធាតុដាក់ឈ្មោះតាម
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},មួយទៀតការចូលបិទរយៈពេល {0} ត្រូវបានធ្វើឡើងបន្ទាប់ពី {1}
DocType: Production Order,Material Transferred for Manufacturing,សម្ភារៈផ្ទេរសម្រាប់កម្មន្តសាល
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,គណនី {0} មិនមាន
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,គណនី {0} មិនមាន
DocType: Project,Project Type,ប្រភេទគម្រោង
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,កិច្ចការកុមារមានសម្រាប់ភារកិច្ចនេះ។ អ្នកមិនអាចលុបភារកិច្ចនេះបានទេ។
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ទាំង qty គោលដៅឬគោលដៅចំនួនទឹកប្រាក់គឺជាចាំបាច់។
@@ -3683,11 +3689,11 @@
DocType: Company,Asset Depreciation Cost Center,មជ្ឈមណ្ឌលតម្លៃរំលស់ទ្រព្យសម្បត្តិ
DocType: Sales Order Item,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
DocType: Sales Invoice Item,Delivered Qty,ប្រគល់ Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,ចំនួនសរុបមិនរាប់បញ្ចូល ពន្ធ
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",ប្រសិនបើបានធីកកូនទាំងអស់នៃធាតុផលិតគ្នានឹងត្រូវបញ្ចូលក្នុងសំណើសម្ភារៈ។
DocType: Assessment Plan,Assessment Plan,ផែនការការវាយតំលៃ
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,អតិថិជន {0} ត្រូវបានបង្កើត។
DocType: Stock Settings,Limit Percent,ដែនកំណត់ភាគរយ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,សូមបង្កើតប្រព័ន្ធដាក់ឈ្មោះគ្រូបង្រៀននៅក្នុងការអប់រំ> ការកំណត់អប់រំ
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,បច្ចុប្បន្នពុំមានស្តុកនៅក្នុងឃ្លាំងណាមួយឡើយ
,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
DocType: Sample Collection,No. of print,ចំនួននៃការបោះពុម្ព
@@ -3703,12 +3709,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),កូនបំណុល ({0})
DocType: Pricing Rule,Margin,រឹម
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,អតិថិជនថ្មី
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,ប្តូរប្រវត្តិរូប POS
DocType: Bank Reconciliation Detail,Clearance Date,កាលបរិច្ឆេទបោសសំអាត
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,របាយការណ៍វាយតម្ល្រ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ចំនួនទឹកប្រាក់ការទិញសរុបគឺជាការចាំបាច់
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,ចំនួនទឹកប្រាក់ការទិញសរុបគឺជាការចាំបាច់
DocType: Lead,Address Desc,អាសយដ្ឋាន DESC
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,គណបក្សជាការចាំបាច់
DocType: Journal Entry,JV-,JV-
@@ -3740,7 +3746,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,ឈ្មោះអចិន្ត្រៃយ៍
DocType: Stock Entry,Customer or Supplier Details,សេចក្ដីលម្អិតអតិថិជនឬផ្គត់ផ្គង់
DocType: Employee Loan Application,Required by Date,ទាមទារដោយកាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),តុល្យភាពបិទ (Dr - Cr)
DocType: Lead,Lead Owner,ការនាំមុខម្ចាស់
DocType: Bin,Requested Quantity,បរិមាណបានស្នើ
DocType: Patient,Marital Status,ស្ថានភាពគ្រួសារ
@@ -3754,7 +3759,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,វ៉ារ្យ៉ង់ច្រើន
DocType: Sales Invoice,Against Income Account,ប្រឆាំងនឹងគណនីចំណូល
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ផ្តល់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ធាតុ {0}: qty លំដាប់ {1} មិនអាចតិចជាង qty គោលបំណងអប្បរមា {2} (បានកំណត់ក្នុងធាតុ) ។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ធាតុ {0}: qty លំដាប់ {1} មិនអាចតិចជាង qty គោលបំណងអប្បរមា {2} (បានកំណត់ក្នុងធាតុ) ។
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,សូមចូលជាអ្នកប្រើផ្សេង។
DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
@@ -3855,7 +3860,7 @@
DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
DocType: Company,Default Cash Account,គណនីសាច់ប្រាក់លំនាំដើម
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិនមានអតិថិជនឬផ្គត់) មេ។
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់សិស្សនេះ
@@ -4007,7 +4012,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,គ្មាននិយោជិកដែលមានលក្ខណៈវិនិច្ឆ័យដូចបានរៀបរាប់
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
DocType: Restaurant,Default Customer,អតិថិជនលំនាំដើម
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស> ការកំណត់ធនធានមនុស្ស
DocType: Assessment Plan,Supervisor Name,ឈ្មោះអ្នកគ្រប់គ្រង
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,កុំបញ្ជាក់ថាតើការណាត់ជួបត្រូវបានបង្កើតសម្រាប់ថ្ងៃតែមួយទេ
DocType: Program Enrollment Course,Program Enrollment Course,កម្មវិធីវគ្គបណ្តុះបណ្តាលចុះឈ្មោះ
@@ -4130,7 +4134,7 @@
DocType: BOM,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ថ្មីបំផុត
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","អាសយដ្ឋានអ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,វិក័យប័ត្រ
@@ -4147,7 +4151,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,អាជ្ញាប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,សូមជ្រើសយកការទៅមុខផងដែរប្រសិនបើអ្នកចង់រួមបញ្ចូលតុល្យភាពឆ្នាំមុនសារពើពន្ធរបស់ទុកនឹងឆ្នាំសារពើពន្ធនេះ
DocType: GL Entry,Against Voucher Type,ប្រឆាំងនឹងប្រភេទប័ណ្ណ
DocType: Physician,Phone (R),ទូរស័ព្ទ (R)
@@ -4159,7 +4163,7 @@
DocType: Patient,B Negative,ខអវិជ្ជមាន
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,ស្ថានភាពថែទាំត្រូវបានលុបចោលឬត្រូវបានបញ្ចប់ដើម្បីដាក់ស្នើ
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,លេខសៀរៀលនៅក្នុងជួរដេក {0} មិនផ្គូផ្គងនឹងការដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,លេខសៀរៀលនៅក្នុងជួរដេក {0} មិនផ្គូផ្គងនឹងការដឹកជញ្ជូនចំណាំ
DocType: Student,Guardian Details,កាសែត Guardian លំអិត
DocType: C-Form,C-Form,C-សំណុំបែបបទ
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,លោក Mark វត្តមានសម្រាប់បុគ្គលិកច្រើន
@@ -4201,7 +4205,7 @@
DocType: Stock Entry Detail,Basic Amount,ចំនួនទឹកប្រាក់ជាមូលដ្ឋាន
DocType: Training Event,Exam,ការប្រឡង
DocType: Complaint,Complaint,បណ្តឹង
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
DocType: Patient,Alcohol Past Use,អាល់កុលប្រើអតីតកាល
DocType: Fertilizer Content,Fertilizer Content,មាតិកាជី
@@ -4330,6 +4334,7 @@
DocType: Salary Detail,Formula,រូបមន្ត
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,# សៀរៀល
DocType: Lab Test Template,Lab Test Template,គំរូតេស្តមន្ទីរពិសោធន៍
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,គណនីលក់
DocType: Purchase Invoice Item,Total Weight,ទំងន់សរុប
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,គណៈកម្មការលើការលក់
DocType: Offer Letter Term,Value / Description,គុណតម្លៃ / ការពិពណ៌នាសង្ខេប
@@ -4487,7 +4492,7 @@
DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ការបញ្ជាទិញដែលបានចេញផ្សាយសម្រាប់ការផលិត។
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
DocType: Program Enrollment Tool,Enroll Students,ចុះឈ្មោះសិស្ស
DocType: Lab Test,Approved Date,កាលបរិច្ឆេទអនុម័ត
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ស្តង់ដាលក់
@@ -4564,7 +4569,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,ផលិតកម្មធាតុ
,Employee Information,ព័ត៌មានបុគ្គលិក
DocType: Stock Entry Detail,Additional Cost,ការចំណាយបន្ថែមទៀត
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
DocType: Quality Inspection,Incoming,មកដល់
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,គំរូពន្ធលំនាំដើមសម្រាប់ការលក់និងការទិញត្រូវបានបង្កើត។
@@ -4581,7 +4586,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},ចំណាំ: {0}
,Delivery Note Trends,និន្នាការដឹកជញ្ជូនចំណាំ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,សប្តាហ៍នេះមានសេចក្តីសង្ខេប
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,នៅក្នុងផ្សារ Qty
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,នៅក្នុងផ្សារ Qty
DocType: Delivery Trip,Calculate Estimated Arrival Times,គណនាពេលវេលាមកដល់ប៉ាន់ស្មាន
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,គណនី: {0} អាច Update បានតាមរយៈប្រត្តិបត្តិការស្តុកតែប៉ុណ្ណោះ។
DocType: Student Group Creation Tool,Get Courses,ទទួលបានវគ្គសិក្សា
@@ -4597,7 +4602,7 @@
DocType: Material Request,% Ordered,% លំដាប់
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",សម្រាប់សិស្សនិស្សិតដែលមានមូលដ្ឋានលើវគ្គសិក្សាជាក្រុមហើយវគ្គនេះនឹងមានសុពលភាពសម្រាប់គ្រប់សិស្សចុះឈ្មោះចូលរៀនវគ្គសិក្សានេះបានមកពីកម្មវិធីចុះឈ្មោះចូលរៀននៅ។
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ម៉ៅការ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ជាមធ្យម។ អត្រាទិញ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ជាមធ្យម។ អត្រាទិញ
DocType: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
DocType: Employee,History In Company,ប្រវត្តិសាស្រ្តនៅក្នុងក្រុមហ៊ុន
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},សារថ្មីពី {អ្នកផ្ញើ}
@@ -4645,7 +4650,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ជួរដេក {0}: រូបិយប័ណ្ណរបស់ Bom បាន # {1} គួរតែស្មើនឹងរូបិយប័ណ្ណដែលបានជ្រើស {2}
DocType: Journal Entry Account,Exchange Rate,អត្រាប្តូរប្រាក់
DocType: Patient,Additional information regarding the patient,ព័ត៌មានបន្ថែមទាក់ទងនឹងអ្នកជំងឺ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
DocType: Homepage,Tag Line,បន្ទាត់ស្លាក
DocType: Fee Component,Fee Component,សមាសភាគថ្លៃសេវា
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,គ្រប់គ្រងកងនាវា
@@ -4860,7 +4865,7 @@
DocType: Employee Education,Employee Education,បុគ្គលិកអប់រំ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ធាតុស្ទួនក្រុមបានរកឃើញក្នុងតារាងក្រុមធាតុ
DocType: Land Unit,Parent Land Unit,អង្គភាពដីធ្លីមាតាឬបិតា
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
DocType: Fertilizer,Fertilizer Name,ឈ្មោះជី
DocType: Salary Slip,Net Pay,ប្រាក់ចំណេញសុទ្ធ
DocType: Account,Account,គណនី
@@ -4939,7 +4944,7 @@
DocType: Item Customer Detail,Ref Code,យោងលេខកូដ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,ក្រុមអតិថិជនត្រូវបានទាមទារនៅក្នុងពត៌មាន POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,កំណត់ត្រាបុគ្គលិក។
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,សូមកំណត់កាលបរិច្ឆេទបន្ទាប់រំលស់
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,សូមកំណត់កាលបរិច្ឆេទបន្ទាប់រំលស់
DocType: HR Settings,Payroll Settings,ការកំណត់បើកប្រាក់បៀវត្ស
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,ផ្គូផ្គងនឹងវិកិយប័ត្រដែលមិនមានភ្ជាប់និងការទូទាត់។
DocType: POS Settings,POS Settings,ការកំណត់ POS
@@ -5107,7 +5112,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
DocType: Asset Maintenance Task,Last Completion Date,កាលបរិច្ឆេទបញ្ចប់ចុងក្រោយ
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
DocType: Buying Settings,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,កាលបរិច្ឆេទការធានារ៉ាប់រងការចាប់ផ្តើមគួរតែតិចជាងកាលបរិច្ឆេទធានារ៉ាប់រងបញ្ចប់
@@ -5237,6 +5242,7 @@
DocType: Bank Reconciliation,Get Payment Entries,ទទួលបានធាតុបញ្ចូលការទូទាត់
DocType: Quotation Item,Against Docname,ប្រឆាំងនឹងការ Docname
DocType: SMS Center,All Employee (Active),ទាំងអស់និយោជិត (សកម្ម)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,អតិថិជន> ក្រុមអតិថិជន> ដែនដី
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,មើលឥឡូវ
DocType: BOM,Raw Material Cost,តម្លៃនៃវត្ថុធាតុដើម
DocType: Item Reorder,Re-Order Level,ដីកាសម្រេចកម្រិតឡើងវិញ
@@ -5337,7 +5343,6 @@
DocType: Room,Seating Capacity,ការកសាងសមត្ថភាពកន្លែងអង្គុយ
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,ក្រុមសាកល្បង
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,អតិថិជន> ក្រុមអតិថិជន> ដែនដី
DocType: Project,Total Expense Claim (via Expense Claims),ពាក្យបណ្តឹងលើការចំណាយសរុប (តាមរយៈការប្តឹងទាមទារសំណងលើការចំណាយ)
DocType: GST Settings,GST Summary,សង្ខេបជីអេសធី
DocType: Assessment Result,Total Score,ពិន្ទុសរុប
@@ -5351,7 +5356,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,កាលវិភាគវគ្គសិក្សាត្រូវបានបង្កើត
DocType: Journal Entry,Total Debit,ឥណពន្ធសរុប
DocType: Manufacturing Settings,Default Finished Goods Warehouse,ឃ្លាំងទំនិញលំនាំដើមបានបញ្ចប់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,ការលក់បុគ្គល
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ការលក់បុគ្គល
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,មជ្ឈមណ្ឌលថវិកានិងការចំណាយ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,របៀបបង់ប្រាក់លំនាំដើមច្រើនមិនត្រូវបានអនុញ្ញាតទេ
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,សម្រាប់
@@ -5527,7 +5532,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,សូមពិចារណាឬបន្ទុកសម្រាប់ពន្ធលើ
DocType: Driver,Driving License Category,អាជ្ញាប័ណ្ណបើកបរប្រភេទ
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ជាក់ស្តែ Qty ចាំបាច់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} បច្ចុប្បន្នមានជំហរ {1} លេខសម្គាល់អ្នកផ្គត់ផ្គង់ហើយការបញ្ជាទិញចំពោះអ្នកផ្គត់ផ្គង់នេះគួរតែត្រូវបានចេញដោយប្រុងប្រយ័ត្ន។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} បច្ចុប្បន្នមានជំហរ {1} លេខសម្គាល់អ្នកផ្គត់ផ្គង់ហើយការបញ្ជាទិញចំពោះអ្នកផ្គត់ផ្គង់នេះគួរតែត្រូវបានចេញដោយប្រុងប្រយ័ត្ន។
DocType: Asset Maintenance Team,Asset Maintenance Team,ក្រុមថែទាំទ្រព្យសម្បត្តិ
DocType: Employee Loan,Loan Type,ប្រភេទសេវាឥណទាន
DocType: Scheduling Tool,Scheduling Tool,ឧបករណ៍កាលវិភាគ
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index f7d2e62..005843d 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,ಬೆಲೆ ಪ್ರಕಾರ ವಿಂಗಡಿಸಿ
,Delay Days,ವಿಳಂಬ ದಿನಗಳು
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ಸೇವೆ ಖರ್ಚು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,ಸರಕುಪಟ್ಟಿ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,ಧಾರಣ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
DocType: Purchase Invoice Item,Item Weight Details,ಐಟಂ ತೂಕ ವಿವರಗಳು
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ರೆಫರೆನ್ಸ್: {0}, ಐಟಂ ಕೋಡ್: {1} ಮತ್ತು ಗ್ರಾಹಕ: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,ಕೆಜಿ
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ಕೆಲಸ ತೆರೆಯುತ್ತಿದೆ .
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},ಐಟಂ {0} ಅಡ್ಡಸಾಲು {1} ನಲ್ಲಿ subcontracting ಮಾಡಲು BOM ಅನ್ನು ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},ಐಟಂ {0} ಅಡ್ಡಸಾಲು {1} ನಲ್ಲಿ subcontracting ಮಾಡಲು BOM ಅನ್ನು ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ಫಲಿತಾಂಶವನ್ನು ಸಲ್ಲಿಸಲಾಗಿದೆ
DocType: Item Attribute,Increment,ಹೆಚ್ಚಳವನ್ನು
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ಟೈಮ್ಸ್ಪ್ಯಾನ್
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
DocType: Price List,Price Not UOM Dependant,ಬೆಲೆ UOM ಅವಲಂಬಿತವಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ಉತ್ಪನ್ನ {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ಯಾವುದೇ ಐಟಂಗಳನ್ನು ಪಟ್ಟಿ
DocType: Asset Repair,Error Description,ದೋಷ ವಿವರಣೆ
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,ದಿನಸಿ
DocType: Quality Inspection Reading,Reading 1,1 ಓದುವಿಕೆ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
DocType: Crop,Perennial,ದೀರ್ಘಕಾಲಿಕ
DocType: Consultation,Consultation Date,ಸಮಾಲೋಚನೆ ದಿನಾಂಕ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext ಬಳಕೆದಾರರಿಗೆ ಉತ್ಪನ್ನ ಪಟ್ಟಿ ಮತ್ತು ಶೋಧನೆ
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",ಉದಾಹರಣೆಗೆ "ಪ್ರಾಥಮಿಕ ಶಾಲೆ" ಅಥವಾ "ವಿಶ್ವವಿದ್ಯಾಲಯ"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,ಸ್ಟಾಕ್ ವರದಿಗಳು
DocType: Warehouse,Warehouse Detail,ವೇರ್ಹೌಸ್ ವಿವರ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ಟರ್ಮ್ ಎಂಡ್ ದಿನಾಂಕ ನಂತರ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ ಪದವನ್ನು ಸಂಪರ್ಕಿತ ಉದ್ದವಾಗಿರುವಂತಿಲ್ಲ (ಅಕಾಡೆಮಿಕ್ ಇಯರ್ {}). ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""ಸ್ಥಿರ ಆಸ್ತಿ" ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
DocType: Delivery Trip,Departure Time,ನಿರ್ಗಮನ ಸಮಯ
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,ವಿಶಿಷ್ಟ ವಿವರಗಳನ್ನು ಪಡೆಯಲು
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,ಪೂರೈಕೆದಾರ ಮಾನ್ಯತೆಗಳ ಟೆಂಪ್ಲೇಟ್ಗಳು.
DocType: Lead,Interested,ಆಸಕ್ತಿ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,ಆರಂಭಿಕ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,ಆರಂಭಿಕ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},ಗೆ {0} ಗೆ {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,ತೆರಿಗೆಗಳನ್ನು ಹೊಂದಿಸಲು ವಿಫಲವಾಗಿದೆ
DocType: Item,Copy From Item Group,ಐಟಂ ಗುಂಪಿನಿಂದ ನಕಲಿಸಿ
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ಸಾಲು {0}: ಪರಿಶೀಲಿಸಿ ಖಾತೆ ವಿರುದ್ಧ 'ಅಡ್ವಾನ್ಸ್ ಈಸ್' {1} ಈ ಮುಂಗಡ ಪ್ರವೇಶ ವೇಳೆ.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},ವೇರ್ಹೌಸ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},ವೇರ್ಹೌಸ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
DocType: Email Digest,Profit & Loss,ಲಾಭ ನಷ್ಟ
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,ಲೀಟರ್
DocType: Task,Total Costing Amount (via Time Sheet),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ಇದು ಈ ಕಂಪೆನಿಯ ವಿರುದ್ಧ ವಹಿವಾಟುಗಳನ್ನು ಆಧರಿಸಿದೆ. ವಿವರಗಳಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ಸ್ವಯಂಚಾಲಿತ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸೃಷ್ಟಿ ಮೇಲೆ ಈಮೇಲ್ ಸೂಚಿಸಿ
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,ನಿರೋಧಕ
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,ಸಮಾಲೋಚನೆ
DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
DocType: Opening Invoice Creation Tool,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,ಒಂಟಿಯಾದ
DocType: Request for Quotation,Request for Quotation,ಉದ್ಧರಣ ವಿನಂತಿ
DocType: Healthcare Settings,Require Lab Test Approval,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಅನುಮೋದನೆ ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,ಐಟಂ ಕೋಡ್> ಐಟಂ ಗ್ರೂಪ್> ಬ್ರ್ಯಾಂಡ್
DocType: Salary Slip Timesheet,Working Hours,ದುಡಿಮೆಯು
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ
DocType: Naming Series,Change the starting / current sequence number of an existing series.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸರಣಿಯ ಆರಂಭಿಕ / ಪ್ರಸ್ತುತ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಬದಲಾಯಿಸಿ.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
DocType: Drug Prescription,Dosage,ಡೋಸೇಜ್
DocType: Journal Entry Account,Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,ಆವರೇಜ್. ಮಾರಾಟ ದರ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ಆವರೇಜ್. ಮಾರಾಟ ದರ
DocType: Assessment Plan,Examiner Name,ಎಕ್ಸಾಮಿನರ್ ಹೆಸರು
DocType: Lab Test Template,No Result,ಫಲಿತಾಂಶವಿಲ್ಲ
DocType: Purchase Invoice Item,Quantity and Rate,ಪ್ರಮಾಣ ಮತ್ತು ದರ
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,ವೇತನದಾರರ ಅವಧಿಯ ಆಯ್ಕೆ
DocType: Purchase Invoice,Unpaid,ವೇತನರಹಿತ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,ಮಾರಾಟ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ> ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
DocType: Packing Slip,From Package No.,ಪ್ಯಾಕೇಜ್ ನಂಬ್ರ
DocType: Item Attribute,To Range,ಶ್ರೇಣಿಗೆ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ನಿಕ್ಷೇಪಗಳು
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,ಕಾರ್ಯಾಗಾರ
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಎಚ್ಚರಿಸಿ
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,ನಿಮ್ಮ ಗ್ರಾಹಕರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,ಸಾಕಷ್ಟು ಭಾಗಗಳನ್ನು ನಿರ್ಮಿಸಲು
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ಸಾಕಷ್ಟು ಭಾಗಗಳನ್ನು ನಿರ್ಮಿಸಲು
DocType: POS Profile User,POS Profile User,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಬಳಕೆದಾರ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ನೇರ ಆದಾಯ
DocType: Patient Appointment,Date TIme,ದಿನಾಂಕ ಸಮಯ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","ಖಾತೆ ವರ್ಗೀಕರಿಸಲಾದ ವೇಳೆ , ಖಾತೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","ಖಾತೆ ವರ್ಗೀಕರಿಸಲಾದ ವೇಳೆ , ಖಾತೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ಕಂಪೆನಿ ಮತ್ತು ತೆರಿಗೆಗಳನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
DocType: Purchase Invoice,Supplier GSTIN,ಸರಬರಾಜುದಾರ GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ಇದನ್ನು ಅವಲಂಬಿಸಿರುವ ಕೆಲಸವನ್ನು {0} ಮುಚ್ಚಿಲ್ಲ ಹತ್ತಿರಕ್ಕೆ ಕೆಲಸವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
DocType: Production Order,Additional Operating Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚವನ್ನು
DocType: Lab Test Template,Lab Routine,ಲ್ಯಾಬ್ ನಿಯತಕ್ರಮ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 ಸಂಬಂಧ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,ವ್ಯವಸ್ಥಾಪಕ
DocType: Payment Entry,Payment From / To,ಪಾವತಿ / ಹೋಗು
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ಹೊಸ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ಪ್ರಸ್ತುತ ಬಾಕಿ ಮೊತ್ತದ ಕಡಿಮೆ. ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಕನಿಷ್ಠ ಎಂದು ಹೊಂದಿದೆ {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ಹೊಸ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ಪ್ರಸ್ತುತ ಬಾಕಿ ಮೊತ್ತದ ಕಡಿಮೆ. ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಕನಿಷ್ಠ ಎಂದು ಹೊಂದಿದೆ {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},ವೇರ್ಹೌಸ್ನಲ್ಲಿ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ಆಧರಿಸಿ ' ಮತ್ತು ' ಗುಂಪಿನ ' ಇರಲಾಗುವುದಿಲ್ಲ
DocType: Sales Person,Sales Person Targets,ಮಾರಾಟಗಾರನ ಗುರಿ
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,ಬ್ಯಾಚ್ ಹೆಸರು
DocType: Fee Validity,Max number of visit,ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಭೇಟಿ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ದಾಖಲಾಗಿ
DocType: GST Settings,GST Settings,ಜಿಎಸ್ಟಿ ಸೆಟ್ಟಿಂಗ್ಗಳು
DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,ಬಜೆಟ್ ವಿರುದ್ಧ
DocType: Employee,Cell Number,ಸೆಲ್ ಸಂಖ್ಯೆ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ನೀಡಿರುವ ಮಾನದಂಡಕ್ಕೆ ಉದ್ಯೋಗಿ ಇಲ್ಲ. ಸಂಬಳದ ಸ್ಲಿಪ್ಸ್ ಅನ್ನು ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಶೀಲಿಸಿ.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,ಆಟೋ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ರಚಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ಆಟೋ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ರಚಿಸಲಾಗಿದೆ
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ಲಾಸ್ಟ್
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,ಉತ್ಪಾದನಾ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ಶಕ್ತಿ
DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ಸಾಲು {0}: {1} ಐಟಂಗೆ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು ಅಗತ್ಯವಿದೆ {2}. ನೀವು {3} ಒದಗಿಸಿದ್ದೀರಿ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ಸಾಲು {0}: {1} ಐಟಂಗೆ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು ಅಗತ್ಯವಿದೆ {2}. ನೀವು {3} ಒದಗಿಸಿದ್ದೀರಿ.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ದಯವಿಟ್ಟು ಟೇಬಲ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
DocType: BOM,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} 'ಸ್ವೀಕರಿಸುವವರಲ್ಲಿ' ಅಮಾನ್ಯ ಇಮೇಲ್ ವಿಳಾಸವಾಗಿದೆ
@@ -1055,7 +1056,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ಉಲ್ಲೇಖ ವಿನಂತಿಸಲಾಗಿದೆ
DocType: Vital Signs,Heart Rate / Pulse,ಹಾರ್ಟ್ ರೇಟ್ / ಪಲ್ಸ್
DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},ಐಟಂಗಳನ್ನು ಮೂಲಕ ವಿತರಿಸಲಾಯಿತು ಏಕೆಂದರೆ 'ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್' ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ {0}
DocType: Vehicle,Acquisition Date,ಸ್ವಾಧೀನ ದಿನಾಂಕ
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,ಸೂಲ
@@ -1080,7 +1081,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),ನಿಮ್ಮ ಅಕ್ಷರದ ತಲೆ ಅಪ್ಲೋಡ್ ಮಾಡಿ (100px ಮೂಲಕ ವೆಬ್ ಸ್ನೇಹವಾಗಿ 900px ಆಗಿ ಇಡಿ)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ಖಾತೆ {2} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ಐಟಂ ರೋ {IDX}: {DOCTYPE} {DOCNAME} ಮೇಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ '{DOCTYPE}' ಟೇಬಲ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} ಈಗಾಗಲೇ ಪೂರ್ಣಗೊಂಡ ಅಥವಾ ರದ್ದು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} ಈಗಾಗಲೇ ಪೂರ್ಣಗೊಂಡ ಅಥವಾ ರದ್ದು
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ಯಾವುದೇ ಕಾರ್ಯಗಳು
DocType: Item Variant Settings,Copy Fields to Variant,ವಿಭಿನ್ನ ಕ್ಷೇತ್ರಗಳಿಗೆ ಕ್ಷೇತ್ರಗಳನ್ನು ನಕಲಿಸಿ
DocType: Asset,Opening Accumulated Depreciation,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ
@@ -1192,9 +1193,10 @@
DocType: Production Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಮತ್ತು ಸಂಸ್ಥಾನದ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),ಮುಚ್ಚುವುದು (ಒಟ್ಟು + ತೆರೆಯುವಿಕೆ)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),ಮುಚ್ಚುವುದು (ಒಟ್ಟು + ತೆರೆಯುವಿಕೆ)
DocType: Journal Entry,Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ಮೊದಲ ದಾಖಲೆ ಪ್ರಕಾರ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿಗೆ ಮುದ್ರಿಸು
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ಈ ನಿರ್ವಹಣೆ ಭೇಟಿ ರದ್ದು ಮೊದಲು ವಸ್ತು ಭೇಟಿ {0} ರದ್ದು
DocType: Crop Cycle,ISO 8016 standard,ಐಎಸ್ಒ 8016 ಪ್ರಮಾಣಿತ
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
@@ -1220,7 +1222,7 @@
DocType: Supplier,Default Payable Accounts,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
DocType: Fee Structure,Components,ಘಟಕಗಳು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1272,6 +1274,7 @@
,Company Name,ಕಂಪನಿ ಹೆಸರು
DocType: SMS Center,Total Message(s),ಒಟ್ಟು ಸಂದೇಶ (ಗಳು)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,ದಯವಿಟ್ಟು ಸೆಟಪ್> ಸೆಟ್ಟಿಂಗ್ಗಳು> ಹೆಸರಿಸುವ ಸರಣಿ ಮೂಲಕ {0} ಹೆಸರಿಸುವ ಸರಣಿಗಳನ್ನು ಹೊಂದಿಸಿ
DocType: Purchase Invoice,Additional Discount Percentage,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ಎಲ್ಲಾ ಸಹಾಯ ವೀಡಿಯೊಗಳನ್ನು ಪಟ್ಟಿಯನ್ನು ವೀಕ್ಷಿಸಿ
DocType: Agriculture Analysis Criteria,Soil Texture,ಮಣ್ಣಿನ ವಿನ್ಯಾಸ
@@ -1300,7 +1303,7 @@
DocType: BOM Website Item,BOM Website Item,ಬಿಒಎಮ್ ವೆಬ್ಸೈಟ್ ಐಟಂ
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
DocType: Timesheet Detail,Bill,ಬಿಲ್
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕ ದಾಖಲಿಸಿದರೆ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕ ದಾಖಲಿಸಿದರೆ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ಬಿಳಿ
DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ )
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ರೋ {0}: ಫಾರ್ ಪ್ರಮಾಣ ಲಭ್ಯವಿಲ್ಲ {4} ಉಗ್ರಾಣದಲ್ಲಿ {1} ಪ್ರವೇಶ ಸಮಯದಲ್ಲಿ ಪೋಸ್ಟ್ ನಲ್ಲಿ ({2} {3})
@@ -1317,7 +1320,7 @@
DocType: Lead,Next Contact Date,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,ಆರಂಭಿಕ ಪ್ರಮಾಣ
DocType: Healthcare Settings,Appointment Reminder,ನೇಮಕಾತಿ ಜ್ಞಾಪನೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
DocType: Program Enrollment Tool Student,Student Batch Name,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಹೆಸರು
DocType: Consultation,Doctor,ಡಾಕ್ಟರ್
DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
@@ -1333,6 +1336,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ಅಲೋಕೇಶನ್ ಉಪಕರಣ ಬಿಡಿ
DocType: Item,Hub Category to Publish,ಹಬ್ ವರ್ಗ ಪ್ರಕಟಣೆ
DocType: Leave Block List,Leave Block List Dates,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,ಸೆಟಪ್> ಸಂಖ್ಯಾ ಸರಣಿಗಳ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ಸೆಟಪ್ ಸಂಖ್ಯೆಯ ಸರಣಿ
DocType: Sales Invoice,Billing Address GSTIN,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ GSTIN
DocType: Assessment Plan,Evaluate,ಮೌಲ್ಯಮಾಪನ ಮಾಡಿ
DocType: Workstation,Net Hour Rate,ನೆಟ್ ಅವರ್ ದರ
@@ -1367,7 +1371,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಪಾವತಿ
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ಮಾರಾಟದ ಆರ್ಡರ್ / ಗೂಡ್ಸ್ ಮುಕ್ತಾಯಗೊಂಡ ವೇರ್ಹೌಸ್ ರಿಸರ್ವ್ಡ್ ಗೋದಾಮಿನ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
DocType: Repayment Schedule,Interest Amount,ಬಡ್ಡಿ ಪ್ರಮಾಣ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
DocType: Serial No,Creation Document No,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
@@ -1460,7 +1464,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,ತೆರೆಯುವ ಲೆಕ್ಕಪರಿಶೋಧಕ ಬ್ಯಾಲೆನ್ಸ್
,GST Sales Register,ಜಿಎಸ್ಟಿ ಮಾರಾಟದ ನೋಂದಣಿ
DocType: Sales Invoice Advance,Sales Invoice Advance,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಡ್ವಾನ್ಸ್
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ಮನವಿ ನಥಿಂಗ್
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,ಮನವಿ ನಥಿಂಗ್
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,ನಿಮ್ಮ ಡೊಮೇನ್ಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ಮತ್ತೊಂದು ಬಜೆಟ್ ದಾಖಲೆ '{0}' ಈಗಾಗಲೇ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1} '{2}' ಹಣಕಾಸು ವರ್ಷಕ್ಕೆ {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ಸೃಷ್ಟಿ ಸಮಯದಲ್ಲಿ ಮಾತ್ರ ಜಾಗವನ್ನು ನಕಲಿಸಲಾಗುತ್ತದೆ.
@@ -1470,11 +1474,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ಈ ವ್ಯತ್ಯಯದ ಐಟಂ ಕೋಡ್ ಬಿತ್ತರಿಸಲಾಗುವುದು. ನಿಮ್ಮ ಸಂಕ್ಷೇಪಣ ""ಎಸ್ಎಮ್"", ಮತ್ತು ಉದಾಹರಣೆಗೆ, ಐಟಂ ಕೋಡ್ ""ಟಿ ಶರ್ಟ್"", ""ಟಿ-ಶರ್ಟ್ ಎಸ್.ಎಂ."" ಇರುತ್ತದೆ ವ್ಯತ್ಯಯದ ಐಟಂ ಸಂಕೇತ"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ನೀವು ಸಂಬಳ ಸ್ಲಿಪ್ ಉಳಿಸಲು ಒಮ್ಮೆ ( ಮಾತಿನಲ್ಲಿ) ನಿವ್ವಳ ವೇತನ ಗೋಚರಿಸುತ್ತದೆ.
DocType: Purchase Invoice,Is Return,ಮರಳುವುದು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,ಎಚ್ಚರಿಕೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,ಎಚ್ಚರಿಕೆ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,ರಿಟರ್ನ್ / ಡೆಬಿಟ್ ಗಮನಿಸಿ
DocType: Price List Country,Price List Country,ದರ ಪಟ್ಟಿ ಕಂಟ್ರಿ
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},ಐಟಂ {0} ಮಾನ್ಯ ಸರಣಿ ಸೂಲ {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},ಐಟಂ {0} ಮಾನ್ಯ ಸರಣಿ ಸೂಲ {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ಐಟಂ ಕೋಡ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM ಪರಿವರ್ತಿಸುವುದರ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ದಯವಿಟ್ಟು ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಪಡೆಯಲು ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ
@@ -1580,7 +1584,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
DocType: Supplier Scorecard,Warn for new Request for Quotations,ಉಲ್ಲೇಖಗಳಿಗಾಗಿ ಹೊಸ ವಿನಂತಿಗಾಗಿ ಎಚ್ಚರಿಕೆ ನೀಡಿ
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ಖರೀದಿ ಆದೇಶ ನೀವು ಯೋಜನೆ ಸಹಾಯ ಮತ್ತು ನಿಮ್ಮ ಖರೀದಿ ಮೇಲೆ ಅನುಸರಿಸಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್ಗಳು
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",ಒಟ್ಟು ಸಂಚಿಕೆ / ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಲ್ಲಿ {1} \ ವಿನಂತಿಸಿದ ಪ್ರಮಾಣ {2} ಐಟಂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {3}
@@ -1618,7 +1622,6 @@
DocType: Warehouse,Warehouse Contact Info,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
DocType: Payment Entry,Write Off Difference Amount,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
DocType: Volunteer,Volunteer Name,ಸ್ವಯಂಸೇವಕ ಹೆಸರು
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,ದಯವಿಟ್ಟು ಶೈಕ್ಷಣಿಕ> ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ತರಬೇತುದಾರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: ನೌಕರರ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ, ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಇಮೇಲ್"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},ಶಿಪ್ಪಿಂಗ್ ನಿಯಮವು ದೇಶಕ್ಕೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ {0}
DocType: Item,Foreign Trade Details,ವಿದೇಶಿ ವ್ಯಾಪಾರ ವಿವರಗಳು
@@ -1631,7 +1634,7 @@
DocType: Student Group Student,Group Roll Number,ಗುಂಪು ರೋಲ್ ಸಂಖ್ಯೆ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ಎಲ್ಲಾ ಕೆಲಸವನ್ನು ತೂಕ ಒಟ್ಟು ಇರಬೇಕು 1. ಪ್ರಕಾರವಾಗಿ ಎಲ್ಲ ಪ್ರಾಜೆಕ್ಟ್ ಕಾರ್ಯಗಳ ತೂಕ ಹೊಂದಿಸಿಕೊಳ್ಳಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ಸಲಕರಣಾ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
@@ -1656,7 +1659,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,ಮಕ್ಕಳ ಗೋದಾಮಿನ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಈ ಗೋದಾಮಿನ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ.
DocType: Item,Website Item Groups,ವೆಬ್ಸೈಟ್ ಐಟಂ ಗುಂಪುಗಳು
DocType: Purchase Invoice,Total (Company Currency),ಒಟ್ಟು (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,ಕ್ರಮಸಂಖ್ಯೆ {0} ಒಮ್ಮೆ ಹೆಚ್ಚು ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,ಕ್ರಮಸಂಖ್ಯೆ {0} ಒಮ್ಮೆ ಹೆಚ್ಚು ಪ್ರವೇಶಿಸಿತು
DocType: Journal Entry,Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ
DocType: Expense Claim Advance,Unclaimed amount,ಹಕ್ಕು ಪಡೆಯದ ಮೊತ್ತ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ಪ್ರಗತಿಯಲ್ಲಿದೆ ಐಟಂಗಳನ್ನು
@@ -1753,7 +1756,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,ಸಂವಹನ ದಾಖಲೆ .
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","ಉದ್ಧರಣ ವಿನಂತಿ ಹೆಚ್ಚು ಚೆಕ್ ಪೋರ್ಟಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು, ಪೋರ್ಟಲ್ ಪ್ರವೇಶವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಕೋರಿಂಗ್ ವೇರಿಯಬಲ್
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ಪ್ರಮಾಣ ಖರೀದಿ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ಪ್ರಮಾಣ ಖರೀದಿ
DocType: Sales Invoice,Shipping Address Name,ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ ಹೆಸರು
DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿಯನ್ನು ರಚಿಸುವಲ್ಲಿ ದೋಷಗಳಿವೆ
@@ -2018,7 +2021,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ಈ ವಾಹನ ವಿರುದ್ಧ ದಾಖಲೆಗಳು ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಹಣಕಾಸಿನ ವರ್ಷದ {0}. ಹಣಕಾಸಿನ ವರ್ಷ {0} ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಹೊಂದಿಸಲಾಗಿದೆ
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,ಅದೇ ಹೆಸರಿನ ಗ್ರಾಹಕರು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದಾರೆ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ಇದು ಸಂಬಳದ ಸ್ಲಿಪ್ಗಳನ್ನು ಸಲ್ಲಿಸುತ್ತದೆ ಮತ್ತು ಸಂಚಯ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಅನ್ನು ರಚಿಸುತ್ತದೆ. ನೀವು ಮುಂದುವರಿಯಲು ಬಯಸುವಿರಾ?
@@ -2032,6 +2035,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,ಬೆಲೆ
DocType: Quotation,Term Details,ಟರ್ಮ್ ವಿವರಗಳು
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} ಈ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಹೆಚ್ಚು ದಾಖಲಿಸಲಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),ಒಟ್ಟು (ತೆರಿಗೆ ಇಲ್ಲದೆ)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ಲೀಡ್ ಕೌಂಟ್
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ಲೀಡ್ ಕೌಂಟ್
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 ಹೆಚ್ಚು ಇರಬೇಕು
@@ -2052,7 +2056,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ಸರಕುಪಟ್ಟಿ ರದ್ದು ಮೇಲೆ ಪಾವತಿ ಅನ್ಲಿಂಕ್
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ಪ್ರವೇಶಿಸಿತು ಪ್ರಸ್ತುತ ದೂರಮಾಪಕ ಓದುವ ಆರಂಭಿಕ ವಾಹನ ದೂರಮಾಪಕ ಹೆಚ್ಚು ಇರಬೇಕು {0}
DocType: Restaurant Reservation,No Show,ಶೋ ಇಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,ದಯವಿಟ್ಟು ಸೆಟಪ್> ಸೆಟ್ಟಿಂಗ್ಗಳು> ಹೆಸರಿಸುವ ಸರಣಿ ಮೂಲಕ {0} ಹೆಸರಿಸುವ ಸರಣಿಗಳನ್ನು ಹೊಂದಿಸಿ
DocType: Shipping Rule Country,Shipping Rule Country,ಶಿಪ್ಪಿಂಗ್ ಆಡಳಿತ
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ಬಿಟ್ಟು ಅಟೆಂಡೆನ್ಸ್
DocType: Maintenance Visit,Partially Completed,ಭಾಗಶಃ ಪೂರ್ಣಗೊಂಡಿತು
@@ -2145,7 +2148,7 @@
DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
DocType: Grant Application,Assessment Mark (Out of 10),ಅಸೆಸ್ಮೆಂಟ್ ಮಾರ್ಕ್ (10 ರಲ್ಲಿ)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ಮೊಬೈಲ್ ಇಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,ಮುಖ್ಯ
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ಭಿನ್ನ
DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
DocType: Employee Attendance Tool,Employees HTML,ನೌಕರರು ಎಚ್ಟಿಎಮ್ಎಲ್
@@ -2195,7 +2198,7 @@
DocType: Course,Course Abbreviation,ಕೋರ್ಸ್ ಸಂಕ್ಷೇಪಣ
DocType: Student Leave Application,Student Leave Application,ವಿದ್ಯಾರ್ಥಿ ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್
DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ನೌಕರರ {0} ಮೇಲೆ ಅರ್ಧ ದಿನ {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ಒಟ್ಟು ಕೆಲಸದ ಗರಿಷ್ಠ ಕೆಲಸದ ಹೆಚ್ಚು ಮಾಡಬಾರದು {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ಮೇಲೆ
@@ -2383,9 +2386,10 @@
DocType: Task,Actual End Date (via Time Sheet),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
DocType: Soil Texture,Soil Type,ಮಣ್ಣಿನ ಪ್ರಕಾರ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,ಹೊಸ ಸಂದೇಶ
,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
DocType: Shipping Rule,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
DocType: Supplier Scorecard Period,Period Score,ಅವಧಿ ಸ್ಕೋರ್
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ಗ್ರಾಹಕರು ಸೇರಿಸಿ
@@ -2396,7 +2400,7 @@
,Vehicle Expenses,ವಾಹನ ವೆಚ್ಚಗಳು
DocType: Serial No,Invoice Details,ಇನ್ವಾಯ್ಸ್ ವಿವರಗಳು
DocType: Grant Application,Show on Website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ತೋರಿಸಿ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ಪ್ರಾರಂಭಿಸಿ
DocType: Hub Category,Hub Category,ಹಬ್ ವರ್ಗ
DocType: Purchase Invoice,SEZ,SEZ
@@ -2428,7 +2432,7 @@
DocType: Patient,B Positive,ಬಿ ಧನಾತ್ಮಕ
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
DocType: Patient Medical Record,Patient Medical Record,ರೋಗಿಯ ವೈದ್ಯಕೀಯ ದಾಖಲೆ
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,ಅಲ್ಲದ ಗ್ರೂಪ್ ಗ್ರೂಪ್
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ಕ್ರೀಡೆ
@@ -2479,6 +2483,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,ಯಾವುದೇ ಉಲ್ಲೇಖಕ್ಕೆ ಸ್ವೀಕರಿಸಿದ RFQ ಅನ್ನು ಹೊಂದಿಸಲಾಗುವುದಿಲ್ಲ
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,ಖಾತೆ ಕರೆನ್ಸಿಯಲ್ಲಿ ಮುದ್ರಿಸಲು ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
,Production Analytics,ಪ್ರೊಡಕ್ಷನ್ ಅನಾಲಿಟಿಕ್ಸ್
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ಇದು ಈ ರೋಗಿಯ ವಿರುದ್ಧ ವಹಿವಾಟುಗಳನ್ನು ಆಧರಿಸಿದೆ. ವಿವರಗಳಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
@@ -2534,7 +2539,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
DocType: Leave Control Panel,Leave blank if considered for all departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
DocType: Payroll Entry,Fortnightly,ಪಾಕ್ಷಿಕ
DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
DocType: Vital Signs,Weight (In Kilogram),ತೂಕ (ಕಿಲೋಗ್ರಾಂನಲ್ಲಿ)
@@ -2612,7 +2617,7 @@
DocType: Student,Guardians,ಗಾರ್ಡಿಯನ್ಸ್
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ದರ ಪಟ್ಟಿ ಹೊಂದಿಸದೆ ವೇಳೆ ಬೆಲೆಗಳು ತೋರಿಸಲಾಗುವುದಿಲ್ಲ
DocType: Stock Entry,Total Incoming Value,ಒಟ್ಟು ಒಳಬರುವ ಮೌಲ್ಯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ನಿಮ್ಮ ತಂಡದ ಮಾಡಲಾಗುತ್ತದೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಫಾರ್ ಸಮಯ, ವೆಚ್ಚ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ಖರೀದಿ ಬೆಲೆ ಪಟ್ಟಿ
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಅಸ್ಥಿರಗಳ ಟೆಂಪ್ಲೇಟ್ಗಳು.
@@ -2715,7 +2720,7 @@
DocType: Company,For Reference Only.,ಪರಾಮರ್ಶೆಗಾಗಿ ಮಾತ್ರ.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},ವೈದ್ಯ {0} {1} ನಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲ
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,ಬ್ಯಾಚ್ ಆಯ್ಕೆ ಇಲ್ಲ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ಅಮಾನ್ಯ {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},ಅಮಾನ್ಯ {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,ರೆಫರೆನ್ಸ್ ಆಹ್ವಾನ
@@ -2752,8 +2757,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
DocType: Water Analysis,Origin,ಮೂಲ
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಮೂಲಕ ಮಿತಿಗಿಂತ {0} {1} ಐಟಂ {4}. ನೀವು ಮಾಡುತ್ತಿದ್ದಾರೆ ಇನ್ನೊಂದು ಅದೇ ವಿರುದ್ಧ {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
@@ -2809,7 +2814,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,ಹೊಸ ಖರೀದಿಯ ಆದೇಶಗಳಿಗೆ ಎಚ್ಚರಿಕೆ ನೀಡಿ
DocType: Quality Inspection Reading,Reading 9,9 ಓದುವಿಕೆ
DocType: Supplier,Is Frozen,ಹೆಪ್ಪುಗಟ್ಟಿರುವ
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,ಗ್ರೂಪ್ ನೋಡ್ ಗೋದಾಮಿನ ವ್ಯವಹಾರಗಳಿಗೆ ಆಯ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,ಗ್ರೂಪ್ ನೋಡ್ ಗೋದಾಮಿನ ವ್ಯವಹಾರಗಳಿಗೆ ಆಯ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
DocType: Buying Settings,Buying Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಖರೀದಿ
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,ಯಾವುದೇ BOM . ಒಂದು ಮುಕ್ತಾಯಗೊಂಡ ಗುಡ್ ಐಟಂ
DocType: Upload Attendance,Attendance To Date,ದಿನಾಂಕ ಹಾಜರಿದ್ದ
@@ -2824,6 +2829,7 @@
DocType: Grant Application,Organization,ಸಂಸ್ಥೆ
DocType: BOM Update Tool,BOM Update Tool,BOM ಅಪ್ಡೇಟ್ ಟೂಲ್
DocType: SG Creation Tool Course,Student Group Name,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಹೆಸರು
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,ಸ್ಫೋಟಿಸಿದ ನೋಟವನ್ನು ತೋರಿಸಿ
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ಶುಲ್ಕಗಳು ರಚಿಸಲಾಗುತ್ತಿದೆ
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
DocType: Room,Room Number,ಕೋಣೆ ಸಂಖ್ಯೆ
@@ -2834,7 +2840,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್ ಮಾಡಿ
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ಬಳಕೆದಾರ ವೇದಿಕೆ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
DocType: Lab Test Sample,Lab Test Sample,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಮಾದರಿ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -2905,7 +2911,7 @@
DocType: Membership,USD,ಯು. ಎಸ್. ಡಿ
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
DocType: Selling Settings,Auto close Opportunity after 15 days,15 ದಿನಗಳ ನಂತರ ಆಟೋ ನಿಕಟ ಅವಕಾಶ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ಸ್ಕೋರ್ಕಾರ್ಡ್ ನಿಂತಿರುವ ಕಾರಣ {0} ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ಸ್ಕೋರ್ಕಾರ್ಡ್ ನಿಂತಿರುವ ಕಾರಣ {0} ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ಅಂತ್ಯ ವರ್ಷ
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / ಲೀಡ್%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / ಲೀಡ್%
@@ -3018,7 +3024,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ಮೇಲೆ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ರೋ # {0}: ಜರ್ನಲ್ ಎಂಟ್ರಿ {1} ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ {2} ಅಥವಾ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ
DocType: Supplier Scorecard Criteria,Criteria Weight,ಮಾನದಂಡ ತೂಕ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,ಸರಬರಾಜುದಾರ> ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
DocType: Buying Settings,Default Buying Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
DocType: Payroll Entry,Salary Slip Based on Timesheet,ಸಂಬಳ ಸ್ಲಿಪ್ Timesheet ಆಧರಿಸಿ
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,ಖರೀದಿ ದರ
@@ -3108,7 +3113,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ಟ್ರ್ಯಾಕ್ ಇಂಡಸ್ಟ್ರಿ ಪ್ರಕಾರ ಕಾರಣವಾಗುತ್ತದೆ.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,ಲೆಟರ್ಹೆಡ್ಸ್ಗೆ ಹೋಗಿ
DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -3298,6 +3303,7 @@
DocType: Company,Default Inventory Account,ಡೀಫಾಲ್ಟ್ ಇನ್ವೆಂಟರಿ ಖಾತೆ
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿದೆ ಶೂನ್ಯ ಇರಬೇಕು.
DocType: Antibiotic,Antibiotic Name,ಆಂಟಿಬಯೋಟಿಕ್ ಹೆಸರು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,ಐಟಂ ಕೋಡ್> ಐಟಂ ಗ್ರೂಪ್> ಬ್ರ್ಯಾಂಡ್
DocType: Purchase Invoice,Apply Additional Discount On,ಹೆಚ್ಚುವರಿ ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ಬೆಳೆ ಬೆಳೆಯುತ್ತಿರುವ ಎಲ್ಲ ಭೂಮಿ ಘಟಕಗಳಿಗೆ ಲಿಂಕ್
@@ -3493,6 +3499,7 @@
DocType: Supplier,Credit Limit,ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,ಸರಾಸರಿ. ಬೆಲೆ ಪಟ್ಟಿ ದರ ಮಾರಾಟ
DocType: Production Plan Sales Order,Salse Order Date,ಮಣ್ಣಿನ ಜ್ವಾಲಾಮುಖಿ ಆದೇಶ ದಿನಾಂಕ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,ಸರಬರಾಜುದಾರ> ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
DocType: Salary Component,Salary Component,ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,ಪಾವತಿ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
DocType: GL Entry,Voucher No,ಚೀಟಿ ಸಂಖ್ಯೆ
@@ -3502,7 +3509,7 @@
DocType: Leave Allocation,Leave Allocation,ಅಲೋಕೇಶನ್ ಬಿಡಿ
DocType: Payment Request,Recipient Message And Payment Details,ಸ್ವೀಕರಿಸುವವರ ಸಂದೇಶ ಮತ್ತು ಪಾವತಿ ವಿವರಗಳು
DocType: Training Event,Trainer Email,ತರಬೇತುದಾರ ಇಮೇಲ್
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳನ್ನು {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳನ್ನು {0} ದಾಖಲಿಸಿದವರು
DocType: Restaurant Reservation,No of People,ಜನರ ಸಂಖ್ಯೆ
DocType: Production Planning Tool,Include sub-contracted raw materials,ಉಪ ಗುತ್ತಿಗೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ನಿಯಮಗಳು ಅಥವಾ ಒಪ್ಪಂದದ ಟೆಂಪ್ಲೇಟು .
@@ -3568,7 +3575,7 @@
DocType: Production Planning Tool,Create Material Requests,CreateMaterial ವಿನಂತಿಗಳು
DocType: Employee Education,School/University,ಸ್ಕೂಲ್ / ವಿಶ್ವವಿದ್ಯಾಲಯ
DocType: Payment Request,Reference Details,ರೆಫರೆನ್ಸ್ ವಿವರಗಳು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯದ ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡಿಮೆ ಇರಬೇಕು
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯದ ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡಿಮೆ ಇರಬೇಕು
DocType: Sales Invoice Item,Available Qty at Warehouse,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
DocType: Asset,Double Declining Balance,ಡಬಲ್ ಕ್ಷೀಣಿಸಿದ ಬ್ಯಾಲೆನ್ಸ್
@@ -3580,7 +3587,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ಖಾತೆ {2} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,ಪ್ರತಿ ಗುಣಲಕ್ಷಣಗಳಿಂದ ಕನಿಷ್ಠ ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
apps/erpnext/erpnext/config/hr.py +310,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,ಖಾತೆ ಗುಂಪು
DocType: Sales Order,Fully Delivered,ಸಂಪೂರ್ಣವಾಗಿ ತಲುಪಿಸಲಾಗಿದೆ
@@ -3591,14 +3598,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ಪಾವತಿಸಲಾಗುತ್ತದೆ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,ಪ್ರೋಗ್ರಾಂಗಳಿಗೆ ಹೋಗಿ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ಸಾಲು {0} # ನಿಗದಿಪಡಿಸಿದ ಮೊತ್ತವು {1} ಹಕ್ಕುಸ್ವಾಮ್ಯದ ಮೊತ್ತಕ್ಕಿಂತಲೂ ಹೆಚ್ಚಿಲ್ಲ {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,ಸೆಟಪ್> ಸಂಖ್ಯಾ ಸರಣಿಗಳ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ಸೆಟಪ್ ಸಂಖ್ಯೆಯ ಸರಣಿ
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರಚಿಸಿಲ್ಲ
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"ಇಂದ ದಿನಾಂಕ, ಗೆ ದಿನಾಂಕದ ಆಮೇಲೆ ಬರಬೇಕು"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ಅಲ್ಲ ವಿದ್ಯಾರ್ಥಿಯಾಗಿ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು {0} ವಿದ್ಯಾರ್ಥಿ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧ ಇದೆ {1}
DocType: Asset,Fully Depreciated,ಸಂಪೂರ್ಣವಾಗಿ Depreciated
,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್ ಎಚ್ಟಿಎಮ್ಎಲ್
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ಉಲ್ಲೇಖಗಳು ಪ್ರಸ್ತಾಪಗಳನ್ನು, ನಿಮ್ಮ ಗ್ರಾಹಕರಿಗೆ ಕಳುಹಿಸಿದ್ದಾರೆ ಬಿಡ್ ಇವೆ"
DocType: Sales Order,Customer's Purchase Order,ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ
@@ -3683,7 +3689,7 @@
DocType: Stock Settings,Item Naming By,ಐಟಂ ಹೆಸರಿಸುವ ಮೂಲಕ
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ಮತ್ತೊಂದು ಅವಧಿ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ {0} ನಂತರ ಮಾಡಲಾಗಿದೆ {1}
DocType: Production Order,Material Transferred for Manufacturing,ವಸ್ತು ಉತ್ಪಾದನೆ ವರ್ಗಾಯಿಸಲ್ಪಟ್ಟ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ಖಾತೆ {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,ಖಾತೆ {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
DocType: Project,Project Type,ಪ್ರಾಜೆಕ್ಟ್ ಕೌಟುಂಬಿಕತೆ
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ಈ ಕಾರ್ಯಕ್ಕಾಗಿ ಮಗುವಿನ ಕಾರ್ಯವು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಈ ಕಾರ್ಯವನ್ನು ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ.
@@ -3787,11 +3793,11 @@
DocType: Company,Asset Depreciation Cost Center,ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ
DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
DocType: Sales Invoice Item,Delivered Qty,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,ಒಟ್ಟು ಎಕ್ಸ್ಕ್. ತೆರಿಗೆ
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","ಪರಿಶೀಲಿಸಿದರೆ, ಪ್ರತಿಯೊಂದು ನಿರ್ಮಾಣ ಐಟಂ ಎಲ್ಲಾ ಮಕ್ಕಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಸೇರಿಸಲಾಗುವುದು."
DocType: Assessment Plan,Assessment Plan,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,ಗ್ರಾಹಕ {0} ರಚಿಸಲಾಗಿದೆ.
DocType: Stock Settings,Limit Percent,ಮಿತಿ ಪರ್ಸೆಂಟ್
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,ದಯವಿಟ್ಟು ಶೈಕ್ಷಣಿಕ> ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ತರಬೇತುದಾರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ಯಾವುದೇ ವೇರ್ಹೌಸ್ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಯಾವುದೇ ಸ್ಟಾಕ್ ಲಭ್ಯವಿಲ್ಲ
,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಪಾವತಿ ಅವಧಿ
DocType: Sample Collection,No. of print,ಮುದ್ರಣ ಸಂಖ್ಯೆ
@@ -3807,12 +3813,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),ಸಾಲಗಾರರು ({0})
DocType: Pricing Rule,Margin,ಕರೆ
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ಹೊಸ ಗ್ರಾಹಕರು
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,ನಿವ್ವಳ ಲಾಭ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,ನಿವ್ವಳ ಲಾಭ%
DocType: Appraisal Goal,Weightage (%),Weightage ( % )
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಬದಲಾಯಿಸಿ
DocType: Bank Reconciliation Detail,Clearance Date,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,ಅಸೆಸ್ಮೆಂಟ್ ವರದಿ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡ್ಡಾಯ
DocType: Lead,Address Desc,DESC ವಿಳಾಸ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,ಪಕ್ಷದ ಕಡ್ಡಾಯ
DocType: Journal Entry,JV-,JV-
@@ -3844,7 +3850,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,ಸ್ಟ್ಯಾಂಡಿಂಗ್ ಹೆಸರು
DocType: Stock Entry,Customer or Supplier Details,ಗ್ರಾಹಕ ಅಥವಾ ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
DocType: Employee Loan Application,Required by Date,ದಿನಾಂಕ ಅಗತ್ಯವಾದ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),ಮುಚ್ಚುವ ಬ್ಯಾಲೆನ್ಸ್ (ಡಾ - ಕ್ರ)
DocType: Lead,Lead Owner,ಲೀಡ್ ಮಾಲೀಕ
DocType: Bin,Requested Quantity,ವಿನಂತಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
DocType: Patient,Marital Status,ವೈವಾಹಿಕ ಸ್ಥಿತಿ
@@ -3858,7 +3863,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,ಬಹು ರೂಪಾಂತರಗಳು
DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ಐಟಂ {0}: ಆದೇಶ ಪ್ರಮಾಣ {1} ಕನಿಷ್ಠ ಸಲುವಾಗಿ ಪ್ರಮಾಣ {2} (ಐಟಂ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿದೆ) ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ಐಟಂ {0}: ಆದೇಶ ಪ್ರಮಾಣ {1} ಕನಿಷ್ಠ ಸಲುವಾಗಿ ಪ್ರಮಾಣ {2} (ಐಟಂ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿದೆ) ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,ದಯವಿಟ್ಟು ಇನ್ನೊಂದು ಬಳಕೆದಾರರಂತೆ ಲಾಗಿನ್ ಮಾಡಿ.
DocType: Territory,Territory Targets,ಪ್ರದೇಶ ಗುರಿಗಳ
@@ -3959,7 +3964,7 @@
DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
DocType: Company,Default Cash Account,ಡೀಫಾಲ್ಟ್ ನಗದು ಖಾತೆ
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ಈ ವಿದ್ಯಾರ್ಥಿ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
@@ -4111,7 +4116,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ಪ್ರಸ್ತಾಪಿತ ಮಾನದಂಡಗಳಿಗೆ ಉದ್ಯೋಗಿಗಳು ಇಲ್ಲ
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
DocType: Restaurant,Default Customer,ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ> ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
DocType: Assessment Plan,Supervisor Name,ಮೇಲ್ವಿಚಾರಕ ಹೆಸರು
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ಅದೇ ದಿನದಂದು ಅಪಾಯಿಂಟ್ಮೆಂಟ್ ರಚಿಸಿದ್ದರೆ ಅದನ್ನು ದೃಢೀಕರಿಸಬೇಡಿ
DocType: Program Enrollment Course,Program Enrollment Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಕೋರ್ಸ್
@@ -4234,7 +4238,7 @@
DocType: BOM,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ಹೊಸತು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ಇಮೇಲ್ ವಿಳಾಸ, ಅನನ್ಯ ಇರಬೇಕು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,ರಸೀತಿ
@@ -4251,7 +4255,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ಪರವಾನಗಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ನೀವು ಆದ್ದರಿಂದ ಈ ಹಿಂದಿನ ಆರ್ಥಿಕ ವರ್ಷದ ಬಾಕಿ ಈ ಆರ್ಥಿಕ ವರ್ಷ ಬಿಟ್ಟು ಸೇರಿವೆ ಬಯಸಿದರೆ ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಆಯ್ಕೆ ಮಾಡಿ
DocType: GL Entry,Against Voucher Type,ಚೀಟಿ ಕೌಟುಂಬಿಕತೆ ವಿರುದ್ಧ
DocType: Physician,Phone (R),ಫೋನ್ (ಆರ್)
@@ -4263,7 +4267,7 @@
DocType: Patient,B Negative,ಬಿ ಋಣಾತ್ಮಕ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,ನಿರ್ವಹಣೆ ಸ್ಥಿತಿಯನ್ನು ಸಲ್ಲಿಕೆಗೆ ರದ್ದುಪಡಿಸಬೇಕು ಅಥವಾ ಪೂರ್ಣಗೊಳಿಸಬೇಕು
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,ಸಾಲು {0} ಸರಣಿ ಸಂಖ್ಯೆಗಳು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಹೊಂದುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,ಸಾಲು {0} ಸರಣಿ ಸಂಖ್ಯೆಗಳು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಹೊಂದುವುದಿಲ್ಲ
DocType: Student,Guardian Details,ಗಾರ್ಡಿಯನ್ ವಿವರಗಳು
DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ಅನೇಕ ನೌಕರರು ಮಾರ್ಕ್ ಅಟೆಂಡೆನ್ಸ್
@@ -4305,7 +4309,7 @@
DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
DocType: Training Event,Exam,ಪರೀಕ್ಷೆ
DocType: Complaint,Complaint,ದೂರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
DocType: Patient,Alcohol Past Use,ಆಲ್ಕೊಹಾಲ್ ಪಾಸ್ಟ್ ಯೂಸ್
DocType: Fertilizer Content,Fertilizer Content,ರಸಗೊಬ್ಬರ ವಿಷಯ
@@ -4434,6 +4438,7 @@
DocType: Salary Detail,Formula,ಸೂತ್ರ
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,ಸರಣಿ #
DocType: Lab Test Template,Lab Test Template,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಟೆಂಪ್ಲೇಟು
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,ಮಾರಾಟದ ಖಾತೆ
DocType: Purchase Invoice Item,Total Weight,ಒಟ್ಟು ತೂಕ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,ಮಾರಾಟದ ಮೇಲೆ ಕಮಿಷನ್
DocType: Offer Letter Term,Value / Description,ಮೌಲ್ಯ / ವಿವರಣೆ
@@ -4592,7 +4597,7 @@
DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ಉತ್ಪಾದನೆಗೆ ಬಿಡುಗಡೆ ಆರ್ಡರ್ಸ್ .
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
DocType: Program Enrollment Tool,Enroll Students,ವಿದ್ಯಾರ್ಥಿಗಳು ದಾಖಲು
DocType: Lab Test,Approved Date,ಅನುಮೋದಿತ ದಿನಾಂಕ
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
@@ -4669,7 +4674,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,ಪ್ರೊಡಕ್ಷನ್ ಐಟಂ
,Employee Information,ನೌಕರರ ಮಾಹಿತಿ
DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
DocType: Quality Inspection,Incoming,ಒಳಬರುವ
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿಯ ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ.
@@ -4686,7 +4691,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},ರೇಟಿಂಗ್ : {0}
,Delivery Note Trends,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಪ್ರವೃತ್ತಿಗಳು
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ರಲ್ಲಿ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ರಲ್ಲಿ
DocType: Delivery Trip,Calculate Estimated Arrival Times,ಅಂದಾಜು ಆಗಮನದ ಸಮಯವನ್ನು ಲೆಕ್ಕಾಚಾರ ಮಾಡಿ
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ಖಾತೆ: {0} ಮಾತ್ರ ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಮೂಲಕ ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು
DocType: Student Group Creation Tool,Get Courses,ಕೋರ್ಸ್ಗಳು ಪಡೆಯಿರಿ
@@ -4702,7 +4707,7 @@
DocType: Material Request,% Ordered,% ಆದೇಶ
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ಕೋರ್ಸ್ ಆಧಾರಿತ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಫಾರ್, ಕೋರ್ಸ್ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಸೇರಿಕೊಂಡಳು ಕೋರ್ಸ್ಗಳು ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿ ಪಡಿಸಿ ನಡೆಯಲಿದೆ."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
DocType: Employee,History In Company,ಕಂಪನಿ ಇತಿಹಾಸ
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{ಕಳುಹಿಸುವವರ} ನಿಂದ ಹೊಸ ಸಂದೇಶ
@@ -4750,7 +4755,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ರೋ {0}: ಆಫ್ ಬಿಒಎಮ್ # ಕರೆನ್ಸಿ {1} ಆಯ್ಕೆ ಕರೆನ್ಸಿ ಸಮಾನ ಇರಬೇಕು {2}
DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
DocType: Patient,Additional information regarding the patient,ರೋಗಿಗೆ ಸಂಬಂಧಿಸಿದ ಹೆಚ್ಚುವರಿ ಮಾಹಿತಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
DocType: Homepage,Tag Line,ಟ್ಯಾಗ್ ಲೈನ್
DocType: Fee Component,Fee Component,ಶುಲ್ಕ ಕಾಂಪೊನೆಂಟ್
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
@@ -4965,7 +4970,7 @@
DocType: Employee Education,Employee Education,ನೌಕರರ ಶಿಕ್ಷಣ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ನಕಲು ಐಟಂ ಗುಂಪು ಐಟಂ ಗುಂಪು ಟೇಬಲ್ ಕಂಡುಬರುವ
DocType: Land Unit,Parent Land Unit,ಪೋಷಕ ಭೂಮಿ ಘಟಕ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
DocType: Fertilizer,Fertilizer Name,ರಸಗೊಬ್ಬರ ಹೆಸರು
DocType: Salary Slip,Net Pay,ನಿವ್ವಳ ವೇತನ
DocType: Account,Account,ಖಾತೆ
@@ -5044,7 +5049,7 @@
DocType: Item Customer Detail,Ref Code,ಉಲ್ಲೇಖ ಕೋಡ್
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,ಗ್ರಾಹಕ ಗುಂಪಿನಲ್ಲಿ ಪಿಒಎಸ್ ಪ್ರೊಫೈಲ್ನಲ್ಲಿ ಅಗತ್ಯವಿದೆ
apps/erpnext/erpnext/config/hr.py +12,Employee records.,ನೌಕರರ ದಾಖಲೆಗಳು .
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಸೆಟ್ ಮಾಡಿ
DocType: HR Settings,Payroll Settings,ವೇತನದಾರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,ಅಲ್ಲದ ಲಿಂಕ್ ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಪಾವತಿಗಳು ಫಲಿತಾಂಶ .
DocType: POS Settings,POS Settings,ಪಿಓಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -5212,7 +5217,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
DocType: Asset Maintenance Task,Last Completion Date,ಕೊನೆಯ ಪೂರ್ಣಗೊಳಿಸುವಿಕೆ ದಿನಾಂಕ
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
DocType: Buying Settings,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ವಿಮೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ ವಿಮಾ ಅಂತಿಮ ದಿನಾಂಕ ಕಡಿಮೆ ಇರಬೇಕು
@@ -5343,6 +5348,7 @@
DocType: Bank Reconciliation,Get Payment Entries,ಪಾವತಿ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
DocType: Quotation Item,Against Docname,docName ವಿರುದ್ಧ
DocType: SMS Center,All Employee (Active),ಎಲ್ಲಾ ನೌಕರರ ( ಸಕ್ರಿಯ )
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ಗ್ರಾಹಕ> ಗ್ರಾಹಕರ ಗುಂಪು> ಪ್ರದೇಶ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ಈಗ ವೀಕ್ಷಿಸಿ
DocType: BOM,Raw Material Cost,ರಾ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ
DocType: Item Reorder,Re-Order Level,ಮರು ಕ್ರಮಾಂಕದ ಮಟ್ಟ
@@ -5443,7 +5449,6 @@
DocType: Room,Seating Capacity,ಆಸನ ಸಾಮರ್ಥ್ಯ
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ಗ್ರಾಹಕ> ಗ್ರಾಹಕರ ಗುಂಪು> ಪ್ರದೇಶ
DocType: Project,Total Expense Claim (via Expense Claims),ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು (ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ)
DocType: GST Settings,GST Summary,ಜಿಎಸ್ಟಿ ಸಾರಾಂಶ
DocType: Assessment Result,Total Score,ಒಟ್ಟು ಅಂಕ
@@ -5457,7 +5462,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,ನಂತರದ ವೇಳಾಪಟ್ಟಿಯನ್ನು ರಚಿಸಲಾಗಿದೆ
DocType: Journal Entry,Total Debit,ಒಟ್ಟು ಡೆಬಿಟ್
DocType: Manufacturing Settings,Default Finished Goods Warehouse,ಡೀಫಾಲ್ಟ್ ತಯಾರಾದ ಸರಕುಗಳು ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,ಮಾರಾಟಗಾರ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ಮಾರಾಟಗಾರ
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,ಬಜೆಟ್ ಮತ್ತು ವೆಚ್ಚದ ಕೇಂದ್ರ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ಬಹುಪಾಲು ಡೀಫಾಲ್ಟ್ ಮೋಡ್ ಅನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ಫಾರ್
@@ -5633,7 +5638,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,ತೆರಿಗೆ ಅಥವಾ ಶುಲ್ಕ ಪರಿಗಣಿಸಿ
DocType: Driver,Driving License Category,ಚಾಲಕ ಪರವಾನಗಿ ವರ್ಗ
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ನಿಜವಾದ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ಪ್ರಸ್ತುತ ಒಂದು {1} ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಟ್ಯಾಂಡಿಂಗ್ ಅನ್ನು ಹೊಂದಿದೆ, ಮತ್ತು ಈ ಸರಬರಾಜುದಾರರಿಗೆ ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಎಚ್ಚರಿಕೆಯಿಂದ ನೀಡಬೇಕು."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ಪ್ರಸ್ತುತ ಒಂದು {1} ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಸ್ಟ್ಯಾಂಡಿಂಗ್ ಅನ್ನು ಹೊಂದಿದೆ, ಮತ್ತು ಈ ಸರಬರಾಜುದಾರರಿಗೆ ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಎಚ್ಚರಿಕೆಯಿಂದ ನೀಡಬೇಕು."
DocType: Asset Maintenance Team,Asset Maintenance Team,ಆಸ್ತಿ ನಿರ್ವಹಣೆ ತಂಡ
DocType: Employee Loan,Loan Type,ಸಾಲದ ಬಗೆಯ
DocType: Scheduling Tool,Scheduling Tool,ನಿಗದಿಗೊಳಿಸುವ ಟೂಲ್
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index af74e66..cb92e49 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,가격순 정렬
,Delay Days,지연 일
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,서비스 비용
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,송장
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,보존 재고 항목 만들기
DocType: Purchase Invoice Item,Item Weight Details,품목 무게 세부 사항
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","참조 : {0}, 상품 코드 : {1} 및 고객 : {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,KG
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,작업에 대한 열기.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM은 {1} 행의 외주 품목 {0}에 대해 지정되지 않았습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM은 {1} 행의 외주 품목 {0}에 대해 지정되지 않았습니다.
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} 결과 제출 됨
DocType: Item Attribute,Increment,증가
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,시간 범위
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},허용되지 {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,에서 항목을 가져 오기
DocType: Price List,Price Not UOM Dependant,UOM에 의존하지 않는 가격
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},제품 {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,나열된 항목이 없습니다.
DocType: Asset Repair,Error Description,오류 설명
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,식료품 점
DocType: Quality Inspection Reading,Reading 1,읽기 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,연금 펀드
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,다음 감가 상각 날짜는 구매 날짜 이전 될 수 없습니다
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,다음 감가 상각 날짜는 구매 날짜 이전 될 수 없습니다
DocType: Crop,Perennial,다년생의
DocType: Consultation,Consultation Date,상담 일
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext 사용자를위한 제품 목록 및 검색
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","예를 들어, "초등 학교"또는 "대학""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,재고 보고서
DocType: Warehouse,Warehouse Detail,창고 세부 정보
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,계약 기간 종료 날짜 나중에 용어가 연결되는 학술 올해의 연말 날짜 초과 할 수 없습니다 (학년 {}). 날짜를 수정하고 다시 시도하십시오.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","자산 레코드 항목에 대해 존재하는, 선택 해제 할 수 없습니다 "고정 자산""
DocType: Delivery Trip,Departure Time,출발 시각
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,사양 세부 사항을 얻을
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,공급 업체 순위의 템플릿.
DocType: Lead,Interested,관심
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,열기
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,열기
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},에서 {0}에 {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,세금을 설정하지 못했습니다.
DocType: Item,Copy From Item Group,상품 그룹에서 복사
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,연간 잎
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,행 {0} : 확인하시기 바랍니다이 계정에 대한 '사전인가'{1}이 사전 항목 인 경우.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},웨어 하우스는 {0}에 속하지 않는 회사 {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},웨어 하우스는 {0}에 속하지 않는 회사 {1}
DocType: Email Digest,Profit & Loss,이익 및 손실
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,리터
DocType: Task,Total Costing Amount (via Time Sheet),(시간 시트를 통해) 총 원가 계산 금액
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,이것은이 회사와의 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오.
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,자동 자료 요청의 생성에 이메일로 통보
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,저항하는
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,상담
DocType: Journal Entry,Multi Currency,멀티 통화
DocType: Opening Invoice Creation Tool,Invoice Type,송장 유형
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,상품 수령증
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,과부
DocType: Request for Quotation,Request for Quotation,견적 요청
DocType: Healthcare Settings,Require Lab Test Approval,실험실 테스트 승인 필요
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,상품 코드> 상품 그룹> 브랜드
DocType: Salary Slip Timesheet,Working Hours,근무 시간
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,총 우수
DocType: Naming Series,Change the starting / current sequence number of an existing series.,기존 시리즈의 시작 / 현재의 순서 번호를 변경합니다.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,비용 센터를 입력 해주십시오
DocType: Drug Prescription,Dosage,복용량
DocType: Journal Entry Account,Sales Order,판매 주문
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,평균. 판매 비율
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,평균. 판매 비율
DocType: Assessment Plan,Examiner Name,심사관 이름
DocType: Lab Test Template,No Result,어떤 결과가 없습니다
DocType: Purchase Invoice Item,Quantity and Rate,수량 및 평가
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,급여 기간을 선택
DocType: Purchase Invoice,Unpaid,지불하지 않은
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,판매 예약
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,인력> 인사말 설정에서 Employee Naming System을 설정하십시오.
DocType: Packing Slip,From Package No.,패키지 번호에서
DocType: Item Attribute,To Range,범위
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,증권 및 예치금
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,작업장
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,구매 주문 경고
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,충분한 부품 작성하기
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,충분한 부품 작성하기
DocType: POS Profile User,POS Profile User,POS 프로필 사용자
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,직접 수입
DocType: Patient Appointment,Date TIme,날짜 시간
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","계정별로 분류하면, 계정을 기준으로 필터링 할 수 없습니다"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","계정별로 분류하면, 계정을 기준으로 필터링 할 수 없습니다"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,관리 책임자
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,회사 및 세금 설정
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,코스를 선택하십시오
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,차이 계정
DocType: Purchase Invoice,Supplier GSTIN,공급 업체 GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,종속 작업 {0}이 닫혀 있지 가까운 작업을 할 수 없습니다.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
DocType: Production Order,Additional Operating Cost,추가 운영 비용
DocType: Lab Test Template,Lab Routine,실험실 루틴
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,화장품
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2와의 관계
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,관리자
DocType: Payment Entry,Payment From / To,/에서로 지불
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},새로운 신용 한도는 고객의 현재 뛰어난 양 미만이다. 신용 한도이어야 수있다 {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},새로운 신용 한도는 고객의 현재 뛰어난 양 미만이다. 신용 한도이어야 수있다 {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},창고 {0}에 계정을 설정하십시오.
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Based On'과 'Group By'는 달라야 합니다.
DocType: Sales Person,Sales Person Targets,영업 사원 대상
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,배치 이름
DocType: Fee Validity,Max number of visit,최대 방문 횟수
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,작업 표 작성 :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,싸다
DocType: GST Settings,GST Settings,GST 설정
DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
@@ -958,7 +959,7 @@
DocType: Budget,Budget Against,예산에 대하여
DocType: Employee,Cell Number,핸드폰 번호
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,주어진 기준에 맞는 직원이 없습니다. 급여 전표가 아직 작성되지 않았는지 확인하십시오.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,자동 자료 요청 생성
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,자동 자료 요청 생성
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,상실
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,제조에 예약
@@ -966,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,에너지
DocType: Opportunity,Opportunity From,기회에서
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,월급의 문.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,행 {0} : {1} 품목 {2}에 필요한 일련 번호. 귀하는 {3}을 (를) 제공했습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,행 {0} : {1} 품목 {2}에 필요한 일련 번호. 귀하는 {3}을 (를) 제공했습니다.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,표를 선택하십시오.
DocType: BOM,Website Specifications,웹 사이트 사양
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}은 (는) '수신자'의 이메일 주소가 잘못되었습니다.
@@ -1054,7 +1055,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,견적 요청 됨
DocType: Vital Signs,Heart Rate / Pulse,심박수 / 맥박수
DocType: Company,Default Bank Account,기본 은행 계좌
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},항목을 통해 전달되지 않기 때문에 '업데이트 재고'확인 할 수없는 {0}
DocType: Vehicle,Acquisition Date,취득일
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,NOS
@@ -1079,7 +1080,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),"편지 머리 업로드 (웹 페이지를 900px, 100px로 유지)"
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} 계정 {2} 그룹이 될 수 없습니다
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,항목 행 {IDX} {문서 타입} {DOCNAME} 위에 존재하지 않는 '{문서 타입}'테이블
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,표 {0} 이미 완료 또는 취소
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,표 {0} 이미 완료 또는 취소
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,어떤 작업을하지
DocType: Item Variant Settings,Copy Fields to Variant,필드를 변형에 복사
DocType: Asset,Opening Accumulated Depreciation,감가 상각 누계액 열기
@@ -1191,9 +1192,10 @@
DocType: Production Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,판매 파트너 및 지역
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),마감 (개업 + 총)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),마감 (개업 + 총)
DocType: Journal Entry,Depreciation Entry,감가 상각 항목
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,첫 번째 문서 유형을 선택하세요
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,계정 통화로 인쇄
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"이 유지 보수 방문을 취소하기 전, 재질 방문 {0} 취소"
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 표준
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},일련 번호 {0} 항목에 속하지 않는 {1}
@@ -1219,7 +1221,7 @@
DocType: Supplier,Default Payable Accounts,기본 미지급금
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
DocType: Fee Structure,Components,구성 요소들
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,항목 변형 {0} 업데이트
DocType: Quality Inspection Reading,Reading 6,6 읽기
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1271,6 +1273,7 @@
,Company Name,회사 명
DocType: SMS Center,Total Message(s),전체 메시지 (들)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,설정> 설정> 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
DocType: Purchase Invoice,Additional Discount Percentage,추가 할인 비율
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,모든 도움말 동영상 목록보기
DocType: Agriculture Analysis Criteria,Soil Texture,토양 질감
@@ -1299,7 +1302,7 @@
DocType: BOM Website Item,BOM Website Item,BOM 웹 사이트 항목
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
DocType: Timesheet Detail,Bill,계산서
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,다음 감가 상각 날짜는 과거 날짜로 입력
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,다음 감가 상각 날짜는 과거 날짜로 입력
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,화이트
DocType: SMS Center,All Lead (Open),모든 납 (열기)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),행 {0}에 대한 수량을 사용할 수없는 {4}웨어 하우스의 {1} 항목의 시간을 게시에 ({2} {3})
@@ -1316,7 +1319,7 @@
DocType: Lead,Next Contact Date,다음 접촉 날짜
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,열기 수량
DocType: Healthcare Settings,Appointment Reminder,약속 알림
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
DocType: Program Enrollment Tool Student,Student Batch Name,학생 배치 이름
DocType: Consultation,Doctor,의사
DocType: Holiday List,Holiday List Name,휴일 목록 이름
@@ -1332,6 +1335,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,할당 도구를 남겨
DocType: Item,Hub Category to Publish,게시 할 허브 카테고리
DocType: Leave Block List,Leave Block List Dates,차단 목록 날짜를 남겨
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,셋업> 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
DocType: Sales Invoice,Billing Address GSTIN,대금 청구 주소 GSTIN
DocType: Assessment Plan,Evaluate,평가하다
DocType: Workstation,Net Hour Rate,인터넷 시간 비율
@@ -1366,7 +1370,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,판매 송장 지불
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,판매 주문 / 완제품 창고에서 예약 창고
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,판매 금액
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,판매 금액
DocType: Repayment Schedule,Interest Amount,이자 금액
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
DocType: Serial No,Creation Document No,작성 문서 없음
@@ -1459,7 +1463,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,개시 잔고
,GST Sales Register,GST 영업 등록
DocType: Sales Invoice Advance,Sales Invoice Advance,선행 견적서
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,요청하지 마
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,요청하지 마
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,도메인 선택
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},또 다른 예산 기록은 '{0}'이 (가) 이미 존재에 대해 {1} '{2}'회계 연도 {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,필드는 생성시에만 복사됩니다.
@@ -1469,11 +1473,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","이 변형의 상품 코드에 추가됩니다.귀하의 약어는 ""SM""이며, 예를 들어, 아이템 코드는 ""T-SHIRT"", ""T-SHIRT-SM""입니다 변형의 항목 코드"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,당신이 급여 슬립을 저장하면 (즉) 순 유료가 표시됩니다.
DocType: Purchase Invoice,Is Return,돌아가요
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,주의
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,주의
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,반품 / 직불 참고
DocType: Price List Country,Price List Country,가격 목록 나라
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},항목에 대한 {0} 유효한 일련 NOS {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},항목에 대한 {0} 유효한 일련 NOS {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,상품 코드 일련 번호 변경할 수 없습니다
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM 변환 계수
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,배치 번호를 얻기 위해 상품 코드를 입력하세요
@@ -1579,7 +1583,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
DocType: Supplier Scorecard,Warn for new Request for Quotations,견적 요청에 대한 새로운 경고
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,구매 주문은 당신이 계획하는 데 도움이 당신의 구입에 후속
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,실험실 처방전
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",자료 요청의 총 발행 / 전송 양 {0} {1} \ 항목에 대한 요청한 수량 {2}보다 클 수 없습니다 {3}
@@ -1617,7 +1621,6 @@
DocType: Warehouse,Warehouse Contact Info,창고 연락처 정보
DocType: Payment Entry,Write Off Difference Amount,차이 금액 오프 쓰기
DocType: Volunteer,Volunteer Name,자원 봉사자 이름
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,강사 네이밍 시스템> 교육 환경 설정
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0} : 직원의 이메일을 찾을 수 없습니다, 따라서 보낸 이메일이 아닌"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},국가 {0}에는 배송 규칙이 적용되지 않습니다.
DocType: Item,Foreign Trade Details,대외 무역 세부 사항
@@ -1630,7 +1633,7 @@
DocType: Student Group Student,Group Roll Number,그룹 롤 번호
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,모든 작업 가중치의 합계 1. 따라 모든 프로젝트 작업의 가중치를 조정하여주십시오해야한다
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,자본 장비
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
@@ -1655,7 +1658,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,아이웨어 하우스는이웨어 하우스에 대한 필요성이 존재한다. 이웨어 하우스를 삭제할 수 없습니다.
DocType: Item,Website Item Groups,웹 사이트 상품 그룹
DocType: Purchase Invoice,Total (Company Currency),총 (회사 통화)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,일련 번호 {0} 번 이상 입력
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,일련 번호 {0} 번 이상 입력
DocType: Journal Entry,Journal Entry,분개
DocType: Expense Claim Advance,Unclaimed amount,청구되지 않은 금액
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,진행중인 {0} 항목
@@ -1752,7 +1755,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,통신 로그.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","견적 요청은 더 체크 포털 설정을 위해, 포털에서 액세스를 사용할 수 없습니다."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,공급 업체 스코어 카드 채점 변수
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,금액을 구매
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,금액을 구매
DocType: Sales Invoice,Shipping Address Name,배송 주소 이름
DocType: Material Request,Terms and Conditions Content,약관 내용
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,수업 일정을 만드는 중에 오류가 발생했습니다.
@@ -2017,7 +2020,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,이이 차량에 대한 로그를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
DocType: Customer,Default Price List,기본 가격리스트
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,자산 이동 기록 {0} 작성
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,자산 이동 기록 {0} 작성
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,당신은 삭제할 수 없습니다 회계 연도 {0}. 회계 연도 {0} 전역 설정에서 기본값으로 설정
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,같은 이름의 고객이 이미 있습니다.
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,급여 전표를 제출하고 발생 분개를 생성합니다. 진행 하시겠습니까?
@@ -2031,6 +2034,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,가격
DocType: Quotation,Term Details,용어의 자세한 사항
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,이 학생 그룹에 대한 {0} 학생 이상 등록 할 수 없습니다.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),합계 (세금 제외)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,리드 카운트
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,리드 카운트
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0보다 커야합니다
@@ -2051,7 +2055,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,송장의 취소에 지불 연결 해제
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},입력 현재 주행 독서는 초기 차량 주행보다 커야합니다 {0}
DocType: Restaurant Reservation,No Show,더 쇼 없다
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,설정> 설정> 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
DocType: Shipping Rule Country,Shipping Rule Country,배송 규칙 나라
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,두고 출석
DocType: Maintenance Visit,Partially Completed,부분적으로 완료
@@ -2144,7 +2147,7 @@
DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
DocType: Grant Application,Assessment Mark (Out of 10),평가 표시 (10 점 만점)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 모바일 없음
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,주요 기능
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,주요 기능
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,변체
DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
DocType: Employee Attendance Tool,Employees HTML,직원 HTML을
@@ -2194,7 +2197,7 @@
DocType: Course,Course Abbreviation,코스 약어
DocType: Student Leave Application,Student Leave Application,학생 휴가 신청
DocType: Item,Will also apply for variants,또한 변형 적용됩니다
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},에 반나절에 직원 {0} {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},총 근무 시간은 최대 근무 시간보다 더 안 {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,켜기
@@ -2382,9 +2385,10 @@
DocType: Task,Actual End Date (via Time Sheet),실제 종료 날짜 (시간 시트를 통해)
DocType: Soil Texture,Soil Type,토양 유형
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,새로운 메시지
,Quotation Trends,견적 동향
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
DocType: Shipping Rule,Shipping Amount,배송 금액
DocType: Supplier Scorecard Period,Period Score,기간 점수
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,고객 추가
@@ -2395,7 +2399,7 @@
,Vehicle Expenses,차량 비용
DocType: Serial No,Invoice Details,인보이스 세부 정보
DocType: Grant Application,Show on Website,웹 사이트에 표시
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,시작하다
DocType: Hub Category,Hub Category,허브 카테고리
DocType: Purchase Invoice,SEZ,경제 특구
@@ -2427,7 +2431,7 @@
DocType: Patient,B Positive,B 양성
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,약어는 비워둘수 없습니다
DocType: Patient Medical Record,Patient Medical Record,환자의 의료 기록
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,비 그룹에 그룹
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,스포츠
@@ -2478,6 +2482,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,수신 RFQ를 견적으로 설정할 수 없습니다.
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,총 공제
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,계좌 통화로 인쇄 할 계좌를 선택하십시오
,Production Analytics,생산 분석
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,이것은이 환자와의 거래를 기반으로합니다. 자세한 내용은 아래 타임 라인을 참조하십시오.
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,비용 업데이트
@@ -2533,7 +2538,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,회사를 선택 ...
DocType: Leave Control Panel,Leave blank if considered for all departments,모든 부서가 있다고 간주 될 경우 비워 둡니다
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
DocType: Payroll Entry,Fortnightly,이주일에 한번의
DocType: Currency Exchange,From Currency,통화와
DocType: Vital Signs,Weight (In Kilogram),무게 (킬로그램 단위)
@@ -2611,7 +2616,7 @@
DocType: Student,Guardians,보호자
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,가격리스트가 설정되지 않은 경우 가격이 표시되지
DocType: Stock Entry,Total Incoming Value,총 수신 값
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,직불 카드에 대한이 필요합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,직불 카드에 대한이 필요합니다
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","작업 표는 팀에 의해 수행하는 행동이 시간, 비용 및 결제 추적 할 수 있도록"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,구매 가격 목록
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,공급자 스코어 카드 변수의 템플릿.
@@ -2712,7 +2717,7 @@
DocType: Company,For Reference Only.,참조 용으로 만 사용됩니다.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},의사 {0}은 (는) {1}에서 사용할 수 없습니다.
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,배치 번호 선택
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},잘못된 {0} : {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},잘못된 {0} : {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,참조 인보이스
@@ -2749,8 +2754,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
DocType: Water Analysis,Origin,유래
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,이 문서에 의해 제한을 초과 {0} {1} 항목 {4}. 당신은하고 있습니다 동일에 대한 또 다른 {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,저장 한 후 반복 설정하십시오
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,선택 변화량 계정
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,저장 한 후 반복 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,선택 변화량 계정
DocType: Purchase Invoice,Price List Currency,가격리스트 통화
DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
@@ -2806,7 +2811,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,새 구매 주문 경고
DocType: Quality Inspection Reading,Reading 9,9 읽기
DocType: Supplier,Is Frozen,동결
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,그룹 노드웨어 하우스는 트랜잭션을 선택 할 수 없습니다
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,그룹 노드웨어 하우스는 트랜잭션을 선택 할 수 없습니다
DocType: Buying Settings,Buying Settings,구매 설정
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,완제품 항목에 대한 BOM 번호
DocType: Upload Attendance,Attendance To Date,날짜 출석
@@ -2821,6 +2826,7 @@
DocType: Grant Application,Organization,조직
DocType: BOM Update Tool,BOM Update Tool,BOM 업데이트 도구
DocType: SG Creation Tool Course,Student Group Name,학생 그룹 이름
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,분해보기 표시
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,수수료 만들기
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
DocType: Room,Room Number,방 번호
@@ -2831,7 +2837,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,세금 템플릿 만들기
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,사용자 포럼
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
DocType: Lab Test Sample,Lab Test Sample,실험실 테스트 샘플
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,빠른 분개
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
@@ -2902,7 +2908,7 @@
DocType: Membership,USD,미화
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,송장 생성
DocType: Selling Settings,Auto close Opportunity after 15 days,15 일이 경과되면 자동 가까운 기회
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,스코어 카드가 {1} (으)로 인해 구매 주문이 {0}에 허용되지 않습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,스코어 카드가 {1} (으)로 인해 구매 주문이 {0}에 허용되지 않습니다.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,최종 년도
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,따옴표 / 리드 %
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
@@ -3014,7 +3020,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 위
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,행 번호 {0} 저널 항목 {1} 계정이없는이 {2} 또는 이미 다른 쿠폰에 대해 일치
DocType: Supplier Scorecard Criteria,Criteria Weight,기준 무게
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,공급 업체> 공급 업체 유형
DocType: Buying Settings,Default Buying Price List,기본 구매 가격 목록
DocType: Payroll Entry,Salary Slip Based on Timesheet,표를 바탕으로 급여 슬립
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,구매율
@@ -3104,7 +3109,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,트랙은 산업 유형에 의해 리드.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,편지지로 이동
DocType: Item Supplier,Item Supplier,부품 공급 업체
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,모든 주소.
DocType: Company,Stock Settings,재고 설정
@@ -3294,6 +3299,7 @@
DocType: Company,Default Inventory Account,기본 재고 계정
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,행 {0} : 완성 된 수량은 0보다 커야합니다.
DocType: Antibiotic,Antibiotic Name,항생제 이름
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,상품 코드> 상품 그룹> 브랜드
DocType: Purchase Invoice,Apply Additional Discount On,추가 할인에 적용
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,유형 선택 ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,농작물이 성장하고있는 모든 육상 유닛에 대한 링크
@@ -3489,6 +3495,7 @@
DocType: Supplier,Credit Limit,신용 한도
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,평균 판매 가격 목록 비율
DocType: Production Plan Sales Order,Salse Order Date,Salse 주문 날짜
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,공급 업체> 공급 업체 유형
DocType: Salary Component,Salary Component,급여 구성 요소
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,결제 항목은 {0}-않은 링크입니다
DocType: GL Entry,Voucher No,바우처 없음
@@ -3498,7 +3505,7 @@
DocType: Leave Allocation,Leave Allocation,휴가 배정
DocType: Payment Request,Recipient Message And Payment Details,받는 사람의 메시지와 지불 세부 사항
DocType: Training Event,Trainer Email,트레이너 이메일
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,자료 요청 {0} 생성
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,자료 요청 {0} 생성
DocType: Restaurant Reservation,No of People,사람들의 수
DocType: Production Planning Tool,Include sub-contracted raw materials,하청 원료를 포함
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,조건 또는 계약의 템플릿.
@@ -3564,7 +3571,7 @@
DocType: Production Planning Tool,Create Material Requests,자료 요청을 만듭니다
DocType: Employee Education,School/University,학교 / 대학
DocType: Payment Request,Reference Details,참조 세부 사항
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,내용 연수 후 예상 값은 총 구매 금액보다 작아야합니다
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,내용 연수 후 예상 값은 총 구매 금액보다 작아야합니다
DocType: Sales Invoice Item,Available Qty at Warehouse,창고에서 사용 가능한 수량
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,청구 금액
DocType: Asset,Double Declining Balance,이중 체감
@@ -3576,7 +3583,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,업데이트 받기
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1} 계정 {2} 회사에 속하지 않는 {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,각 속성에서 하나 이상의 값을 선택하십시오.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
apps/erpnext/erpnext/config/hr.py +310,Leave Management,관리를 남겨주세요
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,계정별 그룹
DocType: Sales Order,Fully Delivered,완전 배달
@@ -3587,14 +3594,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},지급 금액은 대출 금액보다 클 수 없습니다 {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,프로그램으로 이동
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},행 {0} # 할당 된 금액 {1}은 청구되지 않은 금액 {2}보다 클 수 없습니다.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,셋업> 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,생산 주문이 작성되지
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는 '마감일자' 이전이어야 합니다
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},학생으로 상태를 변경할 수 없습니다 {0} 학생 응용 프로그램과 연결되어 {1}
DocType: Asset,Fully Depreciated,완전 상각
,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,표시된 출석 HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","견적, 당신은 당신의 고객에게 보낸 입찰 제안서 있습니다"
DocType: Sales Order,Customer's Purchase Order,고객의 구매 주문
@@ -3679,7 +3685,7 @@
DocType: Stock Settings,Item Naming By,상품 이름 지정으로
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},또 다른 기간 결산 항목은 {0} 이후 한 {1}
DocType: Production Order,Material Transferred for Manufacturing,재료 제조에 대한 양도
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,계정 {0}이 존재하지 않습니다
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,계정 {0}이 존재하지 않습니다
DocType: Project,Project Type,프로젝트 형식
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,이 작업에 대한 하위 작업이 있습니다. 이 작업은 삭제할 수 없습니다.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,목표 수량 또는 목표량 하나는 필수입니다.
@@ -3783,11 +3789,11 @@
DocType: Company,Asset Depreciation Cost Center,자산 감가 상각 비용 센터
DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
DocType: Sales Invoice Item,Delivered Qty,납품 수량
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,총 Excl. 세
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","이 옵션이 선택되면, 각 생산 항목의 모든 아이들은 자료 요청에 포함됩니다."
DocType: Assessment Plan,Assessment Plan,평가 계획
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,고객 {0}이 (가) 생성되었습니다.
DocType: Stock Settings,Limit Percent,제한 비율
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,강사 네이밍 시스템> 교육 환경 설정
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,현재 어떤 창고에서도 재고가 없습니다.
,Payment Period Based On Invoice Date,송장의 날짜를 기준으로 납부 기간
DocType: Sample Collection,No. of print,인쇄 매수
@@ -3803,12 +3809,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),채무자 ({0})
DocType: Pricing Rule,Margin,마진
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,신규 고객
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,매출 총 이익 %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,매출 총 이익 %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS 프로파일 변경
DocType: Bank Reconciliation Detail,Clearance Date,통관 날짜
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,평가 보고서
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,총 구매 금액이 필수입니다
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,총 구매 금액이 필수입니다
DocType: Lead,Address Desc,제품 설명에게 주소
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,파티는 필수입니다
DocType: Journal Entry,JV-,JV-
@@ -3840,7 +3846,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,서있는 이름
DocType: Stock Entry,Customer or Supplier Details,"고객, 공급 업체의 자세한 사항"
DocType: Employee Loan Application,Required by Date,날짜에 필요한
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),결산 잔액 (Dr-Cr)
DocType: Lead,Lead Owner,리드 소유자
DocType: Bin,Requested Quantity,요청한 수량
DocType: Patient,Marital Status,결혼 여부
@@ -3854,7 +3859,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,여러 변형
DocType: Sales Invoice,Against Income Account,손익 계정에 대한
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0} % 배달
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,항목 {0} : 정렬 된 수량은 {1} 최소 주문 수량 {2} (항목에 정의)보다 작을 수 없습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,항목 {0} : 정렬 된 수량은 {1} 최소 주문 수량 {2} (항목에 정의)보다 작을 수 없습니다.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,월별 분포 비율
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,다른 사용자로 로그인하십시오.
DocType: Territory,Territory Targets,지역 대상
@@ -3955,7 +3960,7 @@
DocType: Serial No,Out of AMC,AMC의 아웃
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,유지 보수 방문을합니다
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
DocType: Company,Default Cash Account,기본 현금 계정
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,이이 학생의 출석을 기반으로
@@ -4107,7 +4112,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,언급 된 기준에 해당하는 직원 없음
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
DocType: Restaurant,Default Customer,기본 고객
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,인력> 인사말 설정에서 Employee Naming System을 설정하십시오.
DocType: Assessment Plan,Supervisor Name,관리자 이름
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,같은 날 약속이 만들어 졌는지 확인하지 마십시오.
DocType: Program Enrollment Course,Program Enrollment Course,프로그램 등록 과정
@@ -4230,7 +4234,7 @@
DocType: BOM,Website Description,웹 사이트 설명
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,자본에 순 변경
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,최신
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","이메일 주소는 이미 존재, 고유해야합니다 {0}"
DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,영수증
@@ -4247,7 +4251,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,현금 흐름표
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,특허
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,당신은 또한 이전 회계 연도의 균형이 회계 연도에 나뭇잎 포함 할 경우 이월를 선택하세요
DocType: GL Entry,Against Voucher Type,바우처 형식에 대한
DocType: Physician,Phone (R),전화 (R)
@@ -4259,7 +4263,7 @@
DocType: Patient,B Negative,B 네거티브
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,제출하려면 유지 보수 상태를 취소하거나 완료해야합니다.
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,행 {0}의 일련 번호가 배달 참고와 일치하지 않습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,행 {0}의 일련 번호가 배달 참고와 일치하지 않습니다.
DocType: Student,Guardian Details,가디언의 자세한 사항
DocType: C-Form,C-Form,C-양식
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,여러 직원 마크 출석
@@ -4301,7 +4305,7 @@
DocType: Stock Entry Detail,Basic Amount,기본 금액
DocType: Training Event,Exam,시험
DocType: Complaint,Complaint,불평
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
DocType: Patient,Alcohol Past Use,알콜 과거 사용
DocType: Fertilizer Content,Fertilizer Content,비료 내용
@@ -4430,6 +4434,7 @@
DocType: Salary Detail,Formula,공식
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,직렬 #
DocType: Lab Test Template,Lab Test Template,실험실 테스트 템플릿
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,판매 계정
DocType: Purchase Invoice Item,Total Weight,총 무게
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,판매에 대한 수수료
DocType: Offer Letter Term,Value / Description,값 / 설명
@@ -4587,7 +4592,7 @@
DocType: Customer,From Lead,리드에서
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,생산 발표 순서.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,회계 연도 선택 ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
DocType: Program Enrollment Tool,Enroll Students,학생 등록
DocType: Lab Test,Approved Date,승인 날짜
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,표준 판매
@@ -4664,7 +4669,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,생산 품목
,Employee Information,직원 정보
DocType: Stock Entry Detail,Additional Cost,추가 비용
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,공급 업체의 견적을
DocType: Quality Inspection,Incoming,수신
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,판매 및 구매에 대한 기본 세금 템플릿이 생성됩니다.
@@ -4681,7 +4686,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},참고 : {0}
,Delivery Note Trends,배송 참고 동향
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,이번 주 요약
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,재고 수량에서
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,재고 수량에서
DocType: Delivery Trip,Calculate Estimated Arrival Times,예상 도착 시간 계산
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,계정 : {0} 만 재고 거래를 통해 업데이트 할 수 있습니다
DocType: Student Group Creation Tool,Get Courses,과정을 받으세요
@@ -4697,7 +4702,7 @@
DocType: Material Request,% Ordered,% 발주
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","과정 기반 학생 그룹의 경우, 과정은 등록 된 과정의 등록 된 과정에서 모든 학생에 대해 유효성이 검사됩니다."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,일한 분량에 따라 공임을 지급받는 일
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,평균. 구매 비율
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,평균. 구매 비율
DocType: Task,Actual Time (in Hours),(시간) 실제 시간
DocType: Employee,History In Company,회사의 역사
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{보낸 사람}의 새 메시지
@@ -4745,7 +4750,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},행 {0} 다음 BOM 번호의 통화 {1} 선택한 통화 같아야한다 {2}
DocType: Journal Entry Account,Exchange Rate,환율
DocType: Patient,Additional information regarding the patient,환자에 관한 추가 정보
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
DocType: Homepage,Tag Line,태그 라인
DocType: Fee Component,Fee Component,요금 구성 요소
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,함대 관리
@@ -4960,7 +4965,7 @@
DocType: Employee Education,Employee Education,직원 교육
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,항목 그룹 테이블에서 발견 중복 항목 그룹
DocType: Land Unit,Parent Land Unit,부모 지상 유닛
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
DocType: Fertilizer,Fertilizer Name,비료 이름
DocType: Salary Slip,Net Pay,실질 임금
DocType: Account,Account,계정
@@ -5039,7 +5044,7 @@
DocType: Item Customer Detail,Ref Code,참조 코드
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS 프로파일에 고객 그룹이 필요합니다.
apps/erpnext/erpnext/config/hr.py +12,Employee records.,직원 기록.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,다음 감가 상각 날짜를 설정하십시오
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,다음 감가 상각 날짜를 설정하십시오
DocType: HR Settings,Payroll Settings,급여 설정
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,연결되지 않은 청구서 지불을 일치시킵니다.
DocType: POS Settings,POS Settings,POS 설정
@@ -5207,7 +5212,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},생일 알림 {0}
DocType: Asset Maintenance Task,Last Completion Date,마지막 완료일
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,일 이후 마지막 주문
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
DocType: Buying Settings,Naming Series,시리즈 이름 지정
DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,보험 시작일은 보험 종료일보다 작아야합니다
@@ -5338,6 +5343,7 @@
DocType: Bank Reconciliation,Get Payment Entries,지불 항목 가져 오기
DocType: Quotation Item,Against Docname,docName 같은 반대
DocType: SMS Center,All Employee (Active),모든 직원 (활성)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,고객> 고객 그룹> 지역
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,지금보기
DocType: BOM,Raw Material Cost,원료 비용
DocType: Item Reorder,Re-Order Level,다시 주문 수준
@@ -5438,7 +5444,6 @@
DocType: Room,Seating Capacity,좌석
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,실험실 테스트 그룹
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,고객> 고객 그룹> 지역
DocType: Project,Total Expense Claim (via Expense Claims),총 경비 요청 (비용 청구를 통해)
DocType: GST Settings,GST Summary,GST 요약
DocType: Assessment Result,Total Score,총 점수
@@ -5452,7 +5457,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,다음 코스 일정이 작성되었습니다.
DocType: Journal Entry,Total Debit,총 직불
DocType: Manufacturing Settings,Default Finished Goods Warehouse,기본 완제품 창고
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,영업 사원
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,영업 사원
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,예산 및 비용 센터
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,여러 기본 결제 방법이 허용되지 않습니다.
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,그
@@ -5628,7 +5633,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,세금이나 요금에 대한 고려
DocType: Driver,Driving License Category,운전 면허증 카테고리
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,실제 수량은 필수입니다
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}에는 현재 {1} 공급 업체 성과표가 있으며이 공급 업체에 대한 구매 주문은 신중하게 발행해야합니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}에는 현재 {1} 공급 업체 성과표가 있으며이 공급 업체에 대한 구매 주문은 신중하게 발행해야합니다.
DocType: Asset Maintenance Team,Asset Maintenance Team,자산 관리팀
DocType: Employee Loan,Loan Type,대출 유형
DocType: Scheduling Tool,Scheduling Tool,예약 도구
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index c2592ee..959b14c 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Bi bihayê bihayê
,Delay Days,Dereng Rojan
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Biha
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Entry Stock Hire
DocType: Purchase Invoice Item,Item Weight Details,Pirtûka giran
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","World: Kurdî: {0}, Code babet: {1} û Mişterî: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vekirina ji bo Job.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM ne ji bo veguhestina pelê {0} li ser row {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM ne ji bo veguhestina pelê {0} li ser row {1}
DocType: Item Attribute,Increment,Increment
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Select Warehouse ...
@@ -149,7 +149,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},ji bo destûr ne {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Get tomar ji
DocType: Price List,Price Not UOM Dependant,Bersaziya UOM Dependent
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No tomar di lîsteyê de
DocType: Asset Repair,Error Description,Çewtiya çewtiyê
@@ -157,7 +157,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,torpîl
DocType: Quality Inspection Reading,Reading 1,Reading 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,kalîyê
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Next Date Farhad. Nikarim li ber Date Purchase be
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Next Date Farhad. Nikarim li ber Date Purchase be
DocType: Crop,Perennial,Perennial
DocType: Consultation,Consultation Date,Dîroka Şêwirmendiyê
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Pirtûka hilber û lêgerînê ji bo bikarhênerên ERPNext
@@ -172,7 +172,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",eg "Dibistana Seretayî" an "University"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Reports Stock
DocType: Warehouse,Warehouse Detail,Detail warehouse
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},limit Credit hatiye dîtin ji bo mişterî re derbas {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},limit Credit hatiye dîtin ji bo mişterî re derbas {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,The Date Term End ne dikarin paşê ji Date Sal End of the Year (Ekadîmî) ji bo ku di dema girêdayî be (Year (Ekadîmî) {}). Ji kerema xwe re li rojên bike û careke din biceribîne.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Ma Asset Fixed" nikare bibe nedixwest, wek record Asset li dijî babete heye"
DocType: Delivery Trip,Departure Time,Wextê Demjimêr
@@ -192,7 +192,7 @@
DocType: Quality Inspection,Get Specification Details,Get Specification Details
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Templates of stander supplier.
DocType: Lead,Interested,bala
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Dergeh
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Dergeh
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Ji {0} ji bo {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Ji bo bacê saz kirin
DocType: Item,Copy From Item Group,Copy Ji babetî Pula
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Destkêşana Date divê mezintir Date of bizaveka be
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Dihêle per Sal
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Hêvîye 'de venêrî Is Advance' li dijî Account {1} eger ev an entry pêşwext e.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Warehouse {0} nayê ji şîrketa girêdayî ne {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Warehouse {0} nayê ji şîrketa girêdayî ne {1}
DocType: Email Digest,Profit & Loss,Qezencê & Loss
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),Bi tevahî bi qurûşekî jî Mîqdar (via Time Sheet)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ev li ser vê kompaniyê veguherîn li ser veguhestinê ye. Ji bo agahdariyên jêrîn binêrin
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notify by Email li ser çêkirina Daxwaza Material otomatîk
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Berxwedana
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Şêwirmendî
DocType: Journal Entry,Multi Currency,Multi Exchange
DocType: Opening Invoice Creation Tool,Invoice Type,bi fatûreyên Type
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Delivery Note
@@ -531,7 +532,6 @@
DocType: Employee,Widowed,bî
DocType: Request for Quotation,Request for Quotation,Daxwaza ji bo Quotation
DocType: Healthcare Settings,Require Lab Test Approval,Pêwîstiya Tîma Tîpa Lêdanê ye
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kodê Asayîş> Tîpa Group> Brand
DocType: Salary Slip Timesheet,Working Hours,dema xebatê
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Tiştek Berbiçav
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Guhertina Guherandinên / hejmara cihekê niha ya series heyî.
@@ -560,7 +560,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ji kerema xwe ve Navenda Cost binivîse
DocType: Drug Prescription,Dosage,Pîvanîk
DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. Rate firotin
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Rate firotin
DocType: Assessment Plan,Examiner Name,Navê sehkerê
DocType: Lab Test Template,No Result,No Result
DocType: Purchase Invoice Item,Quantity and Rate,Quantity û Rate
@@ -610,6 +610,7 @@
DocType: Payroll Entry,Select Payroll Period,Select payroll Period
DocType: Purchase Invoice,Unpaid,Unpaid
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserved for sale
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan> HR Set
DocType: Packing Slip,From Package No.,Ji No. Package
DocType: Item Attribute,To Range,to range
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Birûmet û meden
@@ -634,11 +635,11 @@
DocType: Training Event,Workshop,Kargeh
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Biryarên kirînê bikujin
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,"Lîsteya çend ji mişterîyên xwe. Ew dikarin bibin rêxistin, yan jî kesên."
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Parts bes ji bo Build
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parts bes ji bo Build
DocType: POS Profile User,POS Profile User,POS Profîl User
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Dahata rasterast
DocType: Patient Appointment,Date TIme,Dîroka TIme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Dikarin li ser Account ne filter bingeha, eger destê Account komkirin"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Dikarin li ser Account ne filter bingeha, eger destê Account komkirin"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Berpirsê kargêrî
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Kompan û bacê saz bikin
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Tikaye Kurs hilbijêre
@@ -649,7 +650,7 @@
DocType: Stock Entry Detail,Difference Account,Account Cudahiya
DocType: Purchase Invoice,Supplier GSTIN,Supplier GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Can karê nêzîkî wek karekî girêdayî wê {0} e girtî ne ne.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ji kerema xwe ve Warehouse ji bo ku Daxwaza Material wê werin zindî binivîse
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Ji kerema xwe ve Warehouse ji bo ku Daxwaza Material wê werin zindî binivîse
DocType: Production Order,Additional Operating Cost,Cost Operating Additional
DocType: Lab Test Template,Lab Routine,Lîwaya Labê
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Cosmetics
@@ -820,7 +821,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Peywendiya bi Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Rêvebir
DocType: Payment Entry,Payment From / To,Payment From / To
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},limit credit New kêmtir ji yê mayî niha ji bo mişterî e. limit Credit heye Hindîstan be {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},limit credit New kêmtir ji yê mayî niha ji bo mişterî e. limit Credit heye Hindîstan be {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Ji kerema xwe li Warehouse hesab bike. {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Li ser' û 'Koma By' nikare bibe heman
DocType: Sales Person,Sales Person Targets,Armanc Person Sales
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,Navê batch
DocType: Fee Validity,Max number of visit,Hejmareke zêde ya serdana
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet tên afirandin:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Nivîsîn
DocType: GST Settings,GST Settings,Settings gst
DocType: Selling Settings,Customer Naming By,Qada Mişterî By
@@ -958,7 +959,7 @@
DocType: Budget,Budget Against,budceya dijî
DocType: Employee,Cell Number,Hejmara Cell
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Ji bo pîvanên nirxdar tune tune. Vê kontrol bikin ku hejmarên meaşan nehatibû afirandin.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Daxwazên Auto Material Generated
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Daxwazên Auto Material Generated
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Windabû
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Tu dikarî bi fîşeke niha li nakeve 'li dijî Peyam Journal' column
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reserved bo febrîkayan
@@ -966,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Înercî
DocType: Opportunity,Opportunity From,derfet ji
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,daxuyaniyê de meaşê mehane.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Hejmarên Serial Ji bo {2} Pêdivî ye. Te destnîşan kir {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Hejmarên Serial Ji bo {2} Pêdivî ye. Te destnîşan kir {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Ji kerema xwe sifrê hilbijêrin
DocType: BOM,Website Specifications,Specifications Website
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} Navnîşa e-nameyek e ku li 'Recipients'
@@ -1034,7 +1035,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Gotinê
DocType: Vital Signs,Heart Rate / Pulse,Dilê Dil / Pulse
DocType: Company,Default Bank Account,Account Bank Default
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Fîltre li ser bingeha Partîya, Partîya select yekem Type"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Fîltre li ser bingeha Partîya, Partîya select yekem Type"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Update Stock' nikarin werin kontrolkirin, ji ber tumar bi via teslîmî ne {0}"
DocType: Vehicle,Acquisition Date,Derheqê Date
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,nos
@@ -1059,7 +1060,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Serê nameya xwe barkirin (Ji hêla 900px bi 100px re hevalbikin heval bikin)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} dikarin bi a Group
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Babetê Row {IDX}: {doctype} {docname} nayê li jor de tune ne '{doctype}' sifrê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No erkên
DocType: Item Variant Settings,Copy Fields to Variant,Keviyên Kopî Variant
DocType: Asset,Opening Accumulated Depreciation,Vekirina Farhad. Accumulated
@@ -1171,9 +1172,10 @@
DocType: Production Order,Plan material for sub-assemblies,maddî Plan ji bo sub-meclîsên
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners Sales û Herêmê
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} divê çalak be
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Pevçûn
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Pevçûn
DocType: Journal Entry,Depreciation Entry,Peyam Farhad.
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Ji kerema xwe re ji cureyê pelgeyê hilbijêre
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Print Currency Account
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Betal Serdan Material {0} berî betalkirinê ev Maintenance Visit
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} nayê to Babetê girêdayî ne {1}
@@ -1199,7 +1201,7 @@
DocType: Supplier,Default Payable Accounts,Default Accounts cîhde
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Xebatkarê {0} e çalak ne an tune ne
DocType: Fee Structure,Components,Components
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Ji kerema xwe ve Asset Category li babet binivîse {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Ji kerema xwe ve Asset Category li babet binivîse {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Babetê Variants {0} ve
DocType: Quality Inspection Reading,Reading 6,Reading 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1251,6 +1253,7 @@
,Company Name,Navê Company
DocType: SMS Center,Total Message(s),Total Message (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Hilbijêre babet ji bo transfera
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ji kerema xwe veşartî ji bo {0} bi Sîstema Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Rêjeya Discount Additional
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,View lîsteya hemû videos alîkarî
DocType: Agriculture Analysis Criteria,Soil Texture,Paqijê maqûl
@@ -1279,7 +1282,7 @@
DocType: BOM Website Item,BOM Website Item,BOM babet Website
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Upload nameya serokê û logo xwe. (Tu ji wan paşê biguherîne).
DocType: Timesheet Detail,Bill,Hesab
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Next Date Farhad wek date borî ketin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Next Date Farhad wek date borî ketin
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Spî
DocType: SMS Center,All Lead (Open),Hemû Lead (Open)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty ji bo amade ne {4} li warehouse {1} hate dem bi mesaj û ji entry ({2} {3})
@@ -1296,7 +1299,7 @@
DocType: Lead,Next Contact Date,Next Contact Date
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,vekirina Qty
DocType: Healthcare Settings,Appointment Reminder,Reminder Reminder
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
DocType: Program Enrollment Tool Student,Student Batch Name,Xwendekarên Name Batch
DocType: Consultation,Doctor,Pizişk
DocType: Holiday List,Holiday List Name,Navê Lîsteya Holiday
@@ -1312,6 +1315,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Dev ji Tool Kodek
DocType: Item,Hub Category to Publish,Kategorî Weşanê
DocType: Leave Block List,Leave Block List Dates,Dev ji Lîsteya Block Kurdî Nexşe
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Ji kerema xwe veşartina nimûne ji bo Tevlêbûnê ya Setup> Pirtûka Nimûne
DocType: Sales Invoice,Billing Address GSTIN,Navnîşana GSTIN
DocType: Assessment Plan,Evaluate,Bihadanîn
DocType: Workstation,Net Hour Rate,Rate Saet Net
@@ -1346,7 +1350,7 @@
DocType: Purchase Receipt,PREC-RET-,Prec-direvin
DocType: POS Profile,Sales Invoice Payment,Sales bi fatûreyên Payment
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Reserved li Sales Order / Qediya Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Şêwaz firotin
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Şêwaz firotin
DocType: Repayment Schedule,Interest Amount,Şêwaz Interest
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu Approver Expense ji bo vê qeyda. Ji kerema xwe ve ya 'status' û Save baştir bike
DocType: Serial No,Creation Document No,Creation dokumênt No
@@ -1439,7 +1443,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Vekirina Balance Accounting
,GST Sales Register,Gst Sales Register
DocType: Sales Invoice Advance,Sales Invoice Advance,Sales bi fatûreyên Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Tu tişt ji bo daxwazkirina
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Tu tişt ji bo daxwazkirina
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Domainên xwe hilbijêrin
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Din record Budget '{0}' jixwe li dijî heye {1} '{2}' ji bo sala diravî ya {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Heya dê di dema demê de çêbirin dê kopî bibin.
@@ -1449,11 +1453,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ev dê ji qanûna Babetê ji guhertoya bendên. Ji bo nimûne, eger kurtenivîsên SYR ji we "SM", e û code babete de ye "T-SHIRT", code babete ji yên ku guhertoya wê bibe "T-SHIRT-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Net (di peyvên) xuya wê carekê hûn Slip Salary li xilas bike.
DocType: Purchase Invoice,Is Return,e Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Baldaynî
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Baldaynî
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Return / Debit Têbînî
DocType: Price List Country,Price List Country,List Price Country
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} nos serial derbasdar e ji bo vî babetî {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} nos serial derbasdar e ji bo vî babetî {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Code babete dikarin ji bo No. Serial ne bê guhertin
DocType: Purchase Invoice Item,UOM Conversion Factor,Factor Converter UOM
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Tikaye kodî babet bikeve to get Hejmara Batch
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Sales Order {0} ne derbasdar e
DocType: Supplier Scorecard,Warn for new Request for Quotations,Ji bo Quotations ji bo daxwaza nû ya hişyar bikin
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,emir kirînê alîkariya we û plankirina û li pey xwe li ser kirînên te
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}","Bi giştî dikele, Doza / Transfer {0} li Daxwaza Material {1} \ ne dikarin bibin mezintir dorpêçê de xwestin {2} ji bo babet {3}"
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Warehouse Têkilî
DocType: Payment Entry,Write Off Difference Amount,Hewe Off Mîqdar Cudahiya
DocType: Volunteer,Volunteer Name,Navê Dilxwaz
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Ji kerema xwe li Sîstema Perwerdehiya Perwerdehiya Navneteweyî ya Mamosteyê sazkirinê saz bikin
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: email Employee dîtin ne, yanî email şandin ne"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Destûra Rêveçûnê ne ji bo welatê {0}
DocType: Item,Foreign Trade Details,Details Bazirganiya Derve
@@ -1610,7 +1613,7 @@
DocType: Student Group Student,Group Roll Number,Pol Hejmara Roll
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Ji bo {0}, tenê bikarhênerên credit dikare li dijî entry debit din ve girêdayî"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bi tevahî ji hemû pîvan Erka divê bê nîşandan 1. kerema xwe pîvan ji hemû erkên Project eyar bikin li gorî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,"Babetê {0}, divê babete-bînrawe bi peyman be"
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Teçxîzatên hatiye capital
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule Pricing is yekem li ser esasê hilbijartin 'Bisepîne Li ser' qada, ku dikare bê Babetê, Babetê Pol an Brand."
@@ -1635,7 +1638,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,warehouse zarok ji bo vê warehouse heye. Tu dikarî vê warehouse jêbirin.
DocType: Item,Website Item Groups,Groups babet Website
DocType: Purchase Invoice,Total (Company Currency),Total (Company Exchange)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,"hejmara Serial {0} ketin, ji carekê zêdetir"
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,"hejmara Serial {0} ketin, ji carekê zêdetir"
DocType: Journal Entry,Journal Entry,Peyam di Journal
DocType: Expense Claim Advance,Unclaimed amount,Heqê nenaskirî
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} tomar di pêşketina
@@ -1732,7 +1735,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,log-Ragihandin a.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Daxwaza ji bo Quotation ji bo gihiştina ji portal hate qedexekirin, ji bo zêdetir settings portal check."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Variable Scoring
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Asta kirîn
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Asta kirîn
DocType: Sales Invoice,Shipping Address Name,Shipping Name Address
DocType: Material Request,Terms and Conditions Content,Şert û mercan Content
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Gelek şaş bûne çêbikin
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ev li ser têketin li dijî vê Vehicle bingeha. Dîtina cedwela li jêr bo hûragahiyan
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Li dijî Supplier bi fatûreyên {0} dîroka {1}
DocType: Customer,Default Price List,Default List Price
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Tu nikarî bibî Fiscal Sal {0}. Sal malî {0} wek default li Settings Global danîn
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Pêwendiyek bi heman navî heye
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ew ê ji bo salary slips pêşkêş dikin û navnîşa rojnameya rojnamegeriyê biafirînin. Ma hûn dixwazin pêşniyar bikin?
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Pricing
DocType: Quotation,Term Details,Details term
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ne dikarin zêdetir ji {0} xwendekar ji bo vê koma xwendekaran kul.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Tiştek Bacê
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,View Lead
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,View Lead
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} divê mezintir 0 be
@@ -2028,7 +2032,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Payment li ser komcivîna me ya bi fatûreyên
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},xwendina Green niha ketin divê mezintir destpêkê Vehicle Green be {0}
DocType: Restaurant Reservation,No Show,Pêşanî tune
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ji kerema xwe veşartî ji bo {0} bi Sîstema Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Country
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Dev û Beşdariyê
DocType: Maintenance Visit,Partially Completed,Qismen Qediya
@@ -2121,7 +2124,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
DocType: Grant Application,Assessment Mark (Out of 10),Nirxandina Mark (Ji ji 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Ser
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Ser
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix ji bo ku hijmara series li ser danûstandinên xwe
DocType: Employee Attendance Tool,Employees HTML,karmendên HTML
@@ -2171,7 +2174,7 @@
DocType: Course,Course Abbreviation,Abbreviation Kurs
DocType: Student Leave Application,Student Leave Application,Xwendekarên Leave Application
DocType: Item,Will also apply for variants,jî wê ji bo Guhertoyên serî
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Xebatkarê {0} roja Half li ser {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Total dema xebatê ne, divê ji bilî dema xebatê max be mezintir {0}"
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Li
@@ -2358,9 +2361,10 @@
DocType: Task,Actual End Date (via Time Sheet),Rastî End Date (via Time Sheet)
DocType: Soil Texture,Soil Type,Cureyê mîrata
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Şêwaz {0} {1} dijî {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Peyama Nû
,Quotation Trends,Trends quotation
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Babetê Pol di master babete bo em babete behsa ne {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
DocType: Shipping Rule,Shipping Amount,Şêwaz Shipping
DocType: Supplier Scorecard Period,Period Score,Dawîn Score
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,lê zêde muşteriyan
@@ -2371,7 +2375,7 @@
,Vehicle Expenses,Mesref Vehicle
DocType: Serial No,Invoice Details,Details bi fatûreyên
DocType: Grant Application,Show on Website,Li ser Malperê nîşan bide
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"nirxa hêvîkirin ku piştî jiyana kêrhatî, divê mezintir an wekhev bin {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},"nirxa hêvîkirin ku piştî jiyana kêrhatî, divê mezintir an wekhev bin {0}"
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Destpê bike
DocType: Hub Category,Hub Category,Kategorî
DocType: Purchase Invoice,SEZ,SEZ
@@ -2403,7 +2407,7 @@
DocType: Patient,B Positive,B Positive
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty divê 1 be, wek babete a hebûnê sabît e. Ji kerema xwe ve row cuda ji bo QTY multiple bi kar tînin."
DocType: Leave Block List Allow,Leave Block List Allow,Dev ji Lîsteya Block Destûrê bide
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Kurte nikare bibe vala an space
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Kurte nikare bibe vala an space
DocType: Patient Medical Record,Patient Medical Record,Radyoya Tenduristî
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Pol to non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sports
@@ -2454,6 +2458,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Nikarî raketek RFQ qebûl nabe
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Total dabirîna
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Hesabek hilbijêre ku ji bo kaxeza hesabê çap bike
,Production Analytics,Analytics Production
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ev li ser nexweşiya li ser veguhestinê ye. Ji bo agahdariyên jêrîn binêrin
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,cost Demê
@@ -2509,7 +2514,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Select Company ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Vala bihêlin, eger ji bo hemû beşên nirxandin"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Cure yên kar (daîmî, peymana, û hwd. Intern)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
DocType: Payroll Entry,Fortnightly,Livînê
DocType: Currency Exchange,From Currency,ji Exchange
DocType: Vital Signs,Weight (In Kilogram),Weight (Kilogram)
@@ -2586,7 +2591,7 @@
DocType: Student,Guardians,serperişt
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Bihayê wê li banî tê ne bê eger List Price is set ne
DocType: Stock Entry,Total Incoming Value,Total Nirx Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debit To pêwîst e
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debit To pêwîst e
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets alîkariya şopandibe, dem, mesrefa û fatûre ji bo activites kirin ji aliyê ekîba xwe"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Buy List Price
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templates of supplier variables variables.
@@ -2688,7 +2693,7 @@
DocType: Company,For Reference Only.,For Reference Only.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Bijîşk {0} ne li ser {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Hilbijêre Batch No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Invalid {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-direvin
DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2725,8 +2730,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Hên operasyonên, mesrefa xebatê û bide Operation yekane no ji bo operasyonên xwe."
DocType: Water Analysis,Origin,Reh
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ev belge li ser sînor ji aliyê {0} {1} ji bo em babete {4}. Ma tu ji yekî din {3} li dijî heman {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Hilbijêre guhertina account mîqdara
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Hilbijêre guhertina account mîqdara
DocType: Purchase Invoice,Price List Currency,List Price Exchange
DocType: Naming Series,User must always select,Bikarhêner her tim divê hilbijêre
DocType: Stock Settings,Allow Negative Stock,Destûrê bide Stock Negative
@@ -2782,7 +2787,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Wergirtina navendên nû yên nû bikişînin
DocType: Quality Inspection Reading,Reading 9,Reading 9
DocType: Supplier,Is Frozen,e Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,warehouse node Pol nayê ne bi destûr ji bo muameleyên hilbijêre
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,warehouse node Pol nayê ne bi destûr ji bo muameleyên hilbijêre
DocType: Buying Settings,Buying Settings,Settings kirîn
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,No. BOM ji bo babet baş Qediya
DocType: Upload Attendance,Attendance To Date,Amadebûna To Date
@@ -2797,6 +2802,7 @@
DocType: Grant Application,Organization,Sazûman
DocType: BOM Update Tool,BOM Update Tool,Tool Tool BOM
DocType: SG Creation Tool Course,Student Group Name,Navê Komeleya Xwendekarên
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Çavdêriya teqawîtiyê nîşan bide
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Pargîdanî
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Kerema xwe binêre ka tu bi rastî dixwazî jê bibî hemû muamele û ji bo vê şirketê. Daneyên axayê te dê pevê wekî xwe ye. Ev çalakî nayê vegerandin.
DocType: Room,Room Number,Hejmara room
@@ -2807,7 +2813,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Şablon
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum Bikarhêner
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Madeyên xav nikare bibe vala.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
DocType: Lab Test Sample,Lab Test Sample,Sample Lab Lab
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Peyam di Journal Quick
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Tu dikarî rêjeya nayê guhertin, eger BOM agianst tu babete behsa"
@@ -2878,7 +2884,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Invoice Make
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Opportunity nêzîkî piştî 15 rojan de
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Birêvebirina kirînê ji ber ku {1} stand scorecard ji {0} ne têne destnîşankirin.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Birêvebirina kirînê ji ber ku {1} stand scorecard ji {0} ne têne destnîşankirin.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Sal
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2970,7 +2976,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Li jorê
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Peyam {1} nayê Hesabê te nîne {2} an ji niha ve bi rêk û pêk li dijî fîşeke din
DocType: Supplier Scorecard Criteria,Criteria Weight,Nirxên giran
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Supplier> Supplier Type
DocType: Buying Settings,Default Buying Price List,Default Lîsteya Buying Price
DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip meaş Li ser timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Rêjeya Kirînê
@@ -3060,7 +3065,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Leads by Type Industry.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Biçe Letterheads
DocType: Item Supplier,Item Supplier,Supplier babetî
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Ji kerema xwe re nirx ji bo {0} quotation_to hilbijêre {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Hemû Navnîşan.
DocType: Company,Stock Settings,Settings Stock
@@ -3238,6 +3243,7 @@
DocType: Company,Default Inventory Account,Account Inventory Default
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Qediya Qty divê ji sifirê mezintir be.
DocType: Antibiotic,Antibiotic Name,Navê Antibiotic
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kodê Asayîş> Tîpa Group> Brand
DocType: Purchase Invoice,Apply Additional Discount On,Apply Additional li ser navnîshana
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Tîpa Hilbijêre ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Zanyariyek ji bo Yekîneyên Yekbûyî yên ku di Cropê de zêde dibe
@@ -3433,6 +3439,7 @@
DocType: Supplier,Credit Limit,Sînora Credit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Lîsteya bihayê bihayê firotinê
DocType: Production Plan Sales Order,Salse Order Date,Salse Order Date
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Supplier> Supplier Type
DocType: Salary Component,Salary Component,meaş Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Arşîva Payment {0} un-girêdayî ne
DocType: GL Entry,Voucher No,fîşeke No
@@ -3442,7 +3449,7 @@
DocType: Leave Allocation,Leave Allocation,Dev ji mûçeyan
DocType: Payment Request,Recipient Message And Payment Details,Recipient Message Û Details Payment
DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Daxwazên maddî {0} tên afirandin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Daxwazên maddî {0} tên afirandin
DocType: Restaurant Reservation,No of People,Nabe Gel
DocType: Production Planning Tool,Include sub-contracted raw materials,Usa jî madeyên xav-sub bi peyman
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Şablon ji alî an peymaneke.
@@ -3508,7 +3515,7 @@
DocType: Production Planning Tool,Create Material Requests,Create Requests Material
DocType: Employee Education,School/University,School / Zanîngeha
DocType: Payment Request,Reference Details,Details Reference
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nirx a bende Piştî Jiyana gerek kêmtir ji Gross Purchase Mîqdar be
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Nirx a bende Piştî Jiyana gerek kêmtir ji Gross Purchase Mîqdar be
DocType: Sales Invoice Item,Available Qty at Warehouse,Available Qty li Warehouse
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Şêwaz billed
DocType: Asset,Double Declining Balance,Double Balance Îro
@@ -3520,7 +3527,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get rojanekirî
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ne ji Company girêdayî ne {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Ji hêla her taybetmendiyên herî kêm nirxek hilbijêre.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Daxwaza maddî {0} betal e an sekinî
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Daxwaza maddî {0} betal e an sekinî
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Dev ji Management
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Pol destê Account
DocType: Sales Order,Fully Delivered,bi temamî Çiyan
@@ -3531,14 +3538,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Şêwaz dandin de ne dikarin bibin mezintir Loan Mîqdar {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Herin bernameyan
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Hejmara nirxên vekirî {1} ji bila hejmarê nerazîkirî {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Ji kerema xwe veşartina nimûne ji bo Tevlêbûnê ya Setup> Pirtûka Nimûne
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Bikirin siparîşê pêwîst ji bo vî babetî {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Production Order tên afirandin ne
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Ji Date' Divê piştî 'To Date' be
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Dikare biguhere status wek xwendekarê bi {0} bi serlêdana xwendekaran ve girêdayî {1}
DocType: Asset,Fully Depreciated,bi temamî bicūkkirin
,Stock Projected Qty,Stock projeya Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Beşdariyê nîşankirin HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Quotations pêşniyarên in, bids ku hûn û mişterîyên xwe şandin"
DocType: Sales Order,Customer's Purchase Order,Mişterî ya Purchase Order
@@ -3623,7 +3629,7 @@
DocType: Stock Settings,Item Naming By,Babetê Bidin By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},"Din jî dema despêka Girtina {0} hatiye dîtin, piştî {1}"
DocType: Production Order,Material Transferred for Manufacturing,Maddî Transferred bo Manufacturing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Account {0} nayê heye ne
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Account {0} nayê heye ne
DocType: Project,Project Type,Type Project
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Taskek Zarok ji bo vê Taskê heye. Hûn nikarin vê Taskê nadeve.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,An QTY hedef an target mîqdara bivênevê ye.
@@ -3727,11 +3733,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Navenda Farhad. Cost
DocType: Sales Order Item,Sales Order Date,Sales Order Date
DocType: Sales Invoice Item,Delivered Qty,teslîmî Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Total Excl. Bac
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Eger kontrolkirin, hemû zarok ji hev babete bo hilberîna wê di Requests Material di nav de."
DocType: Assessment Plan,Assessment Plan,Plan nirxandina
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Têkilî {0} hatiye afirandin.
DocType: Stock Settings,Limit Percent,Sedî Sînora
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Ji kerema xwe li Sîstema Perwerdehiya Perwerdehiya Navneteweyî ya Mamosteyê sazkirinê saz bikin
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Niha tu firotek li her wareyê heye
,Payment Period Based On Invoice Date,Period tezmînat li ser Date bi fatûreyên
DocType: Sample Collection,No. of print,Hejmara çapkirinê
@@ -3747,12 +3753,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Deyndarên ({0})
DocType: Pricing Rule,Margin,margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,muşteriyan New
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Profit% Gross
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Profit% Gross
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Guhertina POS Profîla
DocType: Bank Reconciliation Detail,Clearance Date,Date clearance
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Rapora Nirxandinê
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Şêwaz Purchase Gross wêneke e
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Şêwaz Purchase Gross wêneke e
DocType: Lead,Address Desc,adres Desc
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Partiya wêneke e
DocType: Journal Entry,JV-,nájv-
@@ -3784,7 +3790,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Navekî Standing
DocType: Stock Entry,Customer or Supplier Details,Details Mişterî an Supplier
DocType: Employee Loan Application,Required by Date,Pêwîst ji aliyê Date
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Balance Closing (Dr-Cr)
DocType: Lead,Lead Owner,Xwedîyê Lead
DocType: Bin,Requested Quantity,Quantity xwestin
DocType: Patient,Marital Status,Rewşa zewacê
@@ -3798,7 +3803,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Pirrjimar Pirrjimar
DocType: Sales Invoice,Against Income Account,Li dijî Account da-
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Çiyan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Babetê {0}: QTY fermana {1} nikare were kêmî ji kêm QTY da {2} (danasîn li babete).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Babetê {0}: QTY fermana {1} nikare were kêmî ji kêm QTY da {2} (danasîn li babete).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Rêjeya Belavkariya mehane
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Ji kerema xwe bikarhênerê din bikar bînin.
DocType: Territory,Territory Targets,Armanc axa
@@ -3899,7 +3904,7 @@
DocType: Serial No,Out of AMC,Out of AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Ji kerema xwe re ji bo ku bikarhêner ku Sales Manager Master {0} rola xwedî têkilî bi
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Ji kerema xwe re ji bo ku bikarhêner ku Sales Manager Master {0} rola xwedî têkilî bi
DocType: Company,Default Cash Account,Account Cash Default
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ne Mişterî an Supplier) master.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ev li ser amadebûna vê Xwendekarên li
@@ -4051,7 +4056,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ji bo krîterên nirxên ne karmendan tune
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
DocType: Restaurant,Default Customer,Berpirsiyarê Default
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan> HR Set
DocType: Assessment Plan,Supervisor Name,Navê Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bawer bikin ku heger wê roja ku ji bo rûniştinê hate çêkirin
DocType: Program Enrollment Course,Program Enrollment Course,Program hejmartina Kurs
@@ -4173,7 +4177,7 @@
DocType: BOM,Website Description,Website Description
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Change Net di Sebra min
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Newest
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email Address divê yekta be, ji niha ve ji bo heye {0}"
DocType: Serial No,AMC Expiry Date,AMC Expiry Date
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Meqbûz
@@ -4190,7 +4194,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Daxûyanîya Flow Cash
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Deyn Mîqdar dikarin Maximum Mîqdar deyn ji mideyeka ne bêtir ji {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Îcaze
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ji kerema xwe ve çêşît Forward hilbijêre, eger hûn jî dixwazin ku di nav hevsengiyê sala diravî ya berî bernadin ji bo vê sala diravî ya"
DocType: GL Entry,Against Voucher Type,Li dijî Type Vienna
DocType: Physician,Phone (R),Telefon (R)
@@ -4202,7 +4206,7 @@
DocType: Patient,B Negative,B Negative
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Rewşa Tenduristiyê divê betal bike an qedexekirinê
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} nayê ji şîrketa endamê ne {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Numbers Serial li row {0} nayê bi Delivery Têbînî hev nagirin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Numbers Serial li row {0} nayê bi Delivery Têbînî hev nagirin
DocType: Student,Guardian Details,Guardian Details
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Beşdariyê Mark ji bo karmendên multiple
@@ -4244,7 +4248,7 @@
DocType: Stock Entry Detail,Basic Amount,Şêwaz bingehîn
DocType: Training Event,Exam,Bilbilên
DocType: Complaint,Complaint,Gilî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
DocType: Leave Allocation,Unused leaves,pelên Unused
DocType: Patient,Alcohol Past Use,Bikaranîna Pêdivî ya Alkol
DocType: Fertilizer Content,Fertilizer Content,Naveroka Fertilizer
@@ -4372,6 +4376,7 @@
DocType: Salary Detail,Formula,Formîl
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Template Test Lab
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Hesabê firotanê
DocType: Purchase Invoice Item,Total Weight,Total Weight
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komîsyona li ser Sales
DocType: Offer Letter Term,Value / Description,Nirx / Description
@@ -4528,7 +4533,7 @@
DocType: Customer,From Lead,ji Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Emir ji bo hilberîna berdan.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Select Fiscal Sal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
DocType: Program Enrollment Tool,Enroll Students,kul Xwendekarên
DocType: Lab Test,Approved Date,Dîroka Endamê
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Selling Standard
@@ -4605,7 +4610,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Babetê Production
,Employee Information,Information karker
DocType: Stock Entry Detail,Additional Cost,Cost Additional
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Can filter li ser Voucher No bingeha ne, eger ji aliyê Vienna kom"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Can filter li ser Voucher No bingeha ne, eger ji aliyê Vienna kom"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Make Supplier Quotation
DocType: Quality Inspection,Incoming,Incoming
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Saziyên bacê yên ji bo firotin û kirînê ji nû ve tên afirandin.
@@ -4622,7 +4627,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Têbînî: {0}
,Delivery Note Trends,Trends Delivery Note
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Nasname vê hefteyê
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,In Stock Qty
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,In Stock Qty
DocType: Delivery Trip,Calculate Estimated Arrival Times,Hilbijartina Qeydkirina Demjimêr Bêjin
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} bi tenê dikare bi rêya Transactions Stock ve
DocType: Student Group Creation Tool,Get Courses,Get Kursên
@@ -4638,7 +4643,7 @@
DocType: Material Request,% Ordered,% Ordered
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Ji bo qursa li Komeleya Xwendekarên Kurdistanê, li Kurs dê ji bo her Xwendekarên ji Kursên helîna li Program hejmartina vîze."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Rate kirîn
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Rate kirîn
DocType: Task,Actual Time (in Hours),Time rastî (di Hours)
DocType: Employee,History In Company,Dîroka Li Company
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Peyama nû ji {sender}
@@ -4686,7 +4691,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Exchange ji BOM # di {1} de divê ji bo pereyê hilbijartin wekhev be {2}
DocType: Journal Entry Account,Exchange Rate,Rate
DocType: Patient,Additional information regarding the patient,Agahiyên bêtir li ser nexweşiyê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
DocType: Homepage,Tag Line,Line Tag
DocType: Fee Component,Fee Component,Fee Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Management ya Korsan
@@ -4901,7 +4906,7 @@
DocType: Employee Education,Employee Education,Perwerde karker
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,koma babete hate dîtin li ser sifrê koma babete
DocType: Land Unit,Parent Land Unit,Unit Unit
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Ev pêwîst e ji bo pędivî Details Babetê.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Ev pêwîst e ji bo pędivî Details Babetê.
DocType: Fertilizer,Fertilizer Name,Navekî Fertilizer
DocType: Salary Slip,Net Pay,Pay net
DocType: Account,Account,Konto
@@ -4980,7 +4985,7 @@
DocType: Item Customer Detail,Ref Code,Code Ref
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Giştî ya Giştî ya POS Profesor e
apps/erpnext/erpnext/config/hr.py +12,Employee records.,records Employee.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ji kerema xwe ve set Next Date Farhad.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Ji kerema xwe ve set Next Date Farhad.
DocType: HR Settings,Payroll Settings,Settings payroll
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Hev hisab ne-girêdayî û Payments.
DocType: POS Settings,POS Settings,POS Settings
@@ -5147,7 +5152,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Reminder Birthday ji bo {0}
DocType: Asset Maintenance Task,Last Completion Date,Dîroka Dawîn Dawîn
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Rojan de ji sala Last Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
DocType: Buying Settings,Naming Series,Series Bidin
DocType: Leave Block List,Leave Block List Name,Dev ji Lîsteya Block Name
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Serî divê kêmtir ji date Insurance End be
@@ -5276,6 +5281,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Get berheman Payment
DocType: Quotation Item,Against Docname,li dijî Docname
DocType: SMS Center,All Employee (Active),Hemû Employee (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Giştî> Giştî ya Giştî> Herêmî
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,View Now
DocType: BOM,Raw Material Cost,Cost Raw
DocType: Item Reorder,Re-Order Level,Re-Order Level
@@ -5376,7 +5382,6 @@
DocType: Room,Seating Capacity,þiyanên seating
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Komên Lab Lab
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Giştî> Giştî ya Giştî> Herêmî
DocType: Project,Total Expense Claim (via Expense Claims),Total mesrefan (via Îdîayên Expense)
DocType: GST Settings,GST Summary,gst Nasname
DocType: Assessment Result,Total Score,Total Score
@@ -5390,7 +5395,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Di çarçoveyek kursên rêbazan de hatine afirandin
DocType: Journal Entry,Total Debit,Total Debit
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default QediyayîComment Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Person Sales
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Person Sales
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budceya û Navenda Cost
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Modeya piralî ya pêdivî ye ku pêdivî ye
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,bo
@@ -5566,7 +5571,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Binêre, Bacê an Charge ji bo"
DocType: Driver,Driving License Category,Kategorî
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rastî Qty wêneke e
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} niha li ser {1} Pargîdanîya Scorecard heye, û Kirêdar kirina vê pargîdaniyê divê bi hişyariyê re bêne belav kirin."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} niha li ser {1} Pargîdanîya Scorecard heye, û Kirêdar kirina vê pargîdaniyê divê bi hişyariyê re bêne belav kirin."
DocType: Asset Maintenance Team,Asset Maintenance Team,Tîmên Parastina Girtîgehê
DocType: Employee Loan,Loan Type,Type deyn
DocType: Scheduling Tool,Scheduling Tool,Amûra scheduling
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index eb2a47c..b11681b 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,ຈັດຮຽງໂດຍລາຄາ
,Delay Days,Delay Days
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ຄ່າໃຊ້ຈ່າຍໃນການບໍລິການ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,ໃບເກັບເງິນ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,ເຮັດໃຫ້ການເກັບຮັກສາສະເຕັກເຂົ້າ
DocType: Purchase Invoice Item,Item Weight Details,Item Weight Details
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ອ້າງອິງ: {0}, ລະຫັດສິນຄ້າ: {1} ແລະລູກຄ້າ: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,ກິໂລກຣາມ
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ການເປີດກວ້າງການວຽກ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM ບໍ່ໄດ້ລະບຸໄວ້ສໍາລັບລາຍການການຕິດຕໍ່ໃນ {0} ຢູ່ແຖວ {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM ບໍ່ໄດ້ລະບຸໄວ້ສໍາລັບລາຍການການຕິດຕໍ່ໃນ {0} ຢູ່ແຖວ {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ຜົນໄດ້ຮັບສົ່ງ
DocType: Item Attribute,Increment,ການເພີ່ມຂຶ້ນ
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},ບໍ່ອະນຸຍາດໃຫ້ສໍາລັບການ {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,ໄດ້ຮັບການລາຍການຈາກ
DocType: Price List,Price Not UOM Dependant,Price Not UOM Dependent
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ຜະລິດຕະພັນ {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ບໍ່ມີລາຍະລະບຸໄວ້
DocType: Asset Repair,Error Description,Error Description
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,ຂາຍເຄື່ອງແຫ້ງ
DocType: Quality Inspection Reading,Reading 1,ອ່ານ 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,ກອງທຶນບໍານານ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາບໍ່ສາມາດກ່ອນທີ່ວັນເວລາຊື້
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາບໍ່ສາມາດກ່ອນທີ່ວັນເວລາຊື້
DocType: Crop,Perennial,ອາຍຸຫລາຍປີ
DocType: Consultation,Consultation Date,ວັນທີປຶກສາຫາລື
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ລາຍະການສິນຄ້າແລະການຄົ້ນພົບສໍາລັບຜູ້ໃຊ້ ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",ຕົວຢ່າງ: "ໂຮງຮຽນປະຖົມ" ຫຼື "ວິທະຍາໄລ"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,ບົດລາຍງານ Stock
DocType: Warehouse,Warehouse Detail,ຂໍ້ມູນ Warehouse
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ວັນທີໄລຍະສຸດທ້າຍບໍ່ສາມາດຈະຕໍ່ມາກ່ວາປີທີ່ສິ້ນສຸດຂອງປີທາງວິຊາການທີ່ໃນໄລຍະການມີການເຊື່ອມຕໍ່ (ປີທາງວິຊາການ {}). ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""ແມ່ນຊັບສິນຄົງທີ່" ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
DocType: Delivery Trip,Departure Time,ເວລາອອກຍ່າງທາງ
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,ໄດ້ຮັບລາຍລະອຽດຂໍ້ມູນຈໍາເພາະ
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,ແມ່ແບບຂອງຕໍາແຫນ່ງສະຫນອງ.
DocType: Lead,Interested,ຄວາມສົນໃຈ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,ເປີດ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,ເປີດ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},ຈາກ {0} ກັບ {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,ບໍ່ສາມາດຕິດຕັ້ງພາສີໄດ້
DocType: Item,Copy From Item Group,ຄັດລອກຈາກກຸ່ມສິນຄ້າ
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,ບັນເທົາອາການທີ່ສະຫມັກຈະຕ້ອງຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,ໃບຕໍ່ປີ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ຕິດຕໍ່ກັນ {0}: ກະລຸນາກວດສອບຄື Advance 'ກັບບັນຊີ {1} ຖ້າຫາກວ່ານີ້ເປັນການເຂົ້າລ່ວງຫນ້າ.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Warehouse {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Warehouse {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
DocType: Email Digest,Profit & Loss,ກໍາໄລແລະຂາດທຶນ
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,ລິດ
DocType: Task,Total Costing Amount (via Time Sheet),ມູນຄ່າທັງຫມົດຈໍານວນເງິນ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ທຸລະກໍາກັບບໍລິສັດນີ້. ເບິ່ງໄລຍະເວລາຕ່ໍາກວ່າສໍາລັບລາຍລະອຽດ
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ແຈ້ງໂດຍ Email ກ່ຽວກັບການສ້າງຂອງຄໍາຮ້ອງຂໍອຸປະກອນອັດຕະໂນມັດ
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,ທົນທານຕໍ່
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,ປຶກສາຫາລື
DocType: Journal Entry,Multi Currency,ສະກຸນເງິນຫຼາຍ
DocType: Opening Invoice Creation Tool,Invoice Type,ປະເພດໃບເກັບເງິນ
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,ການສົ່ງເງິນ
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,ຜູ້ທີ່ເປັນຫມ້າຍ
DocType: Request for Quotation,Request for Quotation,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
DocType: Healthcare Settings,Require Lab Test Approval,ຕ້ອງການການອະນຸມັດທົດລອງທົດລອງ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,ລະຫັດສິນຄ້າ> ກຸ່ມສິນຄ້າ> ຍີ່ຫໍ້
DocType: Salary Slip Timesheet,Working Hours,ຊົ່ວໂມງເຮັດວຽກ
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,ຍອດລວມທັງຫມົດ
DocType: Naming Series,Change the starting / current sequence number of an existing series.,ການປ່ຽນແປງ / ຈໍານວນລໍາດັບການເລີ່ມຕົ້ນໃນປັດຈຸບັນຂອງໄລຍະການທີ່ມີຢູ່ແລ້ວ.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ກະລຸນາໃສ່ສູນຕົ້ນທຶນ
DocType: Drug Prescription,Dosage,Dosage
DocType: Journal Entry Account,Sales Order,ຂາຍສິນຄ້າ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,avg. ອັດຕາການຂາຍ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,avg. ອັດຕາການຂາຍ
DocType: Assessment Plan,Examiner Name,ຊື່ຜູ້ກວດສອບ
DocType: Lab Test Template,No Result,ບໍ່ມີຜົນການຄົ້ນຫາ
DocType: Purchase Invoice Item,Quantity and Rate,ປະລິມານແລະອັດຕາການ
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,ເລືອກ Payroll ໄລຍະເວລາ
DocType: Purchase Invoice,Unpaid,ບໍ່ທັນໄດ້ຈ່າຍ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,ສະຫງວນສໍາລັບຂາຍ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ> HR Settings
DocType: Packing Slip,From Package No.,ຈາກ Package ສະບັບເລກທີ
DocType: Item Attribute,To Range,ການຊ່ວງ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ຫລັກຊັບແລະເງິນຝາກ
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,ກອງປະຊຸມ
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ເຕືອນໃບສັ່ງຊື້
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,ບອກໄດ້ບໍ່ຫຼາຍປານໃດຂອງລູກຄ້າຂອງທ່ານ. ພວກເຂົາເຈົ້າສາມາດຈະມີອົງການຈັດຕັ້ງຫຼືບຸກຄົນ.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Parts ພຽງພໍທີ່ຈະກໍ່ສ້າງ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parts ພຽງພໍທີ່ຈະກໍ່ສ້າງ
DocType: POS Profile User,POS Profile User,POS User Profile
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ລາຍໄດ້ໂດຍກົງ
DocType: Patient Appointment,Date TIme,Date TIme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ບັນຊີ, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມບັນຊີ"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ບັນຊີ, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມບັນຊີ"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,ຫ້ອງການປົກຄອງ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ການສ້າງຕັ້ງບໍລິສັດແລະພາສີ
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,ບັນຊີທີ່ແຕກຕ່າງກັນ
DocType: Purchase Invoice,Supplier GSTIN,GSTIN Supplier
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ສາມາດເຮັດໄດ້ບໍ່ແມ່ນວຽກງານຢ່າງໃກ້ຊິດເປັນວຽກງານຂຶ້ນຂອງຕົນ {0} ບໍ່ໄດ້ປິດ.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ກະລຸນາໃສ່ Warehouse ສໍາລັບການທີ່ວັດສະດຸການຈອງຈະໄດ້ຮັບການຍົກຂຶ້ນມາ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,ກະລຸນາໃສ່ Warehouse ສໍາລັບການທີ່ວັດສະດຸການຈອງຈະໄດ້ຮັບການຍົກຂຶ້ນມາ
DocType: Production Order,Additional Operating Cost,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
DocType: Lab Test Template,Lab Routine,Lab routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,ເຄື່ອງສໍາອາງ
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ຄວາມສໍາພັນກັບ Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,ຜູ້ຈັດການ
DocType: Payment Entry,Payment From / To,ການຊໍາລະເງິນຈາກ / ໄປ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໃຫມ່ແມ່ນຫນ້ອຍກວ່າຈໍານວນເງິນທີ່ຍັງຄ້າງຄາໃນປະຈຸບັນສໍາລັບລູກຄ້າ. ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອຈະຕ້ອງມີ atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໃຫມ່ແມ່ນຫນ້ອຍກວ່າຈໍານວນເງິນທີ່ຍັງຄ້າງຄາໃນປະຈຸບັນສໍາລັບລູກຄ້າ. ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອຈະຕ້ອງມີ atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},ກະລຸນາຕັ້ງບັນຊີໃນ Warehouse {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ອ້າງອິງກ່ຽວກັບ' ແລະ 'Group ໂດຍ' ບໍ່ສາມາດຈະເປັນຄືກັນ
DocType: Sales Person,Sales Person Targets,ຄາດຫມາຍຕົ້ນຕໍຂາຍສ່ວນບຸກຄົນ
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,ຊື່ batch
DocType: Fee Validity,Max number of visit,ຈໍານວນການຢ້ຽມຢາມສູງສຸດ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ສ້າງ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ລົງທະບຽນ
DocType: GST Settings,GST Settings,ການຕັ້ງຄ່າສີມູນຄ່າເພີ່ມ
DocType: Selling Settings,Customer Naming By,ຊື່ລູກຄ້າໂດຍ
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,ງົບປະມານຕໍ່
DocType: Employee,Cell Number,ຫມາຍເລກໂທລະ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ບໍ່ມີພະນັກງານສໍາລັບເງື່ອນໄຂທີ່ກໍານົດໄວ້. ກວດເບິ່ງວ່າເງິນເດືອນບໍ່ໄດ້ຖືກສ້າງແລ້ວ.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,ການຮ້ອງຂໍການວັດສະດຸ Auto Generated
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ການຮ້ອງຂໍການວັດສະດຸ Auto Generated
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ການສູນເສຍ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,ທ່ານບໍ່ສາມາດເຂົ້າໃບໃນປັດຈຸບັນ 'ຕໍ່ອະນຸ' ຖັນ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,ສະຫງວນສໍາລັບການຜະລິດ
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ພະລັງງານ
DocType: Opportunity,Opportunity From,ໂອກາດຈາກ
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ຄໍາຖະແຫຼງທີ່ເງິນເດືອນ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ແຖວ {0}: {1} ຈໍານວນ Serial ຈໍາເປັນສໍາລັບລາຍການ {2}. ທ່ານໄດ້ສະຫນອງ {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ແຖວ {0}: {1} ຈໍານວນ Serial ຈໍາເປັນສໍາລັບລາຍການ {2}. ທ່ານໄດ້ສະຫນອງ {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ກະລຸນາເລືອກຕາຕະລາງ
DocType: BOM,Website Specifications,ຂໍ້ມູນຈໍາເພາະເວັບໄຊທ໌
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ເປັນທີ່ຢູ່ອີເມວທີ່ບໍ່ຖືກຕ້ອງໃນ 'ຜູ້ຮັບ'
@@ -1036,7 +1037,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Quote Requested
DocType: Vital Signs,Heart Rate / Pulse,Heart Rate / Pulse
DocType: Company,Default Bank Account,ມາດຕະຖານບັນຊີທະນາຄານ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","ການກັ່ນຕອງໂດຍອີງໃສ່ພັກ, ເລືອກເອົາພັກປະເພດທໍາອິດ"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","ການກັ່ນຕອງໂດຍອີງໃສ່ພັກ, ເລືອກເອົາພັກປະເພດທໍາອິດ"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'ປັບປຸງ Stock' ບໍ່ສາມາດໄດ້ຮັບການກວດກາເພາະວ່າລາຍການຈະບໍ່ສົ່ງຜ່ານ {0}
DocType: Vehicle,Acquisition Date,ຂອງທີ່ໄດ້ມາທີ່ສະຫມັກ
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,ພວກເຮົາ
@@ -1061,7 +1062,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),ອັບໂຫລດຫົວຈົດຫມາຍຂອງທ່ານ (ຮັກສາມັນເປັນມິດກັບເວັບເປັນ 900px ໂດຍ 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} ບໍ່ສາມາດເປັນກຸ່ມ
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ລາຍການຕິດຕໍ່ກັນ {idx}: {doctype} {docname} ບໍ່ມີຢູ່ໃນຂ້າງເທິງ '{doctype}' ຕາຕະລາງ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} ແມ່ນໄດ້ສໍາເລັດໄປແລ້ວຫລືຍົກເລີກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} ແມ່ນໄດ້ສໍາເລັດໄປແລ້ວຫລືຍົກເລີກ
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ມີວຽກງານທີ່
DocType: Item Variant Settings,Copy Fields to Variant,ຄັດລອກເຂດການປ່ຽນແປງ
DocType: Asset,Opening Accumulated Depreciation,ເປີດຄ່າເສື່ອມລາຄາສະສົມ
@@ -1173,9 +1174,10 @@
DocType: Production Order,Plan material for sub-assemblies,ອຸປະກອນການວາງແຜນສໍາລັບອະນຸສະພາແຫ່ງ
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners ການຂາຍແລະອານາເຂດ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} ຕ້ອງມີການເຄື່ອນໄຫວ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),ປິດ (ເປີດ + ລວມ)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),ປິດ (ເປີດ + ລວມ)
DocType: Journal Entry,Depreciation Entry,Entry ຄ່າເສື່ອມລາຄາ
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ກະລຸນາເລືອກປະເພດເອກະສານທໍາອິດ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,ພິມເງິນຕາຕ່າງປະເທດ
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ຍົກເລີກການໄປຢ້ຽມຢາມວັດສະດຸ {0} ກ່ອນຍົກເລີກການນີ້ບໍາລຸງຮັກສາ Visit
DocType: Crop Cycle,ISO 8016 standard,ມາດຕະຖານ ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
@@ -1201,7 +1203,7 @@
DocType: Supplier,Default Payable Accounts,ມາດຕະຖານບັນຊີເຈົ້າຫນີ້
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
DocType: Fee Structure,Components,ອົງປະກອບ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
DocType: Quality Inspection Reading,Reading 6,ອ່ານ 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1253,6 +1255,7 @@
,Company Name,ຊື່ບໍລິສັດ
DocType: SMS Center,Total Message(s),ຂໍ້ຄວາມທັງຫມົດ (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,ເລືອກລາຍການສໍາລັບການຖ່າຍໂອນ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,ກະລຸນາຕັ້ງຊື່ຊຸດຊື່ສໍາລັບ {0} ຜ່ານ Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,ເພີ່ມເຕີມຮ້ອຍສ່ວນລົດ
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ເບິ່ງບັນຊີລາຍຊື່ຂອງການທັງຫມົດການຊ່ວຍເຫຼືອວິດີໂອໄດ້
DocType: Agriculture Analysis Criteria,Soil Texture,ໂຄງສ້າງດິນ
@@ -1281,7 +1284,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Item ເວັບໄຊທ໌
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,ອັບຫົວຈົດຫມາຍສະບັບແລະສັນຍາລັກຂອງທ່ານ. (ທ່ານສາມາດແກ້ໄຂໃຫ້ເຂົາເຈົ້າຕໍ່ມາ).
DocType: Timesheet Detail,Bill,ບັນຊີລາຍການ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາແມ່ນເຂົ້າໄປເປັນວັນທີ່ຜ່ານມາ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາແມ່ນເຂົ້າໄປເປັນວັນທີ່ຜ່ານມາ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ສີຂາວ
DocType: SMS Center,All Lead (Open),Lead ທັງຫມົດ (ເປີດ)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ຕິດຕໍ່ກັນ {0}: ຈໍານວນບໍ່ສາມາດໃຊ້ສໍາລັບການ {4} ໃນສາງ {1} ທີ່ປຊຊກິນທີ່ໃຊ້ເວລາຂອງການເຂົ້າມາ ({2} {3})
@@ -1298,7 +1301,7 @@
DocType: Lead,Next Contact Date,ຖັດໄປວັນທີ່
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,ເປີດຈໍານວນ
DocType: Healthcare Settings,Appointment Reminder,Appointment Reminder
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
DocType: Program Enrollment Tool Student,Student Batch Name,ຊື່ນັກ Batch
DocType: Consultation,Doctor,ທ່ານຫມໍ
DocType: Holiday List,Holiday List Name,ລາຍຊື່ຂອງວັນພັກ
@@ -1314,6 +1317,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ອອກຈາກເຄື່ອງມືການຈັດສັນ
DocType: Item,Hub Category to Publish,Category Hub ເພື່ອເຜີຍແຜ່
DocType: Leave Block List,Leave Block List Dates,ອອກຈາກວັນ Block ຊີ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup> ເລກລໍາດັບ
DocType: Sales Invoice,Billing Address GSTIN,ທີ່ຢູ່ໃບບິນໃບບິນ GSTIN
DocType: Assessment Plan,Evaluate,ປະເມີນ
DocType: Workstation,Net Hour Rate,ອັດຕາຊົ່ວໂມງສຸດທິ
@@ -1348,7 +1352,7 @@
DocType: Purchase Receipt,PREC-RET-,"PREC, RET-"
DocType: POS Profile,Sales Invoice Payment,ການຊໍາລະເງິນການຂາຍໃບເກັບເງິນ
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse ໄວ້ໃນ Sales Order / Finished Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,ຈໍານວນການຂາຍ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ຈໍານວນການຂາຍ
DocType: Repayment Schedule,Interest Amount,ຈໍານວນເງິນທີ່ຫນ້າສົນໃຈ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,ທ່ານມີການອະນຸມັດຄ່າໃຊ້ຈ່າຍສໍາລັບການບັນທຶກນີ້. ກະລຸນາປັບປຸງສະຖານະການແລະບັນທຶກ
DocType: Serial No,Creation Document No,ການສ້າງເອກະສານທີ່ບໍ່ມີ
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,ການເປີດບັນຊີດຸ່ນດ່ຽງ
,GST Sales Register,GST Sales ຫມັກສະມາຊິກ
DocType: Sales Invoice Advance,Sales Invoice Advance,ຂາຍ Invoice Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ບໍ່ມີຫຍັງໃນການຮ້ອງຂໍ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,ບໍ່ມີຫຍັງໃນການຮ້ອງຂໍ
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,ເລືອກໂດເມນຂອງທ່ານ
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ບັນທຶກງົບປະມານອີກປະການຫນຶ່ງ '{0}' ແລ້ວຢູ່ຕໍ່ {1} '{2}' ສໍາລັບປີງົບປະມານ {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ສະຫນາມຈະຖືກຄັດລອກຜ່ານເວລາຂອງການສ້າງ.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ນີ້ຈະໄດ້ຮັບການຜນວກເຂົ້າກັບຂໍ້ມູນລະຫັດຂອງຕົວແປ. ສໍາລັບການຍົກຕົວຢ່າງ, ຖ້າຫາກວ່າຕົວຫຍໍ້ຂອງທ່ານແມ່ນ "SM", ແລະລະຫັດສິນຄ້າແມ່ນ "ເສື້ອທີເຊີດ", ລະຫັດສິນຄ້າຂອງ variant ຈະ "ເສື້ອທີເຊີດ, SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ຈ່າຍສຸດທິ (ໃນຄໍາສັບຕ່າງໆ) ຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດ Slip ເງິນເດືອນໄດ້.
DocType: Purchase Invoice,Is Return,ແມ່ນກັບຄືນ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,ລະມັດລະວັງ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,ລະມັດລະວັງ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Return / ເດບິດຫມາຍເຫດ
DocType: Price List Country,Price List Country,ລາຄາປະເທດ
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} ພວກເຮົາອະນຸກົມທີ່ຖືກຕ້ອງສໍາລັບລາຍການ {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} ພວກເຮົາອະນຸກົມທີ່ຖືກຕ້ອງສໍາລັບລາຍການ {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ລະຫັດສິນຄ້າບໍ່ສາມາດມີການປ່ຽນແປງສໍາລັບການສະບັບເລກທີ Serial
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Factor ແປງ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບຈໍານວນ Batch
@@ -1561,7 +1565,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,ໃບສັ່ງຂາຍ {0} ບໍ່ຖືກຕ້ອງ
DocType: Supplier Scorecard,Warn for new Request for Quotations,ເຕືອນສໍາລັບການຮ້ອງຂໍສໍາລັບວົງຢືມ
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,ສັ່ງຊື້ຊ່ວຍໃຫ້ທ່ານວາງແຜນແລະປະຕິບັດຕາມເຖິງກ່ຽວກັບການຊື້ຂອງທ່ານ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab test Test
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",ປະລິມານທີ່ຈົດທະບຽນ / ການຖ່າຍໂອນທັງຫມົດ {0} ໃນວັດສະດຸການຈອງ {1} \ ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານການຮ້ອງຂໍ {2} ສໍາລັບລາຍການ {3}
@@ -1599,7 +1603,6 @@
DocType: Warehouse,Warehouse Contact Info,Warehouse ຂໍ້ມູນຕິດຕໍ່
DocType: Payment Entry,Write Off Difference Amount,ຂຽນ Off ຈໍານວນທີ່ແຕກຕ່າງກັນ
DocType: Volunteer,Volunteer Name,ຊື່ອາສາສະຫມັກ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,ກະລຸນາຕັ້ງຊື່ລະບົບການໃຫ້ຄໍາແນະນໍາໃນການສຶກສາ> ການສຶກສາການສຶກສາ
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: ບໍ່ໄດ້ພົບເຫັນ email ພະນັກງານ, ເພາະສະນັ້ນອີເມວບໍ່ໄດ້ສົ່ງ"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},ກົດລະບຽບການສົ່ງສິນຄ້າບໍ່ສາມາດໃຊ້ໄດ້ສໍາລັບປະເທດ {0}
DocType: Item,Foreign Trade Details,ລາຍລະອຽດການຄ້າຕ່າງປະເທດ
@@ -1612,7 +1615,7 @@
DocType: Student Group Student,Group Roll Number,Group ຈໍານວນມ້ວນ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, ພຽງແຕ່ລະເງິນກູ້ຢືມສາມາດໄດ້ຮັບການເຊື່ອມຕໍ່ເຂົ້າເດບິດອື່ນ"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ຈໍານວນທັງຫມົດຂອງທັງຫມົດນ້ໍາວຽກງານຄວນຈະ 1. ກະລຸນາປັບປຸງນ້ໍາຂອງວຽກງານໂຄງການທັງຫມົດຕາມຄວາມເຫມາະສົມ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,ລາຍການ {0} ຈະຕ້ອງເປັນອະນຸສັນຍາລາຍການ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ອຸປະກອນນະຄອນຫຼວງ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກຄັດເລືອກທໍາອິດໂດຍອີງໃສ່ 'ສະຫມັກຕໍາກ່ຽວກັບ' ພາກສະຫນາມ, ທີ່ສາມາດຈະມີລາຍການ, ກຸ່ມສິນຄ້າຫຼືຍີ່ຫໍ້."
@@ -1637,7 +1640,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,ຄັງສິນຄ້າເດັກຢູ່ສໍາລັບການສາງນີ້. ທ່ານບໍ່ສາມາດລົບ warehouse ນີ້.
DocType: Item,Website Item Groups,ກຸ່ມສົນທະນາເວັບໄຊທ໌ສິນຄ້າ
DocType: Purchase Invoice,Total (Company Currency),ທັງຫມົດ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,ຈໍານວນ Serial {0} ເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,ຈໍານວນ Serial {0} ເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
DocType: Journal Entry,Journal Entry,ວາລະສານການອອກສຽງ
DocType: Expense Claim Advance,Unclaimed amount,ຈໍານວນເງິນທີ່ບໍ່ໄດ້ຮັບການຮ້ອງຂໍ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ລາຍການມີຄວາມຄືບຫນ້າ
@@ -1734,7 +1737,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,ເຂົ້າສູ່ລະບົບການສື່ສານ.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","ການຮ້ອງຂໍສໍາລັບວົງຢືມໄດ້ຖືກປິດການເຂົ້າເຖິງຈາກປະຕູ, ສໍາລັບການຫຼາຍການຕັ້ງຄ່າປະຕູການກວດກາ."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ຈໍານວນການຊື້
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ຈໍານວນການຊື້
DocType: Sales Invoice,Shipping Address Name,Shipping Address ຊື່
DocType: Material Request,Terms and Conditions Content,ຂໍ້ກໍານົດແລະເງື່ອນໄຂເນື້ອໃນ
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,ມີຂໍ້ຜິດພາດໃນການສ້າງຕາຕະລາງເວລາ
@@ -1998,7 +2001,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ໄມ້ຕໍ່ກັບຍານພາຫະນະນີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},ຕໍ່ Supplier Invoice {0} ວັນ {1}
DocType: Customer,Default Price List,ລາຄາມາດຕະຖານ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ທ່ານບໍ່ສາມາດລົບປະຈໍາປີ {0}. ປີງົບປະມານ {0} ກໍານົດເປັນມາດຕະຖານໃນການຕັ້ງຄ່າ Global
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,ລູກຄ້າທີ່ມີຊື່ດຽວກັນກໍ່ມີຢູ່ແລ້ວ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ນີ້ຈະສົ່ງໃບຢັ້ງຢືນເງິນເດືອນແລະສ້າງບັນຊີເລກທະບຽນເຂົ້າ. ທ່ານຕ້ອງການດໍາເນີນການ?
@@ -2012,6 +2015,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,ການຕັ້ງລາຄາ
DocType: Quotation,Term Details,ລາຍລະອຽດໃນໄລຍະ
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ບໍ່ສາມາດລົງທະບຽນຫຼາຍກ່ວາ {0} ນັກສຶກສາສໍາລັບກຸ່ມນັກສຶກສານີ້.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),ລວມ (ໂດຍບໍ່ມີພາສີ)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ນັບເປັນຜູ້ນໍາພາ
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ນັບເປັນຜູ້ນໍາພາ
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ຕ້ອງໄດ້ຫຼາຍກ່ວາ 0
@@ -2032,7 +2036,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink ການຊໍາລະເງິນກ່ຽວກັບການຍົກເລີກການໃບເກັບເງິນ
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ອ່ານໄມປັດຈຸບັນເຂົ້າໄປຄວນຈະເປັນຫຼາຍກ່ວາເບື້ອງຕົ້ນພາຫະນະໄມ {0}
DocType: Restaurant Reservation,No Show,ບໍ່ມີສະແດງ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,ກະລຸນາຕັ້ງຊື່ຊຸດຊື່ສໍາລັບ {0} ຜ່ານ Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Shipping ກົດລະບຽບປະເທດ
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ອອກຈາກແລະເຂົ້າຮ່ວມ
DocType: Maintenance Visit,Partially Completed,ສໍາເລັດບາງສ່ວນ
@@ -2125,7 +2128,7 @@
DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
DocType: Grant Application,Assessment Mark (Out of 10),ເຄື່ອງຫມາຍການປະເມີນ (ອອກຈາກ 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ຕົ້ນຕໍ
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,ຕົ້ນຕໍ
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variant
DocType: Naming Series,Set prefix for numbering series on your transactions,ຕັ້ງຄໍານໍາຫນ້າສໍາລັບການຈໍານວນໄລຍະກ່ຽວກັບການໂອນຂອງທ່ານ
DocType: Employee Attendance Tool,Employees HTML,ພະນັກງານ HTML
@@ -2175,7 +2178,7 @@
DocType: Course,Course Abbreviation,ຊື່ຫຍໍ້ຂອງລາຍວິຊາ
DocType: Student Leave Application,Student Leave Application,ຄໍາຮ້ອງສະຫມັກອອກຈາກນັກສຶກສາ
DocType: Item,Will also apply for variants,ຍັງຈະນໍາໃຊ້ສໍາລັບການ variants
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} ວັນເຄິ່ງຫນຶ່ງໃນ {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ຊົ່ວໂມງການເຮັດວຽກທັງຫມົດບໍ່ຄວນຈະມີຫຼາຍກ່ວາຊົ່ວໂມງເຮັດວຽກສູງສຸດ {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ກ່ຽວກັບ
@@ -2362,9 +2365,10 @@
DocType: Task,Actual End Date (via Time Sheet),ຕົວຈິງວັນທີ່ສິ້ນສຸດ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
DocType: Soil Texture,Soil Type,ປະເພດດິນ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,ຂໍ້ຄວາມໃຫມ່
,Quotation Trends,ແນວໂນ້ມວົງຢືມ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ກຸ່ມສິນຄ້າບໍ່ໄດ້ກ່າວເຖິງໃນຕົ້ນສະບັບລາຍການສໍາລັບການ item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
DocType: Shipping Rule,Shipping Amount,ການຂົນສົ່ງຈໍານວນເງິນ
DocType: Supplier Scorecard Period,Period Score,ຄະແນນໄລຍະເວລາ
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ຕື່ມການລູກຄ້າ
@@ -2375,7 +2379,7 @@
,Vehicle Expenses,ຄ່າໃຊ້ຈ່າຍຍານພາຫະນະ
DocType: Serial No,Invoice Details,ລາຍລະອຽດໃບແຈ້ງຫນີ້
DocType: Grant Application,Show on Website,ສະແດງເທິງເວັບໄຊທ໌
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ເລີ່ມຕົ້ນສຸດ
DocType: Hub Category,Hub Category,Category Hub
DocType: Purchase Invoice,SEZ,ຂພສ
@@ -2407,7 +2411,7 @@
DocType: Patient,B Positive,B Positive
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
DocType: Leave Block List Allow,Leave Block List Allow,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,ກຸ່ມທີ່ບໍ່ແມ່ນກຸ່ມ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ກິລາ
@@ -2458,6 +2462,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,ບໍ່ສາມາດກໍານົດໄດ້ຮັບ RFQ ກັບ No ອ້າງ
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,ຫັກຈໍານວນທັງຫມົດ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,ເລືອກບັນຊີເພື່ອພິມໃນສະກຸນເງິນບັນຊີ
,Production Analytics,ການວິເຄາະການຜະລິດ
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການໂອນເງິນກັບຜູ້ປ່ວຍນີ້. ເບິ່ງຕາຕະລາງຂ້າງລຸ່ມສໍາລັບລາຍລະອຽດ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ຄ່າໃຊ້ຈ່າຍ Updated
@@ -2513,7 +2518,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ເລືອກບໍລິສັດ ...
DocType: Leave Control Panel,Leave blank if considered for all departments,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການພະແນກການທັງຫມົດ
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","ປະເພດຂອງການຈ້າງງານ (ຖາວອນ, ສັນຍາ, ແລະອື່ນໆພາຍໃນ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
DocType: Payroll Entry,Fortnightly,ສອງອາທິດ
DocType: Currency Exchange,From Currency,ຈາກສະກຸນເງິນ
DocType: Vital Signs,Weight (In Kilogram),ນ້ໍາຫນັກ (ໃນກິໂລກໍາ)
@@ -2591,7 +2596,7 @@
DocType: Student,Guardians,ຜູ້ປົກຄອງ
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ລາຄາຈະບໍ່ໄດ້ຮັບການສະແດງໃຫ້ເຫັນວ່າລາຄາບໍ່ໄດ້ຕັ້ງ
DocType: Stock Entry,Total Incoming Value,ມູນຄ່າຂາເຂົ້າທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ຊ່ວຍຮັກສາຕິດຕາມຂອງທີ່ໃຊ້ເວລາ, ຄ່າໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນສໍາລັບກິດຈະກໍາເຮັດໄດ້ໂດຍທີມງານຂອງທ່ານ"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ລາຄາຊື້
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ແມ່ແບບຂອງຕົວປ່ຽນແປງຈໍາຫນ່າຍດັດນີຊີ້ວັດ.
@@ -2694,7 +2699,7 @@
DocType: Company,For Reference Only.,ສໍາລັບການກະສານອ້າງອີງເທົ່ານັ້ນ.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},ທ່ານຫມໍ {0} ບໍ່ມີຢູ່ໃນ {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,ເລືອກຊຸດ No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ບໍ່ຖືກຕ້ອງ {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},ບໍ່ຖືກຕ້ອງ {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,"PINV, RET-"
DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2731,8 +2736,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ລະບຸການດໍາເນີນງານ, ຄ່າໃຊ້ຈ່າຍປະຕິບັດແລະໃຫ້ການດໍາເນີນງານເປັນເອກະລັກທີ່ບໍ່ມີການປະຕິບັດງານຂອງທ່ານ."
DocType: Water Analysis,Origin,ຕົ້ນກໍາເນີດ
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ເອກະສານນີ້ແມ່ນໃນໄລຍະຂອບເຂດຈໍາກັດໂດຍ {0} {1} ສໍາລັບ item {4}. ທ່ານກໍາລັງເຮັດໃຫ້ຄົນອື່ນ {3} ຕໍ່ຕ້ານດຽວກັນ {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
DocType: Purchase Invoice,Price List Currency,ລາຄາສະກຸນເງິນ
DocType: Naming Series,User must always select,ຜູ້ໃຊ້ຕ້ອງໄດ້ເລືອກ
DocType: Stock Settings,Allow Negative Stock,ອະນຸຍາດໃຫ້ລົບ Stock
@@ -2788,7 +2793,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,ເຕືອນສໍາຫລັບໃບສັ່ງຊື້ໃຫມ່
DocType: Quality Inspection Reading,Reading 9,ອ່ານ 9
DocType: Supplier,Is Frozen,ແມ່ນ Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,warehouse node ກຸ່ມດັ່ງກ່າວແມ່ນບໍ່ອະນຸຍາດໃຫ້ເລືອກສໍາລັບການເຮັດທຸລະກໍາ
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,warehouse node ກຸ່ມດັ່ງກ່າວແມ່ນບໍ່ອະນຸຍາດໃຫ້ເລືອກສໍາລັບການເຮັດທຸລະກໍາ
DocType: Buying Settings,Buying Settings,ການຕັ້ງຄ່າການຊື້
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM ເລກສໍາລັບລາຍການສິນຄ້າສໍາເລັດ
DocType: Upload Attendance,Attendance To Date,ຜູ້ເຂົ້າຮ່ວມເຖິງວັນທີ່
@@ -2803,6 +2808,7 @@
DocType: Grant Application,Organization,ອົງການຈັດຕັ້ງ
DocType: BOM Update Tool,BOM Update Tool,ເຄື່ອງມື Update BOM
DocType: SG Creation Tool Course,Student Group Name,ຊື່ກຸ່ມນັກສຶກສາ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,ສະແດງໃຫ້ເຫັນການຂຸດຄົ້ນເບິ່ງ
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ສ້າງຄ່າທໍານຽມ
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ກະລຸນາເຮັດໃຫ້ແນ່ໃຈວ່າທ່ານຕ້ອງການທີ່ຈະລົບເຮັດທຸລະກໍາທັງຫມົດຂອງບໍລິສັດນີ້. ຂໍ້ມູນຕົ້ນສະບັບຂອງທ່ານຈະຍັງຄົງເປັນມັນເປັນ. ການດໍາເນີນການນີ້ບໍ່ສາມາດຍົກເລີກໄດ້.
DocType: Room,Room Number,ຈໍານວນຫ້ອງ
@@ -2813,7 +2819,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,ເຮັດແບບແມ່ພິມພາສີ
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,ໄວອະນຸທິນ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງອັດຕາການຖ້າຫາກວ່າ BOM ທີ່ໄດ້ກ່າວມາ agianst ລາຍການໃດ
@@ -2884,7 +2890,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Make Invoice
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto ໃກ້ໂອກາດພາຍໃນ 15 ວັນ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,ໃບສັ່ງຊື້ຍັງບໍ່ໄດ້ຮັບອະນຸຍາດສໍາລັບການ {0} ເນື່ອງຈາກການນຸ່ງປະຈໍາດັດນີຊີ້ວັດຂອງ {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,ໃບສັ່ງຊື້ຍັງບໍ່ໄດ້ຮັບອະນຸຍາດສໍາລັບການ {0} ເນື່ອງຈາກການນຸ່ງປະຈໍາດັດນີຊີ້ວັດຂອງ {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ປີສຸດທ້າຍ
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot /% Lead
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot /% Lead
@@ -2977,7 +2983,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ຂ້າງເທິງ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"ຕິດຕໍ່ກັນ, {0}: Journal Entry {1} ບໍ່ມີບັນຊີ {2} ຫລືແລ້ວປຽບທຽບ voucher ອື່ນ"
DocType: Supplier Scorecard Criteria,Criteria Weight,ມາດຕະຖານນ້ໍາຫນັກ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Supplier> Supplier Type
DocType: Buying Settings,Default Buying Price List,ມາດຕະຖານບັນຊີການຊື້ລາຄາ
DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip ເງິນເດືອນຈາກ Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,ອັດຕາການຊື້
@@ -3067,7 +3072,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ການຕິດຕາມຊີ້ນໍາໂດຍປະເພດອຸດສາຫະກໍາ.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Go to Letterheads
DocType: Item Supplier,Item Supplier,ຜູ້ຜະລິດລາຍການ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ທີ່ຢູ່ທັງຫມົດ.
DocType: Company,Stock Settings,ການຕັ້ງຄ່າ Stock
@@ -3245,6 +3250,7 @@
DocType: Company,Default Inventory Account,ບັນຊີມາດຕະຖານສິນຄ້າຄົງຄັງ
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນຕ້ອງໄດ້ຫຼາຍກ່ວາສູນ.
DocType: Antibiotic,Antibiotic Name,ຢາຕ້ານເຊື້ອຊື່
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,ລະຫັດສິນຄ້າ> ກຸ່ມສິນຄ້າ> ຍີ່ຫໍ້
DocType: Purchase Invoice,Apply Additional Discount On,ສະຫມັກຕໍາສ່ວນລົດເພີ່ມເຕີມກ່ຽວກັບ
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,ເລືອກປະເພດ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ການເຊື່ອມໂຍງກັບຫນ່ວຍງານທີ່ດິນທັງຫມົດທີ່ປູກພືດທີ່ເຕີບໃຫຍ່
@@ -3440,6 +3446,7 @@
DocType: Supplier,Credit Limit,ຈໍາກັດການປ່ອຍສິນເຊື່ອ
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,ລາຄາເສລີ່ຍ ລາຄາການຂາຍລາຄາ
DocType: Production Plan Sales Order,Salse Order Date,salse Order ວັນ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Supplier> Supplier Type
DocType: Salary Component,Salary Component,ເງິນເດືອນ Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,ການອອກສຽງການຊໍາລະເງິນ {0} ມີ un ການເຊື່ອມຕໍ່
DocType: GL Entry,Voucher No,Voucher No
@@ -3449,7 +3456,7 @@
DocType: Leave Allocation,Leave Allocation,ອອກຈາກການຈັດສັນ
DocType: Payment Request,Recipient Message And Payment Details,ຜູ້ຮັບຂໍ້ຄວາມແລະລາຍລະອຽດການຊໍາລະເງິນ
DocType: Training Event,Trainer Email,ຄູຝຶກ Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,ການຮ້ອງຂໍອຸປະກອນການ {0} ສ້າງ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,ການຮ້ອງຂໍອຸປະກອນການ {0} ສ້າງ
DocType: Restaurant Reservation,No of People,No of People
DocType: Production Planning Tool,Include sub-contracted raw materials,ປະກອບມີອຸປະກອນການເປັນວັດຖຸດິບຍ່ອຍເຮັດສັນຍາ
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ຮູບແບບຂອງຂໍ້ກໍານົດຫຼືການເຮັດສັນຍາ.
@@ -3515,7 +3522,7 @@
DocType: Production Planning Tool,Create Material Requests,ສ້າງການຮ້ອງຂໍການວັດສະດຸ
DocType: Employee Education,School/University,ໂຮງຮຽນ / ວິທະຍາໄລ
DocType: Payment Request,Reference Details,ລາຍລະອຽດກະສານອ້າງອີງ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງຫນ້ອຍກ່ວາລວມຍອດການຊື້ຈໍານວນ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງຫນ້ອຍກ່ວາລວມຍອດການຊື້ຈໍານວນ
DocType: Sales Invoice Item,Available Qty at Warehouse,ມີຈໍານວນຢູ່ໃນສາງ
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ຈໍານວນເງິນເກັບ
DocType: Asset,Double Declining Balance,ດຸນຫລຸດ Double
@@ -3527,7 +3534,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ໄດ້ຮັບການປັບປຸງ
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,ເລືອກຢ່າງຫນ້ອຍຫນຶ່ງມູນຄ່າຈາກແຕ່ລະຄຸນສົມບັດ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,ຂໍອຸປະກອນການ {0} ຈະຖືກຍົກເລີກຫຼືຢຸດເຊົາການ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,ຂໍອຸປະກອນການ {0} ຈະຖືກຍົກເລີກຫຼືຢຸດເຊົາການ
apps/erpnext/erpnext/config/hr.py +310,Leave Management,ອອກຈາກການຄຸ້ມຄອງ
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Group ໂດຍບັນຊີ
DocType: Sales Order,Fully Delivered,ສົ່ງຢ່າງເຕັມທີ່
@@ -3538,14 +3545,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ຈ່າຍຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາເງິນກູ້ຈໍານວນ {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,ໄປທີ່ Programs
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},ແຖວ {0} # ຈໍານວນເງິນທີ່ຈັດສັນ {1} ບໍ່ສາມາດຈະສູງກວ່າຈໍານວນເງິນທີ່ຍັງບໍ່ໄດ້ຮັບການຂໍ {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup> ເລກລໍາດັບ
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ຊື້ຈໍານວນຄໍາສັ່ງທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,ຜະລິດພັນທີ່ບໍ່ໄດ້ສ້າງ
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','ຈາກວັນທີ່ສະຫມັກ' ຈະຕ້ອງຫລັງຈາກທີ່ໄປວັນ '
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ບໍ່ສາມາດມີການປ່ຽນແປງສະຖານະພາບເປັນນັກສຶກສາ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາຮ້ອງສະຫມັກນັກສຶກສາ {1}
DocType: Asset,Fully Depreciated,ຄ່າເສື່ອມລາຄາຢ່າງເຕັມສ່ວນ
,Stock Projected Qty,Stock ປະມານການຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ການຊື້ຂາຍແມ່ນການສະເຫນີ, ສະເຫນີລາຄາທີ່ທ່ານໄດ້ຖືກສົ່ງໄປໃຫ້ກັບລູກຄ້າຂອງທ່ານ"
DocType: Sales Order,Customer's Purchase Order,ການສັ່ງຊື້ຂອງລູກຄ້າ
@@ -3630,7 +3636,7 @@
DocType: Stock Settings,Item Naming By,ລາຍການຕັ້ງຊື່ໂດຍ
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ອີກປະການຫນຶ່ງ Entry ໄລຍະເວລາປິດ {0} ໄດ້ຮັບການເຮັດໃຫ້ຫຼັງຈາກ {1}
DocType: Production Order,Material Transferred for Manufacturing,ອຸປະກອນການໂອນສໍາລັບການຜະລິດ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ບັນຊີ {0} ບໍ່ໄດ້ຢູ່
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,ບັນຊີ {0} ບໍ່ໄດ້ຢູ່
DocType: Project,Project Type,ປະເພດໂຄງການ
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ວຽກງານຂອງເດັກຢູ່ສໍາລັບວຽກງານນີ້. ທ່ານບໍ່ສາມາດລຶບ Task ນີ້.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ທັງຈໍານວນເປົ້າຫມາຍຫຼືເປົ້າຫມາຍຈໍານວນແມ່ນບັງຄັບ.
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Center ຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
DocType: Sales Order Item,Sales Order Date,ວັນທີ່ສະຫມັກໃບສັ່ງຂາຍ
DocType: Sales Invoice Item,Delivered Qty,ສົ່ງຈໍານວນ
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,ລວມ Excl ພາສີ
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","ຖ້າຫາກວ່າການກວດກາ, ເດັກນ້ອຍທັງຫມົດຂອງລາຍການຜະລິດແຕ່ລະຄົນຈະໄດ້ຮັບການມີຢູ່ໃນການຮ້ອງຂໍການວັດສະດຸ."
DocType: Assessment Plan,Assessment Plan,ແຜນການປະເມີນຜົນ
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,ລູກຄ້າ {0} ຖືກສ້າງຂຶ້ນ.
DocType: Stock Settings,Limit Percent,ເປີເຊັນຂອບເຂດຈໍາກັດ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,ກະລຸນາຕັ້ງຊື່ລະບົບການໃຫ້ຄໍາແນະນໍາໃນການສຶກສາ> ການສຶກສາການສຶກສາ
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ໃນປະຈຸບັນບໍ່ມີຫຼັກຊັບໃນຄັງສິນຄ້າໃດໆ
,Payment Period Based On Invoice Date,ໄລຍະເວລາການຊໍາລະເງິນໂດຍອີງໃສ່ວັນ Invoice
DocType: Sample Collection,No. of print,No of print
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),ລູກຫນີ້ ({0})
DocType: Pricing Rule,Margin,margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ລູກຄ້າໃຫມ່
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,ກໍາໄຮ% Gross
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,ກໍາໄຮ% Gross
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,ປ່ຽນ POS Profile
DocType: Bank Reconciliation Detail,Clearance Date,ວັນເກັບກູ້ລະເບີດ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,ບົດລາຍງານການປະເມີນຜົນ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ການຊື້ທັງຫມົດເປັນການບັງຄັບ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,ການຊື້ທັງຫມົດເປັນການບັງຄັບ
DocType: Lead,Address Desc,ທີ່ຢູ່ Desc
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,ພັກເປັນການບັງຄັບ
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,ຢືນຊື່
DocType: Stock Entry,Customer or Supplier Details,ລູກຄ້າຫຼືຜູ້ຜະລິດລາຍລະອຽດ
DocType: Employee Loan Application,Required by Date,ທີ່ກໍານົດໄວ້ by Date
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),ຍອດຄົງເຫລືອ (Dr-Cr)
DocType: Lead,Lead Owner,ເຈົ້າຂອງເປັນຜູ້ນໍາພາ
DocType: Bin,Requested Quantity,ຈໍານວນການຮ້ອງຂໍ
DocType: Patient,Marital Status,ສະຖານະພາບ
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Multiple Variants
DocType: Sales Invoice,Against Income Account,ຕໍ່ບັນຊີລາຍໄດ້
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ສົ່ງ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ລາຍການ {0}: ຄໍາສັ່ງຈໍານວນ {1} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຈໍານວນຄໍາສັ່ງຂັ້ນຕ່ໍາ {2} (ລະບຸໄວ້ໃນລາຍການ).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ລາຍການ {0}: ຄໍາສັ່ງຈໍານວນ {1} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຈໍານວນຄໍາສັ່ງຂັ້ນຕ່ໍາ {2} (ລະບຸໄວ້ໃນລາຍການ).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ເປີເຊັນຂອງການແຜ່ກະຈາຍປະຈໍາເດືອນ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,ກະລຸນາເຂົ້າສູ່ລະບົບເປັນຜູ້ໃຊ້ອື່ນ.
DocType: Territory,Territory Targets,ຄາດຫມາຍຕົ້ນຕໍອານາເຂດ
@@ -3906,7 +3911,7 @@
DocType: Serial No,Out of AMC,ອອກຈາກ AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ເຮັດໃຫ້ບໍາລຸງຮັກສາ Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
DocType: Company,Default Cash Account,ມາດຕະຖານບັນຊີເງິນສົດ
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ບໍລິສັດ (ໄດ້ລູກຄ້າຫລືຜູ້ຜະລິດ) ຕົ້ນສະບັບ.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງນັກສຶກສານີ້
@@ -4058,7 +4063,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ບໍ່ມີພະນັກງານສໍາລັບເງື່ອນໄຂທີ່ໄດ້ລະບຸໄວ້
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
DocType: Restaurant,Default Customer,Customer Default
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ> HR Settings
DocType: Assessment Plan,Supervisor Name,ຊື່ Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ຢ່າຢືນຢັນວ່າການນັດຫມາຍຖືກສ້າງຂື້ນໃນມື້ດຽວກັນ
DocType: Program Enrollment Course,Program Enrollment Course,ຂອງລາຍວິຊາການເຂົ້າໂຮງຮຽນໂຄງການ
@@ -4181,7 +4185,7 @@
DocType: BOM,Website Description,ລາຍລະອຽດເວັບໄຊທ໌
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ການປ່ຽນແປງສຸດທິໃນການລົງທຶນ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ຫຼ້າສຸດ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ທີ່ຢູ່ອີເມວຈະຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
DocType: Serial No,AMC Expiry Date,AMC ຫມົດເຂດ
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,ຮັບ
@@ -4198,7 +4202,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ໃບອະນຸຍາດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ກະລຸນາເລືອກປະຕິບັດຕໍ່ຖ້າຫາກວ່າທ່ານຍັງຕ້ອງການທີ່ຈະປະກອບມີຍອດເຫຼືອເດືອນກ່ອນປີງົບປະມານຂອງໃບປີງົບປະມານນີ້
DocType: GL Entry,Against Voucher Type,ຕໍ່ຕ້ານປະເພດ Voucher
DocType: Physician,Phone (R),ໂທລະສັບ (R)
@@ -4210,7 +4214,7 @@
DocType: Patient,B Negative,B Negative
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,ສະຖານະການບໍາລຸງຮັກສາຕ້ອງຖືກຍົກເລີກຫຼືສິ້ນສຸດລົງເພື່ອສົ່ງ
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ບັນຊີ {0} ບໍ່ໄດ້ເປັນບໍລິສັດ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,ຈໍານວນ serial ໃນແຖວ {0} ບໍ່ກົງກັບກັບການຈັດສົ່ງຫມາຍເຫດ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,ຈໍານວນ serial ໃນແຖວ {0} ບໍ່ກົງກັບກັບການຈັດສົ່ງຫມາຍເຫດ
DocType: Student,Guardian Details,ລາຍລະອຽດຜູ້ປົກຄອງ
DocType: C-Form,C-Form,"C, ແບບຟອມການ"
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ຫຼາກຫຼາຍ
@@ -4252,7 +4256,7 @@
DocType: Stock Entry Detail,Basic Amount,ຈໍານວນພື້ນຖານ
DocType: Training Event,Exam,ການສອບເສັງ
DocType: Complaint,Complaint,ຄໍາຮ້ອງທຸກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
DocType: Leave Allocation,Unused leaves,ໃບທີ່ບໍ່ໄດ້ໃຊ້
DocType: Patient,Alcohol Past Use,Alcohol Past Use
DocType: Fertilizer Content,Fertilizer Content,ເນື້ອຫາປຸ໋ຍ
@@ -4381,6 +4385,7 @@
DocType: Salary Detail,Formula,ສູດ
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial:
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,ບັນຊີການຂາຍ
DocType: Purchase Invoice Item,Total Weight,ນ້ໍາຫນັກລວມ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,ຄະນະກໍາມະການຂາຍ
DocType: Offer Letter Term,Value / Description,ມູນຄ່າ / ລາຍລະອຽດ
@@ -4538,7 +4543,7 @@
DocType: Customer,From Lead,ຈາກ Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ຄໍາສັ່ງປ່ອຍອອກມາເມື່ອສໍາລັບການຜະລິດ.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ເລືອກປີງົບປະມານ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
DocType: Program Enrollment Tool,Enroll Students,ລົງທະບຽນນັກສຶກສາ
DocType: Lab Test,Approved Date,ວັນທີ່ຖືກອະນຸມັດ
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ຂາຍມາດຕະຖານ
@@ -4615,7 +4620,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,ສິນຄ້າການຜະລິດ
,Employee Information,ຂໍ້ມູນພະນັກງານ
DocType: Stock Entry Detail,Additional Cost,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ Voucher No, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມ Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ Voucher No, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມ Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາຜູ້ຜະລິດ
DocType: Quality Inspection,Incoming,ເຂົ້າມາ
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,ແມ່ແບບພາສີມາດຕະຖານສໍາລັບການຂາຍແລະການຊື້ໄດ້ຖືກສ້າງຂຶ້ນ.
@@ -4632,7 +4637,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},ຫມາຍເຫດ: {0}
,Delivery Note Trends,ທ່າອ່ຽງການສົ່ງເງິນ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Summary ອາທິດນີ້
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,ສິນຄ້າພ້ອມສົ່ງ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,ສິນຄ້າພ້ອມສົ່ງ
DocType: Delivery Trip,Calculate Estimated Arrival Times,ຄິດໄລ່ເວລາມາຮອດປະມານ
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ບັນຊີ: {0} ພຽງແຕ່ສາມາດໄດ້ຮັບການປັບປຸງໂດຍຜ່ານທຸລະກໍາຫຼັກຊັບ
DocType: Student Group Creation Tool,Get Courses,ໄດ້ຮັບວິຊາ
@@ -4648,7 +4653,7 @@
DocType: Material Request,% Ordered,% ຄໍາສັ່ງ
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ສໍາລັບວິຊາທີ່ນັກສຶກສາ Group, ຂອງລາຍວິຊາການຈະໄດ້ຮັບການກວດສອບສໍາລັບທຸກນັກສຶກສາຈາກວິຊາທີ່ລົງທະບຽນໃນໂຄງການການເຂົ້າໂຮງຮຽນ."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,ເຫມົາ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,avg. ອັດຕາການຊື້
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,avg. ອັດຕາການຊື້
DocType: Task,Actual Time (in Hours),ທີ່ໃຊ້ເວລາຕົວຈິງ (ໃນຊົ່ວໂມງ)
DocType: Employee,History In Company,ປະຫວັດສາດໃນບໍລິສັດ
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},ຂໍ້ຄວາມໃຫມ່ຈາກ {sender}
@@ -4696,7 +4701,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ຕິດຕໍ່ກັນ {0}: ສະກຸນເງິນຂອງ BOM: {1} ຄວນຈະເທົ່າກັບສະກຸນເງິນການຄັດເລືອກ {2}
DocType: Journal Entry Account,Exchange Rate,ອັດຕາແລກປ່ຽນ
DocType: Patient,Additional information regarding the patient,ຂໍ້ມູນເພີ່ມເຕີມກ່ຽວກັບຄົນເຈັບ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
DocType: Homepage,Tag Line,Line Tag
DocType: Fee Component,Fee Component,ຄ່າບໍລິການສ່ວນປະກອບ
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ການຈັດການ Fleet
@@ -4911,7 +4916,7 @@
DocType: Employee Education,Employee Education,ການສຶກສາພະນັກງານ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ກຸ່ມລາຍການຊ້ໍາກັນພົບເຫັນຢູ່ໃນຕາຕະລາງກຸ່ມລາຍການ
DocType: Land Unit,Parent Land Unit,ຫນ່ວຍງານທີ່ດິນພໍ່ແມ່
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
DocType: Fertilizer,Fertilizer Name,ຊື່ປຸ໋ຍ
DocType: Salary Slip,Net Pay,ຈ່າຍສຸດທິ
DocType: Account,Account,ບັນຊີ
@@ -4990,7 +4995,7 @@
DocType: Item Customer Detail,Ref Code,ລະຫັດກະສານອ້າງອີງ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Group Customer ຖືກກໍາໃນ Profile POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,ການບັນທຶກຂອງພະນັກງານ.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,ກະລຸນາທີ່ກໍານົດໄວ້ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,ກະລຸນາທີ່ກໍານົດໄວ້ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
DocType: HR Settings,Payroll Settings,ການຕັ້ງຄ່າ Payroll
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,"ຄໍາວ່າໃບແຈ້ງຫນີ້ທີ່ບໍ່ແມ່ນ, ການເຊື່ອມຕໍ່ແລະການຊໍາລະເງິນ."
DocType: POS Settings,POS Settings,POS Settings
@@ -5158,7 +5163,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},ເຕືອນວັນເດືອນປີເກີດສໍາລັບ {0}
DocType: Asset Maintenance Task,Last Completion Date,ວັນສິ້ນສຸດແລ້ວ
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ວັນນັບຕັ້ງແຕ່ສັ່ງຫຼ້າສຸດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
DocType: Buying Settings,Naming Series,ການຕັ້ງຊື່ Series
DocType: Leave Block List,Leave Block List Name,ອອກຈາກຊື່ Block ຊີ
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ວັນປະກັນໄພ Start ຄວນຈະມີຫນ້ອຍກ່ວາວັນການປະກັນໄພ End
@@ -5288,6 +5293,7 @@
DocType: Bank Reconciliation,Get Payment Entries,ໄດ້ຮັບການອອກສຽງການຊໍາລະເງິນ
DocType: Quotation Item,Against Docname,ຕໍ່ Docname
DocType: SMS Center,All Employee (Active),ທັງຫມົດພະນັກງານ (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ລູກຄ້າ> ກຸ່ມລູກຄ້າ> ອານາເຂດ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ເບິ່ງໃນປັດຈຸບັນ
DocType: BOM,Raw Material Cost,ຕົ້ນທຶນວັດຖຸດິບ
DocType: Item Reorder,Re-Order Level,Re: ຄໍາສັ່ງລະດັບ
@@ -5388,7 +5394,6 @@
DocType: Room,Seating Capacity,ຈໍານວນທີ່ນັ່ງ
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,ກຸ່ມທົດລອງທົດລອງ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ລູກຄ້າ> ກຸ່ມລູກຄ້າ> ອານາເຂດ
DocType: Project,Total Expense Claim (via Expense Claims),ລວມຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ (ຜ່ານການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍ)
DocType: GST Settings,GST Summary,GST ຫຍໍ້
DocType: Assessment Result,Total Score,ຄະແນນທັງຫມົດ
@@ -5402,7 +5407,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,ປະຕິບັດຕາມຕາຕະລາງຫຼັກສູດໄດ້ຖືກສ້າງຂຶ້ນ
DocType: Journal Entry,Total Debit,ເດບິດຈໍານວນທັງຫມົດ
DocType: Manufacturing Settings,Default Finished Goods Warehouse,ສໍາເລັດຮູບມາດຕະຖານສິນຄ້າ Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,ຄົນຂາຍ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ຄົນຂາຍ
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,ງົບປະມານແລະສູນຕົ້ນທຶນ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ຮູບແບບໃນຕອນຕົ້ນຫຼາຍຂອງການຊໍາລະເງິນບໍ່ໄດ້ອະນຸຍາດໃຫ້
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,ສໍາລັບ
@@ -5578,7 +5583,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,ພິຈາລະນາຈ່າຍພາສີຫລືຄ່າທໍານຽມສໍາລັບ
DocType: Driver,Driving License Category,ປະເພດໃບອະນຸຍາດຂັບຂີ່
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ຕົວຈິງຈໍານວນເປັນການບັງຄັບ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ປະຈຸບັນມີ {1} ຈໍາ Supplier Scorecard, ແລະໃບສັ່ງຊື້ເພື່ອຈໍາຫນ່າຍນີ້ຄວນໄດ້ຮັບການອອກກັບລະມັດລະວັງ."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ປະຈຸບັນມີ {1} ຈໍາ Supplier Scorecard, ແລະໃບສັ່ງຊື້ເພື່ອຈໍາຫນ່າຍນີ້ຄວນໄດ້ຮັບການອອກກັບລະມັດລະວັງ."
DocType: Asset Maintenance Team,Asset Maintenance Team,ທີມບໍາລຸງຮັກສາຊັບສິນ
DocType: Employee Loan,Loan Type,ປະເພດເງິນກູ້
DocType: Scheduling Tool,Scheduling Tool,ເຄື່ອງມືການຕັ້ງເວລາ
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 5f22194..84794a5 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Rūšiuoti pagal kainą
,Delay Days,Vėlavimo dienos
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Paslaugų išlaidų
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,faktūra
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Padarykite atsargų įrašą
DocType: Purchase Invoice Item,Item Weight Details,Prekės svarumo duomenys
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Nuoroda: {0}, Prekės kodas: {1} ir klientų: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kilogramas
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Atidarymo dėl darbo.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM nėra nurodyta subrangos elementui {0} eilutėje {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM nėra nurodyta subrangos elementui {0} eilutėje {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Rezultatų pateikimas
DocType: Item Attribute,Increment,prieaugis
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Laiko tarpas
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Neleidžiama {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Gauk elementus iš
DocType: Price List,Price Not UOM Dependant,Kaina ne priklausomai nuo UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prekės {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nėra išvardytus punktus
DocType: Asset Repair,Error Description,Klaida Aprašymas
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Parduotuvė
DocType: Quality Inspection Reading,Reading 1,Skaitymas 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,pensijų fondai
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Kitas Nusidėvėjimas data negali būti prieš perkant data
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Kitas Nusidėvėjimas data negali būti prieš perkant data
DocType: Crop,Perennial,Daugiametis
DocType: Consultation,Consultation Date,Konsultacijos data
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktų sąrašas ir atradimas ERPNext vartotojams
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",pvz "pradinė mokykla" arba "Universitetas"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Akcijų ataskaitos
DocType: Warehouse,Warehouse Detail,Sandėlių detalės
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kredito limitas buvo kirto klientui {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kredito limitas buvo kirto klientui {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Kadencijos pabaigos data negali būti vėlesnė nei metų pabaigoje mokslo metų data, iki kurios terminas yra susijęs (akademiniai metai {}). Ištaisykite datas ir bandykite dar kartą."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Ar Ilgalaikio turto" negali būti nepažymėta, kaip Turto įrašas egzistuoja nuo elemento"
DocType: Delivery Trip,Departure Time,Išvykimo laikas
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Gauk specifikaciją
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Tiekėjo lentelės šablonai.
DocType: Lead,Interested,Suinteresuotas
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,atidarymas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,atidarymas
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Iš {0} ir {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Nepavyko nustatyti mokesčių
DocType: Item,Copy From Item Group,Kopijuoti Nuo punktas grupės
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Malšinančių data turi būti didesnis nei įstoti data
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Lapai per metus
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Eilutės {0}: Prašome patikrinti "yra iš anksto" prieš paskyra {1}, jei tai yra išankstinis įrašas."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Sandėlių {0} nepriklauso bendrovei {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Sandėlių {0} nepriklauso bendrovei {1}
DocType: Email Digest,Profit & Loss,Pelnas ir nuostoliai
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,litrų
DocType: Task,Total Costing Amount (via Time Sheet),Iš viso Sąnaudų suma (per Time lapas)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Tai grindžiama sandoriais prieš šią bendrovę. Žiūrėkite žemiau pateiktą laiko juostą
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Praneškite elektroniniu paštu steigti automatinio Medžiaga Užsisakyti
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Atsparus
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Konsultavimas
DocType: Journal Entry,Multi Currency,Daugiafunkciniai Valiuta
DocType: Opening Invoice Creation Tool,Invoice Type,Sąskaitos faktūros tipas
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Važtaraštis
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,likusi našle
DocType: Request for Quotation,Request for Quotation,Užklausimas
DocType: Healthcare Settings,Require Lab Test Approval,Reikalauti gero bandymo patvirtinimo
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Prekės kodas> Prekės grupė> Gamintojas
DocType: Salary Slip Timesheet,Working Hours,Darbo valandos
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Viso neįvykdyti
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Pakeisti pradinį / trumpalaikiai eilės numerį esamo serijos.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Prašome įvesti sąnaudų centro
DocType: Drug Prescription,Dosage,Dozavimas
DocType: Journal Entry Account,Sales Order,Pardavimo užsakymas
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Vid. pardavimo kaina
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Vid. pardavimo kaina
DocType: Assessment Plan,Examiner Name,Eksperto vardas
DocType: Lab Test Template,No Result,Nėra rezultatas
DocType: Purchase Invoice Item,Quantity and Rate,Kiekis ir Balsuok
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Pasirinkite Darbo užmokesčio laikotarpis
DocType: Purchase Invoice,Unpaid,neapmokamas
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Skirta pardavimui
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių> HR nustatymai
DocType: Packing Slip,From Package No.,Nuo paketas Nr
DocType: Item Attribute,To Range,Norėdami Diapazonas
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vertybiniai popieriai ir užstatai
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,dirbtuvė
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Įspėti pirkimo užsakymus
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Sąrašas keletą savo klientams. Jie gali būti organizacijos ar asmenys.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Pakankamai Dalys sukurti
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pakankamai Dalys sukurti
DocType: POS Profile User,POS Profile User,POS vartotojo profilis
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,tiesioginių pajamų
DocType: Patient Appointment,Date TIme,Data TIme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Negali filtruoti pagal sąskaitą, jei sugrupuoti pagal sąskaitą"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Negali filtruoti pagal sąskaitą, jei sugrupuoti pagal sąskaitą"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,administracijos pareigūnas
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Įmonės steigimas ir mokesčiai
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Prašome pasirinkti kursai
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,skirtumas paskyra
DocType: Purchase Invoice,Supplier GSTIN,tiekėjas GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Ar nėra artimas užduotis, nes jos priklauso nuo užduoties {0} nėra uždarytas."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prašome įvesti sandėlis, kuris bus iškeltas Medžiaga Prašymas"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Prašome įvesti sandėlis, kuris bus iškeltas Medžiaga Prašymas"
DocType: Production Order,Additional Operating Cost,Papildoma eksploatavimo išlaidos
DocType: Lab Test Template,Lab Routine,"Lab Routine"
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,kosmetika
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Ryšys su Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,vadybininkas
DocType: Payment Entry,Payment From / To,Mokėjimo Nuo / Iki
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nauja kredito limitas yra mažesnis nei dabartinio nesumokėtos sumos klientui. Kredito limitas turi būti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nauja kredito limitas yra mažesnis nei dabartinio nesumokėtos sumos klientui. Kredito limitas turi būti atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Nustatykite sąskaitą sandėlyje {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Remiantis" ir "grupę" negali būti tas pats
DocType: Sales Person,Sales Person Targets,Pardavimų asmuo tikslai
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,Serija Vardas
DocType: Fee Validity,Max number of visit,Maksimalus apsilankymo skaičius
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Lapą sukurta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,įrašyti
DocType: GST Settings,GST Settings,GST Nustatymai
DocType: Selling Settings,Customer Naming By,Klientų įvardijimas Iki
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,biudžeto prieš
DocType: Employee,Cell Number,Telefono numeris
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Nė vienas darbuotojas pagal nurodytus kriterijus nėra. Patikrinkite, ar atlyginimų čekiai dar nebuvo sukurti."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Medžiaga Prašymai Sugeneruoti
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Medžiaga Prašymai Sugeneruoti
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,prarastas
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Jūs negalite įvesti dabartinį kuponą į "prieš leidinys įrašas" skiltyje
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Skirta gamybos
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energija
DocType: Opportunity,Opportunity From,galimybė Nuo
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mėnesinis darbo užmokestis pareiškimas.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Eilutė {0}: {1} {2} elementui reikalingi eilės numeriai. Jūs pateikė {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Eilutė {0}: {1} {2} elementui reikalingi eilės numeriai. Jūs pateikė {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Pasirinkite lentelę
DocType: BOM,Website Specifications,Interneto svetainė duomenys
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} yra netinkamas el. Pašto adresas "gavėjams"
@@ -1036,7 +1037,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citata prašoma
DocType: Vital Signs,Heart Rate / Pulse,Širdies ritmas / impulsas
DocType: Company,Default Bank Account,Numatytasis banko sąskaitos
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Filtruoti remiantis partijos, pasirinkite Šalis Įveskite pirmą"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Filtruoti remiantis partijos, pasirinkite Šalis Įveskite pirmą"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},""Atnaujinti sandėlyje" negali būti patikrinta, nes daiktų nėra pristatomos per {0}"
DocType: Vehicle,Acquisition Date,įsigijimo data
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,nos
@@ -1061,7 +1062,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Įkelkite savo laiško galva (laikykite jį tinkamu kaip 900 pikselių 100 pikselių)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Sąskaitos {2} negali būti Grupė
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prekė eilutė {IDX}: {DOCTYPE} {DOCNAME} neegzistuoja viršaus "{DOCTYPE}" stalo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,nėra užduotys
DocType: Item Variant Settings,Copy Fields to Variant,Kopijuoti laukus į variantą
DocType: Asset,Opening Accumulated Depreciation,Atidarymo sukauptas nusidėvėjimas
@@ -1173,9 +1174,10 @@
DocType: Production Order,Plan material for sub-assemblies,Planas medžiaga mazgams
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pardavimų Partneriai ir teritorija
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} turi būti aktyvus
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Uždarymas (atidarymas + viso)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Uždarymas (atidarymas + viso)
DocType: Journal Entry,Depreciation Entry,Nusidėvėjimas įrašas
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Prašome pasirinkti dokumento tipą pirmas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Spausdinti sąskaitos valiuta
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atšaukti Medžiaga Apsilankymai {0} prieš atšaukiant šią Priežiūros vizitas
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standartas
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijos Nr {0} nepriklauso punkte {1}
@@ -1201,7 +1203,7 @@
DocType: Supplier,Default Payable Accounts,Numatytieji mokėtinų sumų
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbuotojų {0} is not active arba neegzistuoja
DocType: Fee Structure,Components,komponentai
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
DocType: Quality Inspection Reading,Reading 6,Skaitymas 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1253,6 +1255,7 @@
,Company Name,Įmonės pavadinimas
DocType: SMS Center,Total Message(s),Bendras pranešimas (-ai)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Pasirinkite punktas perkelti
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Nustatymų seriją galite nustatyti {0} naudodami sąranką> Nustatymai> vardų serija
DocType: Purchase Invoice,Additional Discount Percentage,Papildoma nuolaida procentais
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Peržiūrėkite visas pagalbos video sąrašą
DocType: Agriculture Analysis Criteria,Soil Texture,Dirvožemio tekstūra
@@ -1281,7 +1284,7 @@
DocType: BOM Website Item,BOM Website Item,BOM svetainė punktas
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Įkelti savo laiške galvą ir logotipą. (Galite redaguoti juos vėliau).
DocType: Timesheet Detail,Bill,sąskaita
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Kitas Nusidėvėjimas data yra įvesta kaip praeities datos
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Kitas Nusidėvėjimas data yra įvesta kaip praeities datos
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,baltas
DocType: SMS Center,All Lead (Open),Visi švinas (Atviras)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Eilutės {0}: Kiekis neprieinama {4} sandėlyje {1} ne komandiruotės laiką įrašo ({2} {3})
@@ -1298,7 +1301,7 @@
DocType: Lead,Next Contact Date,Kitas Kontaktinė data
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,atidarymo Kiekis
DocType: Healthcare Settings,Appointment Reminder,Paskyrimų priminimas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
DocType: Program Enrollment Tool Student,Student Batch Name,Studentų Serija Vardas
DocType: Consultation,Doctor,Gydytojas
DocType: Holiday List,Holiday List Name,Atostogų sąrašas Vardas
@@ -1314,6 +1317,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Palikite Allocation įrankis
DocType: Item,Hub Category to Publish,Hub kategorija paskelbti
DocType: Leave Block List,Leave Block List Dates,Palikite blokuojamų sąrašą Datos
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Nustatykite numerių seriją lankytojams per sąranką> numeravimo serija
DocType: Sales Invoice,Billing Address GSTIN,Atsiskaitymo adresas GSTIN
DocType: Assessment Plan,Evaluate,Įvertinti
DocType: Workstation,Net Hour Rate,Grynasis valandą greičiu
@@ -1348,7 +1352,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Pardavimų sąskaitų apmokėjimo
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Sandėlis pardavimų užsakymų / Finished produkcijos sandėlis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Parduodami suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Parduodami suma
DocType: Repayment Schedule,Interest Amount,palūkanų suma
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Jūs esate sąskaita Tvirtintojas už šio įrašo. Atnaujinkite parametras "status" ir sutaupykite
DocType: Serial No,Creation Document No,Kūrimas dokumentas Nr
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Atidarymo Apskaitos balansas
,GST Sales Register,"Paaiškėjo, kad GST Pardavimų Registruotis"
DocType: Sales Invoice Advance,Sales Invoice Advance,Pardavimų sąskaita faktūra Išankstinis
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nieko prašyti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nieko prašyti
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Pasirinkite savo domenus
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Kitas Biudžeto įrašas '{0} "jau egzistuoja nuo {1} {2}" fiskalinio metų {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Laukai bus kopijuojami tik kūrimo metu.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tai bus pridėtas prie elemento kodekso variante. Pavyzdžiui, jei jūsų santrumpa yra "S.", o prekės kodas yra T-shirt ", elementas kodas variantas bus" T-shirt-SM ""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto darbo užmokestis (žodžiais) bus matomas, kai jums sutaupyti darbo užmokestį."
DocType: Purchase Invoice,Is Return,Ar Grįžti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Atsargiai
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Atsargiai
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Prekių grąžinimas / debeto aviza
DocType: Price List Country,Price List Country,Kainų sąrašas Šalis
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} galioja eilės numeriai už prekę {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} galioja eilės numeriai už prekę {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Prekės kodas negali būti keičiamas Serial No.
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM konversijos faktorius
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Prašome įvesti Prekės kodas gauti SERIJOS NUMERIS
@@ -1561,7 +1565,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Pardavimų užsakymų {0} negalioja
DocType: Supplier Scorecard,Warn for new Request for Quotations,Įspėti apie naują prašymą dėl pasiūlymų
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Pirkimo pavedimai padės jums planuoti ir sekti savo pirkimų
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab testo rekvizitai
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Bendras išdavimas / Pervežimas kiekis {0} Krovimas Užsisakyti {1} \ negali būti didesnis nei prašomo kiekio {2} už prekę {3}
@@ -1599,7 +1603,6 @@
DocType: Warehouse,Warehouse Contact Info,Sandėlių Kontaktinė informacija
DocType: Payment Entry,Write Off Difference Amount,Nurašyti skirtumo suma
DocType: Volunteer,Volunteer Name,Savanorio vardas
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Prašome nustatyti "Instruktorių pavadinimo" sistemą "Education"> "Education Settings"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Darbuotojų elektroninio pašto nerastas, todėl elektroninių laiškų, nesiunčiamas"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pristatymo taisyklė netaikoma šaliai {0}
DocType: Item,Foreign Trade Details,Užsienio prekybos informacija
@@ -1612,7 +1615,7 @@
DocType: Student Group Student,Group Roll Number,Grupė salė Taškų
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",Dėl {0} tik kredito sąskaitos gali būti susijęs su kitos debeto įrašą
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bendras visų užduočių svoriai turėtų būti 1. Prašome reguliuoti svareliai visų projekto užduotis atitinkamai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Prekė {0} turi būti Prekė pagal subrangos sutartis
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,kapitalo įranga
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Kainodaros taisyklė pirmiausia atrenkami remiantis "Taikyti" srityje, kuris gali būti punktas, punktas Grupė ar prekės ženklą."
@@ -1637,7 +1640,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Vaikų sandėlis egzistuoja šiame sandėlyje. Jūs negalite trinti šį sandėlį.
DocType: Item,Website Item Groups,Interneto svetainė punktas Grupės
DocType: Purchase Invoice,Total (Company Currency),Iš viso (Įmonės valiuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serijos numeris {0} įvesta daugiau nei vieną kartą
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serijos numeris {0} įvesta daugiau nei vieną kartą
DocType: Journal Entry,Journal Entry,žurnalo įrašą
DocType: Expense Claim Advance,Unclaimed amount,Neprašyta suma
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} elementų pažangą
@@ -1734,7 +1737,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Ryšio žurnalas.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Užklausimas yra išjungtas patekti iš portalo, daugiau patikrinimų portalo nustatymus."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tiekėjo rezultatų lentelės vertinimo kintamasis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Ieško suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Ieško suma
DocType: Sales Invoice,Shipping Address Name,Pristatymas Adresas Pavadinimas
DocType: Material Request,Terms and Conditions Content,Terminai ir sąlygos turinys
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kuriant tvarkaraštį sukūrėme klaidų
@@ -1998,7 +2001,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tai grindžiama rąstų prieš šią transporto priemonę. Žiūrėti grafikas žemiau detales
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Prieš tiekėjo sąskaitoje {0} data {1}
DocType: Customer,Default Price List,Numatytasis Kainų sąrašas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs negalite trinti finansiniai metai {0}. Finansiniai metai {0} yra numatytoji Global Settings
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Tokio paties kliento klientas jau egzistuoja
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tai pateikia Atlyginimo lapelius ir sukuria kaupimo žurnalo įrašą. Ar norite testi?
@@ -2012,6 +2015,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Kainos
DocType: Quotation,Term Details,Terminuoti detalės
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Negalima registruotis daugiau nei {0} studentams šio studentų grupę.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Iš viso (be mokesčio)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Švinas Grafas
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Švinas Grafas
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} turi būti didesnis nei 0
@@ -2032,7 +2036,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Atsieti Apmokėjimas atšaukimas sąskaita faktūra
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Dabartinis Odometro skaitymo įvesta turėtų būti didesnis nei pradinis transporto priemonės hodometro {0}
DocType: Restaurant Reservation,No Show,Nr šou
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Nustatymų seriją galite nustatyti {0} naudodami sąranką> Nustatymai> vardų serija
DocType: Shipping Rule Country,Shipping Rule Country,Pristatymas taisyklė Šalis
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Palikite ir lankymas
DocType: Maintenance Visit,Partially Completed,dalinai užpildytą
@@ -2125,7 +2128,7 @@
DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
DocType: Grant Application,Assessment Mark (Out of 10),Vertinimo ženklas (iš 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobilus Nėra
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,pagrindinis
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,pagrindinis
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variantas
DocType: Naming Series,Set prefix for numbering series on your transactions,Nustatyti priešdėlis numeracijos seriją apie sandorius savo
DocType: Employee Attendance Tool,Employees HTML,darbuotojai HTML
@@ -2175,7 +2178,7 @@
DocType: Course,Course Abbreviation,Žinoma santrumpa
DocType: Student Leave Application,Student Leave Application,Studentų atostogos taikymas
DocType: Item,Will also apply for variants,Bus taikoma variantų
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Darbuotojų {0} pusę dienos {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Iš viso darbo valandų turi būti ne didesnis nei maks darbo valandų {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,apie
@@ -2362,9 +2365,10 @@
DocType: Task,Actual End Date (via Time Sheet),Tikrasis Pabaigos data (per Time lapas)
DocType: Soil Texture,Soil Type,Dirvožemio tipas
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Suma {0} {1} prieš {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nauja žinutė
,Quotation Trends,Kainų tendencijos
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Prekė Grupė nepaminėta prekės šeimininkui už prekę {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
DocType: Shipping Rule,Shipping Amount,Pristatymas suma
DocType: Supplier Scorecard Period,Period Score,Laikotarpio balas
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Pridėti klientams
@@ -2375,7 +2379,7 @@
,Vehicle Expenses,Transporto išlaidos
DocType: Serial No,Invoice Details,informacija apie sąskaitą
DocType: Grant Application,Show on Website,Rodyti svetainėje
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Tikimasi vertė po naudingo tarnavimo laiką turi būti didesnis nei arba lygus {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Tikimasi vertė po naudingo tarnavimo laiką turi būti didesnis nei arba lygus {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Pradėk nuo
DocType: Hub Category,Hub Category,Hub kategorija
DocType: Purchase Invoice,SEZ,SEZ
@@ -2407,7 +2411,7 @@
DocType: Patient,B Positive,B teigiamas
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Eilutės # {0}: Kiekis turi būti 1, kaip elementas yra ilgalaikio turto. Prašome naudoti atskirą eilutę daugkartiniam vnt."
DocType: Leave Block List Allow,Leave Block List Allow,Palikite Blokuoti sąrašas Leisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
DocType: Patient Medical Record,Patient Medical Record,Paciento medicinos ataskaita
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupė ne grupės
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,sporto
@@ -2458,6 +2462,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Negalima nustatyti gauta RFQ jokiai citata
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Iš viso išskaičiavimas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Pasirinkite paskyrą, kurią norite spausdinti paskyros valiuta"
,Production Analytics,gamybos Analytics "
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tai pagrįsta operacijomis su šiuo pacientu. Išsamiau žr. Toliau pateiktą laiko juostą
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,kaina Atnaujinta
@@ -2513,7 +2518,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pasirinkite bendrovė ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Palikite tuščią, jei manoma, skirtų visiems departamentams"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tipai darbo (nuolatinis, sutarčių, vidaus ir kt.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
DocType: Payroll Entry,Fortnightly,kas dvi savaitės
DocType: Currency Exchange,From Currency,nuo valiuta
DocType: Vital Signs,Weight (In Kilogram),Svoris (kilogramais)
@@ -2591,7 +2596,7 @@
DocType: Student,Guardians,globėjai
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Kainos nebus rodomas, jei Kainų sąrašas nenustatytas"
DocType: Stock Entry,Total Incoming Value,Iš viso Priimamojo Vertė
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debeto reikalingas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debeto reikalingas
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Laiko apskaitos žiniaraščiai padėti sekti laiko, išlaidų ir sąskaitų už veiklose padaryti jūsų komanda"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkimo Kainų sąrašas
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Tiekimo rezultatų kortelės kintamųjų šablonai.
@@ -2694,7 +2699,7 @@
DocType: Company,For Reference Only.,Tik nuoroda.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Gydytojas {0} negalimas {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Pasirinkite Serija Nėra
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neteisingas {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Neteisingas {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Informacinė investicija
@@ -2731,8 +2736,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nurodykite operacijas, veiklos sąnaudas ir suteikti unikalią eksploatuoti ne savo operacijas."
DocType: Water Analysis,Origin,Kilmė
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokumentas yra virš ribos iki {0} {1} už prekę {4}. Darai dar {3} prieš patį {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Pasirinkite Keisti suma sąskaita
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Pasirinkite Keisti suma sąskaita
DocType: Purchase Invoice,Price List Currency,Kainų sąrašas Valiuta
DocType: Naming Series,User must always select,Vartotojas visada turi pasirinkti
DocType: Stock Settings,Allow Negative Stock,Leiskite Neigiama Stock
@@ -2788,7 +2793,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Įspėti apie naujus pirkimo užsakymus
DocType: Quality Inspection Reading,Reading 9,Skaitymas 9
DocType: Supplier,Is Frozen,Ar Sušaldyti
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Grupė mazgas sandėlis neleidžiama pasirinkti sandorius
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Grupė mazgas sandėlis neleidžiama pasirinkti sandorius
DocType: Buying Settings,Buying Settings,Ieško Nustatymai
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,"BOM Nr Dėl gatavo geras straipsnis,"
DocType: Upload Attendance,Attendance To Date,Dalyvavimas data
@@ -2803,6 +2808,7 @@
DocType: Grant Application,Organization,organizacija
DocType: BOM Update Tool,BOM Update Tool,BOM naujinimo įrankis
DocType: SG Creation Tool Course,Student Group Name,Studentų Grupės pavadinimas
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Rodyti išskaidytą vaizdą
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Mokesčių kūrimas
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prašome įsitikinkite, kad jūs tikrai norite ištrinti visus šios bendrovės sandorius. Jūsų pagrindiniai duomenys liks kaip ji yra. Šis veiksmas negali būti atšauktas."
DocType: Room,Room Number,Kambario numeris
@@ -2813,7 +2819,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Padaryti mokesčių šabloną
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,vartotojas Forumas
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Žaliavos negali būti tuščias.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
DocType: Lab Test Sample,Lab Test Sample,Laboratorinio bandinio pavyzdys
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Greita leidinys įrašas
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Jūs negalite keisti greitį, jei BOM minėta agianst bet kurį elementą"
@@ -2884,7 +2890,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Padaryti sąskaitą faktūrą
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto arti Galimybė po 15 dienų
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Įsigijimo užsakymai neleidžiami {0} dėl rodiklio, kuris yra {1}."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Įsigijimo užsakymai neleidžiami {0} dėl rodiklio, kuris yra {1}."
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,pabaigos metai
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Švinas%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Švinas%
@@ -2977,7 +2983,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Virš
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Eilutės # {0}: leidinys Įėjimo {1} neturi paskyros {2} arba jau lyginami su kito kuponą
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterijų svoris
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Tiekėjas> Tiekėjo tipas
DocType: Buying Settings,Default Buying Price List,Numatytasis Ieško Kainų sąrašas
DocType: Payroll Entry,Salary Slip Based on Timesheet,Pajamos Kuponas Remiantis darbo laiko apskaitos žiniaraštis
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Pirkimo norma
@@ -3067,7 +3072,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Įrašo Leads pramonės tipo.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Eikite į "Letterheads"
DocType: Item Supplier,Item Supplier,Prekė Tiekėjas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Prašome pasirinkti vertę už {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visi adresai.
DocType: Company,Stock Settings,Akcijų Nustatymai
@@ -3245,6 +3250,7 @@
DocType: Company,Default Inventory Account,Numatytasis Inventorius paskyra
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Eilutės {0}: baigė Kiekis turi būti didesnė už nulį.
DocType: Antibiotic,Antibiotic Name,Antibiotiko pavadinimas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Prekės kodas> Prekės grupė> Gamintojas
DocType: Purchase Invoice,Apply Additional Discount On,Būti taikomos papildomos nuolaida
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Pasirinkite tipą ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Nuoroda į visus Žemės vienetus, kuriuose auga augalas"
@@ -3440,6 +3446,7 @@
DocType: Supplier,Credit Limit,Kredito limitas
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Vidur. Pardavimo kainų sąrašo norma
DocType: Production Plan Sales Order,Salse Order Date,Purvo vulkanas Užsakyti data
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Tiekėjas> Tiekėjo tipas
DocType: Salary Component,Salary Component,Pajamos komponentas
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Apmokėjimo Įrašai {0} yra JT susietų
DocType: GL Entry,Voucher No,Bon Nėra
@@ -3449,7 +3456,7 @@
DocType: Leave Allocation,Leave Allocation,Palikite paskirstymas
DocType: Payment Request,Recipient Message And Payment Details,Gavėjas pranešimą ir Mokėjimo informacija
DocType: Training Event,Trainer Email,treneris paštas
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Medžiaga Prašymai {0} sukūrė
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Medžiaga Prašymai {0} sukūrė
DocType: Restaurant Reservation,No of People,Žmonių skaičius
DocType: Production Planning Tool,Include sub-contracted raw materials,Įtraukti SUBRANGOVAMS žaliavas
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablonas terminų ar sutarties.
@@ -3515,7 +3522,7 @@
DocType: Production Planning Tool,Create Material Requests,Sukurti Materialieji Prašymai
DocType: Employee Education,School/University,Mokykla / Universitetas
DocType: Payment Request,Reference Details,nuoroda detalės
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Tikimasi Vertė Po naudingo tarnavimo laiką turi būti mažesnis nei bendrojo pirkinio sumos
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Tikimasi Vertė Po naudingo tarnavimo laiką turi būti mažesnis nei bendrojo pirkinio sumos
DocType: Sales Invoice Item,Available Qty at Warehouse,Turimas Kiekis į sandėlį
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,įvardintas suma
DocType: Asset,Double Declining Balance,Dvivietis mažėjančio balanso
@@ -3527,7 +3534,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Gaukite atnaujinimus
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Sąskaitos {2} nepriklauso Company {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Pasirinkite bent vieną vertę iš kiekvieno atributo.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Medžiaga Prašymas {0} atšauktas ar sustabdytas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Medžiaga Prašymas {0} atšauktas ar sustabdytas
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Palikite valdymas
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupė sąskaitų
DocType: Sales Order,Fully Delivered,pilnai Paskelbta
@@ -3538,14 +3545,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Išmokėta suma negali būti didesnis nei paskolos suma {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Eikite į "Programos"
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Eilutė {0} # paskirstyta suma {1} negali būti didesnė nei nepageidaujama suma {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Nustatykite numerių seriją lankytojams per sąranką> numeravimo serija
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Pirkimo užsakymo numerį, reikalingą punkto {0}"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Gamybos Kad nebūtų sukurta
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Nuo data" turi būti po "Iki datos"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nepavyksta pakeisti statusą kaip studentas {0} yra susijęs su studento taikymo {1}
DocType: Asset,Fully Depreciated,visiškai nusidėvėjusi
,Stock Projected Qty,Akcijų Numatoma Kiekis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Pažymėti Lankomumas HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citatos yra pasiūlymų, pasiūlymai turite atsiųsti savo klientams"
DocType: Sales Order,Customer's Purchase Order,Kliento Užsakymo
@@ -3630,7 +3636,7 @@
DocType: Stock Settings,Item Naming By,Prekė Pavadinimų Iki
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Kitas Laikotarpis uždarymas Įėjimas {0} buvo padaryta po {1}
DocType: Production Order,Material Transferred for Manufacturing,"Medžiagos, perduotos gamybos"
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Sąskaita {0} neegzistuoja
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Sąskaita {0} neegzistuoja
DocType: Project,Project Type,projekto tipas
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Ši užduotis yra vaiko užduotis. Negalite ištrinti šios užduotys.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Bet tikslas Kiekis arba planuojama suma yra privalomas.
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Turto nusidėvėjimo išlaidos centras
DocType: Sales Order Item,Sales Order Date,Pardavimų užsakymų data
DocType: Sales Invoice Item,Delivered Qty,Paskelbta Kiekis
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Iš viso Excl. Mokestis
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jei pažymėta, visi kiekvienos gamybos prekės vaikai bus įtraukti į Materialiųjų prašymus."
DocType: Assessment Plan,Assessment Plan,vertinimo planas
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Klientas {0} sukurtas.
DocType: Stock Settings,Limit Percent,riba procentais
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Prašome nustatyti "Instruktorių pavadinimo" sistemą "Education"> "Education Settings"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Šiuo metu sandėlyje nėra sandėlyje
,Payment Period Based On Invoice Date,Mokėjimo periodas remiantis sąskaitos faktūros išrašymo data
DocType: Sample Collection,No. of print,Spaudos numeris
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Skolininkai ({0})
DocType: Pricing Rule,Margin,marža
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nauji klientai
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bendrasis pelnas %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bendrasis pelnas %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Keisti POS profilį
DocType: Bank Reconciliation Detail,Clearance Date,Sąskaitų data
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Vertinimo ataskaita
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Pilna Pirkimo suma yra privalomi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Pilna Pirkimo suma yra privalomi
DocType: Lead,Address Desc,Adresas desc
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Šalis yra privalomi
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Nuolatinis vardas
DocType: Stock Entry,Customer or Supplier Details,Klientas ar tiekėjas detalės
DocType: Employee Loan Application,Required by Date,Reikalauja data
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Uždarymo balansas (dr - cr)
DocType: Lead,Lead Owner,Švinas autorius
DocType: Bin,Requested Quantity,prašomam kiekiui
DocType: Patient,Marital Status,Šeimyninė padėtis
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Keli variantai
DocType: Sales Invoice,Against Income Account,Prieš pajamų sąskaita
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Paskelbta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prekė {0}: Užsakytas Kiekis {1} negali būti mažesnis nei minimalus užsakymo Kiekis {2} (apibrėžtą punktas).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prekė {0}: Užsakytas Kiekis {1} negali būti mažesnis nei minimalus užsakymo Kiekis {2} (apibrėžtą punktas).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mėnesio pasiskirstymas procentais
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Prašau prisijungti kaip kitas vartotojas.
DocType: Territory,Territory Targets,Teritorija tikslai
@@ -3906,7 +3911,7 @@
DocType: Serial No,Out of AMC,Iš AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Padaryti Priežiūros vizitas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Prašome susisiekti su vartotojo, kuris turi pardavimo magistras Manager {0} vaidmenį"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Prašome susisiekti su vartotojo, kuris turi pardavimo magistras Manager {0} vaidmenį"
DocType: Company,Default Cash Account,Numatytasis pinigų sąskaitos
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Įmonės (ne klientas ar tiekėjas) meistras.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,"Tai yra, remiantis šio mokinių lankomumą"
@@ -4058,7 +4063,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nė vienas iš minėtų kriterijų darbuotojų nėra
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
DocType: Restaurant,Default Customer,Numatytasis klientas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių> HR nustatymai
DocType: Assessment Plan,Supervisor Name,priežiūros Vardas
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nenurodykite, ar paskyrimas sukurtas tą pačią dieną"
DocType: Program Enrollment Course,Program Enrollment Course,Programos Priėmimas kursai
@@ -4181,7 +4185,7 @@
DocType: BOM,Website Description,Interneto svetainė Aprašymas
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Grynasis pokytis nuosavo kapitalo
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Naujausias
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Pašto adresas turi būti unikalus, jau egzistuoja {0}"
DocType: Serial No,AMC Expiry Date,AMC Galiojimo data
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,gavimas
@@ -4198,7 +4202,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pinigų srautų ataskaita
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Paskolos suma negali viršyti maksimalios paskolos sumos iš {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prašome pasirinkti perkelti skirtumą, jei taip pat norite įtraukti praėjusius finansinius metus balanso palieka šią fiskalinių metų"
DocType: GL Entry,Against Voucher Type,Prieš čekių tipas
DocType: Physician,Phone (R),Telefonas (R)
@@ -4210,7 +4214,7 @@
DocType: Patient,B Negative,B Neigiamas
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Techninės priežiūros statusas turi būti atšauktas arba baigtas pateikti
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Sąskaita {0} nėra siejamas su kompanijos {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Serijiniai numeriai {0} eilės nesutampa su Važtaraštis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Serijiniai numeriai {0} eilės nesutampa su Važtaraštis
DocType: Student,Guardian Details,"guardian" informacija
DocType: C-Form,C-Form,C-Forma
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Pažymėti Dalyvavimas kelių darbuotojų
@@ -4252,7 +4256,7 @@
DocType: Stock Entry Detail,Basic Amount,bazinis dydis
DocType: Training Event,Exam,Egzaminas
DocType: Complaint,Complaint,Skundas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
DocType: Leave Allocation,Unused leaves,nepanaudoti lapai
DocType: Patient,Alcohol Past Use,Alkoholio praeities vartojimas
DocType: Fertilizer Content,Fertilizer Content,Trąšų turinys
@@ -4381,6 +4385,7 @@
DocType: Salary Detail,Formula,formulė
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serijinis #
DocType: Lab Test Template,Lab Test Template,Laboratorijos bandymo šablonas
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Pardavimų sąskaita
DocType: Purchase Invoice Item,Total Weight,Bendras svoris
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisija dėl pardavimo
DocType: Offer Letter Term,Value / Description,Vertė / Aprašymas
@@ -4538,7 +4543,7 @@
DocType: Customer,From Lead,nuo švino
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Užsakymai išleido gamybai.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pasirinkite fiskalinių metų ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
DocType: Program Enrollment Tool,Enroll Students,stoti Studentai
DocType: Lab Test,Approved Date,Patvirtinta data
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standartinė Parduodami
@@ -4615,7 +4620,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Gamybos punktas
,Employee Information,Darbuotojų Informacija
DocType: Stock Entry Detail,Additional Cost,Papildoma Kaina
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Negali filtruoti pagal lakšto, jei grupuojamas kuponą"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Negali filtruoti pagal lakšto, jei grupuojamas kuponą"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Padaryti Tiekėjo Citata
DocType: Quality Inspection,Incoming,įeinantis
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Sukuriami numatyti mokesčių šablonai pardavimui ir pirkimui.
@@ -4632,7 +4637,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Pastaba: {0}
,Delivery Note Trends,Važtaraštis tendencijos
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Šios savaitės suvestinė
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Sandėlyje Kiekis
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Sandėlyje Kiekis
DocType: Delivery Trip,Calculate Estimated Arrival Times,Apskaičiuokite numatytą atvykimo laiką
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Sąskaita: {0} gali būti atnaujintas tik per vertybinių popierių sandorių
DocType: Student Group Creation Tool,Get Courses,Gauk kursai
@@ -4648,7 +4653,7 @@
DocType: Material Request,% Ordered,% Užsakytas
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kursą, pagrįstą studentų grupės, kurso bus patvirtintas kiekvienas studentas iš užprogramuoto kursai programoje registraciją."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,vienetinį
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Vid. Ieško Balsuok
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Vid. Ieško Balsuok
DocType: Task,Actual Time (in Hours),Tikrasis laikas (valandomis)
DocType: Employee,History In Company,Istorija Company
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nauja žinutė iš {siuntėjo}
@@ -4696,7 +4701,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Eilutės {0}: Valiuta BOM # {1} turi būti lygus pasirinkta valiuta {2}
DocType: Journal Entry Account,Exchange Rate,Valiutos kursas
DocType: Patient,Additional information regarding the patient,Papildoma informacija apie pacientą
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
DocType: Homepage,Tag Line,Gairė linija
DocType: Fee Component,Fee Component,mokestis komponentas
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,laivyno valdymo
@@ -4911,7 +4916,7 @@
DocType: Employee Education,Employee Education,Darbuotojų Švietimas
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dubliuoti punktas grupė rastas daiktas grupės lentelėje
DocType: Land Unit,Parent Land Unit,Tėvų žemės skyrius
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
DocType: Fertilizer,Fertilizer Name,Trąšų pavadinimas
DocType: Salary Slip,Net Pay,Grynasis darbo užmokestis
DocType: Account,Account,sąskaita
@@ -4990,7 +4995,7 @@
DocType: Item Customer Detail,Ref Code,teisėjas kodas
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Klientų grupė reikalinga POS profilį
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Darbuotojų įrašus.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Prašome nustatyti Kita nusidėvėjimo data
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Prašome nustatyti Kita nusidėvėjimo data
DocType: HR Settings,Payroll Settings,Payroll Nustatymai
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Rungtynių nesusieti sąskaitų faktūrų ir mokėjimų.
DocType: POS Settings,POS Settings,POS nustatymai
@@ -5158,7 +5163,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Gimimo diena priminimas {0}
DocType: Asset Maintenance Task,Last Completion Date,Paskutinė užbaigimo data
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas nuo paskutinė užsakymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
DocType: Buying Settings,Naming Series,Pavadinimų serija
DocType: Leave Block List,Leave Block List Name,Palikite blokuojamų sąrašą pavadinimas
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Draudimo pradžios data turėtų būti ne mažesnė nei draudimo pabaigos data
@@ -5288,6 +5293,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Gauk Apmokėjimas įrašai
DocType: Quotation Item,Against Docname,prieš DOCNAME
DocType: SMS Center,All Employee (Active),Viskas Darbuotojų (aktyvus)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klientas> Klientų grupė> Teritorija
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,peržiūrėti Dabar
DocType: BOM,Raw Material Cost,Žaliavų kaina
DocType: Item Reorder,Re-Order Level,Re įsakymu lygis
@@ -5388,7 +5394,6 @@
DocType: Room,Seating Capacity,Sėdimų vietų skaičius
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Laboratorijos testų grupės
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klientas> Klientų grupė> Teritorija
DocType: Project,Total Expense Claim (via Expense Claims),Bendras išlaidų pretenzija (per išlaidų paraiškos)
DocType: GST Settings,GST Summary,"Paaiškėjo, kad GST santrauka"
DocType: Assessment Result,Total Score,Galutinis rezultatas
@@ -5402,7 +5407,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Buvo sukurti kursų tvarkaraščiai
DocType: Journal Entry,Total Debit,Iš viso Debeto
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Numatytieji gatavų prekių sandėlis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Pardavėjas
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Pardavėjas
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Biudžeto ir išlaidų centras
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Kelis numatytasis mokėjimo būdas neleidžiamas
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,už
@@ -5578,7 +5583,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Apsvarstykite mokestį arba rinkliavą už
DocType: Driver,Driving License Category,Vairuotojo pažymėjimo kategorija
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tikrasis Kiekis yra privalomi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} šiuo metu turi {1} tiekėjų rezultatų kortelę, o šio tiekėjo pirkimo užsakymai turėtų būti išduodami atsargiai."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} šiuo metu turi {1} tiekėjų rezultatų kortelę, o šio tiekėjo pirkimo užsakymai turėtų būti išduodami atsargiai."
DocType: Asset Maintenance Team,Asset Maintenance Team,Turto priežiūros komanda
DocType: Employee Loan,Loan Type,paskolos tipas
DocType: Scheduling Tool,Scheduling Tool,planavimas įrankis
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 2966afb..1ae695e 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Kārtot pēc cenas
,Delay Days,Kavēšanās dienas
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servisa izdevumu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Pavadzīme
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Veikt saglabāšanas krājumu ievadīšanu
DocType: Purchase Invoice Item,Item Weight Details,Vienuma svara dati
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, Produkta kods: {1} un Klients: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Atvēršana uz darbu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM nav norādīts apakšuzņēmuma postenim {0} rindā {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM nav norādīts apakšuzņēmuma postenim {0} rindā {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Rezultāti iesniegti
DocType: Item Attribute,Increment,Pieaugums
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Laika sprīdis
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Aizliegts {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Dabūtu preces no
DocType: Price List,Price Not UOM Dependant,Cena nav atkarīga no UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkta {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nav minētie posteņi
DocType: Asset Repair,Error Description,Kļūdas apraksts
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Pārtikas veikals
DocType: Quality Inspection Reading,Reading 1,Reading 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pensiju fondi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nākamais nolietojums datums nevar būt pirms iegādes datuma
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Nākamais nolietojums datums nevar būt pirms iegādes datuma
DocType: Crop,Perennial,Daudzgadīgs
DocType: Consultation,Consultation Date,Konsultācijas datums
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktu saraksts un atrašana ERPNext lietotājiem
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","piemēram, "Pamatskola" vai "universitāte""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,akciju Ziņojumi
DocType: Warehouse,Warehouse Detail,Noliktava Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Beigu datums nedrīkst būt vēlāk kā gadu beigu datums akadēmiskā gada, uz kuru termiņš ir saistīts (akadēmiskais gads {}). Lūdzu izlabojiet datumus un mēģiniet vēlreiz."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Vai pamatlīdzeklis" nevar būt nekontrolēti, jo Asset ieraksts pastāv pret posteņa"
DocType: Delivery Trip,Departure Time,Izbraukšanas laiks
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Saņemt specifikācijas detaļas
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Piegādātāja pozīciju veidnes.
DocType: Lead,Interested,Ieinteresēts
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Atklāšana
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Atklāšana
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},No {0} uz {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Neizdevās iestatīt nodokļus
DocType: Item,Copy From Item Group,Kopēt no posteņa grupas
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Lapām gadā
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rinda {0}: Lūdzu, pārbaudiet ""Vai Advance"" pret kontā {1}, ja tas ir iepriekš ieraksts."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
DocType: Email Digest,Profit & Loss,Peļņas un zaudējumu
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litrs
DocType: Task,Total Costing Amount (via Time Sheet),Kopā Izmaksu summa (via laiks lapas)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Tas ir balstīts uz darījumiem ar šo uzņēmumu. Sīkāku informāciju skatiet tālāk redzamajā laika skalā
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Paziņot pa e-pastu uz izveidojot automātisku Material pieprasījuma
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Izturīgs
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Apspriešanās
DocType: Journal Entry,Multi Currency,Multi Valūtas
DocType: Opening Invoice Creation Tool,Invoice Type,Rēķins Type
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Piegāde Note
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Atraitnis
DocType: Request for Quotation,Request for Quotation,Pieprasījums piedāvājumam
DocType: Healthcare Settings,Require Lab Test Approval,Pieprasīt labas pārbaudes apstiprinājumu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Vienības kods> Vienības grupa> Zīmols
DocType: Salary Slip Timesheet,Working Hours,Darba laiks
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Kopā izcilā
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mainīt sākuma / pašreizējo kārtas numuru esošam sēriju.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ievadiet izmaksu centram
DocType: Drug Prescription,Dosage,Devas
DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Vid. Pārdodot Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Vid. Pārdodot Rate
DocType: Assessment Plan,Examiner Name,eksaminētājs Name
DocType: Lab Test Template,No Result,nav rezultāts
DocType: Purchase Invoice Item,Quantity and Rate,Daudzums un Rate
@@ -610,6 +610,7 @@
DocType: Payroll Entry,Select Payroll Period,Izvēlieties Payroll periods
DocType: Purchase Invoice,Unpaid,Nesamaksāts
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervēts pārdošana
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Lūdzu, izveidojiet darbinieku nosaukumu sistēmu cilvēkresursu vadībā> Personāla iestatījumi"
DocType: Packing Slip,From Package No.,No Package Nr
DocType: Item Attribute,To Range,Svārstās
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vērtspapīri un noguldījumi
@@ -634,11 +635,11 @@
DocType: Training Event,Workshop,darbnīca
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Brīdināt pirkumu pasūtījumus
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Pietiekami Parts Build
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pietiekami Parts Build
DocType: POS Profile User,POS Profile User,POS lietotāja profils
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direct Ienākumi
DocType: Patient Appointment,Date TIme,Datums Laiks
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nevar filtrēt, pamatojoties uz kontu, ja grupēti pēc kontu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Nevar filtrēt, pamatojoties uz kontu, ja grupēti pēc kontu"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administratīvā amatpersona
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Uzņēmuma un nodokļu izveidošana
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Lūdzu, izvēlieties kurss"
@@ -649,7 +650,7 @@
DocType: Stock Entry Detail,Difference Account,Atšķirība konts
DocType: Purchase Invoice,Supplier GSTIN,Piegādātājs GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nevar aizvērt uzdevums, jo tās atkarīgas uzdevums {0} nav slēgta."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
DocType: Production Order,Additional Operating Cost,Papildus ekspluatācijas izmaksas
DocType: Lab Test Template,Lab Routine,Laboratorijas kārtība
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmētika
@@ -820,7 +821,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Saistība ar Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Vadītājs
DocType: Payment Entry,Payment From / To,Maksājums no / uz
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Jaunais kredītlimits ir mazāks nekā pašreizējais nesamaksātās summas par klientam. Kredīta limits ir jābūt atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Jaunais kredītlimits ir mazāks nekā pašreizējais nesamaksātās summas par klientam. Kredīta limits ir jābūt atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Lūdzu, iestatiet kontu noliktavā {0}"
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Pamatojoties uz"" un ""Grupēt pēc"", nevar būt vienādi"
DocType: Sales Person,Sales Person Targets,Sales Person Mērķi
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,partijas nosaukums
DocType: Fee Validity,Max number of visit,Maksimālais apmeklējuma skaits
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Kontrolsaraksts izveidots:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,uzņemt
DocType: GST Settings,GST Settings,GST iestatījumi
DocType: Selling Settings,Customer Naming By,Klientu nosaukšana Līdz
@@ -957,7 +958,7 @@
DocType: Budget,Budget Against,budžets pret
DocType: Employee,Cell Number,Šūnu skaits
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Par šiem kritērijiem nav darbinieku. Pārbaudiet, vai algu likmes vēl nav izveidotas."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Materiālu Pieprasījumi Radušies
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Materiālu Pieprasījumi Radušies
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Zaudējis
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervēts ražošanā
@@ -965,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Enerģija
DocType: Opportunity,Opportunity From,Iespēja no
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mēnešalga paziņojumu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rinda {0}: {1} {2} vienumam ir vajadzīgi sērijas numuri. Jūs esat iesniedzis {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rinda {0}: {1} {2} vienumam ir vajadzīgi sērijas numuri. Jūs esat iesniedzis {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Lūdzu, atlasiet tabulu"
DocType: BOM,Website Specifications,Website specifikācijas
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ir nederīga e-pasta adrese saukumā "Saņēmēji"
@@ -1034,7 +1035,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citāts pieprasīts
DocType: Vital Signs,Heart Rate / Pulse,Sirdsdarbības ātrums / impulss
DocType: Company,Default Bank Account,Default bankas kontu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},""Update Stock", nevar pārbaudīt, jo preces netiek piegādātas ar {0}"
DocType: Vehicle,Acquisition Date,iegādes datums
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1059,7 +1060,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Augšupielādējiet vēstules galvu (Saglabājiet to draudzīgai vietnei ar 900 pikseļu līdz 100 pikseļiem)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: kontu {2} nevar būt grupa
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prece Row {idx}: {DOCTYPE} {DOCNAME} neeksistē iepriekš '{DOCTYPE}' tabula
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nav uzdevumi
DocType: Item Variant Settings,Copy Fields to Variant,Kopēt laukus variējumam
DocType: Asset,Opening Accumulated Depreciation,Atklāšanas Uzkrātais nolietojums
@@ -1171,9 +1172,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plāns materiāls mezgliem
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pārdošanas Partneri un teritorija
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} jābūt aktīvam
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Slēgšana (atvēršana + kopā)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Slēgšana (atvēršana + kopā)
DocType: Journal Entry,Depreciation Entry,nolietojums Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Lūdzu, izvēlieties dokumenta veidu pirmais"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Drukāt konta valūtā
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atcelt Materiāls Vizītes {0} pirms lauzt šo apkopes vizīte
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standarts
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Sērijas Nr {0} nepieder posteni {1}
@@ -1199,7 +1201,7 @@
DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
DocType: Fee Structure,Components,sastāvdaļas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Postenis Variants {0} atjaunināta
DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1251,6 +1253,7 @@
,Company Name,Uzņēmuma nosaukums
DocType: SMS Center,Total Message(s),Kopējais ziņojumu (-i)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Lūdzu, iestatiet Nosaukumu sēriju {0}, izmantojot Iestatīšana> Iestatījumi> Nosaukumu sērija"
DocType: Purchase Invoice,Additional Discount Percentage,Papildu Atlaide procentuālā
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skatīt sarakstu ar visu palīdzību video
DocType: Agriculture Analysis Criteria,Soil Texture,Augsnes tekstūra
@@ -1279,7 +1282,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website punkts
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk).
DocType: Timesheet Detail,Bill,Rēķins
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Nākamais Nolietojums datums tiek ievadīta kā pagātnes datumu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Nākamais Nolietojums datums tiek ievadīta kā pagātnes datumu
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Balts
DocType: SMS Center,All Lead (Open),Visi Svins (Open)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rinda {0}: Daudz nav pieejams {4} noliktavā {1} pēc norīkojuma laiku ieraksta ({2} {3})
@@ -1296,7 +1299,7 @@
DocType: Lead,Next Contact Date,Nākamais Contact Datums
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Atklāšanas Daudzums
DocType: Healthcare Settings,Appointment Reminder,Atgādinājums par iecelšanu amatā
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
DocType: Program Enrollment Tool Student,Student Batch Name,Student Partijas nosaukums
DocType: Consultation,Doctor,Ārsts
DocType: Holiday List,Holiday List Name,Brīvdienu saraksta Nosaukums
@@ -1312,6 +1315,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Atstājiet Allocation rīks
DocType: Item,Hub Category to Publish,Hub kategorijas publicēšanai
DocType: Leave Block List,Leave Block List Dates,Atstājiet Block List Datumi
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Lūdzu, uzstādiet apmeklētāju numerācijas sēriju, izmantojot iestatīšanas> numerācijas sēriju"
DocType: Sales Invoice,Billing Address GSTIN,Norēķinu adrese GSTIN
DocType: Assessment Plan,Evaluate,Novērtēt
DocType: Workstation,Net Hour Rate,Neto stundas likme
@@ -1346,7 +1350,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Pārdošanas rēķinu apmaksas
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervēts noliktavām Sales Order / gatavu preču noliktava
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Pārdošanas apjoms
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Pārdošanas apjoms
DocType: Repayment Schedule,Interest Amount,procentu summa
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jūs esat Izdevumu apstiprinātājs šā ieraksta. Lūdzu Update ""Statuss"" un Saglabāt"
DocType: Serial No,Creation Document No,Izveide Dokumenta Nr
@@ -1439,7 +1443,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Atvēršanas Grāmatvedības bilance
,GST Sales Register,GST Pārdošanas Reģistrēties
DocType: Sales Invoice Advance,Sales Invoice Advance,PPR Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nav ko pieprasīt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nav ko pieprasīt
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Atlasiet savus domēnus
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Vēl Budget ieraksts '{0}' jau eksistē pret {1} '{2}' uz fiskālo gadu {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Lauki tiks kopēti tikai izveidošanas laikā.
@@ -1449,11 +1453,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tas tiks pievienots Vienības kodeksa variantu. Piemēram, ja jūsu saīsinājums ir ""SM"", un pozīcijas kods ir ""T-krekls"", postenis kods variants būs ""T-krekls-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (vārdiem), būs redzams pēc tam, kad esat saglabāt algas aprēķinu."
DocType: Purchase Invoice,Is Return,Vai Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Uzmanību!
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Uzmanību!
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Atgriešana / debeta Note
DocType: Price List Country,Price List Country,Cenrādis Valsts
DocType: Item,UOMs,Mērvienības
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} derīgas sērijas nos postenim {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} derīgas sērijas nos postenim {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Postenis kodekss nevar mainīt Serial Nr
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Ievadiet pozīcijas kods, lai iegūtu partijas numurs"
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
DocType: Supplier Scorecard,Warn for new Request for Quotations,Brīdinājums par jaunu kvotu pieprasījumu
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Pirkuma pasūtījumu palīdzēt jums plānot un sekot līdzi saviem pirkumiem
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab testēšanas priekšraksti
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Kopējais Issue / Transfer daudzums {0} Iekraušanas Pieprasījums {1} \ nedrīkst būt lielāks par pieprasīto daudzumu {2} postenim {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Noliktava Kontaktinformācija
DocType: Payment Entry,Write Off Difference Amount,Norakstīt starpības summa
DocType: Volunteer,Volunteer Name,Brīvprātīgo vārds
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Lūdzu, uzstādiet Instruktoru nosaukumu sistēmu izglītībā> Izglītības iestatījumi"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Darbinieku e-pasts nav atrasts, līdz ar to e-pasts nav nosūtīts"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Piegādes noteikumi nav piemērojami valstij {0}
DocType: Item,Foreign Trade Details,Ārējās tirdzniecības Detaļas
@@ -1610,7 +1613,7 @@
DocType: Student Group Student,Group Roll Number,Grupas Roll skaits
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kopējais visu uzdevumu atsvari būtu 1. Lūdzu regulēt svaru visām projekta uzdevumus atbilstoši
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitāla Ekipējums
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cenu noteikums vispirms izvēlas, pamatojoties uz ""Apply On 'jomā, kas var būt punkts, punkts Koncerns vai Brand."
@@ -1635,7 +1638,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Bērnu noliktava pastāv šajā noliktavā. Jūs nevarat izdzēst šo noliktavā.
DocType: Item,Website Item Groups,Mājas lapa punkts Grupas
DocType: Purchase Invoice,Total (Company Currency),Kopā (Uzņēmējdarbības valūta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Sērijas numurs {0} ieraksta vairāk nekā vienu reizi
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Sērijas numurs {0} ieraksta vairāk nekā vienu reizi
DocType: Journal Entry,Journal Entry,Journal Entry
DocType: Expense Claim Advance,Unclaimed amount,Nepieprasītā summa
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} preces progress
@@ -1732,7 +1735,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Sakaru žurnāls.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Pieprasījums piedāvājumam ir atspējots piekļūt no portāla, jo vairāk čeku portāla iestatījumiem."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Piegādātāju rezultātu tabulas vērtēšanas mainīgais
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Iepirkuma Summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iepirkuma Summa
DocType: Sales Invoice,Shipping Address Name,Piegāde Adrese Nosaukums
DocType: Material Request,Terms and Conditions Content,Noteikumi un nosacījumi saturs
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Izveidojot kursu grafiku, radās kļūdas"
@@ -1996,7 +1999,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tas ir balstīts uz baļķiem pret šo Vehicle. Skatīt grafiku zemāk informāciju
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
DocType: Customer,Default Price List,Default Cenrādis
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs nevarat izdzēst saimnieciskais gads {0}. Fiskālā gads {0} ir noteikta kā noklusējuma Global iestatījumi
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Klients ar tādu pašu nosaukumu jau pastāv
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tas iesniegs Algas likmes un izveidos uzkrājumu žurnāla ierakstu. Vai vēlaties turpināt?
@@ -2010,6 +2013,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Cenu
DocType: Quotation,Term Details,Term Details
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nevar uzņemt vairāk nekā {0} studentiem šai studentu grupai.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Kopā (bez nodokļiem)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead skaits
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead skaits
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} nedrīkst būt lielāks par 0
@@ -2030,7 +2034,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Atsaistītu maksājumu par anulēšana rēķina
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Pašreizējais Kilometru skaits stājās jābūt lielākam nekā sākotnēji Transportlīdzekļa odometra {0}
DocType: Restaurant Reservation,No Show,Nav šovu
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Lūdzu, iestatiet Nosaukumu sēriju {0}, izmantojot Iestatīšana> Iestatījumi> Nosaukumu sērija"
DocType: Shipping Rule Country,Shipping Rule Country,Piegāde noteikums Country
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Atstājiet un apmeklējums
DocType: Maintenance Visit,Partially Completed,Daļēji Pabeigts
@@ -2123,7 +2126,7 @@
DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
DocType: Grant Application,Assessment Mark (Out of 10),Novērtējuma zīme (no 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobilo Nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Galvenais
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Galvenais
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variants
DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
DocType: Employee Attendance Tool,Employees HTML,darbinieki HTML
@@ -2173,7 +2176,7 @@
DocType: Course,Course Abbreviation,Protams saīsinājums
DocType: Student Leave Application,Student Leave Application,Studentu atvaļinājums
DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Darbinieku {0} uz pusi dienas uz {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Kopējais darba laiks nedrīkst būt lielāks par max darba stundas {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Par
@@ -2360,9 +2363,10 @@
DocType: Task,Actual End Date (via Time Sheet),Faktiskā Beigu datums (via laiks lapas)
DocType: Soil Texture,Soil Type,Augsnes tips
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Summa {0} {1} pret {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Jauns ziņojums
,Quotation Trends,Piedāvājumu tendences
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Postenis Group vienības kapteinis nav minēts par posteni {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
DocType: Shipping Rule,Shipping Amount,Piegāde Summa
DocType: Supplier Scorecard Period,Period Score,Perioda rādītājs
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Pievienot Klienti
@@ -2373,7 +2377,7 @@
,Vehicle Expenses,transportlīdzekļu Izdevumi
DocType: Serial No,Invoice Details,Informācija par rēķinu
DocType: Grant Application,Show on Website,Rādīt vietnē
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Sagaidāmais vērtība pēc lietderīgās jābūt lielākam vai vienādam ar {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Sagaidāmais vērtība pēc lietderīgās jābūt lielākam vai vienādam ar {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Sāciet
DocType: Hub Category,Hub Category,Hub kategorijas
DocType: Purchase Invoice,SEZ,SEZ
@@ -2405,7 +2409,7 @@
DocType: Patient,B Positive,B Pozitīvs
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Daudz jābūt 1, jo prece ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu daudzkārtējai qty."
DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
DocType: Patient Medical Record,Patient Medical Record,Pacienta medicīniskais ieraksts
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Group Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sporta
@@ -2456,6 +2460,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,"Nevar iestatīt saņemto RFQ, ja nav citēta"
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Kopā atskaitīšana
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Izvēlieties kontu, kuru drukāt konta valūtā"
,Production Analytics,ražošanas Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Tas ir balstīts uz darījumiem ar šo pacientu. Sīkāku informāciju skatiet tālāk redzamajā laika grafikā
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Izmaksas Atjaunots
@@ -2511,7 +2516,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Izvēlieties Company ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Atstāt tukšu, ja to uzskata par visu departamentu"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Nodarbinātības veidi (pastāvīgs, līgums, intern uc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
DocType: Payroll Entry,Fortnightly,divnedēļu
DocType: Currency Exchange,From Currency,No Valūta
DocType: Vital Signs,Weight (In Kilogram),Svars (kilogramā)
@@ -2589,7 +2594,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Cenas netiks parādīts, ja Cenrādis nav noteikts"
DocType: Stock Entry,Total Incoming Value,Kopā Ienākošais vērtība
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debets ir nepieciešama
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debets ir nepieciešama
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets palīdz sekot līdzi laika, izmaksu un rēķinu par aktivitātēm, ko veic savu komandu"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkuma Cenrādis
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Piegādes rezultātu tabulas mainīgie modeļi.
@@ -2692,7 +2697,7 @@
DocType: Company,For Reference Only.,Tikai atsaucei.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Ārsts {0} nav pieejams {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Izvēlieties Partijas Nr
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Nederīga {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Nederīga {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Atsauces ieguldījums
@@ -2729,8 +2734,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Norādiet operācijas, ekspluatācijas izmaksas un sniegt unikālu ekspluatācijā ne jūsu darbībām."
DocType: Water Analysis,Origin,Izcelsme
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokuments ir pāri robežai ar {0} {1} par posteni {4}. Jūs padarīt vēl {3} pret pats {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Izvēlieties Mainīt summu konts
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Izvēlieties Mainīt summu konts
DocType: Purchase Invoice,Price List Currency,Cenrādis Currency
DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
DocType: Stock Settings,Allow Negative Stock,Atļaut negatīvs Stock
@@ -2786,7 +2791,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Brīdiniet par jauniem pirkuma pasūtījumiem
DocType: Quality Inspection Reading,Reading 9,Lasīšana 9
DocType: Supplier,Is Frozen,Vai Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Group mezglu noliktava nav atļauts izvēlēties darījumiem
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Group mezglu noliktava nav atļauts izvēlēties darījumiem
DocType: Buying Settings,Buying Settings,Pērk iestatījumi
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Nē par gatavo labi posteni
DocType: Upload Attendance,Attendance To Date,Apmeklējumu Lai datums
@@ -2801,6 +2806,7 @@
DocType: Grant Application,Organization,organizēšana
DocType: BOM Update Tool,BOM Update Tool,BOM atjaunināšanas rīks
DocType: SG Creation Tool Course,Student Group Name,Student Grupas nosaukums
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Parādīt izvērsto skatu
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Maksu izveidošana
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Lūdzu, pārliecinieties, ka jūs tiešām vēlaties dzēst visus darījumus šajā uzņēmumā. Jūsu meistars dati paliks kā tas ir. Šo darbību nevar atsaukt."
DocType: Room,Room Number,Istabas numurs
@@ -2811,7 +2817,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Veidojiet nodokļu veidlapu
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,lietotāju forums
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
DocType: Lab Test Sample,Lab Test Sample,Laba testa paraugs
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick Journal Entry
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
@@ -2882,7 +2888,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Veikt rēķinu
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto tuvu Opportunity pēc 15 dienām
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pirkuma pasūtījumi nav atļauti {0} dēļ rezultātu rādītāja statusā {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pirkuma pasūtījumi nav atļauti {0} dēļ rezultātu rādītāja statusā {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,beigu gads
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2975,7 +2981,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Virs
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nav konta {2} vai jau saskaņota pret citu talonu
DocType: Supplier Scorecard Criteria,Criteria Weight,Kritērijs Svars
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Piegādātājs> Piegādātāja tips
DocType: Buying Settings,Default Buying Price List,Default Pirkšana Cenrādis
DocType: Payroll Entry,Salary Slip Based on Timesheet,Alga Slip Pamatojoties uz laika kontrolsaraksts
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Pirkšanas līmenis
@@ -3065,7 +3070,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track noved līdz Rūpniecības Type.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Iet uz Letterheads
DocType: Item Supplier,Item Supplier,Postenis piegādātājs
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visas adreses.
DocType: Company,Stock Settings,Akciju iestatījumi
@@ -3243,6 +3248,7 @@
DocType: Company,Default Inventory Account,Noklusējuma Inventāra konts
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rinda {0}: Pabeigts Daudz jābūt lielākai par nulli.
DocType: Antibiotic,Antibiotic Name,Antibiotikas nosaukums
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Vienības kods> Vienības grupa> Zīmols
DocType: Purchase Invoice,Apply Additional Discount On,Piesakies Papildu atlaide
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Atlasiet veidu ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Saikne ar visām zemes vienībām, kurās audzē kultūraugu"
@@ -3438,6 +3444,7 @@
DocType: Supplier,Credit Limit,Kredītlimita
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Vid. Pārdošanas cenu saraksts
DocType: Production Plan Sales Order,Salse Order Date,Salse Pasūtījuma datums
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Piegādātājs> Piegādātāja tips
DocType: Salary Component,Salary Component,alga Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Maksājumu Ieraksti {0} ir ANO saistīti
DocType: GL Entry,Voucher No,Kuponu Nr
@@ -3447,7 +3454,7 @@
DocType: Leave Allocation,Leave Allocation,Atstājiet sadale
DocType: Payment Request,Recipient Message And Payment Details,Saņēmēja ziņu un apmaksas detaļas
DocType: Training Event,Trainer Email,treneris Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiāls Pieprasījumi {0} izveidoti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materiāls Pieprasījumi {0} izveidoti
DocType: Restaurant Reservation,No of People,Cilvēku skaits
DocType: Production Planning Tool,Include sub-contracted raw materials,Iekļaut Apakšuzņēmēju izejvielas
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablons noteikumiem vai līgumu.
@@ -3513,7 +3520,7 @@
DocType: Production Planning Tool,Create Material Requests,Izveidot Materiāls Pieprasījumi
DocType: Employee Education,School/University,Skola / University
DocType: Payment Request,Reference Details,Atsauce Details
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Paredzams, Value Pēc Lietderīgās lietošanas laika jābūt mazākam nekā Bruto Pirkuma summa"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,"Paredzams, Value Pēc Lietderīgās lietošanas laika jābūt mazākam nekā Bruto Pirkuma summa"
DocType: Sales Invoice Item,Available Qty at Warehouse,Pieejams Daudz at Warehouse
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jāmaksā Summa
DocType: Asset,Double Declining Balance,Paātrināto norakstīšanas
@@ -3525,7 +3532,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saņemt atjauninājumus
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} nepieder Uzņēmumu {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Atlasiet vismaz vienu vērtību no katra atribūta.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Atstājiet Management
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupa ar kontu
DocType: Sales Order,Fully Delivered,Pilnībā Pasludināts
@@ -3536,14 +3543,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Izmaksātā summa nedrīkst būt lielāka par aizdevuma summu {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Iet uz programmām
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Rinda {0} # piešķirtā summa {1} nevar būt lielāka par summu, kas nav pieprasīta {2}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Lūdzu, uzstādiet apmeklētāju numerācijas sēriju, izmantojot iestatīšanas> numerācijas sēriju"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Produkcija Pasūtījums nav izveidots
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nevar mainīt statusu kā studentam {0} ir saistīta ar studentu pieteikumu {1}
DocType: Asset,Fully Depreciated,pilnībā amortizēta
,Stock Projected Qty,Stock Plānotais Daudzums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Ievērojama Apmeklējumu HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citāti ir priekšlikumi, cenas jums ir nosūtīti uz jūsu klientiem"
DocType: Sales Order,Customer's Purchase Order,Klienta Pasūtījuma
@@ -3628,7 +3634,7 @@
DocType: Stock Settings,Item Naming By,Postenis nosaukšana Līdz
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Vēl viens periods Noslēguma Entry {0} ir veikts pēc {1}
DocType: Production Order,Material Transferred for Manufacturing,"Materiāls pārvietoti, lai Manufacturing"
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konts {0} neeksistē
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Konts {0} neeksistē
DocType: Project,Project Type,Projekts Type
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Bērna uzdevums pastāv šim uzdevumam. Jūs nevarat izdzēst šo uzdevumu.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Nu mērķa Daudzums vai paredzētais apjoms ir obligāta.
@@ -3732,11 +3738,11 @@
DocType: Company,Asset Depreciation Cost Center,Aktīvu amortizācijas izmaksas Center
DocType: Sales Order Item,Sales Order Date,Sales Order Date
DocType: Sales Invoice Item,Delivered Qty,Pasludināts Daudz
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Kopējais Excl. Nodoklis
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ja ieslēgts, visi bērni katrā ražošanas posteni tiks iekļauts materiāls pieprasījumiem."
DocType: Assessment Plan,Assessment Plan,novērtējums Plan
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Klients {0} ir izveidots.
DocType: Stock Settings,Limit Percent,Limit Percent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Lūdzu, uzstādiet Instruktoru nosaukumu sistēmu izglītībā> Izglītības iestatījumi"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Pašlaik nav nevienas noliktavas noliktavā
,Payment Period Based On Invoice Date,"Samaksa periodā, pamatojoties uz rēķina datuma"
DocType: Sample Collection,No. of print,Drukas numurs
@@ -3752,12 +3758,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Debitori ({0})
DocType: Pricing Rule,Margin,Robeža
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Jauni klienti
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruto peļņa%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto peļņa%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Mainīt POS profilu
DocType: Bank Reconciliation Detail,Clearance Date,Klīrenss Datums
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Novērtējuma ziņojums
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Pirkuma summa ir obligāta
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruto Pirkuma summa ir obligāta
DocType: Lead,Address Desc,Adrese Dilst
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Puse ir obligāta
DocType: Journal Entry,JV-,JV-
@@ -3789,7 +3795,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Pastāvīgais vārds
DocType: Stock Entry,Customer or Supplier Details,Klientu vai piegādātājs detaļas
DocType: Employee Loan Application,Required by Date,Pieprasa Datums
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Noslēguma bilance (Dr-Cr)
DocType: Lead,Lead Owner,Lead Īpašnieks
DocType: Bin,Requested Quantity,Pieprasītā daudzums
DocType: Patient,Marital Status,Ģimenes statuss
@@ -3803,7 +3808,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Vairāki varianti
DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Pasludināts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma daudzumu {2} (definēts postenī).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Prece {0}: pasūtīts Daudzums {1} nevar būt mazāka par minimālo pasūtījuma daudzumu {2} (definēts postenī).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,"Lūdzu, piesakieties kā citam lietotājam."
DocType: Territory,Territory Targets,Teritorija Mērķi
@@ -3904,7 +3909,7 @@
DocType: Serial No,Out of AMC,Out of AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Izveidot tehniskās apkopes vizīti
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
DocType: Company,Default Cash Account,Default Naudas konts
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (nav Klients vai piegādātājs) kapteinis.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Tas ir balstīts uz piedalīšanos šajā Student
@@ -4055,7 +4060,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nav minētu kritēriju darbinieku
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
DocType: Restaurant,Default Customer,Noklusējuma klients
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Lūdzu, izveidojiet darbinieku nosaukumu sistēmu cilvēkresursu vadībā> Personāla iestatījumi"
DocType: Assessment Plan,Supervisor Name,uzraudzītājs Name
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nevar apstiprināt, vai tikšanās ir izveidota tajā pašā dienā"
DocType: Program Enrollment Course,Program Enrollment Course,Programmas Uzņemšana kurss
@@ -4178,7 +4182,7 @@
DocType: BOM,Website Description,Mājas lapa Apraksts
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto pašu kapitāla izmaiņas
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Jaunākās
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pasta adrese ir unikāls, jau pastāv {0}"
DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,kvīts
@@ -4195,7 +4199,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Naudas plūsmas pārskats
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredīta summa nedrīkst pārsniegt maksimālo summu {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Lūdzu, izvēlieties Carry priekšu, ja jūs arī vēlaties iekļaut iepriekšējā finanšu gadā bilance atstāj šajā fiskālajā gadā"
DocType: GL Entry,Against Voucher Type,Pret kupona Tips
DocType: Physician,Phone (R),Tālrunis (R)
@@ -4207,7 +4211,7 @@
DocType: Patient,B Negative,B negatīvs
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,"Uzturēšanas statuss ir jāatceļ vai jāaizpilda, lai iesniegtu"
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Sērijas numurus kārtas {0} nesakrīt ar piegādes piezīme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Sērijas numurus kārtas {0} nesakrīt ar piegādes piezīme
DocType: Student,Guardian Details,Guardian Details
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark apmeklēšana vairākiem darbiniekiem
@@ -4249,7 +4253,7 @@
DocType: Stock Entry Detail,Basic Amount,Pamatsumma
DocType: Training Event,Exam,eksāmens
DocType: Complaint,Complaint,Sūdzība
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
DocType: Patient,Alcohol Past Use,Alkohola iepriekšējā lietošana
DocType: Fertilizer Content,Fertilizer Content,Mēslošanas līdzekļa saturs
@@ -4378,6 +4382,7 @@
DocType: Salary Detail,Formula,Formula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Sērijas #
DocType: Lab Test Template,Lab Test Template,Lab testēšanas veidne
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Pārdošanas konts
DocType: Purchase Invoice Item,Total Weight,Kopējais svars
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisijas apjoms
DocType: Offer Letter Term,Value / Description,Vērtība / Apraksts
@@ -4535,7 +4540,7 @@
DocType: Customer,From Lead,No Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pasūtījumi izlaists ražošanai.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
DocType: Program Enrollment Tool,Enroll Students,uzņemt studentus
DocType: Lab Test,Approved Date,Apstiprināts datums
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard pārdošana
@@ -4612,7 +4617,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Ražošanas postenis
,Employee Information,Darbinieku informācija
DocType: Stock Entry Detail,Additional Cost,Papildu izmaksas
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nevar filtrēt balstīta uz kupona, ja grupēti pēc kuponu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Nevar filtrēt balstīta uz kupona, ja grupēti pēc kuponu"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Izveidot Piegādātāja piedāvājumu
DocType: Quality Inspection,Incoming,Ienākošs
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Tiek veidoti noklusējuma nodokļu veidnes pārdošanai un pirkšanai.
@@ -4629,7 +4634,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Piezīme: {0}
,Delivery Note Trends,Piegāde Piezīme tendences
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ŠONEDĒĻ kopsavilkums
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Noliktavā Daudz
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Noliktavā Daudz
DocType: Delivery Trip,Calculate Estimated Arrival Times,Aprēķiniet aptuveno ierašanās laiku
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konts: {0} var grozīt tikai ar akciju darījumiem
DocType: Student Group Creation Tool,Get Courses,Iegūt Kursi
@@ -4645,7 +4650,7 @@
DocType: Material Request,% Ordered,% Pasūtīts
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Par Kurss balstās studentu grupas, protams, būs jāapstiprina par katru students no uzņemtajiem kursiem programmā Uzņemšanas."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Gabaldarbs
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Vid. Pirkšana Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Vid. Pirkšana Rate
DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
DocType: Employee,History In Company,Vēsture Company
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Jauns ziņojums no {sender}
@@ -4693,7 +4698,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rinda {0}: valūta BOM # {1} jābūt vienādam ar izvēlētās valūtas {2}
DocType: Journal Entry Account,Exchange Rate,Valūtas kurss
DocType: Patient,Additional information regarding the patient,Papildu informācija par pacientu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
DocType: Homepage,Tag Line,Tag Line
DocType: Fee Component,Fee Component,maksa Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
@@ -4908,7 +4913,7 @@
DocType: Employee Education,Employee Education,Darbinieku izglītība
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dublikāts postenis grupa atrodama postenī grupas tabulas
DocType: Land Unit,Parent Land Unit,Vecāku zemes vienība
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
DocType: Fertilizer,Fertilizer Name,Mēslojuma nosaukums
DocType: Salary Slip,Net Pay,Net Pay
DocType: Account,Account,Konts
@@ -4987,7 +4992,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Klientu grupa ir nepieciešama POS profilā
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Darbinieku ieraksti.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Lūdzu noteikt Next Nolietojums datums
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Lūdzu noteikt Next Nolietojums datums
DocType: HR Settings,Payroll Settings,Algas iestatījumi
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Match nesaistītajos rēķiniem un maksājumiem.
DocType: POS Settings,POS Settings,POS iestatījumi
@@ -5155,7 +5160,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
DocType: Asset Maintenance Task,Last Completion Date,Pēdējā pabeigšanas datums
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
DocType: Buying Settings,Naming Series,Nosaucot Series
DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Apdrošināšanas Sākuma datums jābūt mazākam nekā apdrošināšana Beigu datums
@@ -5285,6 +5290,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Iegūt Maksājumu Ieraksti
DocType: Quotation Item,Against Docname,Pret Docname
DocType: SMS Center,All Employee (Active),Visi Employee (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Pasūtītājs> Klientu grupa> Teritorija
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Skatīt Tagad
DocType: BOM,Raw Material Cost,Izejvielas izmaksas
DocType: Item Reorder,Re-Order Level,Re-Order līmenis
@@ -5385,7 +5391,6 @@
DocType: Room,Seating Capacity,sēdvietu skaits
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Lab testu grupas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Pasūtītājs> Klientu grupa> Teritorija
DocType: Project,Total Expense Claim (via Expense Claims),Kopējo izdevumu Pretenzijas (via izdevumu deklarācijas)
DocType: GST Settings,GST Summary,GST kopsavilkums
DocType: Assessment Result,Total Score,Total Score
@@ -5399,7 +5404,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Pēc kursu grafika izveides tika izveidoti
DocType: Journal Entry,Total Debit,Kopējais debets
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Noklusējuma Gatavās produkcijas noliktava
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budžets un izmaksu centrs
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Vairāki noklusējuma maksājuma veidi nav atļauti
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,priekš
@@ -5575,7 +5580,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Apsveriet nodokļi un maksājumi, lai"
DocType: Driver,Driving License Category,Vadītāja apliecības kategorija
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiskais Daudz ir obligāta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pašlaik ir {1} piegādātāju rādītāju karte, un šī piegādātāja iepirkuma rīkojumi jāizsaka piesardzīgi."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pašlaik ir {1} piegādātāju rādītāju karte, un šī piegādātāja iepirkuma rīkojumi jāizsaka piesardzīgi."
DocType: Asset Maintenance Team,Asset Maintenance Team,Aktīvu uzturēšanas komanda
DocType: Employee Loan,Loan Type,aizdevuma veids
DocType: Scheduling Tool,Scheduling Tool,plānošana Tool
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index d1c375d..53a04c3 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Подреди по цена
,Delay Days,Денови на одложување
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Расходи на услуги
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Фактура
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Направете запис за задржување на задржување
DocType: Purchase Invoice Item,Item Weight Details,Детали за телесната тежина
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Суд: {0}, Точка Код: {1} и од купувачи: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Кг
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Отворање на работа.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM не е наведен за предмет за поддоговор {0} во ред {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM не е наведен за предмет за поддоговор {0} во ред {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Резултатот е поднесен
DocType: Item Attribute,Increment,Прираст
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Не се дозволени за {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Се предмети од
DocType: Price List,Price Not UOM Dependant,Цена Не зависена од UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Нема ставки наведени
DocType: Asset Repair,Error Description,Грешка Опис
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Бакалница
DocType: Quality Inspection Reading,Reading 1,Читање 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Пензиски фондови
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следна Амортизација датум не може да биде пред Дата на продажба
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Следна Амортизација датум не може да биде пред Дата на продажба
DocType: Crop,Perennial,Повеќегодишна
DocType: Consultation,Consultation Date,Датум на консултации
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Листа на производи и откритија за корисници на ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","на пример, "ОУ" или "Универзитетот""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,акции на извештаи
DocType: Warehouse,Warehouse Detail,Магацински Детал
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Термин Датум на завршување не може да биде подоцна од годината Датум на завршување на учебната година во која е поврзана на зборот (академска година {}). Ве молам поправете датумите и обидете се повторно.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Дали е фиксни средства"" не може да е немаркирано , како што постои евиденција на средствата во однос на ставките"
DocType: Delivery Trip,Departure Time,Време на заминување
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Земете Спецификација Детали за
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Шаблони на позицијата на добавувачи.
DocType: Lead,Interested,Заинтересирани
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Отворање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Отворање
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Од {0} до {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Не успеа да се постават даноци
DocType: Item,Copy From Item Group,Копија од Група ставки
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Остава на годишно ниво
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете "Дали напредување против сметка {1} Ако ова е однапред влез.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
DocType: Email Digest,Profit & Loss,Добивка и загуба
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,литарски
DocType: Task,Total Costing Amount (via Time Sheet),Вкупно Износ на трошоци (преку време лист)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ова се базира на трансакции против оваа компанија. Погледнете временска рамка подолу за детали
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Да го извести преку е-пошта на создавање на автоматски материјал Барање
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Отпорна
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Советување
DocType: Journal Entry,Multi Currency,Мулти Валута
DocType: Opening Invoice Creation Tool,Invoice Type,Тип на фактура
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Потврда за испорака
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Вдовци
DocType: Request for Quotation,Request for Quotation,Барање за прибирање НА ПОНУДИ
DocType: Healthcare Settings,Require Lab Test Approval,Потребно е одобрување од лабораториско испитување
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Код Код> Точка група> Бренд
DocType: Salary Slip Timesheet,Working Hours,Работно време
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Вкупно Најдобро
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промените почетниот / тековниот број на секвенца на постоечки серија.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ве молиме внесете цена центар
DocType: Drug Prescription,Dosage,Дозирање
DocType: Journal Entry Account,Sales Order,Продај Побарувања
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Среден Продажен курс
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Среден Продажен курс
DocType: Assessment Plan,Examiner Name,Име испитувачот
DocType: Lab Test Template,No Result,без резултат
DocType: Purchase Invoice Item,Quantity and Rate,Количина и брзина
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Изберете Даноци Период
DocType: Purchase Invoice,Unpaid,Неплатени
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Резервирано за продажба
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси> Поставувања за човечки ресурси
DocType: Packing Slip,From Package No.,Од Пакет број
DocType: Item Attribute,To Range,Да се движи
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Хартии од вредност и депозити
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,Работилница
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреди налози за набавка
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Доволно делови да се изгради
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Доволно делови да се изгради
DocType: POS Profile User,POS Profile User,POS профил корисник
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Директните приходи
DocType: Patient Appointment,Date TIme,Датум време
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не може да се филтрираат врз основа на сметка, ако групирани по сметка"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Не може да се филтрираат врз основа на сметка, ако групирани по сметка"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Административен службеник
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Поставување компанија и даноци
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Ве молиме изберете курсот
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Разликата профил
DocType: Purchase Invoice,Supplier GSTIN,добавувачот GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Не може да се затвори задача како свој зависни задача {0} не е затворена.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
DocType: Production Order,Additional Operating Cost,Дополнителни оперативни трошоци
DocType: Lab Test Template,Lab Routine,Лабораторија рутински
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Козметика
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Врска со Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Менаџер
DocType: Payment Entry,Payment From / To,Плаќање од / до
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е помала од сегашната преостанатиот износ за клиентите. Кредитен лимит мора да биде барем {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е помала од сегашната преостанатиот износ за клиентите. Кредитен лимит мора да биде барем {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Поставете сметка во Магацин {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Врз основа на" и "група Со" не може да биде ист
DocType: Sales Person,Sales Person Targets,Продажбата на лице Цели
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,Име на серијата
DocType: Fee Validity,Max number of visit,Макс број на посети
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet е основан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,запишат
DocType: GST Settings,GST Settings,GST Settings
DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,буџетот против
DocType: Employee,Cell Number,Мобилен Број
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дадени критериуми нема вработен. Проверете дека лизгачките листови не се веќе создадени.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Авто Материјал Барања Генерирано
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Авто Материјал Барања Генерирано
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Си ја заборавивте
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во "Против весник Влегување" колона
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Резервирано за производство
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Енергија
DocType: Opportunity,Opportunity From,Можност од
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечен извештај плата.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Сериски броеви потребни за точка {2}. Вие сте доставиле {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Сериски броеви потребни за точка {2}. Вие сте доставиле {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Изберете табела
DocType: BOM,Website Specifications,Веб-страница Спецификации
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} е неважечка е-поштенска адреса во 'Примачи'
@@ -1036,7 +1037,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Цитат е побарано
DocType: Vital Signs,Heart Rate / Pulse,Срцева стапка / пулс
DocType: Company,Default Bank Account,Стандардно банкарска сметка
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Ажурирај складиште 'не може да се провери, бидејќи ставките не се доставуваат преку {0}"
DocType: Vehicle,Acquisition Date,Датум на стекнување
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Бр
@@ -1061,7 +1062,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Подигни ја главата на писмото (држете го веб-пријателски како 900px на 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Сметка {2} не може да биде група
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка ред IDX {}: {DOCTYPE} {docname} не постои во над "{DOCTYPE}" маса
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} е веќе завршен проект или откажани
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} е веќе завршен проект или откажани
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Не задачи
DocType: Item Variant Settings,Copy Fields to Variant,Копирај полиња на варијанта
DocType: Asset,Opening Accumulated Depreciation,Отворање Акумулирана амортизација
@@ -1173,9 +1174,10 @@
DocType: Production Order,Plan material for sub-assemblies,План материјал за потсклопови
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продај Партнери и територија
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} мора да биде активен
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Затворање (отворање + вкупно)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Затворање (отворање + вкупно)
DocType: Journal Entry,Depreciation Entry,амортизација за влез
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Изберете го типот на документот прв
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Печати во Валута на сметката
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Откажи материјал Посети {0} пред да го раскине овој Одржување Посета
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 стандард
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Сериски № {0} не припаѓаат на Точка {1}
@@ -1201,7 +1203,7 @@
DocType: Supplier,Default Payable Accounts,Стандардно Обврски
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
DocType: Fee Structure,Components,делови
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Точка Варијанти {0} ажурирани
DocType: Quality Inspection Reading,Reading 6,Читање 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1253,6 +1255,7 @@
,Company Name,Име на компанијата
DocType: SMS Center,Total Message(s),Вкупно пораки
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ве молиме наместете го Селектирањето за {0} преку Setup> Settings> Series за именување
DocType: Purchase Invoice,Additional Discount Percentage,Дополнителен попуст Процент
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Преглед на листа на сите помош видеа
DocType: Agriculture Analysis Criteria,Soil Texture,Текстура на почвата
@@ -1281,7 +1284,7 @@
DocType: BOM Website Item,BOM Website Item,BOM на вебсајт ставки
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
DocType: Timesheet Detail,Bill,Бил
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следна Амортизација Регистриран е внесен како со поминат рок
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Следна Амортизација Регистриран е внесен како со поминат рок
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Бела
DocType: SMS Center,All Lead (Open),Сите Потенцијални клиенти (Отворени)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина не се достапни за {4} во магацин {1} на објавување времето на стапување ({2} {3})
@@ -1298,7 +1301,7 @@
DocType: Lead,Next Contact Date,Следна Контакт Датум
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Отворање Количина
DocType: Healthcare Settings,Appointment Reminder,Потсетник за назначување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
DocType: Program Enrollment Tool Student,Student Batch Name,Студентски Серија Име
DocType: Consultation,Doctor,Доктор
DocType: Holiday List,Holiday List Name,Одмор Листа на Име
@@ -1314,6 +1317,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Остави алатката Распределба
DocType: Item,Hub Category to Publish,Категорија на хаб за објавување
DocType: Leave Block List,Leave Block List Dates,Остави Забрани Листа Датуми
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување> Нумерирање
DocType: Sales Invoice,Billing Address GSTIN,Адреса за фактурирање GSTIN
DocType: Assessment Plan,Evaluate,Оценете
DocType: Workstation,Net Hour Rate,Нето час стапка
@@ -1348,7 +1352,7 @@
DocType: Purchase Receipt,PREC-RET-,Прец-RET-
DocType: POS Profile,Sales Invoice Payment,Продај фактура за исплата
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Задржани Магацински во Продај Побарувања / готови производи Магацински
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Продажба Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продажба Износ
DocType: Repayment Schedule,Interest Amount,Износот на каматата
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте на сметка Approver за овој запис. Ве молиме инсталирајте ја "статус" и заштеди
DocType: Serial No,Creation Document No,Документот за создавање Не
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Отворање Сметководство Биланс
,GST Sales Register,GST продажба Регистрирај се
DocType: Sales Invoice Advance,Sales Invoice Advance,Продажна Про-Фактура
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ништо да побара
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ништо да побара
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Изберете ги вашите домени
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Уште еден рекорд буџет "{0}" веќе постои од {1} {2} "за фискалната {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Полињата ќе бидат копирани само во времето на создавањето.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ова ќе биде додаден на Кодексот точка на варијанта. На пример, ако вашиот кратенката е "СМ" и кодот на предметот е "Т-маица", кодот го ставка на варијанта ќе биде "Т-маица-СМ""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плати (со зборови) ќе биде видлив откако ќе ја зачувате фиш плата.
DocType: Purchase Invoice,Is Return,Е враќање
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Внимание
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Внимание
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Враќање / задолжување
DocType: Price List Country,Price List Country,Ценовник Земја
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} валидна сериски броеви за ставката {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} валидна сериски броеви за ставката {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Точка законик не може да се промени за Сериски број
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM конверзија Фактор
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Ве молиме внесете Точка законик за да се добие број на серијата
@@ -1561,7 +1565,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
DocType: Supplier Scorecard,Warn for new Request for Quotations,Предупреди за ново барање за цитати
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Купување на налози да ви помогне да планираат и да се надоврзе на вашите купувања
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Рецепти за лабораториски тестови
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",вкупната количина на прашањето / Трансфер {0} во Материјал Барање {1} \ не може да биде поголема од бараната количина {2} за ставката {3}
@@ -1599,7 +1603,6 @@
DocType: Warehouse,Warehouse Contact Info,Магацински Контакт Инфо
DocType: Payment Entry,Write Off Difference Amount,Отпише разликата Износ
DocType: Volunteer,Volunteer Name,Име на волонтерот
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Ве молиме поставете Систем за именување на инструктори во образованието> Образование
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: е-маил на вработените не се најде, па затоа не е-мејл испратен"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правилото за пренесување не важи за земја {0}
DocType: Item,Foreign Trade Details,Надворешна трговија Детали
@@ -1612,7 +1615,7 @@
DocType: Student Group Student,Group Roll Number,Група тек број
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Вкупниот износ на сите задача тежина треба да биде 1. Ве молиме да се приспособат тежини на сите задачи на проектот соодветно
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитал опрема
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цените правило е првата избрана врз основа на "Apply On" поле, која може да биде точка, точка група или бренд."
@@ -1637,7 +1640,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,постои склад дете за овој склад. Не можете да ја избришете оваа склад.
DocType: Item,Website Item Groups,Веб-страница Точка групи
DocType: Purchase Invoice,Total (Company Currency),Вкупно (Валута на Фирма )
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Сериски број {0} влегоа повеќе од еднаш
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Сериски број {0} влегоа повеќе од еднаш
DocType: Journal Entry,Journal Entry,Весник Влегување
DocType: Expense Claim Advance,Unclaimed amount,Неизвесен износ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ставки во тек
@@ -1734,7 +1737,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација се логирате.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",Барање за прибирање понуди е забрането да пристапите од порталот за повеќе поставувања проверка портал.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Променлива оценка на постигнати резултати
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Купување Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Купување Износ
DocType: Sales Invoice,Shipping Address Name,Адреса за Испорака Име
DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Имаше грешки во креирањето на наставниот план
@@ -1998,7 +2001,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ова се базира на логови против ова возило. Види времеплов подолу за детали
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
DocType: Customer,Default Price List,Стандардно Ценовник
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,рекорд движење средства {0} создадена
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,рекорд движење средства {0} создадена
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Не може да избришете фискалната {0}. Фискалната година {0} е поставена како стандардна во глобалните поставувања
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Потрошувач со исто име веќе постои
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ова ќе достави дописници за плати и ќе создаде пресметувачки дневник. Дали сакате да продолжите?
@@ -2012,6 +2015,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,цените
DocType: Quotation,Term Details,Рок Детали за
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не може да се запишат повеќе од {0} студентите за оваа група студенти.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Вкупно (без данок)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водач Грофот
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Водач Грофот
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора да биде поголем од 0
@@ -2032,7 +2036,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Прекин на врска плаќање за поништување на Фактура
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Тековни километражата влезе треба да биде поголема од првичната возила Километража {0}
DocType: Restaurant Reservation,No Show,Нема шоу
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ве молиме наместете го Селектирањето за {0} преку Setup> Settings> Series за именување
DocType: Shipping Rule Country,Shipping Rule Country,Превозот Правило Земја
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Остави и Публика
DocType: Maintenance Visit,Partially Completed,Делумно завршени
@@ -2125,7 +2128,7 @@
DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
DocType: Grant Application,Assessment Mark (Out of 10),Оценка за оценка (од 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Мобилен телефон
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Главните
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Главните
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Варијанта
DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
DocType: Employee Attendance Tool,Employees HTML,вработените HTML
@@ -2175,7 +2178,7 @@
DocType: Course,Course Abbreviation,Кратенка на курсот
DocType: Student Leave Application,Student Leave Application,Студентски оставите апликацијата
DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Вработен {0} на половина ден на {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Вкупно работно време не смее да биде поголема од работното време max {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
@@ -2362,9 +2365,10 @@
DocType: Task,Actual End Date (via Time Sheet),Крај Крај Датум (преку време лист)
DocType: Soil Texture,Soil Type,Тип на почва
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Нова порака
,Quotation Trends,Трендови на Понуди
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
DocType: Shipping Rule,Shipping Amount,Испорака Износ
DocType: Supplier Scorecard Period,Period Score,Период на рејтинг
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Додади Клиентите
@@ -2375,7 +2379,7 @@
,Vehicle Expenses,Трошоци возило
DocType: Serial No,Invoice Details,Детали за фактура
DocType: Grant Application,Show on Website,Покажи на веб-страница
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Почнете
DocType: Hub Category,Hub Category,Категорија на категории
DocType: Purchase Invoice,SEZ,СЕЗ
@@ -2407,7 +2411,7 @@
DocType: Patient,B Positive,Б Позитивен
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr не може да биде празно или простор
DocType: Patient Medical Record,Patient Medical Record,Медицински рекорд на пациенти
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Група за Не-групата
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Спорт
@@ -2458,6 +2462,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Не може да се постави примена RFQ во Нема Цитат
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Вкупно Расходи
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Изберете сметка за печатење во валута на сметката
,Production Analytics,производство и анализатор
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ова се базира на трансакции против овој пациент. Погледнете временска рамка подолу за детали
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Цена освежено
@@ -2513,7 +2518,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изберете компанијата ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Оставете го празно ако се земе предвид за сите одделенија
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
DocType: Payroll Entry,Fortnightly,на секои две недели
DocType: Currency Exchange,From Currency,Од валутен
DocType: Vital Signs,Weight (In Kilogram),Тежина (во килограм)
@@ -2591,7 +2596,7 @@
DocType: Student,Guardians,старатели
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Цените нема да бидат прикажани ако цената листата не е поставена
DocType: Stock Entry,Total Incoming Value,Вкупно Вредност на Прилив
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Дебитна Да се бара
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Дебитна Да се бара
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets помогне да ги пратите на време, трошоци и платежна за активности направено од страна на вашиот тим"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Откупната цена Листа
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони на променливите на резултатите од добавувачот.
@@ -2694,7 +2699,7 @@
DocType: Company,For Reference Only.,За повикување само.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Лекарот {0} не е достапен на {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Изберете Серија Не
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невалиден {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Невалиден {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Референтен инв
@@ -2731,8 +2736,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
DocType: Water Analysis,Origin,Потекло
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овој документ е над границата од {0} {1} за ставката {4}. Ви се прави уште една {3} против истиот {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Поставете се повторуваат по спасување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,износот сметка Одберете промени
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Поставете се повторуваат по спасување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,износот сметка Одберете промени
DocType: Purchase Invoice,Price List Currency,Ценовник Валута
DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
@@ -2788,7 +2793,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Предупреди за нови налози за набавки
DocType: Quality Inspection Reading,Reading 9,Читање 9
DocType: Supplier,Is Frozen,Е Замрзнати
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Група јазол склад не е дозволено да одберете за трансакции
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Група јазол склад не е дозволено да одберете за трансакции
DocType: Buying Settings,Buying Settings,Поставки за купување
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM број за завршени добра
DocType: Upload Attendance,Attendance To Date,Публика: Да најдам
@@ -2803,6 +2808,7 @@
DocType: Grant Application,Organization,организација
DocType: BOM Update Tool,BOM Update Tool,Алатка за ажурирање на BOM
DocType: SG Creation Tool Course,Student Group Name,Име Група на студенти
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Прикажи експлодирачки приказ
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Создавање такси
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
DocType: Room,Room Number,Број на соба
@@ -2813,7 +2819,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Направете даночен образец
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,корисникот форум
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
DocType: Lab Test Sample,Lab Test Sample,Примерок за лабораториски испитувања
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Брзо весник Влегување
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
@@ -2884,7 +2890,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Направете Фактура
DocType: Selling Settings,Auto close Opportunity after 15 days,Авто блиску можност по 15 дена
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Нарачките за нарачка не се дозволени за {0} поради картичка со резултати од {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Нарачките за нарачка не се дозволени за {0} поради картичка со резултати од {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,крајот на годината
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / олово%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / олово%
@@ -2977,7 +2983,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Над 90-
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: весник Влегување {1} нема сметка {2} или веќе се исти против друг ваучер
DocType: Supplier Scorecard Criteria,Criteria Weight,Тежина на критериумите
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Добавувачот> Тип на добавувач
DocType: Buying Settings,Default Buying Price List,Стандардно Купување Ценовник
DocType: Payroll Entry,Salary Slip Based on Timesheet,Плата фиш Врз основа на timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Стапка на купување
@@ -3067,7 +3072,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Следи ги Потенцијалните клиенти по вид на индустрија.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Одете во писма
DocType: Item Supplier,Item Supplier,Точка Добавувачот
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Сите адреси.
DocType: Company,Stock Settings,Акции Settings
@@ -3245,6 +3250,7 @@
DocType: Company,Default Inventory Account,Стандардно Инвентар сметка
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршено Количина мора да биде поголема од нула.
DocType: Antibiotic,Antibiotic Name,Име на антибиотик
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Код на ставка> Група на производи> Бренд
DocType: Purchase Invoice,Apply Additional Discount On,Да важат и дополнителни попуст на
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Изберете Тип ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Поврзаност со сите земјишни единици во кои културата расте
@@ -3440,6 +3446,7 @@
DocType: Supplier,Credit Limit,Кредитен лимит
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Ср. Продажба на ценовник
DocType: Production Plan Sales Order,Salse Order Date,Salse Уредување Дата
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Добавувачот> Тип на добавувач
DocType: Salary Component,Salary Component,плата Компонента
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Плаќање Записи {0} е не-поврзани
DocType: GL Entry,Voucher No,Ваучер Не
@@ -3449,7 +3456,7 @@
DocType: Leave Allocation,Leave Allocation,Остави Распределба
DocType: Payment Request,Recipient Message And Payment Details,Примателот на пораката и детали за плаќање
DocType: Training Event,Trainer Email,тренер-пошта
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Материјал Барања {0} создаден
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Материјал Барања {0} создаден
DocType: Restaurant Reservation,No of People,Број на луѓе
DocType: Production Planning Tool,Include sub-contracted raw materials,Вклучување на под-договор суровини
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Дефиниција на условите или договор.
@@ -3515,7 +3522,7 @@
DocType: Production Planning Tool,Create Material Requests,Креирај Материјал Барања
DocType: Employee Education,School/University,Училиште / Факултет
DocType: Payment Request,Reference Details,Референца Детали
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Предвидена вредност По корисен век мора да биде помала од бруто купување износ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Предвидена вредност По корисен век мора да биде помала од бруто купување износ
DocType: Sales Invoice Item,Available Qty at Warehouse,На располагање Количина на складиште
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Фактурирани Износ
DocType: Asset,Double Declining Balance,Двоен опаѓачки баланс
@@ -3527,7 +3534,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Добијат ажурирања
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Сметка {2} не припаѓа на компанијата {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Изберете барем една вредност од секоја од атрибутите.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Остави менаџмент
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Група од сметка
DocType: Sales Order,Fully Delivered,Целосно Дадени
@@ -3538,14 +3545,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Повлечениот износ не може да биде поголема од кредит Износ {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Одете во Програми
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ред {0} # Ослободената сума {1} не може да биде поголема од неподигнатото количество {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување> Нумерирање
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Производство цел не создаде
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датум"" мора да биде по ""до датум"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},не може да го промени својот статус како студент {0} е поврзан со примена студент {1}
DocType: Asset,Fully Depreciated,целосно амортизираните
,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Забележително присуство на HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",Цитати се и понудите што сте ги испратиле на вашите клиенти
DocType: Sales Order,Customer's Purchase Order,Нарачка на купувачот
@@ -3630,7 +3636,7 @@
DocType: Stock Settings,Item Naming By,Точка грабеж на име со
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Уште еден период Затворање Влегување {0} е направен по {1}
DocType: Production Order,Material Transferred for Manufacturing,Материјал пренесен за производство
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,На сметка {0} не постои
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,На сметка {0} не постои
DocType: Project,Project Type,Тип на проект
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Дете задача е за оваа задача. Не можете да ја избришете оваа задача.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Или цел количество: Контакт лице или целниот износ е задолжително.
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Центар Амортизација Трошоци средства
DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
DocType: Sales Invoice Item,Delivered Qty,Дадени Количина
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Вкупно Excl. Данок
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ако е избрано, сите деца на секој производен објект ќе биде вклучен во материјалот барања."
DocType: Assessment Plan,Assessment Plan,план за оценување
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Клиентот {0} е создаден.
DocType: Stock Settings,Limit Percent,Процент граница
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Ве молиме поставете Систем за именување на инструктори во образованието> Образование
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Немам моментални ставки на пазарот
,Payment Period Based On Invoice Date,Плаќање период врз основа на датум на фактурата
DocType: Sample Collection,No. of print,Бр. На печатење
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Должници ({0})
DocType: Pricing Rule,Margin,маргина
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови клиенти
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Бруто добивка%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Бруто добивка%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Промени ПОС Профил
DocType: Bank Reconciliation Detail,Clearance Date,Чистење Датум
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Извештај за проценка
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Бруто купување износ е задолжително
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Бруто купување износ е задолжително
DocType: Lead,Address Desc,Адреса Desc
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Партијата е задолжително
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Постојано име
DocType: Stock Entry,Customer or Supplier Details,Клиент или снабдувачот
DocType: Employee Loan Application,Required by Date,Потребни по датум
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Затворање на рамнотежа (Dr-Cr)
DocType: Lead,Lead Owner,Сопственик на Потенцијален клиент
DocType: Bin,Requested Quantity,бараната количина
DocType: Patient,Marital Status,Брачен статус
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Повеќе варијанти
DocType: Sales Invoice,Against Income Account,Против профил доход
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Дадени
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Нареди Количина {1} не може да биде помала од минималната Количина налог {2} (што е дефинирано во точка).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Точка {0}: Нареди Количина {1} не може да биде помала од минималната Количина налог {2} (што е дефинирано во точка).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентуална распределба
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Пријавете се како друг корисник.
DocType: Territory,Territory Targets,Територија Цели
@@ -3905,7 +3910,7 @@
DocType: Serial No,Out of AMC,Од АМЦ
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Направете Одржување Посета
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
DocType: Company,Default Cash Account,Стандардно готовинска сметка
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ова се базира на присуството на овој студент
@@ -4057,7 +4062,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Нема вработени за наведените критериуми
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
DocType: Restaurant,Default Customer,Стандарден клиент
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси> Поставувања за човечки ресурси
DocType: Assessment Plan,Supervisor Name,Име супервизор
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потврдувајте дали состанок е креиран за истиот ден
DocType: Program Enrollment Course,Program Enrollment Course,Програма за запишување на курсот
@@ -4180,7 +4184,7 @@
DocType: BOM,Website Description,Веб-сајт Опис
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нето промени во капиталот
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Најновиот
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адреса мора да биде уникатен, веќе постои за {0}"
DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,приемот
@@ -4197,7 +4201,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај за паричниот тек
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Ве молиме изберете ја носи напред ако вие исто така сакаат да се вклучат во претходната фискална година биланс остава на оваа фискална година
DocType: GL Entry,Against Voucher Type,Против ваучер Тип
DocType: Physician,Phone (R),Телефон (R)
@@ -4209,7 +4213,7 @@
DocType: Patient,B Negative,Б Негативно
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Статусот на одржување мора да биде откажан или завршен за поднесување
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Сериски броеви во ред {0} не се поклопува со Потврда за испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Сериски броеви во ред {0} не се поклопува со Потврда за испорака
DocType: Student,Guardian Details,Гардијан Детали
DocType: C-Form,C-Form,C-Форма
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посетеност за повеќе вработени
@@ -4251,7 +4255,7 @@
DocType: Stock Entry Detail,Basic Amount,Основицата
DocType: Training Event,Exam,испит
DocType: Complaint,Complaint,Жалба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
DocType: Leave Allocation,Unused leaves,Неискористени листови
DocType: Patient,Alcohol Past Use,Користење на алкохол за минатото
DocType: Fertilizer Content,Fertilizer Content,Содржина на ѓубрива
@@ -4380,6 +4384,7 @@
DocType: Salary Detail,Formula,формула
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Сериски #
DocType: Lab Test Template,Lab Test Template,Лабораториски тест обрасци
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Продажна сметка
DocType: Purchase Invoice Item,Total Weight,Вкупна тежина
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комисијата за Продажба
DocType: Offer Letter Term,Value / Description,Вредност / Опис
@@ -4537,7 +4542,7 @@
DocType: Customer,From Lead,Од Потенцијален клиент
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Нарачка пуштени во производство.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изберете фискалната година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
DocType: Program Enrollment Tool,Enroll Students,Студентите кои се запишуваат
DocType: Lab Test,Approved Date,Датум на одобрување
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продажба
@@ -4614,7 +4619,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Производство Точка
,Employee Information,Вработен информации
DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Направете Добавувачот цитат
DocType: Quality Inspection,Incoming,Дојдовни
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Основни даночни обрасци за продажба и купување се создаваат.
@@ -4631,7 +4636,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Забелешка: {0}
,Delivery Note Trends,Испратница трендови
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Краток преглед на оваа недела
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Во акциите на количество
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Во акциите на количество
DocType: Delivery Trip,Calculate Estimated Arrival Times,Пресметајте ги проценетите времиња на пристигнување
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Сметка: {0} можат да се ажурираат само преку акции трансакции
DocType: Student Group Creation Tool,Get Courses,Земете курсеви
@@ -4647,7 +4652,7 @@
DocType: Material Request,% Ordered,Нареди%
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За базирани разбира Група на студенти, се разбира ќе биде потврдена за секој студент од запишаните предмети во програмата за запишување."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Плаќаат на парче
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Ср. Купување стапка
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ср. Купување стапка
DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
DocType: Employee,History In Company,Во историјата на компанијата
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Нова порака од {испраќачот}
@@ -4695,7 +4700,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута на Бум # {1} треба да биде еднаква на избраната валута {2}
DocType: Journal Entry Account,Exchange Rate,На девизниот курс
DocType: Patient,Additional information regarding the patient,Дополнителни информации во врска со пациентот
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
DocType: Homepage,Tag Line,таг линија
DocType: Fee Component,Fee Component,надомест Компонента
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,транспортен менаџмент
@@ -4910,7 +4915,7 @@
DocType: Employee Education,Employee Education,Вработен образование
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Дупликат група точка најде во табелата на точката група
DocType: Land Unit,Parent Land Unit,Родителска единица
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
DocType: Fertilizer,Fertilizer Name,Име на ѓубриво
DocType: Salary Slip,Net Pay,Нето плати
DocType: Account,Account,Сметка
@@ -4989,7 +4994,7 @@
DocType: Item Customer Detail,Ref Code,Реф законик
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Групата на клиенти е задолжителна во POS профилот
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Вработен евиденција.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Поставете Следна Амортизација Датум
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Поставете Следна Амортизација Датум
DocType: HR Settings,Payroll Settings,Settings Даноци
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Одговара на не-поврзани фактури и плаќања.
DocType: POS Settings,POS Settings,POS Подесувања
@@ -5157,7 +5162,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Роденден Потсетник за {0}
DocType: Asset Maintenance Task,Last Completion Date,Последен датум на комплетирање
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дена од денот на нарачка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
DocType: Buying Settings,Naming Series,Именување Серија
DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Дата на започнување осигурување треба да биде помал од осигурување Дата на завршување
@@ -5287,6 +5292,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Земете Записи на плаќање
DocType: Quotation Item,Against Docname,Против Docname
DocType: SMS Center,All Employee (Active),Сите вработените (Активни)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Клиент> Група на клиенти> Територија
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Прикажи Сега
DocType: BOM,Raw Material Cost,Суровина трошоци
DocType: Item Reorder,Re-Order Level,Повторно да Ниво
@@ -5387,7 +5393,6 @@
DocType: Room,Seating Capacity,седишта капацитет
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Лабораториски тестови
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Клиент> Група на клиенти> Територија
DocType: Project,Total Expense Claim (via Expense Claims),Вкупно Побарување за Расход (преку Побарувања за Расходи)
DocType: GST Settings,GST Summary,GST Резиме
DocType: Assessment Result,Total Score,вкупниот резултат
@@ -5401,7 +5406,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Следниве планови беа креирани
DocType: Journal Entry,Total Debit,Вкупно Побарува
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Стандардно готови стоки Магацински
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Продажбата на лице
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продажбата на лице
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Буџетот и трошоците центар
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Не е дозволен повеќекратен стандарден начин на плаќање
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
@@ -5577,7 +5582,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Сметаат дека даночните или полнење за
DocType: Driver,Driving License Category,Категорија за возачка дозвола
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Крај Количина е задолжително
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} во моментов има {1} Оценка за набавувачот, а Купувачките налози на овој добавувач треба да бидат претпазливи."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} во моментов има {1} Оценка за набавувачот, а Купувачките налози на овој добавувач треба да бидат претпазливи."
DocType: Asset Maintenance Team,Asset Maintenance Team,Тим за одржување на средства
DocType: Employee Loan,Loan Type,Тип на кредит
DocType: Scheduling Tool,Scheduling Tool,распоред алатка
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index a21507a..2b202f1 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,വില അനുസരിച്ച് അടുക്കുക
,Delay Days,കാലതാമസം ഒഴിവാക്കുക
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,സേവന ചിലവേറിയ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,വികയപതം
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,സൂക്ഷിക്കൽ സ്റ്റോക്ക് എൻട്രി ഉണ്ടാക്കുക
DocType: Purchase Invoice Item,Item Weight Details,ഇനം ഭാരം വിശദാംശങ്ങൾ
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","പരാമർശം: {2}: {0}, ഇനം കോഡ്: {1} ഉപഭോക്തൃ"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,കി. ഗ്രാം
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ഒരു ജോലിക്കായി തുറക്കുന്നു.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},{0} വരിയിൽ {0} സബ് കൺട്രോൾ ചെയ്യുന്നതിനായി BOM നിർദ്ദേശിക്കപ്പെട്ടിട്ടില്ല.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},{0} വരിയിൽ {0} സബ് കൺട്രോൾ ചെയ്യുന്നതിനായി BOM നിർദ്ദേശിക്കപ്പെട്ടിട്ടില്ല.
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ഫലം സമർപ്പിച്ചു
DocType: Item Attribute,Increment,വർദ്ധന
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ടൈംസ്പൻ
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} അനുവദനീയമല്ല
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
DocType: Price List,Price Not UOM Dependant,വിലയല്ല UOM ആശ്രയിച്ചത്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ഉൽപ്പന്ന {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ഇനങ്ങളൊന്നും ലിസ്റ്റ്
DocType: Asset Repair,Error Description,പിശക് വിവരണം
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,പലചരക്ക്
DocType: Quality Inspection Reading,Reading 1,1 Reading
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,പെൻഷൻ ഫണ്ട്
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി വാങ്ങിയ തിയതി ആകരുത്
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി വാങ്ങിയ തിയതി ആകരുത്
DocType: Crop,Perennial,വറ്റാത്ത
DocType: Consultation,Consultation Date,കൺസൾട്ടേഷൻ തീയതി
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,"ERPNext ഉപയോക്താക്കൾക്കുള്ള ഉൽപ്പന്ന ലിസ്റ്റിംഗ്, കണ്ടെത്തൽ"
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",ഉദാ: "പ്രൈമറി സ്കൂൾ" അല്ലെങ്കിൽ "യൂണിവേഴ്സിറ്റി"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,ഓഹരി റിപ്പോർട്ടുകൾ
DocType: Warehouse,Warehouse Detail,വെയർഹൗസ് വിശദാംശം
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ടേം അവസാന തീയതി പിന്നീട് ഏത് പദം (അക്കാദമിക് വർഷം {}) ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അക്കാദമിക വർഷത്തിന്റെ വർഷം അവസാനം തീയതി കൂടുതലാകാൻ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""ഫിക്സ്ഡ് സ്വത്ത്" അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
DocType: Delivery Trip,Departure Time,പുറപ്പെടൽ സമയം
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,സ്പെസിഫിക്കേഷൻ വിശദാംശങ്ങൾ നേടുക
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,വിതരണ സ്റ്റാൻഡിംഗുകളുടെ കൊമേഴ്സ്യലുകൾ.
DocType: Lead,Interested,താല്പര്യം
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,തുറക്കുന്നു
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,തുറക്കുന്നു
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},{0} നിന്ന് {1} വരെ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,നികുതികൾ സജ്ജമാക്കുന്നതിൽ പരാജയപ്പെട്ടു
DocType: Item,Copy From Item Group,ഇനം ഗ്രൂപ്പിൽ നിന്നും പകർത്തുക
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,തീയതി വിടുതൽ ചേരുന്നു തീയതി വലുതായിരിക്കണം
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,പ്രതിവർഷം ഇലകൾ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,വരി {0}: ഈ അഡ്വാൻസ് എൻട്രി ആണ് എങ്കിൽ {1} അക്കൗണ്ട് നേരെ 'അഡ്വാൻസ് തന്നെയല്ലേ' പരിശോധിക്കുക.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},വെയർഹൗസ് {0} കൂട്ടത്തിന്റെ {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},വെയർഹൗസ് {0} കൂട്ടത്തിന്റെ {1} സ്വന്തമല്ല
DocType: Email Digest,Profit & Loss,ലാഭം നഷ്ടം
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,ലിറ്റർ
DocType: Task,Total Costing Amount (via Time Sheet),ആകെ ആറെണ്ണവും തുക (ടൈം ഷീറ്റ് വഴി)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ഇത് ഈ കമ്പനിക്കെതിരെയുള്ള ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്കായി താഴെയുള്ള ടൈംലൈൻ കാണുക
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ഓട്ടോമാറ്റിക് മെറ്റീരിയൽ അഭ്യർത്ഥന സൃഷ്ടിക്ക് ന് ഇമെയിൽ വഴി അറിയിക്കുക
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,ചെറുത്തുനിൽപ്പ്
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,കൺസൾട്ടേഷൻ
DocType: Journal Entry,Multi Currency,മൾട്ടി കറൻസി
DocType: Opening Invoice Creation Tool,Invoice Type,ഇൻവോയിസ് തരം
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,ഡെലിവറി നോട്ട്
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,വിധവയായ
DocType: Request for Quotation,Request for Quotation,ക്വട്ടേഷൻ അഭ്യർത്ഥന
DocType: Healthcare Settings,Require Lab Test Approval,ലാബ് പരിശോധന അംഗീകരിക്കേണ്ടതുണ്ട്
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,ഇനം കോഡ്> ഇനം ഗ്രൂപ്പ്> ബ്രാൻഡ്
DocType: Salary Slip Timesheet,Working Hours,ജോലിചെയ്യുന്ന സമയം
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,മൊത്തം ശ്രദ്ധേയമായത്
DocType: Naming Series,Change the starting / current sequence number of an existing series.,നിലവിലുള്ള ഒരു പരമ്പരയിലെ തുടങ്ങുന്ന / നിലവിലെ ക്രമസംഖ്യ മാറ്റുക.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,കോസ്റ്റ് കേന്ദ്രം നൽകുക
DocType: Drug Prescription,Dosage,മരുന്നിന്റെ
DocType: Journal Entry Account,Sales Order,വിൽപ്പന ഓർഡർ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,ശരാ. വിൽക്കുന്ന റേറ്റ്
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ശരാ. വിൽക്കുന്ന റേറ്റ്
DocType: Assessment Plan,Examiner Name,എക്സാമിനർ പേര്
DocType: Lab Test Template,No Result,ഫലമൊന്നും
DocType: Purchase Invoice Item,Quantity and Rate,"ക്വാണ്ടിറ്റി, റേറ്റ്"
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,ശമ്പളപ്പട്ടിക കാലാവധി തിരഞ്ഞെടുക്കുക
DocType: Purchase Invoice,Unpaid,ലഭിക്കാത്ത
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,വില്പനയ്ക്ക് സംവരണം
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,മാനവ വിഭവശേഷി> എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ദയവായി എംപ്ലോയീ നെയിമിങ് സിസ്റ്റം സെറ്റപ്പ് ചെയ്യുക
DocType: Packing Slip,From Package No.,പാക്കേജ് നമ്പർ നിന്ന്
DocType: Item Attribute,To Range,പരിധി വരെ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,സെക്യൂരിറ്റീസ് ആൻഡ് നിക്ഷേപങ്ങൾ
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,പണിപ്പുര
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,വാങ്ങൽ ഓർഡറുകൾക്ക് മുന്നറിയിപ്പ് നൽകുക
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,"നിങ്ങളുടെ ഉപഭോക്താക്കൾ ഏതാനും കാണിയ്ക്കുക. അവർ സംഘടനകൾ, വ്യക്തികളുടെ ആകാം."
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,ബിൽഡ് മതിയായ ഭാഗങ്ങൾ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ബിൽഡ് മതിയായ ഭാഗങ്ങൾ
DocType: POS Profile User,POS Profile User,POS പ്രൊഫൈൽ ഉപയോക്താവ്
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,നേരിട്ടുള്ള ആദായ
DocType: Patient Appointment,Date TIme,തീയതി സമയം
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","അക്കൗണ്ട് ഭൂഖണ്ടക്രമത്തിൽ, അക്കൗണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","അക്കൗണ്ട് ഭൂഖണ്ടക്രമത്തിൽ, അക്കൗണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,അഡ്മിനിസ്ട്രേറ്റീവ് ഓഫീസർ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,കമ്പനിയേയും നികുതികളേയും സജ്ജമാക്കുക
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,വ്യത്യാസം അക്കൗണ്ട്
DocType: Purchase Invoice,Supplier GSTIN,വിതരണക്കാരൻ ഗ്സ്തിന്
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,അതിന്റെ ചുമതല {0} ക്ലോസ്ഡ് അല്ല അടുത്തുവരെ കാര്യമല്ല Can.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
DocType: Production Order,Additional Operating Cost,അധിക ഓപ്പറേറ്റിംഗ് ചെലവ്
DocType: Lab Test Template,Lab Routine,ലാബ് റൗണ്ടീൻ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,കോസ്മെറ്റിക്സ്
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ഗുഅര്ദിഅന്൨ കൂടെ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,മാനേജർ
DocType: Payment Entry,Payment From / To,/ To നിന്നുള്ള പേയ്മെന്റ്
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},പുതിയ ക്രെഡിറ്റ് പരിധി ഉപഭോക്താവിന് നിലവിലെ മുന്തിയ തുക കുറവാണ്. വായ്പാ പരിധി ആയിരിക്കും കുറഞ്ഞത് {0} ഉണ്ട്
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},പുതിയ ക്രെഡിറ്റ് പരിധി ഉപഭോക്താവിന് നിലവിലെ മുന്തിയ തുക കുറവാണ്. വായ്പാ പരിധി ആയിരിക്കും കുറഞ്ഞത് {0} ഉണ്ട്
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'അടിസ്ഥാനമാക്കി' എന്നതും 'ഗ്രൂപ്പ് സത്യം ഒന്നുതന്നെയായിരിക്കരുത്
DocType: Sales Person,Sales Person Targets,സെയിൽസ് വ്യാക്തി ടാർഗെറ്റ്
DocType: Installation Note,IN-,ബന്ധുത്വമായി
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,ബാച്ച് പേര്
DocType: Fee Validity,Max number of visit,സന്ദർശിക്കുന്ന പരമാവധി എണ്ണം
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,പേരെഴുതുക
DocType: GST Settings,GST Settings,ചരക്കുസേവന ക്രമീകരണങ്ങൾ
DocType: Selling Settings,Customer Naming By,ഉപയോക്താക്കൾക്കായി നാമകരണ
@@ -957,7 +958,7 @@
DocType: Budget,Budget Against,ബജറ്റ് എതിരെ
DocType: Employee,Cell Number,സെൽ നമ്പർ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,തന്നിരിക്കുന്ന മാനദണ്ഡത്തിൽ ജീവനക്കാർ ഇല്ല. ശമ്പള സ്ലിപ്പുകൾ ഇതിനകം സൃഷ്ടിച്ചിട്ടില്ല എന്നു പരിശോധിക്കുക.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,യാന്ത്രികമായി സൃഷ്ടിച്ചത് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,യാന്ത്രികമായി സൃഷ്ടിച്ചത് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,നഷ്ടപ്പെട്ട
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,നിങ്ങൾ കോളം 'ജേർണൽ എൻട്രി എഗൻസ്റ്റ്' നിലവിലുള്ള വൗച്ചർ നൽകുക കഴിയില്ല
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,നിർമാണ സംവരണം
@@ -965,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,എനർജി
DocType: Opportunity,Opportunity From,നിന്ന് ഓപ്പർച്യൂനിറ്റി
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,പ്രതിമാസ ശമ്പളം പ്രസ്താവന.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,വരി {0}: {1} ഇനം {2} എന്നതിന് സീരിയൽ നമ്പറുകൾ ആവശ്യമാണ്. നിങ്ങൾ {3} നൽകി.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,വരി {0}: {1} ഇനം {2} എന്നതിന് സീരിയൽ നമ്പറുകൾ ആവശ്യമാണ്. നിങ്ങൾ {3} നൽകി.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ദയവായി ഒരു പട്ടിക തിരഞ്ഞെടുക്കുക
DocType: BOM,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} എന്നത് 'സ്വീകർത്താക്കളുടെ' അസാധുവായ ഇമെയിൽ വിലാസമാണ്
@@ -1033,7 +1034,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ക്വാട്ട് അഭ്യർത്ഥിച്ചു
DocType: Vital Signs,Heart Rate / Pulse,ഹാർട്ട് റേറ്റ് / പൾസ്
DocType: Company,Default Bank Account,സ്ഥിരസ്ഥിതി ബാങ്ക് അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","പാർട്ടി അടിസ്ഥാനമാക്കി ഫിൽട്ടർ, ആദ്യം പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","പാർട്ടി അടിസ്ഥാനമാക്കി ഫിൽട്ടർ, ആദ്യം പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},ഇനങ്ങളുടെ {0} വഴി അല്ല കാരണം 'അപ്ഡേറ്റ് ഓഹരി' പരിശോധിക്കാൻ കഴിയുന്നില്ല
DocType: Vehicle,Acquisition Date,ഏറ്റെടുക്കൽ തീയതി
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,ഒഴിവ്
@@ -1058,7 +1059,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),നിങ്ങളുടെ കത്ത് ഹെഡ് അപ്ലോഡ് ചെയ്യുക (വെബ് പോക്കറ്റായി 100px കൊണ്ട് 900px ആയി നിലനിർത്തുക)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: അക്കൗണ്ട് {2} ഒരു ഗ്രൂപ്പ് കഴിയില്ല
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ഇനം വരി {IDX}: {doctype} {DOCNAME} മുകളിൽ '{doctype}' പട്ടികയിൽ നിലവിലില്ല
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} ഇതിനകം പൂർത്തിയായി അല്ലെങ്കിൽ റദ്ദാക്കി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} ഇതിനകം പൂർത്തിയായി അല്ലെങ്കിൽ റദ്ദാക്കി
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ടാസ്ക്കുകളൊന്നുമില്ല
DocType: Item Variant Settings,Copy Fields to Variant,വേരിയന്റിലേക്ക് ഫീൽഡുകൾ പകർത്തുക
DocType: Asset,Opening Accumulated Depreciation,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു
@@ -1170,9 +1171,10 @@
DocType: Production Order,Plan material for sub-assemblies,സബ് സമ്മേളനങ്ങൾ പദ്ധതി മെറ്റീരിയൽ
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,സെയിൽസ് പങ്കാളികളും ടെറിട്ടറി
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),അടച്ചു (മൊത്തം + എണ്ണം തുറക്കൽ)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),അടച്ചു (മൊത്തം + എണ്ണം തുറക്കൽ)
DocType: Journal Entry,Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ആദ്യം ഡോക്യുമെന്റ് തരം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,അക്കൗണ്ട് കറൻസിയിൽ അച്ചടിക്കുക
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ഈ മെയിൻറനൻസ് സന്ദർശനം റദ്ദാക്കുന്നതിൽ മുമ്പ് മെറ്റീരിയൽ സന്ദർശനങ്ങൾ {0} റദ്ദാക്കുക
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 സ്റ്റാൻഡേർഡ്
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},സീരിയൽ ഇല്ല {0} ഇനം വരെ {1} സ്വന്തമല്ല
@@ -1198,7 +1200,7 @@
DocType: Supplier,Default Payable Accounts,സ്ഥിരസ്ഥിതി അടയ്ക്കേണ്ട തുക
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
DocType: Fee Structure,Components,ഘടകങ്ങൾ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
DocType: Quality Inspection Reading,Reading 6,6 Reading
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1250,6 +1252,7 @@
,Company Name,കമ്പനി പേര്
DocType: SMS Center,Total Message(s),ആകെ സന്ദേശം (ങ്ങൾ)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setup> Settings> Naming Series വഴി {0} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
DocType: Purchase Invoice,Additional Discount Percentage,അധിക കിഴിവും ശതമാനം
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,എല്ലാ സഹായം വീഡിയോ ലിസ്റ്റ് കാണൂ
DocType: Agriculture Analysis Criteria,Soil Texture,മണ്ണ് ടെക്സ്ചർ
@@ -1278,7 +1281,7 @@
DocType: BOM Website Item,BOM Website Item,BOM ൽ വെബ്സൈറ്റ് ഇനം
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,നിങ്ങളുടെ കത്ത് തലയും ലോഗോ അപ്ലോഡ്. (നിങ്ങൾക്ക് പിന്നീട് എഡിറ്റ് ചെയ്യാൻ കഴിയും).
DocType: Timesheet Detail,Bill,ബില്
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,അടുത്ത മൂല്യത്തകർച്ച തീയതി കഴിഞ്ഞ തീയതി നൽകിയിട്ടുള്ളതെന്ന്
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,അടുത്ത മൂല്യത്തകർച്ച തീയതി കഴിഞ്ഞ തീയതി നൽകിയിട്ടുള്ളതെന്ന്
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,വൈറ്റ്
DocType: SMS Center,All Lead (Open),എല്ലാ ലീഡ് (തുറക്കുക)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),വരി {0}: അളവ് ({2} {3}) വെയർഹൗസിൽ ലെ {4} ലഭ്യമല്ല {1} ചേരുന്ന സമയത്ത് പോസ്റ്റുചെയ്യുന്നതിൽ
@@ -1295,7 +1298,7 @@
DocType: Lead,Next Contact Date,അടുത്തത് കോൺടാക്റ്റ് തീയതി
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty തുറക്കുന്നു
DocType: Healthcare Settings,Appointment Reminder,അപ്പോയിന്മെന്റ് റിമൈൻഡർ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
DocType: Program Enrollment Tool Student,Student Batch Name,വിദ്യാർത്ഥിയുടെ ബാച്ച് പേര്
DocType: Consultation,Doctor,ഡോക്ടർ
DocType: Holiday List,Holiday List Name,ഹോളിഡേ പട്ടിക പേര്
@@ -1311,6 +1314,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,വിഹിതം ടൂൾ വിടുക
DocType: Item,Hub Category to Publish,പ്രസിദ്ധീകരിക്കുന്നതിനുള്ള ഹബ് വിഭാഗം
DocType: Leave Block List,Leave Block List Dates,ബ്ലോക്ക് പട്ടിക തീയതി വിടുക
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,സെറ്റപ്പ്> നമ്പറിംഗ് സീരീസുകൾ വഴി ഹാജരാക്കാനായി സെറ്റപ്പ് നമ്പറുകൾ ക്രമീകരിക്കുക
DocType: Sales Invoice,Billing Address GSTIN,ബില്ലിംഗ് വിലാസം GSTIN
DocType: Assessment Plan,Evaluate,വിലയിരുത്തൽ
DocType: Workstation,Net Hour Rate,നെറ്റ് അന്ത്യസമയം റേറ്റ്
@@ -1345,7 +1349,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,സെയിൽസ് ഇൻവോയ്സ് പേയ്മെന്റ്
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,സെയിൽസ് ഓർഡർ / പൂർത്തിയായ ഗുഡ്സ് സംഭരണശാല കരുതിവച്ചിരിക്കുന്ന വെയർഹൗസ്
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,തുക വിൽക്കുന്ന
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,തുക വിൽക്കുന്ന
DocType: Repayment Schedule,Interest Amount,പലിശ തുക
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,നിങ്ങൾ ഈ റെക്കോർഡ് വേണ്ടി ചിലവിടൽ Approver ആകുന്നു. 'സ്റ്റാറ്റസ്' സേവ് അപ്ഡേറ്റ് ദയവായി
DocType: Serial No,Creation Document No,ക്രിയേഷൻ ഡോക്യുമെന്റ് ഇല്ല
@@ -1438,7 +1442,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,തുറക്കുന്നു അക്കൗണ്ടിംഗ് ബാലൻസ്
,GST Sales Register,ചരക്കുസേവന സെയിൽസ് രജിസ്റ്റർ
DocType: Sales Invoice Advance,Sales Invoice Advance,സെയിൽസ് ഇൻവോയിസ് അഡ്വാൻസ്
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,അഭ്യർത്ഥിക്കാൻ ഒന്നുമില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,അഭ്യർത്ഥിക്കാൻ ഒന്നുമില്ല
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,നിങ്ങളുടെ ഡൊമെയ്നുകൾ തിരഞ്ഞെടുക്കുക
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},മറ്റൊരു ബജറ്റ് റെക്കോർഡ് '{0}' ഇതിനകം സാമ്പത്തിക വർഷം '{2}' നേരെ {1} നിലവിലുണ്ട് {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,സൃഷ്ടിയുടെ സമയത്ത് മാത്രമേ ഫീൽഡുകൾ പകർത്തൂ.
@@ -1448,11 +1452,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ഈ വകഭേദം എന്ന ഇനം കോഡ് ചേർക്കപ്പെടുകയും ചെയ്യും. നിങ്ങളുടെ ചുരുക്കെഴുത്ത് "എസ് എം 'എന്താണ്, ഐറ്റം കോഡ്' ടി-ഷർട്ട് 'ഉദാഹരണത്തിന്, വകഭേദം എന്ന ഐറ്റം കോഡ്' ടി-ഷർട്ട്-എസ് എം" ആയിരിക്കും"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,നിങ്ങൾ ശമ്പളം ജി ലാഭിക്കാൻ ഒരിക്കൽ (വാക്കുകളിൽ) നെറ്റ് വേതനം ദൃശ്യമാകും.
DocType: Purchase Invoice,Is Return,മടക്കം
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,ജാഗ്രത
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,ജാഗ്രത
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,മടക്ക / ഡെബിറ്റ് നോട്ട്
DocType: Price List Country,Price List Country,വില പട്ടിക രാജ്യം
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},ഇനം {1} വേണ്ടി {0} സാധുവായ സീരിയൽ എണ്ണം
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},ഇനം {1} വേണ്ടി {0} സാധുവായ സീരിയൽ എണ്ണം
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ഇനം കോഡ് സീരിയൽ നമ്പർ വേണ്ടി മാറ്റാൻ കഴിയില്ല
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM പരിവർത്തന ഫാക്ടർ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,ബാച്ച് നമ്പർ ലഭിക്കാൻ ദയവായി ഇനം കോഡ് നൽകുക
@@ -1557,7 +1561,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
DocType: Supplier Scorecard,Warn for new Request for Quotations,ഉദ്ധരണികൾക്കുള്ള പുതിയ അഭ്യർത്ഥനയ്ക്കായി മുന്നറിയിപ്പ് നൽകുക
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,വാങ്ങൽ ഓർഡറുകൾ നിങ്ങളുടെ വാങ്ങലുകൾ ന് ആസൂത്രണം ഫോളോ അപ്പ് സഹായിക്കാൻ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ലാബ് ടെസ്റ്റ് കുറിപ്പുകൾ
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",മൊത്തം ഇഷ്യു / ട്രാൻസ്ഫർ അളവ് {0} മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ {1} \ അഭ്യർത്ഥിച്ച അളവ് {2} ഇനം {3} വേണ്ടി ശ്രേഷ്ഠ പാടില്ല
@@ -1595,7 +1599,6 @@
DocType: Warehouse,Warehouse Contact Info,വെയർഹൗസ് ബന്ധപ്പെടാനുള്ള വിവരങ്ങളും
DocType: Payment Entry,Write Off Difference Amount,വ്യത്യാസം തുക എഴുതുക
DocType: Volunteer,Volunteer Name,വോളന്റിയുടെ പേര്
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,ദയവായി വിദ്യാഭ്യാസം> വിദ്യാഭ്യാസ സജ്ജീകരണങ്ങളിൽ സജ്ജീകരണ അധ്യാപിക നാമനിർദേശം ചെയ്യുന്ന സംവിധാനം
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: ജീവനക്കാരുടെ ഇമെയിൽ കണ്ടെത്തിയില്ല, ഇവിടെനിന്നു മെയിൽ അയച്ചിട്ടില്ല"
DocType: Item,Foreign Trade Details,വിദേശ വ്യാപാര വിവരങ്ങൾ
,Assessment Plan Status,അസസ്സ്മെന്റ് പ്ലാൻ സ്റ്റാറ്റസ്
@@ -1607,7 +1610,7 @@
DocType: Student Group Student,Group Roll Number,ഗ്രൂപ്പ് റോൾ നമ്പർ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,എല്ലാ ടാസ്ക് തൂക്കം ആകെ 1. അതനുസരിച്ച് എല്ലാ പദ്ധതി ചുമതലകളുടെ തൂക്കം ക്രമീകരിക്കാൻ വേണം ദയവായി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,ഇനം {0} ഒരു സബ് കരാറിൽ ഇനം ആയിരിക്കണം
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ക്യാപ്പിറ്റൽ ഉപകരണങ്ങൾ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","പ്രൈസിങ് റൂൾ ആദ്യം ഇനം, ഇനം ഗ്രൂപ്പ് അല്ലെങ്കിൽ ബ്രാൻഡ് ആകാം വയലിലെ 'പുരട്ടുക' അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
@@ -1632,7 +1635,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,ശിശു വെയർഹൗസ് ഈ വെയർഹൗസിൽ നിലവിലുണ്ട്. ഈ വെയർഹൗസിൽ ഇല്ലാതാക്കാൻ കഴിയില്ല.
DocType: Item,Website Item Groups,വെബ്സൈറ്റ് ഇനം ഗ്രൂപ്പുകൾ
DocType: Purchase Invoice,Total (Company Currency),ആകെ (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,സീരിയൽ നമ്പർ {0} ഒരിക്കൽ അധികം പ്രവേശിച്ചപ്പോൾ
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,സീരിയൽ നമ്പർ {0} ഒരിക്കൽ അധികം പ്രവേശിച്ചപ്പോൾ
DocType: Journal Entry,Journal Entry,ജേർണൽ എൻട്രി
DocType: Expense Claim Advance,Unclaimed amount,ക്ലെയിം ചെയ്യാത്ത തുക
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} പുരോഗതിയിലാണ് ഇനങ്ങൾ
@@ -1729,7 +1732,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,കമ്മ്യൂണിക്കേഷൻ രേഖ.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","ക്വട്ടേഷൻ അഭ്യർത്ഥന കൂടുതൽ ചെക്ക് പോർട്ടൽ ക്രമീകരണങ്ങൾക്കായി, പോർട്ടലിൽ നിന്നും ആക്സസ് അപ്രാപ്തമാക്കി."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,വിതരണക്കാരൻ സ്കോർബോർഡ് സ്കോർ വേരിയബിൾ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,വാങ്ങൽ തുക
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,വാങ്ങൽ തുക
DocType: Sales Invoice,Shipping Address Name,ഷിപ്പിംഗ് വിലാസം പേര്
DocType: Material Request,Terms and Conditions Content,നിബന്ധനകളും വ്യവസ്ഥകളും ഉള്ളടക്കം
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ പിശകുകൾ ഉണ്ടായിരുന്നു
@@ -1991,7 +1994,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ഇത് ഈ വാഹനം നേരെ രേഖകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,നിങ്ങൾ സാമ്പത്തിക വർഷത്തെ {0} ഇല്ലാതാക്കാൻ കഴിയില്ല. സാമ്പത്തിക വർഷത്തെ {0} ആഗോള ക്രമീകരണങ്ങൾ സ്വതവേ സജ്ജീകരിച്ച
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,സമാന പേരിലുള്ള ഒരു ഉപയോക്താവ് ഇതിനകം നിലവിലുണ്ട്
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ഇത് ശമ്പള സ്ലിപ്പുകളും സമർപ്പിക്കണം. നിങ്ങൾക്ക് തുടരാൻ താൽപ്പര്യമുണ്ടോ?
@@ -2005,6 +2008,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,പ്രൈസിങ്
DocType: Quotation,Term Details,ടേം വിശദാംശങ്ങൾ
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} ഈ വിദ്യാർത്ഥി ഗ്രൂപ്പിനായി വിദ്യാർത്ഥികൾ കൂടുതൽ എൻറോൾ ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),ആകെ (നികുതി കൂടാതെ)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ലീഡ് എണ്ണം
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ലീഡ് എണ്ണം
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 വലുതായിരിക്കണം
@@ -2025,7 +2029,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ഇൻവോയ്സ് റദ്ദാക്കൽ പേയ്മെന്റ് അൺലിങ്കുചെയ്യുക
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},നിലവിൽ തലത്തില് നൽകിയ പ്രാരംഭ വാഹനം ഓഡോമീറ്റർ {0} കൂടുതലായിരിക്കണം
DocType: Restaurant Reservation,No Show,പ്രദര്ശനം ഇല്ല
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setup> Settings> Naming Series വഴി {0} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
DocType: Shipping Rule Country,Shipping Rule Country,ഷിപ്പിംഗ് റൂൾ രാജ്യം
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,"ഉപേക്ഷിക്കുക, ഹാജർ"
DocType: Maintenance Visit,Partially Completed,ഭാഗികമായി പൂർത്തിയാക്കി
@@ -2118,7 +2121,7 @@
DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
DocType: Grant Application,Assessment Mark (Out of 10),അസ്സസ്മെന്റ് മാർക്ക് (10 ൽ 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,ഗുഅര്ദിഅന്൨ മൊബൈൽ ഇല്ല
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,പ്രധാന
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,പ്രധാന
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,മാറ്റമുള്ള
DocType: Naming Series,Set prefix for numbering series on your transactions,നിങ്ങളുടെ ഇടപാടുകൾ പരമ്പര എണ്ണം പ്രിഫിക്സ് സജ്ജമാക്കുക
DocType: Employee Attendance Tool,Employees HTML,എംപ്ലോയീസ് എച്ച്ടിഎംഎൽ
@@ -2168,7 +2171,7 @@
DocType: Course,Course Abbreviation,കോഴ്സ് സംഗ്രഹം
DocType: Student Leave Application,Student Leave Application,വിദ്യാർത്ഥി അനുവാദ അപ്ലിക്കേഷൻ
DocType: Item,Will also apply for variants,കൂടാതെ മോഡലുകൾക്കാണ് ബാധകമാകും
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ന് {1} ജീവനക്കാർ {0} ഹാഫ് ദിവസം
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ആകെ തൊഴിൽ സമയം ജോലി സമയം {0} MAX ശ്രേഷ്ഠ പാടില്ല
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ഓൺ
@@ -2355,9 +2358,10 @@
DocType: Task,Actual End Date (via Time Sheet),യഥാർത്ഥ അവസാന തീയതി (ടൈം ഷീറ്റ് വഴി)
DocType: Soil Texture,Soil Type,മണ്ണ് തരം
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,പുതിയ സന്ദേശം
,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
DocType: Shipping Rule,Shipping Amount,ഷിപ്പിംഗ് തുക
DocType: Supplier Scorecard Period,Period Score,കാലയളവ് സ്കോർ
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ഉപഭോക്താക്കൾ ചേർക്കുക
@@ -2368,7 +2372,7 @@
,Vehicle Expenses,വാഹന ചെലവുകൾ
DocType: Serial No,Invoice Details,ഇൻവോയ്സ് വിശദാംശങ്ങൾ
DocType: Grant Application,Show on Website,വെബ്സൈറ്റിൽ കാണിക്കുക
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ആരംഭിക്കുക
DocType: Hub Category,Hub Category,ഹബ് വിഭാഗം
DocType: Purchase Invoice,SEZ,SEZ
@@ -2400,7 +2404,7 @@
DocType: Patient,B Positive,ബി പോസിറ്റീവ്
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
DocType: Patient Medical Record,Patient Medical Record,രോഗിയുടെ മെഡിക്കൽ റെക്കോർഡ്
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,നോൺ-ഗ്രൂപ്പ് വരെ ഗ്രൂപ്പ്
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,സ്പോർട്സ്
@@ -2451,6 +2455,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,ലഭിച്ചിട്ടില്ല RFQ എന്നതിന് ഒരു ഉദ്ധരണിയും നൽകാൻ കഴിയില്ല
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,ആകെ കിഴിച്ചുകൊണ്ടു
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,അക്കൗണ്ട് കറൻസിയിൽ അച്ചടിക്കാൻ ഒരു അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
,Production Analytics,പ്രൊഡക്ഷൻ അനലിറ്റിക്സ്
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ഈ രോഗിക്ക് എതിരായ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ചുവടെയുള്ള ടൈംലൈൻ കാണുക
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
@@ -2506,7 +2511,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
DocType: Leave Control Panel,Leave blank if considered for all departments,എല്ലാ വകുപ്പുകളുടെയും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
DocType: Payroll Entry,Fortnightly,രണ്ടാഴ്ചയിലൊരിക്കൽ
DocType: Currency Exchange,From Currency,കറൻസി
DocType: Vital Signs,Weight (In Kilogram),ഭാരം (കിലൊഗ്രാമിൽ)
@@ -2583,7 +2588,7 @@
DocType: Student,Guardians,ഗാർഡിയൻ
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,വിലവിവര ലിസ്റ്റ് സജ്ജമാക്കിയിട്ടില്ലെങ്കിൽ വിലകൾ കാണിക്കില്ല
DocType: Stock Entry,Total Incoming Value,ആകെ ഇൻകമിംഗ് മൂല്യം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","തിമെശെഎത്സ് സമയം, നിങ്ങളുടെ ടീം നടക്കുന്ന പ്രവർത്തനങ്ങൾ ചിലവു ബില്ലിംഗ് ട്രാക്ക് സൂക്ഷിക്കാൻ സഹായിക്കുന്നു"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,വാങ്ങൽ വില പട്ടിക
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,വിതരണക്കാരന്റെ സ്കോർബോർഡ് വേരിയബിളുകൾ.
@@ -2685,7 +2690,7 @@
DocType: Company,For Reference Only.,മാത്രം റഫറൻസിനായി.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},{1} എന്ന വൈദ്യരിൽ {0} ലഭ്യമല്ല
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,തിരഞ്ഞെടുക്കുക ബാച്ച് ഇല്ല
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},അസാധുവായ {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},അസാധുവായ {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,റെഫറൻസ് ആഹ്
@@ -2722,8 +2727,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", ഓപ്പറേഷൻസ് വ്യക്തമാക്കുക ഓപ്പറേറ്റിങ് വില നിങ്ങളുടെ പ്രവർത്തനങ്ങൾക്ക് ഒരു അതുല്യമായ ഓപ്പറേഷൻ ഒന്നും തരും."
DocType: Water Analysis,Origin,ഉത്ഭവം
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ഈ പ്രമാണം ഇനം {4} വേണ്ടി {0} {1} വഴി പരിധിക്കു. നിങ്ങൾ നിർമ്മിക്കുന്നത് ഒരേ {2} നേരെ മറ്റൊരു {3}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
@@ -2779,7 +2784,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,പുതിയ വാങ്ങൽ ഓർഡറുകൾക്ക് മുന്നറിയിപ്പ് നൽകുക
DocType: Quality Inspection Reading,Reading 9,9 Reading
DocType: Supplier,Is Frozen,മരവിച്ചു
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,ഗ്രൂപ്പ് നോഡ് വെയർഹൗസ് ഇടപാടുകൾക്ക് തെരഞ്ഞെടുക്കുന്നതിനായി അനുവദിച്ചിട്ടില്ല
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,ഗ്രൂപ്പ് നോഡ് വെയർഹൗസ് ഇടപാടുകൾക്ക് തെരഞ്ഞെടുക്കുന്നതിനായി അനുവദിച്ചിട്ടില്ല
DocType: Buying Settings,Buying Settings,സജ്ജീകരണങ്ങൾ വാങ്ങുക
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,ഒരു പൂർത്തിയായി നല്ല ഇനം വേണ്ടി BOM നമ്പർ
DocType: Upload Attendance,Attendance To Date,തീയതി ആരംഭിക്കുന്ന ഹാജർ
@@ -2794,6 +2799,7 @@
DocType: Grant Application,Organization,സംഘടന
DocType: BOM Update Tool,BOM Update Tool,BOM അപ്ഡേറ്റ് ടൂൾ
DocType: SG Creation Tool Course,Student Group Name,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പേര്
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,പൊട്ടിത്തെറിച്ച കാഴ്ച കാണിക്കുക
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ഫീസ് സൃഷ്ടിക്കുന്നു
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ശരിക്കും ഈ കമ്പനിയുടെ എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കാൻ ആഗ്രഹിക്കുന്ന ദയവായി ഉറപ്പാക്കുക. അത് പോലെ നിങ്ങളുടെ മാസ്റ്റർ ഡാറ്റ തുടരും. ഈ പ്രവർത്തനം തിരുത്താൻ കഴിയില്ല.
DocType: Room,Room Number,മുറി നമ്പർ
@@ -2804,7 +2810,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,ടാക്സ് ടെംപ്ലേറ്റ് ഉണ്ടാക്കുക
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ഉപയോക്തൃ ഫോറം
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
DocType: Lab Test Sample,Lab Test Sample,ലാബ് ടെസ്റ്റ് സാമ്പിൾ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ലേക്ക് ഏതെങ്കിലും ഇനത്തിന്റെ agianst പരാമർശിച്ചു എങ്കിൽ നിങ്ങൾ നിരക്ക് മാറ്റാൻ കഴിയില്ല
@@ -2875,7 +2881,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ഇൻവോയ്സ് ഉണ്ടാക്കുക
DocType: Selling Settings,Auto close Opportunity after 15 days,15 ദിവസം കഴിഞ്ഞ് ഓട്ടോ അടയ്ക്കൂ അവസരം
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} എന്ന സ്കോർക്കോർഡ് നിലയ്ക്കൽ കാരണം {0} വാങ്ങൽ ഓർഡറുകൾ അനുവദനീയമല്ല.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} എന്ന സ്കോർക്കോർഡ് നിലയ്ക്കൽ കാരണം {0} വാങ്ങൽ ഓർഡറുകൾ അനുവദനീയമല്ല.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,അവസാനിക്കുന്ന വർഷം
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
@@ -2967,7 +2973,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-മുകളിൽ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,വരി # {0}: ജേണൽ എൻട്രി {1} മറ്റൊരു വൗച്ചർ പൊരുത്തപ്പെടും അക്കൗണ്ട് {2} ഞങ്ങൾക്കുണ്ട് അല്ലെങ്കിൽ ഇതിനകം ഇല്ല
DocType: Supplier Scorecard Criteria,Criteria Weight,മാനദണ്ഡം ഭാരം
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,വിതരണക്കാരൻ> വിതരണക്കാരൻ തരം
DocType: Buying Settings,Default Buying Price List,സ്ഥിരസ്ഥിതി വാങ്ങൽ വില പട്ടിക
DocType: Payroll Entry,Salary Slip Based on Timesheet,ശമ്പള ജി Timesheet അടിസ്ഥാനമാക്കി
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,വാങ്ങൽ നിരക്ക്
@@ -3057,7 +3062,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ട്രാക്ക് ഇൻഡസ്ട്രി തരം നയിക്കുന്നു.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Letterheads ലേക്ക് പോകുക
DocType: Item Supplier,Item Supplier,ഇനം വിതരണക്കാരൻ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,എല്ലാ വിലാസങ്ങൾ.
DocType: Company,Stock Settings,സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ
@@ -3235,6 +3240,7 @@
DocType: Company,Default Inventory Account,സ്ഥിരസ്ഥിതി ഇൻവെന്ററി അക്കൗണ്ട്
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,വരി {0}: പൂർത്തിയായി അളവ് പൂജ്യം വലുതായിരിക്കണം.
DocType: Antibiotic,Antibiotic Name,ആൻറിബയോട്ടിക്ക് പേര്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,ഇനം കോഡ്> ഇനം ഗ്രൂപ്പ്> ബ്രാൻഡ്
DocType: Purchase Invoice,Apply Additional Discount On,പ്രയോഗിക്കുക അധിക ഡിസ്കൌണ്ട്
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,തരം തിരഞ്ഞെടുക്കുക ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,വിളവെടുപ്പ് വളരുന്ന ഭൂവിഭാഗങ്ങളിലേക്കുള്ള ഒരു ലിങ്ക്
@@ -3430,6 +3436,7 @@
DocType: Supplier,Credit Limit,വായ്പാ പരിധി
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,ശരാശരി. വിലനിരക്ക് റേറ്റ് വിൽക്കുന്നു
DocType: Production Plan Sales Order,Salse Order Date,Salse ഓർഡർ തീയതി
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,വിതരണക്കാരൻ> വിതരണക്കാരൻ തരം
DocType: Salary Component,Salary Component,ശമ്പള ഘടക
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,പേയ്മെന്റ് എൻട്രികൾ {0} ചെയ്യുന്നു അൺ-ലിങ്ക്ഡ്
DocType: GL Entry,Voucher No,സാക്ഷപ്പെടുത്തല് ഇല്ല
@@ -3439,7 +3446,7 @@
DocType: Leave Allocation,Leave Allocation,വിഹിതം വിടുക
DocType: Payment Request,Recipient Message And Payment Details,സ്വീകർത്താവിന്റെ സന്ദേശവും പേയ്മെന്റ് വിശദാംശങ്ങൾ
DocType: Training Event,Trainer Email,പരിശീലകൻ ഇമെയിൽ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ {0} സൃഷ്ടിച്ചു
DocType: Restaurant Reservation,No of People,ആളുകളുടെ എണ്ണം
DocType: Production Planning Tool,Include sub-contracted raw materials,സബ് ചുരുങ്ങി അസംസ്കൃത വസ്തുക്കൾ ഉൾപ്പെടുത്തുക
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,നിബന്ധനകളോ കരാറിലെ ഫലകം.
@@ -3505,7 +3512,7 @@
DocType: Production Planning Tool,Create Material Requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ സൃഷ്ടിക്കുക
DocType: Employee Education,School/University,സ്കൂൾ / യൂണിവേഴ്സിറ്റി
DocType: Payment Request,Reference Details,റഫറൻസ് വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം മൊത്തം വാങ്ങൽ തുക കുറവായിരിക്കണം
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം മൊത്തം വാങ്ങൽ തുക കുറവായിരിക്കണം
DocType: Sales Invoice Item,Available Qty at Warehouse,സംഭരണശാല ലഭ്യമാണ് Qty
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ഈടാക്കൂ തുക
DocType: Asset,Double Declining Balance,ഇരട്ട കുറയുന്ന
@@ -3517,7 +3524,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,അപ്ഡേറ്റുകൾ നേടുക
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: അക്കൗണ്ട് {2} കമ്പനി {3} സ്വന്തമല്ല
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,ഓരോ ആട്രിബ്യൂട്ടുകളിൽ നിന്നും കുറഞ്ഞത് ഒരു മൂല്യമെങ്കിലും തിരഞ്ഞെടുക്കുക.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,മെറ്റീരിയൽ അഭ്യർത്ഥന {0} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,മെറ്റീരിയൽ അഭ്യർത്ഥന {0} റദ്ദാക്കി അല്ലെങ്കിൽ നിറുത്തി
apps/erpnext/erpnext/config/hr.py +310,Leave Management,മാനേജ്മെന്റ് വിടുക
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,അക്കൗണ്ട് വഴി ഗ്രൂപ്പ്
DocType: Sales Order,Fully Delivered,പൂർണ്ണമായി കൈമാറി
@@ -3527,14 +3534,13 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ഈ ഓഹരി അനുരഞ്ജനം ഒരു തുറക്കുന്നു എൻട്രി മുതൽ വ്യത്യാസം അക്കൗണ്ട്, ഒരു അസറ്റ് / ബാധ്യത തരം അക്കൌണ്ട് ആയിരിക്കണം"
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},വിതരണം തുക വായ്പാ തുക {0} അധികമാകരുത് കഴിയില്ല
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,പ്രോഗ്രാമിലേക്ക് പോകുക
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,സെറ്റപ്പ്> നമ്പറിംഗ് സീരീസുകൾ വഴി ഹാജരാക്കാനായി സെറ്റപ്പ് നമ്പറുകൾ ക്രമീകരിക്കുക
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമാണ് വാങ്ങൽ ഓർഡർ നമ്പർ
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചിട്ടില്ല
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','ഈ തീയതി മുതൽ' 'തീയതി ആരംഭിക്കുന്ന' ശേഷം ആയിരിക്കണം
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ആയി വിദ്യാർഥി {0} വിദ്യാർഥി അപേക്ഷ {1} ലിങ്കുചെയ്തതിരിക്കുന്നതിനാൽ നില മാറ്റാൻ കഴിയില്ല
DocType: Asset,Fully Depreciated,പൂർണ്ണമായി മൂല്യത്തകർച്ചയുണ്ടായ
,Stock Projected Qty,ഓഹരി Qty അനുമാനിക്കപ്പെടുന്ന
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
DocType: Employee Attendance Tool,Marked Attendance HTML,അടയാളപ്പെടുത്തിയിരിക്കുന്ന ഹാജർ എച്ച്ടിഎംഎൽ
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ഉദ്ധരണികൾ നിർദേശങ്ങൾ, നിങ്ങളുടെ ഉപഭോക്താക്കൾക്ക് അയച്ചിരിക്കുന്നു ബിഡ്ഡുകൾ ആകുന്നു"
DocType: Sales Order,Customer's Purchase Order,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ
@@ -3619,7 +3625,7 @@
DocType: Stock Settings,Item Naming By,തന്നെയാണ നാമകരണം ഇനം
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} ശേഷം ഇതുവരെ ലഭിച്ചിട്ടുള്ള മറ്റൊരു കാലയളവ് സമാപന എൻട്രി
DocType: Production Order,Material Transferred for Manufacturing,ണം വേണ്ടി മാറ്റിയത് മെറ്റീരിയൽ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,അക്കൗണ്ട് {0} നിലവിലുണ്ട് ഇല്ല
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,അക്കൗണ്ട് {0} നിലവിലുണ്ട് ഇല്ല
DocType: Project,Project Type,പ്രോജക്ട് തരം
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ഈ ടാസ്ക്കിനായി ചൈൽഡ് ടാസ്ക് നിലവിലുണ്ട്. നിങ്ങൾക്ക് ഈ ടാസ്ക് ഇല്ലാതാക്കാൻ കഴിയില്ല.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ലക്ഷ്യം qty അല്ലെങ്കിൽ ലക്ഷ്യം തുക ഒന്നുകിൽ നിർബന്ധമാണ്.
@@ -3722,11 +3728,11 @@
DocType: Company,Asset Depreciation Cost Center,അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ
DocType: Sales Order Item,Sales Order Date,സെയിൽസ് ഓർഡർ തീയതി
DocType: Sales Invoice Item,Delivered Qty,കൈമാറി Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,ആകെ excl. നികുതി
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","പരിശോധിച്ചാൽ, ഓരോ പ്രൊഡക്ഷൻ ഇനത്തിന്റെ എല്ലാ കുട്ടികൾക്കും മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഉൾപ്പെടുത്തും."
DocType: Assessment Plan,Assessment Plan,അസസ്മെന്റ് പദ്ധതി
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,ഉപഭോക്താവ് {0} സൃഷ്ടിച്ചു.
DocType: Stock Settings,Limit Percent,ശതമാനം പരിമിതപ്പെടുത്തുക
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,ദയവായി വിദ്യാഭ്യാസം> വിദ്യാഭ്യാസ സജ്ജീകരണങ്ങളിൽ സജ്ജീകരണ അധ്യാപിക നാമനിർദേശം ചെയ്യുന്ന സംവിധാനം
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ഏതൊരു വെയർഹൌസിലും നിലവിൽ സ്റ്റോക്കില്ല
,Payment Period Based On Invoice Date,ഇൻവോയിസ് തീയതി അടിസ്ഥാനമാക്കി പേയ്മെന്റ് പിരീഡ്
DocType: Sample Collection,No. of print,പ്രിന്റ് ഇല്ല
@@ -3742,12 +3748,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),കടക്കാർ ({0})
DocType: Pricing Rule,Margin,മാർജിൻ
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,പുതിയ ഉപഭോക്താക്കളെ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,മൊത്തം ലാഭം %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,മൊത്തം ലാഭം %
DocType: Appraisal Goal,Weightage (%),വെയിറ്റേജ് (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS പ്രൊഫൈൽ മാറ്റുക
DocType: Bank Reconciliation Detail,Clearance Date,ക്ലിയറൻസ് തീയതി
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,അസ്സസ്മെന്റ് റിപ്പോർട്ട്
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ഗ്രോസ് വാങ്ങൽ തുക നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,ഗ്രോസ് വാങ്ങൽ തുക നിര്ബന്ധമാണ്
DocType: Lead,Address Desc,DESC വിലാസ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,പാർട്ടി നിർബന്ധമായും
DocType: Journal Entry,JV-,JV-
@@ -3779,7 +3785,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,സ്റ്റാൻഡിംഗ് നെയിം
DocType: Stock Entry,Customer or Supplier Details,കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ വിവരങ്ങൾ
DocType: Employee Loan Application,Required by Date,തീയതി പ്രകാരം ആവശ്യമാണ്
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),അടയ്ക്കുക ബാലൻസ് (ഡോ - ക്രക്സ്)
DocType: Lead,Lead Owner,ലീഡ് ഉടമ
DocType: Bin,Requested Quantity,അഭ്യർത്ഥിച്ചു ക്വാണ്ടിറ്റി
DocType: Patient,Marital Status,വൈവാഹിക നില
@@ -3793,7 +3798,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,വിവിധ വകഭേദങ്ങൾ
DocType: Sales Invoice,Against Income Account,ആദായ അക്കൗണ്ടിനെതിരായ
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,കൈമാറി {0}%
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ഇനം {0}: ക്രമപ്പെടുത്തിയ qty {1} {2} (ഇനത്തിലെ നിർവചിച്ചിരിക്കുന്നത്) മിനിമം ഓർഡർ qty താഴെയായിരിക്കണം കഴിയില്ല.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,ഇനം {0}: ക്രമപ്പെടുത്തിയ qty {1} {2} (ഇനത്തിലെ നിർവചിച്ചിരിക്കുന്നത്) മിനിമം ഓർഡർ qty താഴെയായിരിക്കണം കഴിയില്ല.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,പ്രതിമാസ വിതരണ ശതമാനം
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,മറ്റൊരു ഉപയോക്താവായി ലോഗിൻ ചെയ്യുക.
DocType: Territory,Territory Targets,ടെറിറ്ററി ടാർഗെറ്റ്
@@ -3894,7 +3899,7 @@
DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം നിർമ്മിക്കുക
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
DocType: Company,Default Cash Account,സ്ഥിരസ്ഥിതി ക്യാഷ് അക്കൗണ്ട്
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,കമ്പനി (അല്ല കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ) മാസ്റ്റർ.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ഇത് ഈ വിദ്യാർത്ഥി ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
@@ -4046,7 +4051,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,പരാമർശിക്കപ്പെട്ട മാനദണ്ഡത്തിനായി ജീവനക്കാർ ഇല്ല
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
DocType: Restaurant,Default Customer,സ്ഥിരസ്ഥിതി ഉപഭോക്താവ്
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,മാനവ വിഭവശേഷി> എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ദയവായി എംപ്ലോയീ നെയിമിങ് സിസ്റ്റം സെറ്റപ്പ് ചെയ്യുക
DocType: Assessment Plan,Supervisor Name,സൂപ്പർവൈസർ പേര്
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ഒരേ ദിവസം തന്നെ അസൈൻ ചെയ്യപ്പെട്ടാൽ അത് സ്ഥിരീകരിക്കരുത്
DocType: Program Enrollment Course,Program Enrollment Course,പ്രോഗ്രാം എൻറോൾമെന്റ് കോഴ്സ്
@@ -4167,7 +4171,7 @@
DocType: BOM,Website Description,വെബ്സൈറ്റ് വിവരണം
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ഏറ്റവും പുതിയത്
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ഇമെയിൽ വിലാസം അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,രസീത്
@@ -4184,7 +4188,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,അനുമതി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,നിങ്ങൾക്ക് മുൻ സാമ്പത്തിക വർഷത്തെ ബാലൻസ് ഈ സാമ്പത്തിക വർഷം വിട്ടുതരുന്നു ഉൾപ്പെടുത്താൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ മുന്നോട്ട് തിരഞ്ഞെടുക്കുക
DocType: GL Entry,Against Voucher Type,വൗച്ചർ തരം എഗെൻസ്റ്റ്
DocType: Physician,Phone (R),ഫോൺ (R)
@@ -4196,7 +4200,7 @@
DocType: Patient,B Negative,ബി നെഗറ്റീവ്
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,അറ്റകുറ്റപ്പണി സ്റ്റാറ്റസ് റദ്ദാക്കാൻ സമർപ്പിക്കേണ്ടതാണ്
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,തുടർച്ചയായ സീരിയൽ നമ്പറുകൾ {0} ഡെലിവറി നോട്ട് ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,തുടർച്ചയായ സീരിയൽ നമ്പറുകൾ {0} ഡെലിവറി നോട്ട് ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല
DocType: Student,Guardian Details,ഗാർഡിയൻ വിവരങ്ങൾ
DocType: C-Form,C-Form,സി-ഫോം
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ഒന്നിലധികം ജീവനക്കാരുടെ അടയാളപ്പെടുത്തുക ഹാജർ
@@ -4238,7 +4242,7 @@
DocType: Stock Entry Detail,Basic Amount,അടിസ്ഥാന തുക
DocType: Training Event,Exam,പരീക്ഷ
DocType: Complaint,Complaint,പരാതി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
DocType: Patient,Alcohol Past Use,മദ്യപിക്കുന്ന ഭൂതകാല ഉപയോഗം
DocType: Fertilizer Content,Fertilizer Content,വളപ്രയോഗം ഉള്ളടക്കം
@@ -4364,6 +4368,7 @@
DocType: Salary Detail,Formula,ഫോർമുല
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,സീരിയൽ #
DocType: Lab Test Template,Lab Test Template,ടെസ്റ്റ് ടെംപ്ലേറ്റ് ടെംപ്ലേറ്റ്
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,സെൽ അക്കൌണ്ട്
DocType: Purchase Invoice Item,Total Weight,ആകെ ഭാരം
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,വിൽപ്പന കമ്മീഷൻ
DocType: Offer Letter Term,Value / Description,മൂല്യം / വിവരണം
@@ -4520,7 +4525,7 @@
DocType: Customer,From Lead,ലീഡ് നിന്ന്
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ഉത്പാദനത്തിന് പുറത്തുവിട്ട ഉത്തരവ്.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
DocType: Program Enrollment Tool,Enroll Students,വിദ്യാർഥികൾ എൻറോൾ
DocType: Lab Test,Approved Date,അംഗീകരിച്ച തീയതി
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
@@ -4597,7 +4602,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,പ്രൊഡക്ഷൻ ഇനം
,Employee Information,ജീവനക്കാരുടെ വിവരങ്ങൾ
DocType: Stock Entry Detail,Additional Cost,അധിക ചെലവ്
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","വൗച്ചർ ഭൂഖണ്ടക്രമത്തിൽ എങ്കിൽ, വൗച്ചർ പോസ്റ്റ് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","വൗച്ചർ ഭൂഖണ്ടക്രമത്തിൽ എങ്കിൽ, വൗച്ചർ പോസ്റ്റ് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
DocType: Quality Inspection,Incoming,ഇൻകമിംഗ്
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,വിൽപ്പനയ്ക്കായി വാങ്ങുന്നതിനും വാങ്ങുന്നതിനുമുള്ള സ്ഥിര ടാക്സ് ടെംപ്ലേറ്റുകൾ സൃഷ്ടിക്കുന്നു.
@@ -4614,7 +4619,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},കുറിപ്പ്: {0}
,Delivery Note Trends,ഡെലിവറി നോട്ട് ട്രെൻഡുകൾ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ഈ ആഴ്ചത്തെ ചുരുക്കം
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,ഓഹരി അളവ് ൽ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,ഓഹരി അളവ് ൽ
DocType: Delivery Trip,Calculate Estimated Arrival Times,കണക്കാക്കപ്പെട്ട വരവ് സമയം കണക്കാക്കുക
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,അക്കൗണ്ട്: {0} മാത്രം ഓഹരി ഇടപാടുകൾ വഴി അപ്ഡേറ്റ് ചെയ്യാൻ കഴിയില്ല
DocType: Student Group Creation Tool,Get Courses,കോഴ്സുകൾ നേടുക
@@ -4630,7 +4635,7 @@
DocType: Material Request,% Ordered,% ക്രമപ്പെടുത്തിയ
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള സ്റ്റുഡന്റ് ഗ്രൂപ്പ്, കോഴ്സ് പ്രോഗ്രാം എൻറോൾമെന്റ് എൻറോൾ കോഴ്സുകൾ നിന്ന് എല്ലാ വിദ്യാർത്ഥികൾക്കും വേണ്ടി സാധൂകരിക്കാൻ ചെയ്യും."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ശരാ. വാങ്ങുക റേറ്റ്
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ശരാ. വാങ്ങുക റേറ്റ്
DocType: Task,Actual Time (in Hours),(അവേഴ്സ്) യഥാർത്ഥ സമയം
DocType: Employee,History In Company,കമ്പനിയിൽ ചരിത്രം
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{Sender} ൽ നിന്നുള്ള പുതിയ സന്ദേശം
@@ -4678,7 +4683,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},വരി {0}: കറന്സി BOM ൽ # ന്റെ {1} {2} തിരഞ്ഞെടുത്തു കറൻസി തുല്യമോ വേണം
DocType: Journal Entry Account,Exchange Rate,വിനിമയ നിരക്ക്
DocType: Patient,Additional information regarding the patient,രോഗിയെ സംബന്ധിച്ച കൂടുതൽ വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
DocType: Homepage,Tag Line,ടാഗ് ലൈൻ
DocType: Fee Component,Fee Component,ഫീസ്
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ഫ്ലീറ്റ് മാനേജ്മെന്റ്
@@ -4893,7 +4898,7 @@
DocType: Employee Education,Employee Education,ജീവനക്കാരുടെ വിദ്യാഭ്യാസം
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ഇനം ഗ്രൂപ്പ് പട്ടികയിൽ കണ്ടെത്തി തനിപ്പകർപ്പ് ഇനം ഗ്രൂപ്പ്
DocType: Land Unit,Parent Land Unit,പാരന്റ് ലാൻഡ് യൂണിറ്റ്
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
DocType: Fertilizer,Fertilizer Name,രാസവളത്തിന്റെ പേര്
DocType: Salary Slip,Net Pay,നെറ്റ് വേതനം
DocType: Account,Account,അക്കൗണ്ട്
@@ -4971,7 +4976,7 @@
DocType: Item Customer Detail,Ref Code,റഫറൻസ് കോഡ്
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS പ്രൊഫൈലുകളിൽ ഉപഭോക്താവിന്റെ ഗ്രൂപ്പ് ആവശ്യമാണ്
apps/erpnext/erpnext/config/hr.py +12,Employee records.,ജീവനക്കാരുടെ റെക്കോർഡുകൾ.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി സജ്ജമാക്കുക ദയവായി
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി സജ്ജമാക്കുക ദയവായി
DocType: HR Settings,Payroll Settings,ശമ്പളപ്പട്ടിക ക്രമീകരണങ്ങൾ
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,നോൺ-ലിങ്ക്ഡ് ഇൻവോയ്സുകളും പേയ്മെൻറുകൾ ചേരു.
DocType: POS Settings,POS Settings,POS ക്രമീകരണങ്ങൾ
@@ -5139,7 +5144,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
DocType: Asset Maintenance Task,Last Completion Date,അവസാനം പൂർത്തിയാക്കിയ തീയതി
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
DocType: Buying Settings,Naming Series,സീരീസ് നാമകരണം
DocType: Leave Block List,Leave Block List Name,ബ്ലോക്ക് പട്ടിക പേര് വിടുക
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ഇൻഷുറൻസ് ആരംഭ തീയതി ഇൻഷുറൻസ് അവസാന തീയതി കുറവായിരിക്കണം
@@ -5268,6 +5273,7 @@
DocType: Bank Reconciliation,Get Payment Entries,പേയ്മെന്റ് എൻട്രികൾ ലഭ്യമാക്കുക
DocType: Quotation Item,Against Docname,Docname എഗെൻസ്റ്റ്
DocType: SMS Center,All Employee (Active),എല്ലാ ജീവനക്കാരുടെ (സജീവമായ)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ഉപഭോക്താവ്> കസ്റ്റമർ ഗ്രൂപ്പ്> ടെറിട്ടറി
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ഇപ്പോൾ കാണുക
DocType: BOM,Raw Material Cost,അസംസ്കൃത വസ്തുക്കളുടെ വില
DocType: Item Reorder,Re-Order Level,വീണ്ടും ഓർഡർ ലെവൽ
@@ -5368,7 +5374,6 @@
DocType: Room,Seating Capacity,ഇരിപ്പിടങ്ങളുടെ
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,ലാബ് ടെസ്റ്റ് ഗ്രൂപ്പുകൾ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ഉപഭോക്താവ്> കസ്റ്റമർ ഗ്രൂപ്പ്> ടെറിട്ടറി
DocType: Project,Total Expense Claim (via Expense Claims),(ചിലവേറിയ ക്ലെയിമുകൾ വഴി) ആകെ ചിലവേറിയ ക്ലെയിം
DocType: GST Settings,GST Summary,ചരക്കുസേവന ചുരുക്കം
DocType: Assessment Result,Total Score,ആകെ സ്കോർ
@@ -5382,7 +5387,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,കോഴ്സ് ഷെഡ്യൂളുകൾ സൃഷ്ടിച്ചു
DocType: Journal Entry,Total Debit,ആകെ ഡെബിറ്റ്
DocType: Manufacturing Settings,Default Finished Goods Warehouse,സ്വതേ ഉത്പ്പന്ന വെയർഹൗസ് പൂർത്തിയായി
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,സെയിൽസ് വ്യാക്തി
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,സെയിൽസ് വ്യാക്തി
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,ബജറ്റ് ചെലവ് കേന്ദ്രം
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,പണമടയ്ക്കലിന്റെ സ്ഥിരസ്ഥിതി മോഡ് അനുവദനീയമല്ല
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,വേണ്ടി
@@ -5393,7 +5398,7 @@
DocType: Healthcare Settings,Consultations in valid days,സാധുതയുള്ള ദിവസങ്ങളിൽ കൂടിയാലോചനകൾ
DocType: Assessment Plan Criteria,Maximum Score,പരമാവധി സ്കോർ
apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,മൂല്യങ്ങൾ അടിസ്ഥാനമാക്കിയുള്ള ഇടപാടുകൾ പരിമിതപ്പെടുത്താൻ നിയമങ്ങൾ സൃഷ്ടിക്കുക.
-apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,ഗ്രൂപ്പ് റോൾ ഇല്ല
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,ഗ്രൂപ്പ് റോൾ നംബര്
DocType: Batch,Manufacturing Date,നിർമ്മാണ തീയതി
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,ഫീസ് സൃഷ്ടിക്കൽ പരാജയപ്പെട്ടു
DocType: Student Group Creation Tool,Leave blank if you make students groups per year,നിങ്ങൾ പ്രതിവർഷം വിദ്യാർത്ഥികളുടെ ഗ്രൂപ്പുകൾ ഉണ്ടാക്കുന്ന ശൂന്യമായിടൂ
@@ -5557,7 +5562,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,വേണ്ടി നികുതി അഥവാ ചാർജ് പരിചിന്തിക്കുക
DocType: Driver,Driving License Category,ഡ്രൈവിംഗ് ലൈസൻസ് വിഭാഗം
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,യഥാർത്ഥ Qty നിർബന്ധമായും
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} നിലവിൽ ഒരു {1} സപ്ലിയർ സ്കോർകാർഡ് സ്റ്റാൻഡ് ഉണ്ട്, ഈ വിതരണക്കാരന് പർച്ചേസ് ഓർഡറുകൾ മുൻകരുതൽ നൽകണം."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} നിലവിൽ ഒരു {1} സപ്ലിയർ സ്കോർകാർഡ് സ്റ്റാൻഡ് ഉണ്ട്, ഈ വിതരണക്കാരന് പർച്ചേസ് ഓർഡറുകൾ മുൻകരുതൽ നൽകണം."
DocType: Asset Maintenance Team,Asset Maintenance Team,അസറ്റ് മെയിന്റനൻസ് ടീം
DocType: Employee Loan,Loan Type,ലോൺ ഇനം
DocType: Scheduling Tool,Scheduling Tool,സമയംസജ്ജീകരിയ്ക്കുന്നു ടൂൾ
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 6be4393..26b1cd6 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,किंमतानुसार क्रमवारी लावा
,Delay Days,विलंब दिवस
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा खर्च
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,चलन
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,प्रतिधारण स्टॉक प्रवेश करा
DocType: Purchase Invoice Item,Item Weight Details,आयटम वजन तपशील
@@ -149,7 +149,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} ला परवानगी नाही
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,आयटम मिळवा
DocType: Price List,Price Not UOM Dependant,किंमत नाही UOM अवलंबित्व
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पादन {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,कोणतेही आयटम सूचीबद्ध
DocType: Asset Repair,Error Description,त्रुटी वर्णन
@@ -157,7 +157,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,किराणा
DocType: Quality Inspection Reading,Reading 1,1 वाचन
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,पेन्शन फंड्स
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,पुढील घसारा तारीख खरेदी तारीख असू शकत नाही
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,पुढील घसारा तारीख खरेदी तारीख असू शकत नाही
DocType: Crop,Perennial,बारमाही
DocType: Consultation,Consultation Date,सल्ला तारीख
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext वापरकर्त्यांसाठी उत्पादन सूची आणि शोध
@@ -172,7 +172,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",उदा "प्राथमिक शाळा" किंवा "युनिव्हर्सिटी"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,शेअर अहवाल
DocType: Warehouse,Warehouse Detail,वखार तपशील
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,मुदत समाप्ती तारीख नंतर जे मुदत लिंक आहे शैक्षणिक वर्ष वर्ष अंतिम तारीख पेक्षा असू शकत नाही (शैक्षणिक वर्ष {}). तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""मुदत मालमत्ता आहे" मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
DocType: Delivery Trip,Departure Time,प्रस्थानाची वेळ
@@ -192,7 +192,7 @@
DocType: Quality Inspection,Get Specification Details,तपशील मिळवा
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,पुरवठादार स्टँडिंगच्या टेम्पलेट्स.
DocType: Lead,Interested,इच्छुक
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,उघडणे
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,उघडणे
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},{0} पासून आणि {1} पर्यंत
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,कर सेट करण्यात अयशस्वी
DocType: Item,Copy From Item Group,आयटम गट पासून कॉपी
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,relieving तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,रजा वर्ष प्रति
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,रो {0}: कृपया ' आगाऊ आहे' खाते {1} विरुद्ध ही एक आगाऊ नोंद असेल तर तपासा.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},कोठार{0} कंपनी {1} ला संबंधित नाही
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},कोठार{0} कंपनी {1} ला संबंधित नाही
DocType: Email Digest,Profit & Loss,नफा व तोटा
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,लीटर
DocType: Task,Total Costing Amount (via Time Sheet),एकूण कोस्टींग रक्कम (वेळ पत्रक द्वारे)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,हे या कंपनीविरुद्धच्या व्यवहारांवर आधारित आहे. तपशीलासाठी खाली टाइमलाइन पहा
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वयंचलित साहित्य विनंती निर्माण ईमेल द्वारे सूचित करा
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,प्रतिरोधक
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,सल्ला
DocType: Journal Entry,Multi Currency,मल्टी चलन
DocType: Opening Invoice Creation Tool,Invoice Type,चलन प्रकार
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,डिलिव्हरी टीप
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,विधवा झालेली किंवा विधुर झालेला
DocType: Request for Quotation,Request for Quotation,कोटेशन विनंती
DocType: Healthcare Settings,Require Lab Test Approval,लॅब चाचणी मान्यता आवश्यक
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,आयटम कोड> आयटम गट> ब्रँड
DocType: Salary Slip Timesheet,Working Hours,कामाचे तास
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,एकूण शिल्लक
DocType: Naming Series,Change the starting / current sequence number of an existing series.,विद्यमान मालिकेत सुरू / वर्तमान क्रम संख्या बदला.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
DocType: Drug Prescription,Dosage,डोस
DocType: Journal Entry Account,Sales Order,विक्री ऑर्डर
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,सरासरी. विक्री दर
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,सरासरी. विक्री दर
DocType: Assessment Plan,Examiner Name,परीक्षक नाव
DocType: Lab Test Template,No Result,निकाल नाही
DocType: Purchase Invoice Item,Quantity and Rate,प्रमाण आणि दर
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,वेतनपट कालावधी निवडा
DocType: Purchase Invoice,Unpaid,बाकी
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,विक्रीसाठी राखीव
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,कृपया मानव संसाधन> एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
DocType: Packing Slip,From Package No.,संकुल क्रमांक पासून
DocType: Item Attribute,To Range,श्रेणी
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,सिक्युरिटीज आणि ठेवी
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,कार्यशाळा
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,खरेदी ऑर्डर चेतावणी द्या
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,आपल्या ग्राहकांची यादी करा. ते संघटना किंवा व्यक्तींना असू शकते.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,बिल्ड पुरेसे भाग
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,बिल्ड पुरेसे भाग
DocType: POS Profile User,POS Profile User,पीओएस प्रोफाइल वापरकर्ता
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,थेट उत्पन्न
DocType: Patient Appointment,Date TIme,तारीख वेळ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","खाते प्रमाणे गटात समाविष्ट केले, तर खाते आधारित फिल्टर करू शकत नाही"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","खाते प्रमाणे गटात समाविष्ट केले, तर खाते आधारित फिल्टर करू शकत नाही"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,प्रशासकीय अधिकारी
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,कंपनी आणि कर सेट करणे
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स निवडा
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,फरक खाते
DocType: Purchase Invoice,Supplier GSTIN,पुरवठादार GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,त्याच्या भोवतालची कार्य {0} बंद नाही म्हणून बंद कार्य करू शकत नाही.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ज्या वखाराविरुद्ध साहित्य विनंती उठविली जाईल ते प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,ज्या वखाराविरुद्ध साहित्य विनंती उठविली जाईल ते प्रविष्ट करा
DocType: Production Order,Additional Operating Cost,अतिरिक्त कार्यकारी खर्च
DocType: Lab Test Template,Lab Routine,लॅब नियमानुसार
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 संबंध
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,व्यवस्थापक
DocType: Payment Entry,Payment From / To,भरणा / मधून
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नवीन क्रेडिट मर्यादा ग्राहक वर्तमान थकबाकी रक्कम कमी आहे. क्रेडिट मर्यादा किमान असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नवीन क्रेडिट मर्यादा ग्राहक वर्तमान थकबाकी रक्कम कमी आहे. क्रेडिट मर्यादा किमान असणे आवश्यक आहे {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},कृपया वेअरहाऊसमध्ये खाते सेट करा {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'आधारीत' आणि 'गट करून' समान असू शकत नाही
DocType: Sales Person,Sales Person Targets,विक्री व्यक्ती लक्ष्य
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,बॅच नाव
DocType: Fee Validity,Max number of visit,भेटीची कमाल संख्या
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet तयार:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,नाव नोंदणी करा
DocType: GST Settings,GST Settings,'जीएसटी' सेटिंग्ज
DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,बजेट विरुद्ध
DocType: Employee,Cell Number,सेल क्रमांक
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,दिलेल्या निकषांसाठी कोणतेही कर्मचारी नाही. वेतन स्लिप्स आधीपासून तयार केलेले नसल्याचे तपासा.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,ऑटो साहित्य विनंत्या तयार होतो
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ऑटो साहित्य विनंत्या तयार होतो
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,गमावले
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या 'जर्नल प्रवेश विरुद्ध' सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,उत्पादन राखीव
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ऊर्जा
DocType: Opportunity,Opportunity From,पासून संधी
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक पगार विधान.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} पंक्ती: {1} आयटम {2} साठी आवश्यक क्रम संख्या. आपण {3} प्रदान केले आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} पंक्ती: {1} आयटम {2} साठी आवश्यक क्रम संख्या. आपण {3} प्रदान केले आहे
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,कृपया एक सारणी निवडा
DocType: BOM,Website Specifications,वेबसाइट वैशिष्ट्य
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} 'प्राप्तकर्ते' मध्ये अवैध ईमेल पत्ता आहे
@@ -1035,7 +1036,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,विनंती केलेली रक्कम
DocType: Vital Signs,Heart Rate / Pulse,हृदय गती / पल्स
DocType: Company,Default Bank Account,मुलभूत बँक खाते
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी, पहिले पार्टी पयायय टाइप करा"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी, पहिले पार्टी पयायय टाइप करा"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},' अद्यतन शेअर ' तपासणे शक्य नाही कारण आयटम द्वारे वितरीत नाही {0}
DocType: Vehicle,Acquisition Date,संपादन दिनांक
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,क्रमांक
@@ -1060,7 +1061,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),आपले लेटर हेडर अपलोड करा (ते वेब-मित्रत्वाचे म्हणून 900px 100px ठेवा)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: खाते {2} एक गट असू शकत नाही
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आयटम रो {idx}: {doctype} {docName} वरील अस्तित्वात नाही '{doctype}' टेबल
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} आधीच पूर्ण किंवा रद्द
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} आधीच पूर्ण किंवा रद्द
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,कोणतीही कार्ये
DocType: Item Variant Settings,Copy Fields to Variant,फील्ड ते व्हेरियंट कॉपी करा
DocType: Asset,Opening Accumulated Depreciation,जमा घसारा उघडत
@@ -1172,9 +1173,10 @@
DocType: Production Order,Plan material for sub-assemblies,उप-विधानसभा योजना साहित्य
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,विक्री भागीदार आणि प्रदेश
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),बंद करणे (उघडणे + एकूण)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),बंद करणे (उघडणे + एकूण)
DocType: Journal Entry,Depreciation Entry,घसारा प्रवेश
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहले दस्तऐवज प्रकार निवडा
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,खाते चलनातील मुद्रित करा
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,साहित्य भेट रद्द करा {0} ही देखभाल भेट रद्द होण्यापुर्वी रद्द करा
DocType: Crop Cycle,ISO 8016 standard,आयएसओ 8016 मानक
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},सिरियल क्रमांक {0} आयटम {1} शी संबंधित नाही
@@ -1200,7 +1202,7 @@
DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नाही आहे किंवा अस्तित्वात नाही
DocType: Fee Structure,Components,घटक
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,आयटम रूपे {0} सुधारित
DocType: Quality Inspection Reading,Reading 6,6 वाचन
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1252,6 +1254,7 @@
,Company Name,कंपनी नाव
DocType: SMS Center,Total Message(s),एकूण संदेशा (चे)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,कृपया {0} साठी सेटअप> सेटिंग्ज> नाविक शृंखला मार्गे नेमिशन सीरीज सेट करा
DocType: Purchase Invoice,Additional Discount Percentage,अतिरिक्त सवलत टक्केवारी
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,मदत व्हिडिओ यादी पहा
DocType: Agriculture Analysis Criteria,Soil Texture,मातीचा पोत
@@ -1280,7 +1283,7 @@
DocType: BOM Website Item,BOM Website Item,BOM वेबसाइट बाबींचा
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
DocType: Timesheet Detail,Bill,बिल
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,पुढील घसारा तारीख मागील तारीख प्रवेश केला आहे
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,पुढील घसारा तारीख मागील तारीख प्रवेश केला आहे
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,व्हाइट
DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),सलग {0}: प्रमाण उपलब्ध नाही {4} कोठार मध्ये {1} नोंद वेळ पोस्ट करण्यात ({2} {3})
@@ -1297,7 +1300,7 @@
DocType: Lead,Next Contact Date,पुढील संपर्क तारीख
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty उघडणे
DocType: Healthcare Settings,Appointment Reminder,नेमणूक स्मरणपत्र
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
DocType: Program Enrollment Tool Student,Student Batch Name,विद्यार्थी बॅच नाव
DocType: Consultation,Doctor,डॉक्टर
DocType: Holiday List,Holiday List Name,सुट्टी यादी नाव
@@ -1313,6 +1316,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,रजा वाटप साधन
DocType: Item,Hub Category to Publish,हब श्रेणी प्रकाशित करण्यासाठी
DocType: Leave Block List,Leave Block List Dates,रजा ब्लॉक यादी तारखा
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,कृपया सेटअप> क्रमांकिंग सीरिजद्वारे उपस्थिततेसाठी सेटिग नंबरिंग सिरीज
DocType: Sales Invoice,Billing Address GSTIN,बिलिंग पत्ता GSTIN
DocType: Assessment Plan,Evaluate,मुल्यांकन करा
DocType: Workstation,Net Hour Rate,नेट तास दर
@@ -1347,7 +1351,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,विक्री चलन भरणा
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,विक्री ऑर्डर / तयार वस्तू भांडार मध्ये राखीव कोठार
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,विक्री रक्कम
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,विक्री रक्कम
DocType: Repayment Schedule,Interest Amount,व्याज रक्कम
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. 'स्थिती' अद्यतनित करा आणि जतन करा
DocType: Serial No,Creation Document No,निर्मिती दस्तऐवज नाही
@@ -1440,7 +1444,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,उघडत लेखा शिल्लक
,GST Sales Register,जीएसटी विक्री नोंदणी
DocType: Sales Invoice Advance,Sales Invoice Advance,विक्री चलन आगाऊ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,काहीही विनंती करण्यासाठी
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,काहीही विनंती करण्यासाठी
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,आपले डोमेन निवडा
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},आणखी अर्थसंकल्पात रेकॉर्ड '{0}' आधीच विरुद्ध अस्तित्वात {1} '{2}' आर्थिक वर्षात आर्थिक {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,निर्मितीच्या वेळी केवळ फील्डवर कॉपी केली जाईल.
@@ -1450,11 +1454,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","हा जिच्यामध्ये variant आयटम कोड आहे त्यासाठी जोडला जाईल. उदाहरणार्थ जर आपला संक्षेप ""SM"", आहे आणि , आयटम कोड ""टी-शर्ट"", ""टी-शर्ट-एम"" असेल जिच्यामध्ये variant आयटम कोड आहे"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,आपल्या पगाराच्या स्लिप्स एकदा जतन केल्यावर निव्वळ वेतन ( शब्दांत ) दृश्यमान होईल.
DocType: Purchase Invoice,Is Return,परत आहे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,खबरदारी
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,खबरदारी
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,परत / डेबिट टीप
DocType: Price List Country,Price List Country,किंमत यादी देश
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} हा आयटम {1} साठी वैध सिरीयल क्रमांक आहे
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} हा आयटम {1} साठी वैध सिरीयल क्रमांक आहे
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,आयटम कोड सिरियल क्रमांकासाठी बदलला जाऊ शकत नाही
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM रुपांतर फॅक्टर
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,बॅच क्रमांक आयटम कोड प्रविष्ट करा
@@ -1560,7 +1564,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
DocType: Supplier Scorecard,Warn for new Request for Quotations,कोटेशनसाठी नवीन विनंतीसाठी चेतावणी द्या
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,खरेदी आदेश योजना मदत आणि आपल्या खरेदी पाठपुरावा
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,लॅब टेस्ट प्रिस्क्रिप्शन
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / हस्तांतरण प्रमाणात{0} साहित्य विनंती {1} मध्ये \ विनंती प्रमाण {2} पेक्षा आयटम{3} साठी जास्त असू शकत नाही
@@ -1598,7 +1602,6 @@
DocType: Warehouse,Warehouse Contact Info,वखार संपर्क माहिती
DocType: Payment Entry,Write Off Difference Amount,फरक रक्कम बंद लिहा
DocType: Volunteer,Volunteer Name,स्वयंसेवक नाव
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,कृपया शिक्षण> शिक्षण सेटिंग्ज मध्ये शिक्षक नाव प्रणालीची मांडणी करा
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल आढळले नाही, म्हणून पाठविले नाही ई-मेल"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},देशांकरिता शिपिंग नियम लागू नाही {0}
DocType: Item,Foreign Trade Details,विदेश व्यापार तपशील
@@ -1611,7 +1614,7 @@
DocType: Student Group Student,Group Roll Number,गट आसन क्रमांक
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सर्व कार्य वजन एकूण असू 1. त्यानुसार सर्व प्रकल्प कार्ये वजन समायोजित करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,कॅपिटल उपकरणे
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम 'रोजी लागू करा' field वर आधारित पहिले निवडलेला आहे , जो आयटम, आयटम गट किंवा ब्रॅण्ड असू शकतो"
@@ -1636,7 +1639,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,बाल कोठार या कोठार अस्तित्वात नाही. आपण या कोठार हटवू शकत नाही.
DocType: Item,Website Item Groups,वेबसाइट आयटम गट
DocType: Purchase Invoice,Total (Company Currency),एकूण (कंपनी चलन)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,अनुक्रमांक {0} एकापेक्षा अधिक वेळा enter केला आहे
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,अनुक्रमांक {0} एकापेक्षा अधिक वेळा enter केला आहे
DocType: Journal Entry,Journal Entry,जर्नल प्रवेश
DocType: Expense Claim Advance,Unclaimed amount,हक्क न सांगितलेला रक्कम
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} प्रगतीपथावर आयटम
@@ -1733,7 +1736,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,संवाद लॉग.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",कोटेशन विनंती अधिक तपासणी पोर्टल सेटिंग्ज पोर्टल प्रवेश करू अक्षम केले आहे.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,पुरवठादार धावसंख्याकार्ड स्कोअरिंग व्हेरिएबल
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,खरेदी रक्कम
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,खरेदी रक्कम
DocType: Sales Invoice,Shipping Address Name,शिपिंग पत्ता नाव
DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,कोर्स वेळापत्रक तयार करण्यात त्रुटी होत्या
@@ -1997,7 +2000,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,हे या वाहन विरुद्ध नोंदी आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
DocType: Customer,Default Price List,मुलभूत दर सूची
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आपण हटवू शकत नाही आर्थिक वर्ष {0}. आर्थिक वर्ष {0} वैश्विक सेटिंग्ज मध्ये डीफॉल्ट म्हणून सेट केले आहे
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,त्याच नावासह असलेले ग्राहक आधीपासून अस्तित्वात आहे
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,हे सल्ले स्लिप्स सबमिट करेल आणि जमा करुन जर्नल एंट्री तयार करेल. आपण पुढे सुरु ठेवू इच्छिता?
@@ -2011,6 +2014,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,किंमत
DocType: Quotation,Term Details,मुदत तपशील
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} विद्यार्थी या विद्यार्थी गट जास्त नोंदणी करु शकत नाही.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),एकूण (कर न करता)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड संख्या
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,लीड संख्या
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 पेक्षा जास्त असणे आवश्यक आहे
@@ -2031,7 +2035,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,चलन रद्द देयक दुवा रद्द करा
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},प्रवेश चालू ओडोमीटर वाचन प्रारंभिक वाहन ओडोमीटर अधिक असावे {0}
DocType: Restaurant Reservation,No Show,शो नाही
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,कृपया {0} साठी सेटअप> सेटिंग्ज> नाविक शृंखला मार्गे नेमिशन सीरीज सेट करा
DocType: Shipping Rule Country,Shipping Rule Country,शिपिंग नियम देश
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,सोडा आणि विधान परिषदेच्या
DocType: Maintenance Visit,Partially Completed,अंशत: पूर्ण
@@ -2124,7 +2127,7 @@
DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
DocType: Grant Application,Assessment Mark (Out of 10),आकलन चिन्ह (10 पैकी)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,मुख्य
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,मुख्य
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,जिच्यामध्ये variant
DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
DocType: Employee Attendance Tool,Employees HTML,कर्मचारी एचटीएमएल
@@ -2174,7 +2177,7 @@
DocType: Course,Course Abbreviation,अर्थात संक्षेप
DocType: Student Leave Application,Student Leave Application,विद्यार्थी रजेचा अर्ज
DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},वर अर्धा दिवशी कर्मचारी {0} {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},एकूण कामाचे तास कमाल कामाचे तास पेक्षा जास्त असू नये {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,रोजी
@@ -2361,9 +2364,10 @@
DocType: Task,Actual End Date (via Time Sheet),प्रत्यक्ष समाप्ती तारीख (वेळ पत्रक द्वारे)
DocType: Soil Texture,Soil Type,मातीचा प्रकार
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,नवीन संदेश
,Quotation Trends,कोटेशन ट्रेन्ड
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},आयटम गट आयटम मास्त्रे साठी आयटम {0} मधे नमूद केलेला नाही
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
DocType: Shipping Rule,Shipping Amount,शिपिंग रक्कम
DocType: Supplier Scorecard Period,Period Score,कालावधी स्कोअर
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ग्राहक जोडा
@@ -2374,7 +2378,7 @@
,Vehicle Expenses,वाहन खर्च
DocType: Serial No,Invoice Details,चलन तपशील
DocType: Grant Application,Show on Website,वेबसाइटवर दर्शवा
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,सुरु करा
DocType: Hub Category,Hub Category,हब श्रेणी
DocType: Purchase Invoice,SEZ,सेझ
@@ -2406,7 +2410,7 @@
DocType: Patient,B Positive,ब सकारात्मक
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
DocType: Leave Block List Allow,Leave Block List Allow,रजा ब्लॉक यादी परवानगी द्या
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
DocType: Patient Medical Record,Patient Medical Record,पेशंट मेडिकल रेकॉर्ड
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,गट पासून नॉन-गट पर्यंत
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,क्रीडा
@@ -2457,6 +2461,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,कोणतेही भाव नाही प्राप्त आरएफक्यू सेट करू शकत नाही
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,एकूण कपात
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,खाते चलनात मुद्रण करण्यासाठी एक खाते निवडा
,Production Analytics,उत्पादन विश्लेषण
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,हे या पेशंटच्या व्यवहारावर आधारित आहे. तपशीलासाठी खाली टाइमलाइन पहा
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,खर्च अद्यतनित
@@ -2512,7 +2517,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,कंपनी निवडा ...
DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी विचारल्यास रिक्त सोडा
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
DocType: Payroll Entry,Fortnightly,पाक्षिक
DocType: Currency Exchange,From Currency,चलन पासून
DocType: Vital Signs,Weight (In Kilogram),वजन (किलोग्रॅममध्ये)
@@ -2590,7 +2595,7 @@
DocType: Student,Guardians,पालक
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,दर सूची सेट केले नसल्यास दर दर्शविली जाणार नाही
DocType: Stock Entry,Total Incoming Value,एकूण येणारी मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,डेबिट करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,डेबिट करणे आवश्यक आहे
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets आपला संघ केले activites साठी वेळ, खर्च आणि बिलिंग ट्रॅक ठेवण्यात मदत"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरेदी दर सूची
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,सप्लायर स्कोअरकार्ड व्हेरिएबल्सचे टेम्पलेट
@@ -2693,7 +2698,7 @@
DocType: Company,For Reference Only.,संदर्भ केवळ.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},{0} वर वैद्यक {0} उपलब्ध नाही
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,बॅच निवडा कोणत्याही
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},अवैध {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},अवैध {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,संदर्भ INV
@@ -2730,8 +2735,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च आणि आपल्या ऑपरेशनसाठी एक अद्वितीय ऑपरेशन क्रमांक निर्देशीत करा ."
DocType: Water Analysis,Origin,मूळ
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,हा दस्तऐवज करून मर्यादेपेक्षा अधिक {0} {1} आयटम {4}. आपण करत आहेत दुसर्या {3} त्याच विरुद्ध {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,बदल निवडा रक्कम खाते
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,बदल निवडा रक्कम खाते
DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
@@ -2787,7 +2792,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,नवीन खरेदी ऑर्डरसाठी चेतावणी द्या
DocType: Quality Inspection Reading,Reading 9,9 वाचन
DocType: Supplier,Is Frozen,गोठवले आहे
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,गट नोड कोठार व्यवहार निवडण्यासाठी परवानगी नाही
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,गट नोड कोठार व्यवहार निवडण्यासाठी परवानगी नाही
DocType: Buying Settings,Buying Settings,खरेदी सेटिंग्ज
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,एक तयार झालेले चांगले आयटम साठी BOM क्रमांक
DocType: Upload Attendance,Attendance To Date,उपस्थिती पासून तारीख
@@ -2802,6 +2807,7 @@
DocType: Grant Application,Organization,संघटना
DocType: BOM Update Tool,BOM Update Tool,BOM अद्यतन साधन
DocType: SG Creation Tool Course,Student Group Name,विद्यार्थी गट नाव
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,विस्फोट केलेले दृश्य दर्शवा
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,शुल्क तयार करणे
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आपण खरोखर या कंपनीतील सर्व व्यवहार हटवू इच्छिता याची खात्री करा. तुमचा master data आहे तसा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
DocType: Room,Room Number,खोली क्रमांक
@@ -2812,7 +2818,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,कर टेम्पलेट करा
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,वापरकर्ता मंच
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
DocType: Lab Test Sample,Lab Test Sample,लॅब चाचणी नमुना
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,जलद प्रवेश जर्नल
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
@@ -2883,7 +2889,7 @@
DocType: Membership,USD,अमेरिकन डॉलर
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,चलन करा
DocType: Selling Settings,Auto close Opportunity after 15 days,त्यानंतर 15 दिवसांनी ऑटो संधी बंद
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} च्या स्कोअरकार्ड स्टँडिंगमुळे {0} साठी खरेदी ऑर्डरची अनुमती नाही
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} च्या स्कोअरकार्ड स्टँडिंगमुळे {0} साठी खरेदी ऑर्डरची अनुमती नाही
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,समाप्त वर्ष
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / लीड%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / लीड%
@@ -2976,7 +2982,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-वर
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,सलग # {0}: जर्नल प्रवेश {1} खाते नाही {2} किंवा आधीच दुसर्या व्हाउचर विरुद्ध जुळलेल्या
DocType: Supplier Scorecard Criteria,Criteria Weight,निकष वजन
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,पुरवठादार> पुरवठादार प्रकार
DocType: Buying Settings,Default Buying Price List,मुलभूत खरेदी दर सूची
DocType: Payroll Entry,Salary Slip Based on Timesheet,Timesheet आधारित पगाराच्या स्लिप्स
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,खरेदी दर
@@ -3066,7 +3071,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ट्रॅक उद्योग प्रकार करून ठरतो.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,लेटरहेडवर जा
DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सर्व पत्ते.
DocType: Company,Stock Settings,शेअर सेटिंग्ज
@@ -3244,6 +3249,7 @@
DocType: Company,Default Inventory Account,डीफॉल्ट यादी खाते
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,सलग {0}: पूर्ण प्रमाण शून्य पेक्षा जास्त असणे आवश्यक आहे.
DocType: Antibiotic,Antibiotic Name,प्रतिजैविक नाव
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,आयटम कोड> आयटम गट> ब्रँड
DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त सवलत लागू
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,प्रकार निवडा ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,क्रॉप वाढत आहे अशा सर्व जमिनीच्या एककांशी दुवा
@@ -3439,6 +3445,7 @@
DocType: Supplier,Credit Limit,क्रेडिट मर्यादा
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,सरासरी किंमत सूची दर विक्री
DocType: Production Plan Sales Order,Salse Order Date,Salse ऑर्डर तारीख
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,पुरवठादार> पुरवठादार प्रकार
DocType: Salary Component,Salary Component,पगार घटक
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,भरणा नोंदी {0} रद्द लिंक आहेत
DocType: GL Entry,Voucher No,प्रमाणक नाही
@@ -3448,7 +3455,7 @@
DocType: Leave Allocation,Leave Allocation,वाटप सोडा
DocType: Payment Request,Recipient Message And Payment Details,प्राप्तकर्ता संदेश आणि देय तपशील
DocType: Training Event,Trainer Email,प्रशिक्षक ईमेल
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,साहित्य विनंत्या {0} तयार
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,साहित्य विनंत्या {0} तयार
DocType: Restaurant Reservation,No of People,लोक संख्या
DocType: Production Planning Tool,Include sub-contracted raw materials,उप-करारबद्ध कच्चा माल समाविष्ट करा
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,अटी किंवा करार साचा.
@@ -3514,7 +3521,7 @@
DocType: Production Planning Tool,Create Material Requests,साहित्य विनंत्या तयार करा
DocType: Employee Education,School/University,शाळा / विद्यापीठ
DocType: Payment Request,Reference Details,संदर्भ तपशील
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,अपेक्षित मूल्य उपयुक्त जीवन नंतर एकूण खरेदी रक्कम कमी असणे आवश्यक आहे
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,अपेक्षित मूल्य उपयुक्त जीवन नंतर एकूण खरेदी रक्कम कमी असणे आवश्यक आहे
DocType: Sales Invoice Item,Available Qty at Warehouse,कोठार वर उपलब्ध आहे Qty
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,बिल केलेली रक्कम
DocType: Asset,Double Declining Balance,दुहेरी नाकारून शिल्लक
@@ -3526,7 +3533,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अद्यतने मिळवा
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: खाते {2} कंपनी संबंधित नाही {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,प्रत्येक विशेषतेमधून किमान एक मूल्य निवडा.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
apps/erpnext/erpnext/config/hr.py +310,Leave Management,रजा व्यवस्थापन
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,खाते गट
DocType: Sales Order,Fully Delivered,पूर्णतः वितरित
@@ -3537,14 +3544,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित करण्यात आलेल्या रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,प्रोग्रामवर जा
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},रो {0} # वाटप केलेली रक्कम {1} हक्क न सांगितलेल्या रकमेपेक्षा मोठी असू शकत नाही {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,कृपया सेटअप> क्रमांकिंग सीरिजद्वारे उपस्थिततेसाठी सेटिग नंबरिंग सिरीज
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},आयटम आवश्यक मागणीसाठी क्रमांक खरेदी {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,उत्पादन ऑर्डर तयार नाही
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तारीख पासून' नंतर 'तारखेपर्यंत' असणे आवश्यक आहे
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},विद्यार्थी म्हणून स्थिती बदलू शकत नाही {0} विद्यार्थी अर्ज लिंक आहे {1}
DocType: Asset,Fully Depreciated,पूर्णपणे अवमूल्यन
,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},ग्राहक {0} प्रोजेक्ट {1} ला संबंधित नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},ग्राहक {0} प्रोजेक्ट {1} ला संबंधित नाही
DocType: Employee Attendance Tool,Marked Attendance HTML,चिन्हांकित उपस्थिती एचटीएमएल
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","आंतरशालेय, प्रस्ताव आपण आपल्या ग्राहकांना पाठवले आहे बोली"
DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
@@ -3628,7 +3634,7 @@
DocType: Stock Settings,Item Naming By,आयटम करून नामांकन
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},आणखी कालावधी संवरण {0} आला आहे {1}
DocType: Production Order,Material Transferred for Manufacturing,साहित्य उत्पादन साठी हस्तांतरित
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,खाते {0} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,खाते {0} अस्तित्वात नाही
DocType: Project,Project Type,प्रकल्प प्रकार
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,या कामासाठी बालकार्य अस्तित्वात आहे. आपण हे कार्य हटवू शकत नाही.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम आवश्यक आहे.
@@ -3732,11 +3738,11 @@
DocType: Company,Asset Depreciation Cost Center,मालमत्ता घसारा खर्च केंद्र
DocType: Sales Order Item,Sales Order Date,विक्री ऑर्डर तारीख
DocType: Sales Invoice Item,Delivered Qty,वितरित केलेली Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,एकूण एक्झल. कर
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","चेक केलेले असल्यास, प्रत्येक उत्पादन आयटम सर्व लोकांना साहित्य विनंत्या मध्ये समाविष्ट केले जाईल."
DocType: Assessment Plan,Assessment Plan,मूल्यांकन योजना
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,ग्राहक {0} तयार आहे.
DocType: Stock Settings,Limit Percent,मर्यादा टक्के
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,कृपया शिक्षण> शिक्षण सेटिंग्ज मध्ये शिक्षक नाव प्रणालीची मांडणी करा
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,सध्या कोणत्याही कोठारमध्ये कोणतीही स्टॉक उपलब्ध नाही
,Payment Period Based On Invoice Date,चलन तारखेला आधारित भरणा कालावधी
DocType: Sample Collection,No. of print,प्रिंटची संख्या
@@ -3752,12 +3758,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),कर्जदार ({0})
DocType: Pricing Rule,Margin,मार्जिन
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नवीन ग्राहक
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,निव्वळ नफा%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,निव्वळ नफा%
DocType: Appraisal Goal,Weightage (%),वजन (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,पीओएस प्रोफाइल बदला
DocType: Bank Reconciliation Detail,Clearance Date,मंजुरी तारीख
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,मूल्यांकन अहवाल
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,एकूण खरेदी रक्कम अनिवार्य आहे
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,एकूण खरेदी रक्कम अनिवार्य आहे
DocType: Lead,Address Desc,Desc पत्ता
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,पक्ष अनिवार्य आहे
DocType: Journal Entry,JV-,JV-
@@ -3789,7 +3795,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,स्थायी नाव
DocType: Stock Entry,Customer or Supplier Details,ग्राहक किंवा पुरवठादार माहिती
DocType: Employee Loan Application,Required by Date,तारीख आवश्यक
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),समाप्ती शिल्लक (डॉ - सीआर)
DocType: Lead,Lead Owner,लीड मालक
DocType: Bin,Requested Quantity,विनंती प्रमाण
DocType: Patient,Marital Status,विवाहित
@@ -3803,7 +3808,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,एकाधिक वेरिएंट
DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% वितरण
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आयटम {0}: क्रमांकित qty {1} किमान qty {2} (आयटम मध्ये परिभाषित) पेक्षा कमी असू शकत नाही.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,आयटम {0}: क्रमांकित qty {1} किमान qty {2} (आयटम मध्ये परिभाषित) पेक्षा कमी असू शकत नाही.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण टक्केवारी
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,कृपया दुसरे वापरकर्ता म्हणून लॉगिन करा.
DocType: Territory,Territory Targets,प्रदेश लक्ष्य
@@ -3904,7 +3909,7 @@
DocType: Serial No,Out of AMC,एएमसी पैकी
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,देखभाल भेट करा
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
DocType: Company,Default Cash Account,मुलभूत रोख खाते
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,कंपनी ( ग्राहक किंवा पुरवठादार नाही) मास्टर.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,हे या विद्यार्थी पोषाख आधारित आहे
@@ -4056,7 +4061,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,नमूद केलेल्या निकषांसाठी कोणतेही कर्मचारी नाहीत
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
DocType: Restaurant,Default Customer,डीफॉल्ट ग्राहक
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,कृपया मानव संसाधन> एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक नाव
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,त्याच दिवशी नियोजित भेटीची तयार झाल्याची पुष्टी करू नका
DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नावनोंदणी कोर्स
@@ -4179,7 +4183,7 @@
DocType: BOM,Website Description,वेबसाइट वर्णन
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,इक्विटी निव्वळ बदला
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,नवीनतम
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ई-मेल पत्ता, अद्वितीय असणे आवश्यक आहे आधीच अस्तित्वात आहे {0}"
DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,पावती
@@ -4196,7 +4200,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,रोख फ्लो स्टेटमेंट
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,परवाना
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून चलन {0} काढून टाका
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून चलन {0} काढून टाका
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,आपण देखील मागील आर्थिक वर्षातील शिल्लक रजा या आर्थिक वर्षात समाविष्ट करू इच्छित असल्यास कृपया कॅरी फॉरवर्ड निवडा
DocType: GL Entry,Against Voucher Type,व्हाउचर प्रकार विरुद्ध
DocType: Physician,Phone (R),फोन (आर)
@@ -4208,7 +4212,7 @@
DocType: Patient,B Negative,ब नकारात्मक
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,देखभाल स्थिती रद्द करणे किंवा सबमिट करण्यासाठी पूर्ण करणे आवश्यक आहे
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाते {0} ला कंपनी {1} मालकीचे नाही
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,{0} सलग मालिका संख्या डिलिव्हरी टीप जुळत नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,{0} सलग मालिका संख्या डिलिव्हरी टीप जुळत नाही
DocType: Student,Guardian Details,पालक तपशील
DocType: C-Form,C-Form,सी-फॉर्म
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,अनेक कर्मचाऱ्यांना उपस्थिती चिन्ह
@@ -4250,7 +4254,7 @@
DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
DocType: Training Event,Exam,परीक्षा
DocType: Complaint,Complaint,तक्रार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},स्टॉक आयटम {0} साठी आवश्यक कोठार
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},स्टॉक आयटम {0} साठी आवश्यक कोठार
DocType: Leave Allocation,Unused leaves,न वापरलेल्या रजा
DocType: Patient,Alcohol Past Use,मद्याचा शेवटचा वापर
DocType: Fertilizer Content,Fertilizer Content,खते सामग्री
@@ -4379,6 +4383,7 @@
DocType: Salary Detail,Formula,सुत्र
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,सिरियल #
DocType: Lab Test Template,Lab Test Template,लॅब टेस्ट टेम्पलेट
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,विक्री खाते
DocType: Purchase Invoice Item,Total Weight,एकूण वजन
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,विक्री आयोगाने
DocType: Offer Letter Term,Value / Description,मूल्य / वर्णन
@@ -4536,7 +4541,7 @@
DocType: Customer,From Lead,लीड पासून
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ऑर्डर उत्पादनासाठी प्रकाशीत.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी आवश्यक
DocType: Program Enrollment Tool,Enroll Students,विद्यार्थी ची नोंदणी करा
DocType: Lab Test,Approved Date,मंजूर तारीख
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक विक्री
@@ -4613,7 +4618,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,उत्पादन आयटम
,Employee Information,कर्मचारी माहिती
DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,पुरवठादार कोटेशन करा
DocType: Quality Inspection,Incoming,येणार्या
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,विक्री आणि खरेदीसाठी डिफॉल्ट कर टेम्पलेट तयार केले जातात.
@@ -4630,7 +4635,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},टीप: {0}
,Delivery Note Trends,डिलिव्हरी टीप ट्रेन्ड
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,या आठवड्यातील सारांश
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,शेअर प्रमाण मध्ये
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,शेअर प्रमाण मध्ये
DocType: Delivery Trip,Calculate Estimated Arrival Times,अंदाजे आगमन वेळा मोजा
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,खाते: {0} केवळ शेअर व्यवहार द्वारे अद्यतनित केले जाऊ शकतात
DocType: Student Group Creation Tool,Get Courses,अभ्यासक्रम मिळवा
@@ -4646,7 +4651,7 @@
DocType: Material Request,% Ordered,% आदेश दिले
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","कोर्स आधारित विद्यार्थी गट, कार्यक्रम नावनोंदणी नोंदणी अभ्यासक्रम पासून प्रत्येक विद्यार्थ्यासाठी कोर्स तपासले जाईल."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,सरासरी. खरेदी दर
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,सरासरी. खरेदी दर
DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
DocType: Employee,History In Company,कंपनी मध्ये इतिहास
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{प्रेषक} कडून नवीन संदेश
@@ -4694,7 +4699,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},सलग {0}: BOM # चलन {1} निवडले चलन समान असावी {2}
DocType: Journal Entry Account,Exchange Rate,विनिमय दर
DocType: Patient,Additional information regarding the patient,रुग्णाच्या बाबतीत अतिरिक्त माहिती
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
DocType: Homepage,Tag Line,टॅग लाइन
DocType: Fee Component,Fee Component,शुल्क घटक
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,वेगवान व्यवस्थापन
@@ -4909,7 +4914,7 @@
DocType: Employee Education,Employee Education,कर्मचारी शिक्षण
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,आयटम गट टेबल मध्ये आढळले डुप्लिकेट आयटम गट
DocType: Land Unit,Parent Land Unit,पालक जमीन युनिट
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी आवश्यक आहे.
DocType: Fertilizer,Fertilizer Name,खते नाव
DocType: Salary Slip,Net Pay,नेट पे
DocType: Account,Account,खाते
@@ -4988,7 +4993,7 @@
DocType: Item Customer Detail,Ref Code,संदर्भ कोड
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,पीओएस प्रोफाइलमध्ये ग्राहक समूह आवश्यक आहे
apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रेकॉर्ड.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,पुढील घसारा तारीख सेट करा
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,पुढील घसारा तारीख सेट करा
DocType: HR Settings,Payroll Settings,पे रोल सेटिंग्ज
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,नॉन-लिंक्ड पावत्या आणि देयके जुळत.
DocType: POS Settings,POS Settings,पीओएस सेटिंग्ज
@@ -5156,7 +5161,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
DocType: Asset Maintenance Task,Last Completion Date,अंतिम पूर्णता तारीख
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
DocType: Buying Settings,Naming Series,नामांकन मालिका
DocType: Leave Block List,Leave Block List Name,रजा ब्लॉक यादी नाव
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,विमा प्रारंभ तारखेच्या विमा समाप्ती तारीख कमी असावे
@@ -5286,6 +5291,7 @@
DocType: Bank Reconciliation,Get Payment Entries,भरणा नोंदी मिळवा
DocType: Quotation Item,Against Docname,Docname विरुद्ध
DocType: SMS Center,All Employee (Active),सर्व कर्मचारी (सक्रिय)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ग्राहक> ग्राहक गट> प्रदेश
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,आता पहा
DocType: BOM,Raw Material Cost,कच्चा माल खर्च
DocType: Item Reorder,Re-Order Level,पुन्हा-क्रम स्तर
@@ -5386,7 +5392,6 @@
DocType: Room,Seating Capacity,आसन क्षमता
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,प्रयोगशाळा चाचणी गट
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ग्राहक> ग्राहक गट> प्रदेश
DocType: Project,Total Expense Claim (via Expense Claims),एकूण खर्च हक्क (खर्चाचे दावे द्वारे)
DocType: GST Settings,GST Summary,'जीएसटी' सारांश
DocType: Assessment Result,Total Score,एकूण धावसंख्या
@@ -5400,7 +5405,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,खालील अभ्यासक्रम वेळापत्रक तयार केले होते
DocType: Journal Entry,Total Debit,एकूण डेबिट
DocType: Manufacturing Settings,Default Finished Goods Warehouse,मुलभूत पूर्ण वस्तू वखार
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,विक्री व्यक्ती
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,विक्री व्यक्ती
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,बजेट आणि खर्च केंद्र
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,पेमेंटचा एकाधिक डीफॉल्ट मोड अनुमत नाही
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,साठी
@@ -5576,7 +5581,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,कर किंवा शुल्क विचार करा
DocType: Driver,Driving License Category,ड्रायव्हिंग लायसेन्स श्रेणी
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक प्रमाण अनिवार्य आहे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} येथे सध्याचे एक {1} पुरवठादार स्कोअरकार्ड उभे आहे आणि या पुरवठादारास खरेदी ऑर्डर देणे आवश्यक आहे.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} येथे सध्याचे एक {1} पुरवठादार स्कोअरकार्ड उभे आहे आणि या पुरवठादारास खरेदी ऑर्डर देणे आवश्यक आहे.
DocType: Asset Maintenance Team,Asset Maintenance Team,मालमत्ता देखभाल कार्यसंघ
DocType: Employee Loan,Loan Type,कर्ज प्रकार
DocType: Scheduling Tool,Scheduling Tool,शेड्युलिंग साधन
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index b5ac712..b24b895 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Isih mengikut Harga
,Delay Days,Hari Kelewatan
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Perbelanjaan perkhidmatan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Invois
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Buat Kemasukan Saham Penyimpanan
DocType: Purchase Invoice Item,Item Weight Details,Butiran Butiran Butiran
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Rujukan: {0}, Kod Item: {1} dan Pelanggan: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Membuka pekerjaan.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM tidak dinyatakan untuk subkontrak item {0} pada baris {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM tidak dinyatakan untuk subkontrak item {0} pada baris {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,Keputusan {0} diserahkan
DocType: Item Attribute,Increment,Kenaikan
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Jangka masa
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Tidak dibenarkan untuk {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Mendapatkan barangan dari
DocType: Price List,Price Not UOM Dependant,Harga tidak bergantung kepada UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Tiada perkara yang disenaraikan
DocType: Asset Repair,Error Description,Ralat Penerangan
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Barang runcit
DocType: Quality Inspection Reading,Reading 1,Membaca 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Dana pencen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Selepas Tarikh Susut nilai tidak boleh sebelum Tarikh Pembelian
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Selepas Tarikh Susut nilai tidak boleh sebelum Tarikh Pembelian
DocType: Crop,Perennial,Perennial
DocType: Consultation,Consultation Date,Tarikh Perundingan
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Penyenaraian produk dan penemuan untuk pengguna ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",contohnya "Sekolah Rendah" atau "Universiti"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Laporan saham
DocType: Warehouse,Warehouse Detail,Detail Gudang
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Tarikh Akhir Term tidak boleh lewat daripada Tarikh Akhir Tahun Akademik Tahun yang istilah ini dikaitkan (Akademik Tahun {}). Sila betulkan tarikh dan cuba lagi.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Adakah Aset Tetap" tidak boleh dibiarkan, kerana rekod aset wujud terhadap item"
DocType: Delivery Trip,Departure Time,Masa berlepas
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Butiran
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Templat kedudukan pembekal.
DocType: Lead,Interested,Berminat
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Pembukaan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Pembukaan
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Dari {0} kepada {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Gagal menyediakan cukai
DocType: Item,Copy From Item Group,Salinan Dari Perkara Kumpulan
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Meninggalkan setiap Tahun
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Sila semak 'Adakah Advance' terhadap Akaun {1} jika ini adalah suatu catatan terlebih dahulu.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik syarikat {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik syarikat {1}
DocType: Email Digest,Profit & Loss,Untung rugi
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),Jumlah Kos Jumlah (melalui Lembaran Time)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ini berdasarkan urusniaga terhadap Syarikat ini. Lihat garis masa di bawah untuk maklumat lanjut
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui e-mel pada penciptaan Permintaan Bahan automatik
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Tahan
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Perundingan
DocType: Journal Entry,Multi Currency,Mata Multi
DocType: Opening Invoice Creation Tool,Invoice Type,Jenis invois
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Penghantaran Nota
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Janda
DocType: Request for Quotation,Request for Quotation,Permintaan untuk sebut harga
DocType: Healthcare Settings,Require Lab Test Approval,Memerlukan Kelulusan Ujian Lab
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kod Item> Kumpulan Item> Jenama
DocType: Salary Slip Timesheet,Working Hours,Waktu Bekerja
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Jumlah yang belum dijelaskan
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Sila masukkan PTJ
DocType: Drug Prescription,Dosage,Dos
DocType: Journal Entry Account,Sales Order,Pesanan Jualan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Purata. Menjual Kadar
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Purata. Menjual Kadar
DocType: Assessment Plan,Examiner Name,Nama pemeriksa
DocType: Lab Test Template,No Result,Tiada Keputusan
DocType: Purchase Invoice Item,Quantity and Rate,Kuantiti dan Kadar
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Pilih Tempoh Payroll
DocType: Purchase Invoice,Unpaid,Belum dibayar
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Dikhaskan untuk dijual
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Sila sediakan Sistem Penamaan Pekerja dalam Sumber Manusia> Tetapan HR
DocType: Packing Slip,From Package No.,Dari Pakej No.
DocType: Item Attribute,To Range,Untuk Julat
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriti dan Deposit
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,bengkel
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Perhatian Pesanan Pembelian
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Senarai beberapa pelanggan anda. Mereka boleh menjadi organisasi atau individu.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Bahagian Cukup untuk Membina
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Bahagian Cukup untuk Membina
DocType: POS Profile User,POS Profile User,POS Profil Pengguna
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Pendapatan Langsung
DocType: Patient Appointment,Date TIme,Masa tarikh
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Tidak boleh menapis di Akaun, jika dikumpulkan oleh Akaun"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Tidak boleh menapis di Akaun, jika dikumpulkan oleh Akaun"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Pegawai Tadbir
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Menyediakan syarikat dan cukai
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Sila pilih Course
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Akaun perbezaan
DocType: Purchase Invoice,Supplier GSTIN,GSTIN pembekal
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Tidak boleh tugas sedekat tugas takluknya {0} tidak ditutup.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
DocType: Production Order,Additional Operating Cost,Tambahan Kos Operasi
DocType: Lab Test Template,Lab Routine,Rutin Lab
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetik
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Berhubung dengan Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Pengurus
DocType: Payment Entry,Payment From / To,Pembayaran Dari / Ke
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},had kredit baru adalah kurang daripada amaun tertunggak semasa untuk pelanggan. had kredit perlu atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},had kredit baru adalah kurang daripada amaun tertunggak semasa untuk pelanggan. had kredit perlu atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Sila tentukan akaun dalam Gudang {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan Kepada' dan 'Kumpul Mengikut' tidak boleh sama
DocType: Sales Person,Sales Person Targets,Sasaran Orang Jualan
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,Batch Nama
DocType: Fee Validity,Max number of visit,Bilangan lawatan maksimum
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet dicipta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,mendaftar
DocType: GST Settings,GST Settings,Tetapan GST
DocType: Selling Settings,Customer Naming By,Menamakan Dengan Pelanggan
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,bajet Terhadap
DocType: Employee,Cell Number,Bilangan sel
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Tiada kakitangan untuk kriteria yang diberikan. Semak bahawa Slip Gaji belum dibuat.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Permintaan bahan Auto Generated
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Permintaan bahan Auto Generated
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hilang
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam 'Terhadap Journal Entry' ruangan
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Dikhaskan untuk pembuatan
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Tenaga
DocType: Opportunity,Opportunity From,Peluang Daripada
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kenyataan gaji bulanan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nombor Siri diperlukan untuk Item {2}. Anda telah menyediakan {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nombor Siri diperlukan untuk Item {2}. Anda telah menyediakan {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Sila pilih jadual
DocType: BOM,Website Specifications,Laman Web Spesifikasi
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} adalah alamat e-mel yang tidak sah dalam 'Penerima'
@@ -1036,7 +1037,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Tuntut Sebut
DocType: Vital Signs,Heart Rate / Pulse,Kadar Jantung / Pulse
DocType: Company,Default Bank Account,Akaun Bank Default
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Update Stock' tidak boleh disemak kerana perkara yang tidak dihantar melalui {0}
DocType: Vehicle,Acquisition Date,perolehan Tarikh
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1061,7 +1062,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Muat naik kepala surat anda (Pastikan web mesra sebagai 900px dengan 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akaun {2} tidak boleh menjadi Kumpulan
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Perkara Row {IDX}: {DOCTYPE} {} DOCNAME tidak wujud dalam di atas '{DOCTYPE}' meja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Tiada tugasan
DocType: Item Variant Settings,Copy Fields to Variant,Salin Medan ke Varians
DocType: Asset,Opening Accumulated Depreciation,Membuka Susut Nilai Terkumpul
@@ -1173,9 +1174,10 @@
DocType: Production Order,Plan material for sub-assemblies,Bahan rancangan untuk sub-pemasangan
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Jualan rakan-rakan dan Wilayah
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} mesti aktif
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Penutupan (pembukaan + jumlah)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Penutupan (pembukaan + jumlah)
DocType: Journal Entry,Depreciation Entry,Kemasukan susutnilai
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Sila pilih jenis dokumen pertama
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Cetak dalam Mata Wang Akaun
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Bahan Lawatan {0} sebelum membatalkan Lawatan Penyelenggaraan ini
DocType: Crop Cycle,ISO 8016 standard,Standard ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},No siri {0} bukan milik Perkara {1}
@@ -1201,7 +1203,7 @@
DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
DocType: Fee Structure,Components,komponen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
DocType: Quality Inspection Reading,Reading 6,Membaca 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1253,6 +1255,7 @@
,Company Name,Nama Syarikat
DocType: SMS Center,Total Message(s),Jumlah Mesej (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan> Tetapan> Penamaan Siri
DocType: Purchase Invoice,Additional Discount Percentage,Peratus Diskaun tambahan
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat senarai semua video bantuan
DocType: Agriculture Analysis Criteria,Soil Texture,Tekstur Tanah
@@ -1281,7 +1284,7 @@
DocType: BOM Website Item,BOM Website Item,BOM laman Perkara
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Memuat naik kepala surat dan logo. (Anda boleh mengeditnya kemudian).
DocType: Timesheet Detail,Bill,Rang Undang-Undang
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Selepas Tarikh Susutnilai dimasukkan sebagai tarikh lepas
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Selepas Tarikh Susutnilai dimasukkan sebagai tarikh lepas
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,White
DocType: SMS Center,All Lead (Open),Semua Lead (Terbuka)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty tidak tersedia untuk {4} dalam gudang {1} di mencatat masa catatan ({2} {3})
@@ -1298,7 +1301,7 @@
DocType: Lead,Next Contact Date,Hubungi Seterusnya Tarikh
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Membuka Qty
DocType: Healthcare Settings,Appointment Reminder,Peringatan Pelantikan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
DocType: Program Enrollment Tool Student,Student Batch Name,Pelajar Batch Nama
DocType: Consultation,Doctor,Doktor
DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
@@ -1314,6 +1317,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Tinggalkan Alat Peruntukan
DocType: Item,Hub Category to Publish,Kategori Hub untuk Terbitkan
DocType: Leave Block List,Leave Block List Dates,Tinggalkan Tarikh Sekat Senarai
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan> Penomboran Siri
DocType: Sales Invoice,Billing Address GSTIN,Alamat Bil GSTIN
DocType: Assessment Plan,Evaluate,Evaluasi
DocType: Workstation,Net Hour Rate,Kadar Hour bersih
@@ -1348,7 +1352,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Invois Jualan Pembayaran
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gudang Terpelihara dalam Sales Order / Selesai Barang Gudang
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Jumlah Jualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Jumlah Jualan
DocType: Repayment Schedule,Interest Amount,Amaun Faedah
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda Pelulus Perbelanjaan untuk rekod ini. Sila Kemas kini 'Status' dan Jimat
DocType: Serial No,Creation Document No,Penciptaan Dokumen No
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Perakaunan membuka Baki
,GST Sales Register,GST Sales Daftar
DocType: Sales Invoice Advance,Sales Invoice Advance,Jualan Invois Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Tiada apa-apa untuk meminta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Tiada apa-apa untuk meminta
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Pilih Domain anda
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Satu lagi rekod Bajet '{0}' sudah wujud daripada {1} '{2} bagi tahun fiskal {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Bidang akan disalin hanya pada waktu penciptaan.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan dilampirkan Kod Item bagi varian. Sebagai contoh, jika anda adalah singkatan "SM", dan kod item adalah "T-SHIRT", kod item varian akan "T-SHIRT-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Gaji bersih (dengan perkataan) akan dapat dilihat selepas anda menyimpan Slip Gaji.
DocType: Purchase Invoice,Is Return,Tempat kembalinya
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Awas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Awas
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Pulangan / Nota Debit
DocType: Price List Country,Price List Country,Senarai harga Negara
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} nombor siri sah untuk Perkara {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} nombor siri sah untuk Perkara {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod Item tidak boleh ditukar untuk No. Siri
DocType: Purchase Invoice Item,UOM Conversion Factor,Faktor Penukaran UOM
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Sila masukkan Kod Item untuk mendapatkan Nombor kumpulan
@@ -1561,7 +1565,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
DocType: Supplier Scorecard,Warn for new Request for Quotations,Amalkan Permintaan untuk Sebut Harga baru
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu anda merancang dan mengambil tindakan susulan ke atas pembelian anda
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Preskripsi Ubat Lab
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Jumlah kuantiti Terbitan / Transfer {0} dalam Permintaan Bahan {1} \ tidak boleh lebih besar daripada kuantiti diminta {2} untuk item {3}
@@ -1599,7 +1603,6 @@
DocType: Warehouse,Warehouse Contact Info,Gudang info
DocType: Payment Entry,Write Off Difference Amount,Tulis Off Jumlah Perbezaan
DocType: Volunteer,Volunteer Name,Nama Sukarelawan
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Sila persiapkan Sistem Menamakan Pengajar dalam Pendidikan> Tetapan Pendidikan
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: e-mel pekerja tidak dijumpai, maka e-mel tidak dihantar"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Peraturan penghantaran tidak boleh digunakan untuk negara {0}
DocType: Item,Foreign Trade Details,Maklumat Perdagangan Luar Negeri
@@ -1612,7 +1615,7 @@
DocType: Student Group Student,Group Roll Number,Kumpulan Nombor Roll
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya akaun kredit boleh dikaitkan terhadap kemasukan debit lain"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumlah semua berat tugas harus 1. Laraskan berat semua tugas Projek sewajarnya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Peralatan Modal
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Peraturan harga mula-mula dipilih berdasarkan 'Guna Mengenai' bidang, yang boleh menjadi Perkara, Perkara Kumpulan atau Jenama."
@@ -1637,7 +1640,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Child gudang wujud untuk gudang ini. Anda tidak boleh memadam gudang ini.
DocType: Item,Website Item Groups,Kumpulan Website Perkara
DocType: Purchase Invoice,Total (Company Currency),Jumlah (Syarikat mata wang)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Nombor siri {0} memasuki lebih daripada sekali
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Nombor siri {0} memasuki lebih daripada sekali
DocType: Journal Entry,Journal Entry,Jurnal Entry
DocType: Expense Claim Advance,Unclaimed amount,Jumlah tidak dituntut
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} item dalam kemajuan
@@ -1734,7 +1737,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Sebut Harga dilumpuhkan untuk mengakses dari portal, lebih tetapan portal cek."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Pembekal Skor Kad Pembekal Pembekal
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Membeli Jumlah
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Membeli Jumlah
DocType: Sales Invoice,Shipping Address Name,Alamat Penghantaran Nama
DocType: Material Request,Terms and Conditions Content,Terma dan Syarat Kandungan
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Terdapat kesilapan mencipta Jadual Kursus
@@ -1998,7 +2001,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ini adalah berdasarkan kepada balak terhadap kenderaan ini. Lihat garis masa di bawah untuk maklumat
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
DocType: Customer,Default Price List,Senarai Harga Default
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak boleh memadam Tahun Anggaran {0}. Tahun Anggaran {0} ditetapkan sebagai piawai dalam Tetapan Global
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Seorang pelanggan dengan nama yang sama sudah ada
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ini akan menghantar Slip Gaji dan membuat Penyertaan Jurnal akrual. Adakah anda mahu meneruskan?
@@ -2012,6 +2015,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Harga
DocType: Quotation,Term Details,Butiran jangka
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,tidak boleh mendaftar lebih daripada {0} pelajar bagi kumpulan pelajar ini.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Jumlah (Tanpa Cukai)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mesti lebih besar daripada 0
@@ -2032,7 +2036,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Nyahpaut Pembayaran Pembatalan Invois
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},bacaan Odometer Semasa memasuki harus lebih besar daripada awal Kenderaan Odometer {0}
DocType: Restaurant Reservation,No Show,Tidak Tunjukkan
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan> Tetapan> Penamaan Siri
DocType: Shipping Rule Country,Shipping Rule Country,Kaedah Penghantaran Negara
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Tinggalkan dan Kehadiran
DocType: Maintenance Visit,Partially Completed,Sebahagiannya telah lengkap
@@ -2125,7 +2128,7 @@
DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
DocType: Grant Application,Assessment Mark (Out of 10),Penilaian Penilaian (Daripada 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Bimbit
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Utama
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Utama
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varian
DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
DocType: Employee Attendance Tool,Employees HTML,pekerja HTML
@@ -2175,7 +2178,7 @@
DocType: Course,Course Abbreviation,Singkatan Course
DocType: Student Leave Application,Student Leave Application,Pelajar Permohonan Cuti
DocType: Item,Will also apply for variants,Juga akan memohon varian
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Pekerja {0} pada hari Half pada {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak harus lebih besar daripada waktu kerja max {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pada
@@ -2362,9 +2365,10 @@
DocType: Task,Actual End Date (via Time Sheet),Sebenar Tarikh Akhir (melalui Lembaran Time)
DocType: Soil Texture,Soil Type,Jenis Tanah
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Mesej baru
,Quotation Trends,Trend Sebut Harga
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Perkara Kumpulan tidak dinyatakan dalam perkara induk untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
DocType: Shipping Rule,Shipping Amount,Penghantaran Jumlah
DocType: Supplier Scorecard Period,Period Score,Markah Skor
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,menambah Pelanggan
@@ -2375,7 +2379,7 @@
,Vehicle Expenses,Perbelanjaan kenderaan
DocType: Serial No,Invoice Details,Butiran invois
DocType: Grant Application,Show on Website,Tunjukkan di Laman Web
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Nilai jangkaan selepas hayat berguna mesti lebih besar daripada atau sama dengan {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Nilai jangkaan selepas hayat berguna mesti lebih besar daripada atau sama dengan {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Mulakan
DocType: Hub Category,Hub Category,Kategori Hab
DocType: Purchase Invoice,SEZ,SEZ
@@ -2407,7 +2411,7 @@
DocType: Patient,B Positive,B Positif
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty mesti menjadi 1, sebagai item adalah aset tetap. Sila gunakan baris berasingan untuk berbilang qty."
DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
DocType: Patient Medical Record,Patient Medical Record,Rekod Perubatan Pesakit
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Kumpulan kepada Bukan Kumpulan
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sukan
@@ -2458,6 +2462,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Tidak dapat menetapkan RFQ yang diterima untuk Tiada Kata Sebut
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Jumlah Potongan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Pilih akaun untuk mencetak dalam mata wang akaun
,Production Analytics,Analytics pengeluaran
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ini berdasarkan urus niaga terhadap Pesakit ini. Lihat garis masa di bawah untuk maklumat lanjut
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kos Dikemaskini
@@ -2513,7 +2518,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pilih Syarikat ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Tinggalkan kosong jika dipertimbangkan untuk semua jabatan
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (tetap, kontrak, pelatih dan lain-lain)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
DocType: Payroll Entry,Fortnightly,setiap dua minggu
DocType: Currency Exchange,From Currency,Dari Mata Wang
DocType: Vital Signs,Weight (In Kilogram),Berat (Dalam Kilogram)
@@ -2591,7 +2596,7 @@
DocType: Student,Guardians,penjaga
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan dipaparkan jika Senarai Harga tidak ditetapkan
DocType: Stock Entry,Total Incoming Value,Jumlah Nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debit Untuk diperlukan
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu menjejaki masa, kos dan bil untuk kegiatan yang dilakukan oleh pasukan anda"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Senarai Harga
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templat pemboleh ubah kad skor pembekal.
@@ -2694,7 +2699,7 @@
DocType: Company,For Reference Only.,Untuk Rujukan Sahaja.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Doktor {0} tidak boleh didapati di {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Pilih Batch No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Tidak sah {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Tidak sah {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Rujuk Rujukan
@@ -2731,8 +2736,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nyatakan operasi, kos operasi dan memberikan Operasi unik tidak kepada operasi anda."
DocType: Water Analysis,Origin,Asal
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini melebihi had oleh {0} {1} untuk item {4}. Adakah anda membuat terhadap yang sama satu lagi {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Pilih perubahan kira jumlah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Pilih perubahan kira jumlah
DocType: Purchase Invoice,Price List Currency,Senarai Harga Mata Wang
DocType: Naming Series,User must always select,Pengguna perlu sentiasa pilih
DocType: Stock Settings,Allow Negative Stock,Benarkan Saham Negatif
@@ -2788,7 +2793,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Amalkan pesanan baru
DocType: Quality Inspection Reading,Reading 9,Membaca 9
DocType: Supplier,Is Frozen,Adalah Beku
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,nod Kumpulan gudang tidak dibenarkan untuk memilih untuk transaksi
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,nod Kumpulan gudang tidak dibenarkan untuk memilih untuk transaksi
DocType: Buying Settings,Buying Settings,Tetapan Membeli
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. untuk Perkara Baik Selesai
DocType: Upload Attendance,Attendance To Date,Kehadiran Untuk Tarikh
@@ -2803,6 +2808,7 @@
DocType: Grant Application,Organization,organisasi
DocType: BOM Update Tool,BOM Update Tool,Alat Kemaskini BOM
DocType: SG Creation Tool Course,Student Group Name,Nama Kumpulan Pelajar
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Tunjukkan paparan yang meletup
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Membuat Bayaran
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sila pastikan anda benar-benar ingin memadam semua urus niaga bagi syarikat ini. Data induk anda akan kekal kerana ia adalah. Tindakan ini tidak boleh dibuat asal.
DocType: Room,Room Number,Nombor bilik
@@ -2813,7 +2819,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Buat Templat Cukai
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
DocType: Lab Test Sample,Lab Test Sample,Sampel Ujian Makmal
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Pantas Journal Kemasukan
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
@@ -2884,7 +2890,7 @@
DocType: Membership,USD,Dolar Amerika
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Buat Invois
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Peluang dekat selepas 15 hari
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pesanan Pembelian tidak dibenarkan untuk {0} disebabkan kedudukan kad skor {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Pesanan Pembelian tidak dibenarkan untuk {0} disebabkan kedudukan kad skor {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,akhir Tahun
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2977,7 +2983,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Ke atas
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Kemasukan {1} tidak mempunyai akaun {2} atau sudah dipadankan dengan baucar lain
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteria Berat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Pembekal> Jenis Pembekal
DocType: Buying Settings,Default Buying Price List,Default Senarai Membeli Harga
DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip Gaji Berdasarkan Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kadar Beli
@@ -3067,7 +3072,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Leads mengikut Jenis Industri.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Pergi ke Letterheads
DocType: Item Supplier,Item Supplier,Perkara Pembekal
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat.
DocType: Company,Stock Settings,Tetapan saham
@@ -3245,6 +3250,7 @@
DocType: Company,Default Inventory Account,Akaun Inventori lalai
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Bidang Qty mesti lebih besar daripada sifar.
DocType: Antibiotic,Antibiotic Name,Nama antibiotik
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kod Item> Kumpulan Item> Jenama
DocType: Purchase Invoice,Apply Additional Discount On,Memohon Diskaun tambahan On
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Pilih Jenis ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Pautan kepada semua Unit Tanah di mana Tanaman semakin berkembang
@@ -3440,6 +3446,7 @@
DocType: Supplier,Credit Limit,Had Kredit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Purata. Menjual Kadar Harga Harga
DocType: Production Plan Sales Order,Salse Order Date,Salse Order Tarikh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Pembekal> Jenis Pembekal
DocType: Salary Component,Salary Component,Komponen gaji
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Penyertaan Pembayaran {0} adalah un berkaitan
DocType: GL Entry,Voucher No,Baucer Tiada
@@ -3449,7 +3456,7 @@
DocType: Leave Allocation,Leave Allocation,Tinggalkan Peruntukan
DocType: Payment Request,Recipient Message And Payment Details,Penerima Mesej Dan Butiran Pembayaran
DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Permintaan bahan {0} dicipta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Permintaan bahan {0} dicipta
DocType: Restaurant Reservation,No of People,Tidak ada Orang
DocType: Production Planning Tool,Include sub-contracted raw materials,Termasuk bahan-bahan mentah sub-kontrak
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Templat istilah atau kontrak.
@@ -3515,7 +3522,7 @@
DocType: Production Planning Tool,Create Material Requests,Buat Permintaan Bahan
DocType: Employee Education,School/University,Sekolah / Universiti
DocType: Payment Request,Reference Details,Rujukan Butiran
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai dijangka After Life Berguna mesti kurang daripada Jumlah Kasar Pembelian
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai dijangka After Life Berguna mesti kurang daripada Jumlah Kasar Pembelian
DocType: Sales Invoice Item,Available Qty at Warehouse,Kuantiti didapati di Gudang
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jumlah dibilkan
DocType: Asset,Double Declining Balance,Baki Penurunan Double
@@ -3527,7 +3534,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Maklumat Terbaru
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akaun {2} bukan milik Syarikat {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Pilih sekurang-kurangnya satu nilai dari setiap atribut.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Tinggalkan Pengurusan
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Kumpulan dengan Akaun
DocType: Sales Order,Fully Delivered,Dihantar sepenuhnya
@@ -3538,14 +3545,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Amaun yang dikeluarkan tidak boleh lebih besar daripada Jumlah Pinjaman {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Pergi ke Program
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Baris {0} # Jumlah yang diperuntukkan {1} tidak boleh melebihi jumlah yang tidak dituntut {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan> Penomboran Siri
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Order Production tidak dicipta
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Dari Tarikh' mesti selepas 'Sehingga'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},tidak boleh menukar status sebagai pelajar {0} dikaitkan dengan permohonan pelajar {1}
DocType: Asset,Fully Depreciated,disusutnilai sepenuhnya
,Stock Projected Qty,Saham Unjuran Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ketara HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Sebutharga cadangan, bida yang telah anda hantar kepada pelanggan anda"
DocType: Sales Order,Customer's Purchase Order,Pesanan Pelanggan
@@ -3630,7 +3636,7 @@
DocType: Stock Settings,Item Naming By,Perkara Menamakan Dengan
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Satu lagi Entry Tempoh Penutup {0} telah dibuat selepas {1}
DocType: Production Order,Material Transferred for Manufacturing,Bahan Dipindahkan untuk Pembuatan
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Akaun {0} tidak wujud
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Akaun {0} tidak wujud
DocType: Project,Project Type,Jenis Projek
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Tugas Anak wujud untuk Tugas ini. Anda tidak boleh memadamkan Tugas ini.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Qty sasaran atau sasaran jumlah sama ada adalah wajib.
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,Aset Pusat Susutnilai Kos
DocType: Sales Order Item,Sales Order Date,Pesanan Jualan Tarikh
DocType: Sales Invoice Item,Delivered Qty,Dihantar Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Jumlah Excl. Cukai
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jika disemak, semua kanak-kanak setiap item pengeluaran akan dimasukkan ke dalam Permintaan Bahan."
DocType: Assessment Plan,Assessment Plan,Rancangan penilaian
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Pelanggan {0} dibuat.
DocType: Stock Settings,Limit Percent,had Peratus
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Sila persiapkan Sistem Menamakan Pengajar dalam Pendidikan> Tetapan Pendidikan
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Tidak ada stok sedia ada di mana-mana gudang
,Payment Period Based On Invoice Date,Tempoh Pembayaran Berasaskan Tarikh Invois
DocType: Sample Collection,No. of print,Tidak ada cetak
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Penghutang ({0})
DocType: Pricing Rule,Margin,margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Pelanggan Baru
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Keuntungan kasar%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Keuntungan kasar%
DocType: Appraisal Goal,Weightage (%),Wajaran (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Tukar Profil POS
DocType: Bank Reconciliation Detail,Clearance Date,Clearance Tarikh
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Laporan Penilaian
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Jumlah Pembelian Kasar adalah wajib
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Jumlah Pembelian Kasar adalah wajib
DocType: Lead,Address Desc,Alamat Deskripsi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Parti adalah wajib
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Nama Berdiri
DocType: Stock Entry,Customer or Supplier Details,Pelanggan atau pembekal dan
DocType: Employee Loan Application,Required by Date,Diperlukan oleh Tarikh
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Baki Penutup (Dr - Cr)
DocType: Lead,Lead Owner,Lead Pemilik
DocType: Bin,Requested Quantity,diminta Kuantiti
DocType: Patient,Marital Status,Status Perkahwinan
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Pelbagai variasi
DocType: Sales Invoice,Against Income Account,Terhadap Akaun Pendapatan
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dihantar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Perkara {0}: qty Mengarahkan {1} tidak boleh kurang daripada perintah qty minimum {2} (ditakrifkan dalam Perkara).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Perkara {0}: qty Mengarahkan {1} tidak boleh kurang daripada perintah qty minimum {2} (ditakrifkan dalam Perkara).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Taburan Peratus Bulanan
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Sila log masuk sebagai pengguna lain.
DocType: Territory,Territory Targets,Sasaran Wilayah
@@ -3906,7 +3911,7 @@
DocType: Serial No,Out of AMC,Daripada AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
DocType: Company,Default Cash Account,Akaun Tunai Default
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Syarikat (tidak Pelanggan atau Pembekal) induk.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ini adalah berdasarkan kepada kehadiran Pelajar ini
@@ -4058,7 +4063,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Tiada pekerja untuk kriteria yang disebutkan
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
DocType: Restaurant,Default Customer,Pelanggan Lalai
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Sila sediakan Sistem Penamaan Pekerja dalam Sumber Manusia> Tetapan HR
DocType: Assessment Plan,Supervisor Name,Nama penyelia
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Jangan mengesahkan jika pelantikan dibuat untuk hari yang sama
DocType: Program Enrollment Course,Program Enrollment Course,Kursus Program Pendaftaran
@@ -4181,7 +4185,7 @@
DocType: BOM,Website Description,Laman Web Penerangan
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Perubahan Bersih dalam Ekuiti
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Terbaru
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat e-mel mesti menjadi unik, sudah wujud untuk {0}"
DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,resit
@@ -4198,7 +4202,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Penyata aliran tunai
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak boleh melebihi Jumlah Pinjaman maksimum {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lesen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Sila pilih Carry Forward jika anda juga mahu termasuk baki tahun fiskal yang lalu daun untuk tahun fiskal ini
DocType: GL Entry,Against Voucher Type,Terhadap Jenis Baucar
DocType: Physician,Phone (R),Telefon (R)
@@ -4210,7 +4214,7 @@
DocType: Patient,B Negative,B Negatif
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Status Penyelenggaraan perlu Dibatalkan atau Diselesaikan untuk Kirim
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Nombor siri berturut-turut {0} tidak sepadan dengan penghantaran Nota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Nombor siri berturut-turut {0} tidak sepadan dengan penghantaran Nota
DocType: Student,Guardian Details,Guardian Butiran
DocType: C-Form,C-Form,C-Borang
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Kehadiran beberapa pekerja
@@ -4252,7 +4256,7 @@
DocType: Stock Entry Detail,Basic Amount,Jumlah Asas
DocType: Training Event,Exam,peperiksaan
DocType: Complaint,Complaint,Aduan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
DocType: Leave Allocation,Unused leaves,Daun yang tidak digunakan
DocType: Patient,Alcohol Past Use,Penggunaan Pasti Alkohol
DocType: Fertilizer Content,Fertilizer Content,Kandungan Baja
@@ -4381,6 +4385,7 @@
DocType: Salary Detail,Formula,formula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Templat Ujian Lab
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Akaun Jualan
DocType: Purchase Invoice Item,Total Weight,Berat keseluruhan
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Suruhanjaya Jualan
DocType: Offer Letter Term,Value / Description,Nilai / Penerangan
@@ -4538,7 +4543,7 @@
DocType: Customer,From Lead,Dari Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Perintah dikeluarkan untuk pengeluaran.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
DocType: Program Enrollment Tool,Enroll Students,Daftarkan Pelajar
DocType: Lab Test,Approved Date,Tarikh Diluluskan
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Jualan Standard
@@ -4615,7 +4620,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Pengeluaran Item
,Employee Information,Maklumat Kakitangan
DocType: Stock Entry Detail,Additional Cost,Kos tambahan
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Tidak boleh menapis berdasarkan Baucer Tidak, jika dikumpulkan oleh Baucar"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Tidak boleh menapis berdasarkan Baucer Tidak, jika dikumpulkan oleh Baucar"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Membuat Sebutharga Pembekal
DocType: Quality Inspection,Incoming,Masuk
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Templat cukai lalai untuk jualan dan pembelian dicipta.
@@ -4632,7 +4637,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Nota: {0}
,Delivery Note Trends,Trend Penghantaran Nota
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ringkasan Minggu Ini
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Dalam Stok Kuantiti
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Dalam Stok Kuantiti
DocType: Delivery Trip,Calculate Estimated Arrival Times,Kira Anggaran Masa Kedatangan
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Akaun: {0} hanya boleh dikemaskini melalui Urusniaga Stok
DocType: Student Group Creation Tool,Get Courses,Dapatkan Kursus
@@ -4648,7 +4653,7 @@
DocType: Material Request,% Ordered,% Mengarahkan
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Untuk Kumpulan Pelajar berdasarkan, Kursus yang akan disahkan bagi tiap-tiap Pelajar daripada Kursus mendaftar dalam Program Pendaftaran."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Purata. Kadar Membeli
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Purata. Kadar Membeli
DocType: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
DocType: Employee,History In Company,Sejarah Dalam Syarikat
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Mesej Baru dari {sender}
@@ -4696,7 +4701,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Matawang BOM # {1} hendaklah sama dengan mata wang yang dipilih {2}
DocType: Journal Entry Account,Exchange Rate,Kadar pertukaran
DocType: Patient,Additional information regarding the patient,Maklumat tambahan mengenai pesakit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
DocType: Homepage,Tag Line,Line tag
DocType: Fee Component,Fee Component,Komponen Bayaran
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Pengurusan Fleet
@@ -4911,7 +4916,7 @@
DocType: Employee Education,Employee Education,Pendidikan Pekerja
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,kumpulan item Duplicate dijumpai di dalam jadual kumpulan item
DocType: Land Unit,Parent Land Unit,Unit Tanah Induk
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
DocType: Fertilizer,Fertilizer Name,Nama Baja
DocType: Salary Slip,Net Pay,Gaji bersih
DocType: Account,Account,Akaun
@@ -4990,7 +4995,7 @@
DocType: Item Customer Detail,Ref Code,Ref Kod
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Kumpulan Pelanggan Diperlukan dalam Profil POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekod pekerja.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Sila menetapkan Selepas Tarikh Susutnilai
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Sila menetapkan Selepas Tarikh Susutnilai
DocType: HR Settings,Payroll Settings,Tetapan Gaji
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Padankan Invois tidak berkaitan dan Pembayaran.
DocType: POS Settings,POS Settings,Tetapan POS
@@ -5158,7 +5163,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
DocType: Asset Maintenance Task,Last Completion Date,Tarikh Penyempurnaan Terakhir
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Sejak hari Perintah lepas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
DocType: Buying Settings,Naming Series,Menamakan Siri
DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Mula Tarikh harus kurang daripada tarikh Insurance End
@@ -5288,6 +5293,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Dapatkan Penyertaan Pembayaran
DocType: Quotation Item,Against Docname,Terhadap Docname
DocType: SMS Center,All Employee (Active),Semua Pekerja (Aktif)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Pelanggan> Kumpulan Pelanggan> Wilayah
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
DocType: BOM,Raw Material Cost,Kos bahan mentah
DocType: Item Reorder,Re-Order Level,Re-Order Level
@@ -5388,7 +5394,6 @@
DocType: Room,Seating Capacity,Kapasiti Tempat Duduk
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Kumpulan Ujian Makmal
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Pelanggan> Kumpulan Pelanggan> Wilayah
DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Tuntutan Perbelanjaan (melalui Tuntutan Perbelanjaan)
DocType: GST Settings,GST Summary,Ringkasan GST
DocType: Assessment Result,Total Score,Jumlah markah
@@ -5402,7 +5407,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Mengikuti jadual kursus dibuat
DocType: Journal Entry,Total Debit,Jumlah Debit
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Barangan lalai Mendapat Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Orang Jualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Orang Jualan
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Belanjawan dan PTJ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Pelbagai mod lalai pembayaran tidak dibenarkan
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,untuk
@@ -5578,7 +5583,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Cukai atau Caj
DocType: Driver,Driving License Category,Kategori Lesen Memandu
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Kuantiti sebenar adalah wajib
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pada masa ini mempunyai {1} Pembekal Kad Skor Pembekal, dan Pesanan Pembelian kepada pembekal ini perlu dikeluarkan dengan berhati-hati."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} pada masa ini mempunyai {1} Pembekal Kad Skor Pembekal, dan Pesanan Pembelian kepada pembekal ini perlu dikeluarkan dengan berhati-hati."
DocType: Asset Maintenance Team,Asset Maintenance Team,Pasukan Penyelenggaraan Aset
DocType: Employee Loan,Loan Type,Jenis pinjaman
DocType: Scheduling Tool,Scheduling Tool,Alat penjadualan
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 6ba6567..f308859 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,စျေးနှုန်းအားဖြင့်စီ
,Delay Days,နှောင့်နှေးနေ့ရက်များ
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ဝန်ဆောင်မှုကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,ဝယ်ကုန်စာရင်း
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,retention စတော့အိတ် Entry 'Make
DocType: Purchase Invoice Item,Item Weight Details,item အလေးချိန်အသေးစိတ်
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ကိုးကားစရာ: {0}, Item Code ကို: {1} နှင့်ဖောက်သည်: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,ကီလိုဂရမ်
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,တစ်ဦးယောဘသည်အဖွင့်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM {1} အတန်းမှာကို item {0} subcontracting များအတွက်သတ်မှတ်ထားသောမဟုတ်ပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM {1} အတန်းမှာကို item {0} subcontracting များအတွက်သတ်မှတ်ထားသောမဟုတ်ပါ
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ရလဒ်တင်ပြသူ
DocType: Item Attribute,Increment,increment
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} ဘို့ခွင့်မပြု
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,အထဲကပစ္စည်းတွေကို Get
DocType: Price List,Price Not UOM Dependant,စျေး UOM မှီခိုမ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ကုန်ပစ္စည်း {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ဖော်ပြထားသောအရာများမရှိပါ
DocType: Asset Repair,Error Description,မှားယွင်းနေသည်ဖျေါပွခကျြ
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,ကုန်စုံ
DocType: Quality Inspection Reading,Reading 1,1 Reading
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
DocType: Crop,Perennial,နှစ်ရှည်
DocType: Consultation,Consultation Date,တိုင်ပင်ဆွေးနွေးနေ့စွဲ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext အသုံးပြုသူများအတွက်ကုန်ပစ္စည်းစာရင်းနှင့်ရှာဖွေတွေ့ရှိမှု
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",ဥပမာ "မူလတန်းကျောင်း" သို့မဟုတ် "တက္ကသိုလ်က"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,စတော့အိတ်အစီရင်ခံစာများ
DocType: Warehouse,Warehouse Detail,ဂိုဒေါင် Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,အဆိုပါ Term အဆုံးနေ့စွဲနောက်ပိုင်းတွင်သက်တမ်း (Academic တစ်နှစ်တာ {}) နှင့်ဆက်စပ်သောမှပညာရေးဆိုင်ရာတစ်နှစ်တာ၏တစ်နှစ်တာပြီးဆုံးရက်စွဲထက်မဖွစျနိုငျသညျ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ပိုင်ဆိုင်မှုစံချိန်ပစ္စည်းဆန့်ကျင်တည်ရှိအဖြစ်, ထိနျးခြုပျမဖွစျနိုငျ "Fixed Asset ရှိ၏""
DocType: Delivery Trip,Departure Time,ထွက်ခွာချိန်
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Specification အသေးစိတ် Get
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,ကုန်ပစ္စည်းပေးသွင်းရပ်တည်မှု၏ Templates ကို။
DocType: Lead,Interested,စိတ်ဝင်စား
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,ဖွင့်ပွဲ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,ဖွင့်ပွဲ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},{0} ကနေ {1} မှ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,setup ကိုအခွန်ရန်မအောင်မြင်ခဲ့ပါ
DocType: Item,Copy From Item Group,Item အုပ်စု မှစ. မိတ္တူ
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,row {0}: ဤအနေနဲ့ကြိုတင် entry ကိုဖြစ်လျှင် {1} အကောင့်ဆန့်ကျင် '' ကြိုတင်ထုတ် Is '' စစ်ဆေးပါ။
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
DocType: Email Digest,Profit & Loss,အမြတ်အစွန်း & ဆုံးရှုံးမှု
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ဒီကုမ္ပဏီဆန့်ကျင်အရောင်းအပေါ်တွင်အခြေခံထားသည်။ အသေးစိတ်အချက်အလက်များကိုအောက်ပါအချိန်ဇယားကိုကြည့်ပါ
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,အော်တိုပစ္စည်းတောင်းဆိုမှု၏ဖန်တီးမှုအပေါ်အီးမေးလ်ကိုအကြောင်းကြား
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,ခံနိုင်ရည်
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
DocType: Opening Invoice Creation Tool,Invoice Type,ကုန်ပို့လွှာ Type
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Delivery မှတ်ချက်
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,မုဆိုးမ
DocType: Request for Quotation,Request for Quotation,စျေးနှုန်းအဘို့တောင်းဆိုခြင်း
DocType: Healthcare Settings,Require Lab Test Approval,Lab ကစမ်းသပ်အတည်ပြုချက်လိုအပ်
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,item Code ကို> item Group မှ> အမှတ်တံဆိပ်
DocType: Salary Slip Timesheet,Working Hours,အလုပ်လုပ်နာရီ
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,ထူးချွန်စုစုပေါင်း
DocType: Naming Series,Change the starting / current sequence number of an existing series.,ရှိပြီးသားစီးရီး၏စတင်ကာ / လက်ရှိ sequence number ကိုပြောင်းပါ။
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
DocType: Drug Prescription,Dosage,ဆေးတခါသောက်
DocType: Journal Entry Account,Sales Order,အရောင်းအမှာစာ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,AVG ။ ရောင်းချခြင်း Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,AVG ။ ရောင်းချခြင်း Rate
DocType: Assessment Plan,Examiner Name,စစျဆေးသူအမည်
DocType: Lab Test Template,No Result,အဘယ်သူမျှမရလဒ်
DocType: Purchase Invoice Item,Quantity and Rate,အရေအတွက်နှင့် Rate
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,လစာကာလကို Select လုပ်ပါ
DocType: Purchase Invoice,Unpaid,Unpaid
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,ရောင်းမည် reserved
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း> HR က Settings
DocType: Packing Slip,From Package No.,Package ကိုအမှတ်ကနေ
DocType: Item Attribute,To Range,Range ကိုမှ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Securities and စာရင်း
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,အလုပ်ရုံ
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,အရစ်ကျမိန့်သတိပေး
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Build ဖို့လုံလောက်တဲ့အစိတ်အပိုင်းများ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Build ဖို့လုံလောက်တဲ့အစိတ်အပိုင်းများ
DocType: POS Profile User,POS Profile User,POS ကိုယ်ရေးဖိုင်အသုံးပြုသူ
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,တိုက်ရိုက်ဝင်ငွေခွန်
DocType: Patient Appointment,Date TIme,ရက်စွဲအချိန်
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","အကောင့်အားဖြင့်အုပ်စုဖွဲ့လျှင်, အကောင့်ပေါ်မှာအခြေခံပြီး filter နိုင်ဘူး"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","အကောင့်အားဖြင့်အုပ်စုဖွဲ့လျှင်, အကောင့်ပေါ်မှာအခြေခံပြီး filter နိုင်ဘူး"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,ကုမ္ပဏီနှင့်အခွန်တက်ချိန်ညှိခြင်း
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,သင်တန်းကို select ပေးပါ
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,ခြားနားချက်အကောင့်
DocType: Purchase Invoice,Supplier GSTIN,ပေးသွင်း GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,၎င်း၏မှီခိုအလုပ်တစ်ခုကို {0} တံခါးပိတ်မဟုတ်ပါအဖြစ်အနီးကပ်အလုပ်တစ်ခုကိုမနိုင်သလား။
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
DocType: Production Order,Additional Operating Cost,နောက်ထပ် Operating ကုန်ကျစရိတ်
DocType: Lab Test Template,Lab Routine,Lab ကပုံမှန်
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,အလှကုန်
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 နှင့်အတူ relation
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager က
DocType: Payment Entry,Payment From / To,/ စေရန် မှစ. ငွေပေးချေမှုရမည့်
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},နယူးအကြွေးကန့်သတ်ဖောက်သည်များအတွက်လက်ရှိထူးချွန်ငွေပမာဏထက်လျော့နည်းသည်။ အကြွေးကန့်သတ် atleast {0} ဖြစ်ဖို့ရှိပါတယ်
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},နယူးအကြွေးကန့်သတ်ဖောက်သည်များအတွက်လက်ရှိထူးချွန်ငွေပမာဏထက်လျော့နည်းသည်။ အကြွေးကန့်သတ် atleast {0} ဖြစ်ဖို့ရှိပါတယ်
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},ဂိုဒေါင် {0} အတွက်အကောင့်ကိုသတ်မှတ်ပေးပါ
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'' တွင် အခြေခံ. 'နဲ့' Group မှဖြင့် '' အတူတူမဖွစျနိုငျ
DocType: Sales Person,Sales Person Targets,အရောင်းပုဂ္ဂိုလ်ပစ်မှတ်များ
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,batch အမည်
DocType: Fee Validity,Max number of visit,ခရီးစဉ်၏မက်စ်အရေအတွက်က
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ကဖန်တီး:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,စာရင်းသွင်း
DocType: GST Settings,GST Settings,GST က Settings
DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,ဘတ်ဂျက်ဆန့်ကျင်
DocType: Employee,Cell Number,cell အရေအတွက်
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ပေးထားသောစံအဘို့အဘယ်သူမျှမန်ထမ်းရှိပါတယ်။ လစာချော်ပြီးသားဖန်တီးခဲ့ကြပြီမဟုတ်ကြောင်းစစ်ဆေးပါ။
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,generated auto ပစ္စည်းတောင်းဆိုမှုများ
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,generated auto ပစ္စည်းတောင်းဆိုမှုများ
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ဆုံးရှုံး
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ '' ဂျာနယ် Entry 'ဆန့်ကျင်' 'အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,ကုန်ထုတ်လုပ်မှုများအတွက် reserved
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,အတန်း {0}: {1} Serial နံပါတ်များကို Item {2} ဘို့လိုအပ်သည်။ သင် {3} ထောက်ပံ့ပေးခဲ့ကြသည်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,အတန်း {0}: {1} Serial နံပါတ်များကို Item {2} ဘို့လိုအပ်သည်။ သင် {3} ထောက်ပံ့ပေးခဲ့ကြသည်။
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,စားပွဲတစ်ခုကို select ပေးပါ
DocType: BOM,Website Specifications,website သတ်မှတ်ချက်များ
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} 'လက်ခံသူများ' 'တစ်မမှန်ကန်တဲ့အီးမေးလ်လိပ်စာဖြစ်ပါသည်
@@ -1036,7 +1037,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,quote တောင်းဆိုထားသော
DocType: Vital Signs,Heart Rate / Pulse,နှလုံးခုန်နှုန်း / Pulse
DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"ပစ္စည်းများကို {0} ကနေတဆင့်ကယ်နှုတ်တော်မူ၏မဟုတ်သောကြောင့်, '' Update ကိုစတော့အိတ် '' checked မရနိုင်ပါ"
DocType: Vehicle,Acquisition Date,သိမ်းယူမှုနေ့စွဲ
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,nos
@@ -1061,7 +1062,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),သင့်ရဲ့စာကိုဦးခေါင်း (100px အားဖြင့် 900px အဖြစ်ကို web ဖော်ရွေသည်ထိုပွဲကို) Upload လုပ်ပါ
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: အကောင့် {2} တဲ့ Group ကိုမဖွစျနိုငျ
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,item Row {idx}: {DOCTYPE} {DOCNAME} အထက် '' {DOCTYPE} '' table ထဲမှာမတည်ရှိပါဘူး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,အဘယ်သူမျှမတာဝန်များကို
DocType: Item Variant Settings,Copy Fields to Variant,မူကွဲမှ Fields မိတ္တူ
DocType: Asset,Opening Accumulated Depreciation,စုဆောင်းတန်ဖိုးဖွင့်လှစ်
@@ -1173,9 +1174,10 @@
DocType: Production Order,Plan material for sub-assemblies,က sub-အသင်းတော်တို့အဘို့အစီအစဉ်ကိုပစ္စည်း
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,အရောင်းအပေါင်းအဖေါ်များနှင့်နယ်မြေတွေကို
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),ပိတ် (ဖွင့်ပွဲ + စုစုပေါင်း)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),ပိတ် (ဖွင့်ပွဲ + စုစုပေါင်း)
DocType: Journal Entry,Depreciation Entry,တန်ဖိုး Entry '
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ပထမဦးဆုံး Document အမျိုးအစားကိုရွေးချယ်ပါ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,အကောင့်ငွေကြေးစနစ်အတွက် Print
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ဒီ Maintenance ခရီးစဉ်ပယ်ဖျက်မီပစ္စည်းလည်ပတ်သူ {0} Cancel
DocType: Crop Cycle,ISO 8016 standard,က ISO 8016 စံ
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},serial No {0} Item မှ {1} ပိုင်ပါဘူး
@@ -1201,7 +1203,7 @@
DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
DocType: Fee Structure,Components,components
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,item Variant {0} updated
DocType: Quality Inspection Reading,Reading 6,6 Reading
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1253,6 +1255,7 @@
,Company Name,ကုမ္ပဏီအမည်
DocType: SMS Center,Total Message(s),စုစုပေါင်း Message (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setup ကို> Setting> အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
DocType: Purchase Invoice,Additional Discount Percentage,အပိုဆောင်းလျှော့ရာခိုင်နှုန်း
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,အားလုံးအကူအညီနဲ့ဗီဒီယိုစာရင်းကိုကြည့်ခြင်း
DocType: Agriculture Analysis Criteria,Soil Texture,မြေဆီလွှာတွင်အသွေးအရောင်
@@ -1281,7 +1284,7 @@
DocType: BOM Website Item,BOM Website Item,BOM ဝက်ဘ်ဆိုက် Item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
DocType: Timesheet Detail,Bill,ဘီလ်
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Next ကိုတန်ဖိုးနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်သည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Next ကိုတန်ဖိုးနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်သည်
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,အဖြူ
DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),အတန်း {0}: ({2} {3}) entry ကို၏အချိန်ပို့စ်တင်မှာ {1} ဂိုဒေါင်ထဲမှာ {4} များအတွက်အရည်အတွက်ရရှိနိုင်မ
@@ -1298,7 +1301,7 @@
DocType: Lead,Next Contact Date,Next ကိုဆက်သွယ်ရန်နေ့စွဲ
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qty ဖွင့်လှစ်
DocType: Healthcare Settings,Appointment Reminder,ခန့်အပ်တာဝန်ပေးခြင်းသတိပေးချက်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
DocType: Program Enrollment Tool Student,Student Batch Name,ကျောင်းသားအသုတ်လိုက်အမည်
DocType: Consultation,Doctor,ဆရာဝန်
DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
@@ -1314,6 +1317,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ဖြန့်ဝေ Tool ကို Leave
DocType: Item,Hub Category to Publish,hub Category: Publish မှ
DocType: Leave Block List,Leave Block List Dates,Block List ကိုနေ့ရက်များ Leave
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,ကျေးဇူးပြု. Setup ကို> နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
DocType: Sales Invoice,Billing Address GSTIN,ငွေတောင်းခံလိပ်စာ GSTIN
DocType: Assessment Plan,Evaluate,ခန့်မှန်း
DocType: Workstation,Net Hour Rate,Net ကအချိန်နာရီနှုန်း
@@ -1348,7 +1352,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,အရောင်းပြေစာငွေပေးချေမှုရမည့်
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,အရောင်းအမိန့် / Finished ကုန်စည်ဂိုဒေါင်ထဲမှာ Reserved ဂိုဒေါင်
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,ငွေပမာဏရောင်းချနေ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ငွေပမာဏရောင်းချနေ
DocType: Repayment Schedule,Interest Amount,အကျိုးစီးပွားငွေပမာဏ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,သင်သည်ဤစံချိန်များအတွက်ကုန်ကျစရိတ်အတည်ပြုချက်ဖြစ်ကြ၏။ ကို 'နဲ့ Status' နှင့် Save ကို Update ကျေးဇူးပြု.
DocType: Serial No,Creation Document No,ဖန်ဆင်းခြင်း Document ဖိုင်မရှိပါ
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,ဖွင့်လှစ်စာရင်းကိုင် Balance
,GST Sales Register,GST အရောင်းမှတ်ပုံတင်မည်
DocType: Sales Invoice Advance,Sales Invoice Advance,အရောင်းပြေစာကြိုတင်ထုတ်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,သင့်ရဲ့ဒိုမိန်းကိုရွေးချယ်ပါ
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},နောက်ထပ်ဘတ်ဂျက်စံချိန် '' {0} '' ပြီးသားဘဏ္ဍာရေးနှစ်များအတွက် '' {2} '{1} ဆန့်ကျင်တည်ရှိ {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,လယ်ကွင်းများသာဖန်ဆင်းခြင်းအချိန်တွင်ကျော်ကူးယူပါလိမ့်မည်။
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ဤသည်မူကွဲ၏ Item Code ကိုမှ appended လိမ့်မည်။ သင့်ရဲ့အတိုကောက် "SM" ဖြစ်ပြီး, ပစ္စည်း code ကို "သည် T-shirt" ဖြစ်ပါတယ်လျှင်ဥပမာ, ကိုမူကွဲ၏ပစ္စည်း code ကို "သည် T-shirt-SM" ဖြစ်လိမ့်မည်"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,သင်လစာစလစ်ဖြတ်ပိုင်းပုံစံကိုကယ်တင်တခါ (စကား) Net က Pay ကိုမြင်နိုင်ပါလိမ့်မည်။
DocType: Purchase Invoice,Is Return,သို့ပြန်သွားသည်ဖြစ်ပါသည်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,သတိ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,သတိ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,ပြန်သွား / မြီစားမှတ်ချက်
DocType: Price List Country,Price List Country,စျေးနှုန်းကိုစာရင်းနိုင်ငံ
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},Item {1} သည် {0} တရားဝင် serial nos
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},Item {1} သည် {0} တရားဝင် serial nos
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,item Code ကို Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM ကူးပြောင်းခြင်း Factor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,အသုတ်လိုက်နံပါတ်ရဖို့ Item Code ကိုရိုက်ထည့်ပေးပါ
@@ -1561,7 +1565,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,အရောင်းအမှာစာ {0} တရားဝင်မဟုတ်
DocType: Supplier Scorecard,Warn for new Request for Quotations,ကိုးကားချက်များအသစ်တောင်းဆိုမှုအဘို့သတိပေး
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,အရစ်ကျအမိန့်သင်သည်သင်၏ဝယ်ယူမှုအပေါ်စီစဉ်ထားခြင်းနှင့်ဖွင့်အတိုင်းလိုက်နာကူညီ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab ကစမ်းသပ်ဆေးညွှန်း
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",စုစုပေါင်းစာစောင် / လွှဲပြောင်းအရေအတွက် {0} ပစ္စည်းတောင်းဆိုမှုအတွက် {1} \ မေတ္တာရပ်ခံအရေအတွက် {2} Item {3} သည်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -1599,7 +1603,6 @@
DocType: Warehouse,Warehouse Contact Info,ဂိုဒေါင် Contact Info
DocType: Payment Entry,Write Off Difference Amount,Difference ငွေပမာဏဟာ Off ရေးထား
DocType: Volunteer,Volunteer Name,စေတနာ့ဝန်ထမ်းအမည်
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ> ပညာရေးကိုဆက်တင်
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: ဤအရပ်အီးမေးလ်ပို့မပို့နိုင်မတွေ့ရှိထမ်းအီးမေးလ်,"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},တိုင်းပြည် {0} များအတွက်သက်ဆိုင်မဟုတ် shipping အုပ်ချုပ်မှုကို
DocType: Item,Foreign Trade Details,နိုင်ငံခြားကုန်သွယ်မှုဘဏ်အသေးစိတ်
@@ -1612,7 +1615,7 @@
DocType: Student Group Student,Group Roll Number,Group မှ Roll နံပါတ်
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,အားလုံး task ကိုအလေးစုစုပေါင်း 1. အညီအားလုံးစီမံကိန်းအလုပ်များကိုအလေးချိန်ညှိပေးပါရပါမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,မြို့တော်ပစ္စည်းများ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်ပြင်၌, '' တွင် Apply '' အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
@@ -1637,7 +1640,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,ကလေးဂိုဒေါင်ဒီဂိုဒေါင်အဘို့အရှိနေပြီ။ သင်ဤဂိုဒေါင်မဖျက်နိုင်ပါ။
DocType: Item,Website Item Groups,website Item အဖွဲ့များ
DocType: Purchase Invoice,Total (Company Currency),စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,serial number ကို {0} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,serial number ကို {0} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်
DocType: Journal Entry,Journal Entry,ဂျာနယ် Entry '
DocType: Expense Claim Advance,Unclaimed amount,ပိုင်ရှင်မပေါ်သောသွင်းငွေပမာဏ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,တိုးတက်မှုအတွက် {0} ပစ္စည်းများ
@@ -1734,7 +1737,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,ဆက်သွယ်ရေးမှတ်တမ်း။
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","စျေးနှုန်းအဘို့တောင်းဆိုခြင်းပိုပြီးစစ်ဆေးမှုများပေါ်တယ် setting များကိုအဘို့, ပေါ်တယ်မှလက်လှမ်းမီဖို့ကိုပိတ်ထားသည်။"
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ပေးသွင်း Scorecard အမှတ်ပေး Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,ဝယ်ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ဝယ်ငွေပမာဏ
DocType: Sales Invoice,Shipping Address Name,သဘောင်္တင်ခလိပ်စာအမည်
DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,သင်တန်းဇယားကိုအမှားအယွင်းများရှိခဲ့သည်
@@ -1998,7 +2001,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ဒီယာဉ်ဆန့်ကျင်ရာ Logs အပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,သငျသညျဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မဖျက်နိုင်ပါ။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} ကမ္တာ့ချိန်ညှိအတွက် default အနေနဲ့အဖြစ်သတ်မှတ်
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,အမည်တူနှင့်အတူတစ်ဦးကဖောက်သည်ပြီးသားတည်ရှိ
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ဤသည်လစာစလစ်တင်ပြရန်နှင့်တိုးပွားလာသောဂျာနယ် Entry ဖန်တီးပါလိမ့်မယ်။ သငျသညျဆက်လက်ဆောင်ရွက်ချင်ပါသလား?
@@ -2012,6 +2015,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,စျေးနှုန်း
DocType: Quotation,Term Details,သက်တမ်းအသေးစိတ်ကို
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ဒီကျောင်းသားအုပ်စုအတွက် {0} ကျောင်းသားများကိုထက်ပိုစာရင်းသွင်းလို့မရပါ။
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),(အခွန်မပါ) စုစုပေါင်း
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ခဲအရေအတွက်
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ခဲအရေအတွက်
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
@@ -2032,7 +2036,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ငွေတောင်းခံလွှာ၏ Cancellation အပေါ်ငွေပေးချေမှုရမည့်လင့်ဖြုတ်ရန်
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},စာဖတ်ခြင်းသို့ဝင်လက်ရှိ Odometer ကနဦးယာဉ် Odometer {0} ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
DocType: Restaurant Reservation,No Show,အဘယ်သူမျှမပြသပါ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setup ကို> Setting> အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
DocType: Shipping Rule Country,Shipping Rule Country,သဘောင်္တင်ခနည်းဥပဒေနိုင်ငံ
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leave နှင့်တက်ရောက်
DocType: Maintenance Visit,Partially Completed,တစ်စိတ်တစ်ပိုင်း Completed
@@ -2125,7 +2128,7 @@
DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
DocType: Grant Application,Assessment Mark (Out of 10),(10 ထဲက) အကဲဖြတ်မာကု
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 မိုဘိုင်းဘယ်သူမျှမက
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,အဓိက
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,အဓိက
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,မူကွဲ
DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
DocType: Employee Attendance Tool,Employees HTML,ဝန်ထမ်းများ HTML ကို
@@ -2175,7 +2178,7 @@
DocType: Course,Course Abbreviation,သင်တန်းအတိုကောက်
DocType: Student Leave Application,Student Leave Application,ကျောင်းသားသမဂ္ဂခွင့်လျှောက်လွှာ
DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},{1} အပေါ်တစ်ဝက်နေ့၌ဝန်ထမ်း {0}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},စုစုပေါင်းအလုပ်ချိန်နာရီ {0} အလုပ်လုပ် max ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်ပါဘူး
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,အပေါ်
@@ -2362,9 +2365,10 @@
DocType: Task,Actual End Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ်ပြီးဆုံးရက်စွဲ
DocType: Soil Texture,Soil Type,မြေဆီလွှာတွင်အမျိုးအစား
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,နယူးမက်စေ့
,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
DocType: Shipping Rule,Shipping Amount,သဘောင်္တင်ခပမာဏ
DocType: Supplier Scorecard Period,Period Score,ကာလရမှတ်
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Customer များ Add
@@ -2375,7 +2379,7 @@
,Vehicle Expenses,ယာဉ်ကုန်ကျစရိတ်
DocType: Serial No,Invoice Details,ငွေတောင်းခံလွှာအသေးစိတ်
DocType: Grant Application,Show on Website,ဝက်ဘ်ဆိုက်ပေါ်တွင်ပြရန်
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,အပေါ် Start
DocType: Hub Category,Hub Category,hub Category:
DocType: Purchase Invoice,SEZ,အထူးစီးပွားရေးဇုန်
@@ -2407,7 +2411,7 @@
DocType: Patient,B Positive,B ကအပြုသဘောဆောင်သော
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
DocType: Patient Medical Record,Patient Medical Record,လူနာဆေးဘက်ဆိုင်ရာမှတ်တမ်း
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,က Non-Group ကိုမှ Group က
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,အားကစား
@@ -2458,6 +2462,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,အဘယ်သူမျှမ Quote တစ်ခုလက်ခံရရှိ RFQ မသတ်မှတ်နိုင်ပါ
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,အကောင့်ငွေကြေးအတွက် print ထုတ်အကောင့်တစ်ခုရွေးပါ
,Production Analytics,ထုတ်လုပ်မှု Analytics မှ
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ဒီလူနာဆန့်ကျင်အရောင်းအပေါ်တွင်အခြေခံထားသည်။ အသေးစိတ်အချက်အလက်များကိုအောက်ပါအချိန်ဇယားကိုကြည့်ပါ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ကုန်ကျစရိတ် Updated
@@ -2513,7 +2518,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
DocType: Leave Control Panel,Leave blank if considered for all departments,အားလုံးဌာနများစဉ်းစားလျှင်အလွတ် Leave
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
DocType: Payroll Entry,Fortnightly,နှစ်ပတ်တ
DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
DocType: Vital Signs,Weight (In Kilogram),(ကီလိုဂရမ်ခုနှစ်တွင်) အလေးချိန်
@@ -2591,7 +2596,7 @@
DocType: Student,Guardians,အုပ်ထိန်းသူများ
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,စျေးစာရင်းမသတ်မှတ်လျှင်စျေးနှုန်းများပြလိမ့်မည်မဟုတ်
DocType: Stock Entry,Total Incoming Value,စုစုပေါင်း Incoming Value တစ်ခု
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,debit ရန်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,debit ရန်လိုအပ်သည်
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets သင့်ရဲ့အဖွဲ့ကအမှုကိုပြု Activite ဘို့အချိန်, ကုန်ကျစရိတ်နှင့်ငွေတောင်းခံခြေရာခံစောင့်ရှောက်ကူညီပေးရန်"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ကုန်ပစ္စည်းပေးသွင်း scorecard variable တွေကို၏ Templates ကို။
@@ -2694,7 +2699,7 @@
DocType: Company,For Reference Only.,သာလျှင်ကိုးကားစရာသည်။
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},ဆရာဝန် {1} အပေါ်ရရှိနိုင် {0} မဟုတ်
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,ကို Select လုပ်ပါအသုတ်လိုက်အဘယ်သူမျှမ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},မမှန်ကန်ခြင်း {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},မမှန်ကန်ခြင်း {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,ကိုးကားစရာ Inv
@@ -2731,8 +2736,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
DocType: Water Analysis,Origin,မူလ
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ဤစာရွက်စာတမ်းကို item {4} ဘို့ {0} {1} အားဖြင့်ကန့်သတ်ကျော်ပြီဖြစ်ပါသည်။ သငျသညျ {2} အတူတူဆန့်ကျင်သည်အခြား {3} လုပ်နေပါတယ်?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
@@ -2788,7 +2793,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,အသစ်ကဝယ်ယူအမိန့်အဘို့သတိပေး
DocType: Quality Inspection Reading,Reading 9,9 Reading
DocType: Supplier,Is Frozen,Frozen ဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Group က node ကိုဂိုဒေါင်ငွေကြေးလွှဲပြောင်းမှုမှာအဘို့ကိုရွေးဖို့ခွင့်ပြုမထားဘူး
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Group က node ကိုဂိုဒေါင်ငွေကြေးလွှဲပြောင်းမှုမှာအဘို့ကိုရွေးဖို့ခွင့်ပြုမထားဘူး
DocType: Buying Settings,Buying Settings,Settings ကိုဝယ်ယူ
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,တစ် Finished ကောင်း Item သည် BOM အမှတ်
DocType: Upload Attendance,Attendance To Date,နေ့စွဲရန်တက်ရောက်
@@ -2803,6 +2808,7 @@
DocType: Grant Application,Organization,အဖှဲ့အစညျး
DocType: BOM Update Tool,BOM Update Tool,BOM Update ကို Tool ကို
DocType: SG Creation Tool Course,Student Group Name,ကျောင်းသားအုပ်စုအမည်
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Show ကိုအမြင်ပေါက်ကွဲ
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creating အခကြေးငွေများ
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,သင်အမှန်တကယ်ဒီကုမ္ပဏီပေါင်းသည်တလုံးငွေကြေးလွှဲပြောင်းပယ်ဖျက်လိုသေချာအောင်လေ့လာပါ။ ထိုသို့အဖြစ်သင်၏သခင်ဒေတာဖြစ်နေလိမ့်မယ်။ ဤ action ပြင်. မရပါ။
DocType: Room,Room Number,အခန်းနံပတ်
@@ -2813,7 +2819,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,အခွန် Template: Make
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,အသုံးပြုသူဖိုရမ်
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
DocType: Lab Test Sample,Lab Test Sample,Lab ကစမ်းသပ်နမူနာ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry '
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
@@ -2884,7 +2890,7 @@
DocType: Membership,USD,အမေရိကန်ဒေါ်လာ
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ပြေစာလုပ်ပါ
DocType: Selling Settings,Auto close Opportunity after 15 days,15 ရက်အကြာမှာအော်တိုနီးစပ်အခွင့်အလမ်း
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,အရစ်ကျအမိန့်ကြောင့် {1} တစ် scorecard ရပ်တည်မှုမှ {0} ဘို့ခွင့်ပြုမထားပေ။
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,အရစ်ကျအမိန့်ကြောင့် {1} တစ် scorecard ရပ်တည်မှုမှ {0} ဘို့ခွင့်ပြုမထားပေ။
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,အဆုံးတစ်နှစ်တာ
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quote /% ကိုပို့ဆောငျ
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quote /% ကိုပို့ဆောငျ
@@ -2977,7 +2983,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-အထက်
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,အတန်း # {0}: ဂျာနယ် Entry '{1} အကောင့် {2} ရှိသည်သို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
DocType: Supplier Scorecard Criteria,Criteria Weight,လိုအပ်ချက်အလေးချိန်
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,ပေးသွင်း> ပေးသွင်းအမျိုးအစား
DocType: Buying Settings,Default Buying Price List,default ဝယ်ယူစျေးနှုန်းများစာရင်း
DocType: Payroll Entry,Salary Slip Based on Timesheet,Timesheet အပေါ်အခြေခံပြီးလစာစလစ်ဖြတ်ပိုင်းပုံစံ
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,ဝယ်ယူနှုန်း
@@ -3067,7 +3072,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track စက်မှုလက်မှုလုပ်ငန်းရှင်များကအမျိုးအစားအားဖြင့် Leads ။
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Letterheads ကိုသွားပါ
DocType: Item Supplier,Item Supplier,item ပေးသွင်း
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,အားလုံးသည်လိပ်စာ။
DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
@@ -3245,6 +3250,7 @@
DocType: Company,Default Inventory Account,default Inventory အကောင့်
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,အတန်း {0}: Completed အရည်အတွက်သုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
DocType: Antibiotic,Antibiotic Name,ပဋိဇီဝဆေးအမည်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,item Code ကို> item Group မှ> အမှတ်တံဆိပ်
DocType: Purchase Invoice,Apply Additional Discount On,Apply နောက်ထပ်လျှော့တွင်
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,အမျိုးအစားရွေးရန် ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,အဆိုပါသီးနှံကြီးထွားလာသောသူအပေါင်းတို့ကိုမြေယူနစ်မှတစ်ဦးက link ကို
@@ -3440,6 +3446,7 @@
DocType: Supplier,Credit Limit,ခရက်ဒစ်ကန့်သတ်
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,ပျမ်းမျှ။ စျေးစာရင်းနှုန်းရောင်းချနေ
DocType: Production Plan Sales Order,Salse Order Date,Salse အမိန့်နေ့စွဲ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,ပေးသွင်း> ပေးသွင်းအမျိုးအစား
DocType: Salary Component,Salary Component,လစာစိတျအပိုငျး
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,ငွေပေးချေမှုရမည့် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
DocType: GL Entry,Voucher No,ဘောက်ချာမရှိ
@@ -3449,7 +3456,7 @@
DocType: Leave Allocation,Leave Allocation,ဖြန့်ဝေ Leave
DocType: Payment Request,Recipient Message And Payment Details,လက်ခံရရှိသူကို Message ထိုအငွေပေးချေမှုရမည့်အသေးစိတ်
DocType: Training Event,Trainer Email,သင်တန်းပေးတဲ့အီးမေးလ်ဂ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,material တောင်းဆို {0} နေသူများကဖန်တီး
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,material တောင်းဆို {0} နေသူများကဖန်တီး
DocType: Restaurant Reservation,No of People,ပြည်သူ့မျှ
DocType: Production Planning Tool,Include sub-contracted raw materials,Sub-ကန်ထရိုက်ကုန်ကြမ်း Include
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ဝေါဟာရသို့မဟုတ်ကန်ထရိုက်၏ template ။
@@ -3515,7 +3522,7 @@
DocType: Production Planning Tool,Create Material Requests,ပစ္စည်းတောင်းဆို Create
DocType: Employee Education,School/University,ကျောင်း / တက္ကသိုလ်က
DocType: Payment Request,Reference Details,ကိုးကားစရာ Details ကို
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထားသည့် Value တစ်ခုစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရပါမည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထားသည့် Value တစ်ခုစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရပါမည်
DocType: Sales Invoice Item,Available Qty at Warehouse,ဂိုဒေါင်ကနေရယူနိုင်ပါတယ် Qty
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ကြေညာတဲ့ငွေပမာဏ
DocType: Asset,Double Declining Balance,နှစ်ချက်ကျဆင်းနေ Balance
@@ -3527,7 +3534,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates ကိုရယူပါ
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: အကောင့် {2} ကုမ္ပဏီ {3} ပိုင်ပါဘူး
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,အဆိုပါ attribute တွေတစ်ခုချင်းစီကနေအနည်းဆုံးတန်ဖိုးကိုရွေးချယ်ပါ။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
apps/erpnext/erpnext/config/hr.py +310,Leave Management,စီမံခန့်ခွဲမှု Leave
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,အကောင့်အားဖြင့်အုပ်စု
DocType: Sales Order,Fully Delivered,အပြည့်အဝကိုကယ်နှုတ်
@@ -3538,14 +3545,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ထုတ်ချေးငွေပမာဏချေးငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Programs ကိုကိုသွားပါ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},အတန်း {0} # ခွဲဝေငွေပမာဏ {1} သည့်အရေးမဆိုထားသောငွေပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,ကျေးဇူးပြု. Setup ကို> နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,ထုတ်လုပ်မှုအမိန့်နေသူများကဖန်တီးမပေး
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','' နေ့စွဲ မှစ. '' နေ့စွဲရန် '' နောက်မှာဖြစ်ရပါမည်
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်လွှာ {1} နှင့်အတူဆက်စပ်အဖြစ်အဆင့်အတန်းမပြောင်းနိုင်သ
DocType: Asset,Fully Depreciated,အပြည့်အဝတန်ဖိုးလျော့ကျ
,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
DocType: Employee Attendance Tool,Marked Attendance HTML,တခုတ်တရတက်ရောက် HTML ကို
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","ကိုးကားအဆိုပြုချက်, သင်သည်သင်၏ဖောက်သည်များစေလွှတ်ပြီလေလံများမှာ"
DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
@@ -3630,7 +3636,7 @@
DocType: Stock Settings,Item Naming By,အားဖြင့်အမည် item
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} ပြီးနောက်ဖန်ဆင်းခဲ့နောက်ထပ်ကာလသင်တန်းဆင်းပွဲ Entry '
DocType: Production Order,Material Transferred for Manufacturing,ကုန်ထုတ်လုပ်မှုသည်လွှဲပြောင်း material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,အကောင့်ကို {0} တည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,အကောင့်ကို {0} တည်ရှိပါဘူး
DocType: Project,Project Type,စီမံကိန်းကအမျိုးအစား
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ကလေးသူငယ် Task ကိုဒီ Task ကိုများအတွက်တည်ရှိ။ သင်ဤ Task ကိုမဖျက်နိုင်ပါ။
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါတယ်။
@@ -3734,11 +3740,11 @@
DocType: Company,Asset Depreciation Cost Center,ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ
DocType: Sales Order Item,Sales Order Date,အရောင်းအမှာစာနေ့စွဲ
DocType: Sales Invoice Item,Delivered Qty,ကယ်နှုတ်တော်မူ၏ Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,စုစုပေါင်း Excl ။ အခွန်
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","check လုပ်ထားလျှင်, အသီးအသီးထုတ်လုပ်မှုကို item အမျိုးသားအပေါင်းတို့သည်ရုပ်ဝတ္ထုတောင်းဆိုချက်များတွင်ထည့်သွင်းပါလိမ့်မည်။"
DocType: Assessment Plan,Assessment Plan,အကဲဖြတ်အစီအစဉ်
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,ဖောက်သည် {0} နေသူများကဖန်တီး။
DocType: Stock Settings,Limit Percent,ရာခိုင်နှုန်းကန့်သတ်ရန်
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ> ပညာရေးကိုဆက်တင်
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,မည်သည့်ဂိုဒေါင်ထဲမှာရရှိနိုင်လောလောဆယ်အဘယ်သူမျှမစတော့ရှယ်ယာ
,Payment Period Based On Invoice Date,ပြေစာနေ့စွဲတွင် အခြေခံ. ငွေပေးချေမှုရမည့်ကာလ
DocType: Sample Collection,No. of print,ပုံနှိပ်၏အမှတ်
@@ -3754,12 +3760,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),ကိုက် ({0})
DocType: Pricing Rule,Margin,margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,နယူး Customer များ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,စုစုပေါင်းအမြတ်%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,စုစုပေါင်းအမြတ်%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,ပြောင်းလဲမှု POS ကိုယ်ရေးဖိုင်
DocType: Bank Reconciliation Detail,Clearance Date,ရှင်းလင်းရေးနေ့စွဲ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,အကဲဖြတ်အစီရင်ခံစာ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,စုစုပေါင်းအရစ်ကျငွေပမာဏမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,စုစုပေါင်းအရစ်ကျငွေပမာဏမဖြစ်မနေဖြစ်ပါသည်
DocType: Lead,Address Desc,Desc လိပ်စာ
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,ပါတီမဖြစ်မနေဖြစ်ပါသည်
DocType: Journal Entry,JV-,JV-
@@ -3791,7 +3797,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,ရပ်နေသည်ကိုအမည်
DocType: Stock Entry,Customer or Supplier Details,customer သို့မဟုတ်ပေးသွင်း Details ကို
DocType: Employee Loan Application,Required by Date,နေ့စွဲခြင်းဖြင့်တောင်းဆိုနေတဲ့
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),ပိတ်လက်ကျန်ငွေ (ဒေါက်တာ - CR)
DocType: Lead,Lead Owner,ခဲပိုင်ရှင်
DocType: Bin,Requested Quantity,တောင်းဆိုထားသောပမာဏ
DocType: Patient,Marital Status,အိမ်ထောင်ရေးအခြေအနေ
@@ -3805,7 +3810,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,အကွိမျမြားစှာမူကွဲ
DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,item {0}: မိန့် qty {1} {2} (Item မှာသတ်မှတ်ထားတဲ့) နိမ့်ဆုံးအမိန့် qty ထက်နည်းမဖြစ်နိုင်။
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,အခြားအသုံးပြုသူအဖြစ် login ပေးပါ။
DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
@@ -3906,7 +3911,7 @@
DocType: Serial No,Out of AMC,AMC ထဲက
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
DocType: Company,Default Cash Account,default ငွေအကောင့်
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ဒီကျောင်းသားသမဂ္ဂများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
@@ -4058,7 +4063,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,အဆိုပါဖော်ပြခဲ့တဲ့စံအဘို့အဘယ်သူမျှမကန်ထမ်း
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
DocType: Restaurant,Default Customer,default ဖောက်သည်
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း> HR က Settings
DocType: Assessment Plan,Supervisor Name,ကြီးကြပ်ရေးမှူးအမည်
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ချိန်းထိုနေ့အဘို့အနေသူများကဖန်တီးလျှင်အတည်ပြုမပြုပါ
DocType: Program Enrollment Course,Program Enrollment Course,Program ကိုကျောင်းအပ်သင်တန်းအမှတ်စဥ်
@@ -4181,7 +4185,7 @@
DocType: BOM,Website Description,website ဖော်ပြချက်များ
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,နောက်ဆုံးပေါ်
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email လိပ်စာထူးခြားတဲ့သူဖြစ်ရမည်, ပြီးသား {0} များအတွက်တည်ရှိ"
DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,ပွေစာ
@@ -4198,7 +4202,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ငွေသား Flow ဖော်ပြချက်
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ချေးငွေပမာဏ {0} အများဆုံးချေးငွေပမာဏထက်မပိုနိုင်
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,လိုင်စင်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,သင်တို့သည်လည်းယခင်ဘဏ္ဍာနှစ်ရဲ့ချိန်ခွင်လျှာဒီဘဏ္ဍာနှစ်မှပင်အရွက်ကိုထည့်သွင်းရန်လိုလျှင် Forward ပို့ကို select ကျေးဇူးပြု.
DocType: GL Entry,Against Voucher Type,ဘောက်ချာ Type ဆန့်ကျင်
DocType: Physician,Phone (R),ဖုန်း (R)
@@ -4210,7 +4214,7 @@
DocType: Patient,B Negative,B ကအနုတ်
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,ကို Maintenance အခြေအနေ Submit မှပယ်ဖျက်ထားသည်မှာသို့မဟုတ် Completed ခံရဖို့ရှိပါတယ်
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,အတန်းအတွက် serial နံပါတ် {0} Delivery မှတ်ချက်နှင့်အတူမကိုက်ညီ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,အတန်းအတွက် serial နံပါတ် {0} Delivery မှတ်ချက်နှင့်အတူမကိုက်ညီ
DocType: Student,Guardian Details,ဂါးဒီးယန်းအသေးစိတ်
DocType: C-Form,C-Form,C-Form တွင်
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,မျိုးစုံန်ထမ်းများအတွက်မာကုတက်ရောက်
@@ -4252,7 +4256,7 @@
DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
DocType: Training Event,Exam,စာမေးပွဲ
DocType: Complaint,Complaint,တိုင်ကြားစာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
DocType: Patient,Alcohol Past Use,အရက်အတိတ်မှအသုံးပြုခြင်း
DocType: Fertilizer Content,Fertilizer Content,ဓာတ်မြေသြဇာအကြောင်းအရာ
@@ -4381,6 +4385,7 @@
DocType: Salary Detail,Formula,နည်း
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,serial #
DocType: Lab Test Template,Lab Test Template,Lab ကစမ်းသပ် Template ကို
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,အရောင်းအကောင့်
DocType: Purchase Invoice Item,Total Weight,စုစုပေါင်းအလေးချိန်
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,အရောင်းအပေါ်ကော်မရှင်
DocType: Offer Letter Term,Value / Description,Value တစ်ခု / ဖော်ပြချက်များ
@@ -4538,7 +4543,7 @@
DocType: Customer,From Lead,ခဲကနေ
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ထုတ်လုပ်မှုပြန်လွှတ်ပေးခဲ့အမိန့်။
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Entry 'ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Entry 'ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
DocType: Program Enrollment Tool,Enroll Students,ကျောင်းသားများကျောင်းအပ်
DocType: Lab Test,Approved Date,approved နေ့စွဲ
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,စံရောင်းချသည့်
@@ -4615,7 +4620,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,ထုတ်လုပ်မှု Item
,Employee Information,ဝန်ထမ်းပြန်ကြားရေး
DocType: Stock Entry Detail,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
DocType: Quality Inspection,Incoming,incoming
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,အရောင်းနှင့်ဝယ်ယူဘို့ default အခွန်တင်းပလိတ်များဖန်တီးနေကြသည်။
@@ -4632,7 +4637,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},မှတ်စု: {0}
,Delivery Note Trends,Delivery မှတ်ချက်ခေတ်ရေစီးကြောင်း
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,စတော့အိတ်အရည်အတွက်ခုနှစ်တွင်
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,စတော့အိတ်အရည်အတွက်ခုနှစ်တွင်
DocType: Delivery Trip,Calculate Estimated Arrival Times,မှန်းခြေဆိုက်ရောက်ဗီဇာ Times ကတွက်ချက်
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,အကောင့်ဖွ: {0} သာစတော့အိတ်ငွေကြေးကိစ္စရှင်းလင်းမှုကနေတဆင့် updated နိုင်ပါတယ်
DocType: Student Group Creation Tool,Get Courses,သင်တန်းများ get
@@ -4648,7 +4653,7 @@
DocType: Material Request,% Ordered,% မိန့်ထုတ်
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","သင်တန်းများအတွက်အခြေစိုက်ကျောင်းသားအုပ်စု, ထိုသင်တန်းအစီအစဉ်ကျောင်းအပ်အတွက်စာရင်းသွင်းသင်တန်းများအနေဖြင့်တိုင်းကျောင်းသားများအတွက်အတည်ပြုလိမ့်မည်။"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
DocType: Employee,History In Company,ကုမ္ပဏီခုနှစ်တွင်သမိုင်းကြောင်း
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{ပေးပို့သူ} ကနေ New ကိုကို Message
@@ -4696,7 +4701,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},အတန်း {0}: အ BOM # ၏ငွေကြေး {1} ရွေးချယ်ထားတဲ့ငွေကြေး {2} တန်းတူဖြစ်သင့်
DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
DocType: Patient,Additional information regarding the patient,လူနာနှင့်ပတ်သက်သည့်အပိုဆောင်းသတင်းအချက်အလက်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
DocType: Homepage,Tag Line,tag ကိုလိုင်း
DocType: Fee Component,Fee Component,အခကြေးငွေစိတျအပိုငျး
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ရေယာဉ်စုစီမံခန့်ခွဲမှု
@@ -4911,7 +4916,7 @@
DocType: Employee Education,Employee Education,ဝန်ထမ်းပညာရေး
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,ပစ္စည်းအုပ်စု table ထဲမှာကိုတွေ့မိတ္တူပွားကို item အုပ်စု
DocType: Land Unit,Parent Land Unit,မိဘမြေယာယူနစ်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
DocType: Fertilizer,Fertilizer Name,ဓာတ်မြေသြဇာအမည်
DocType: Salary Slip,Net Pay,Net က Pay ကို
DocType: Account,Account,အကောင့်ဖွင့်
@@ -4990,7 +4995,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code ကို
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,ဖောက်သည်အုပ်စု POS ကိုယ်ရေးဖိုင်အတွက်လိုအပ်သောဖြစ်ပါတယ်
apps/erpnext/erpnext/config/hr.py +12,Employee records.,ဝန်ထမ်းမှတ်တမ်းများ။
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲသတ်မှတ်ထားပေးပါ
DocType: HR Settings,Payroll Settings,လုပ်ခလစာ Settings ကို
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Non-နှင့်ဆက်စပ်ငွေတောင်းခံလွှာနှင့်ပေးသွင်းခြင်းနှင့်ကိုက်ညီ။
DocType: POS Settings,POS Settings,POS Settings များ
@@ -5158,7 +5163,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
DocType: Asset Maintenance Task,Last Completion Date,နောက်ဆုံးပြီးစီးနေ့စွဲ
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
DocType: Buying Settings,Naming Series,စီးရီးအမည်
DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,အာမခံ Start ကိုရက်စွဲအာမခံအဆုံးနေ့စွဲထက်လျော့နည်းဖြစ်သင့်
@@ -5288,6 +5293,7 @@
DocType: Bank Reconciliation,Get Payment Entries,ငွေပေးချေမှုရမည့် Entries Get
DocType: Quotation Item,Against Docname,Docname ဆန့်ကျင်
DocType: SMS Center,All Employee (Active),အားလုံးသည်န်ထမ်း (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ဖောက်သည်> ဖောက်သည် Group မှ> နယ်မြေတွေကို
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,အခုတော့ကြည့်ရန်
DocType: BOM,Raw Material Cost,ကုန်ကြမ်းပစ္စည်းကုန်ကျစရိတ်
DocType: Item Reorder,Re-Order Level,Re-Order အဆင့်
@@ -5388,7 +5394,6 @@
DocType: Room,Seating Capacity,ထိုင်ခုံများစွမ်းဆောင်ရည်
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Lab ကစမ်းသပ်အဖွဲ့များ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ဖောက်သည်> ဖောက်သည် Group မှ> နယ်မြေတွေကို
DocType: Project,Total Expense Claim (via Expense Claims),(သုံးစွဲမှုစွပ်စွဲနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
DocType: GST Settings,GST Summary,GST အကျဉ်းချုပ်
DocType: Assessment Result,Total Score,စုစုပေါင်းရမှတ်
@@ -5402,7 +5407,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,အောက်ပါသင်တန်းအချိန်ဇယားကိုဖန်တီးခဲ့ကြ
DocType: Journal Entry,Total Debit,စုစုပေါင်း Debit
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default အနေနဲ့ကုန်စည်ဂိုဒေါင် Finished
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,အရောင်းပုဂ္ဂိုလ်
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,အရောင်းပုဂ္ဂိုလ်
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,ဘတ်ဂျက်နှင့်ကုန်ကျစရိတ်စင်တာ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ငွေပေးချေမှု၏အကွိမျမြားစှာက default mode ကိုခွင့်မပြုပါ
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,အတွက်
@@ -5578,7 +5583,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,သည်အခွန်သို့မဟုတ်တာဝန်ခံဖို့စဉ်းစားပါ
DocType: Driver,Driving License Category,ကားမောင်းလိုင်စင်အမျိုးအစား
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,အမှန်တကယ် Qty မသင်မနေရ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} လက်ရှိ {1} ပေးသွင်း Scorecard ရပ်တည်မှုရှိပါတယ်, ဤကုန်ပစ္စည်းပေးသွင်းဖို့အမိန့်ဝယ်ရန်သတိနဲ့ထုတ်ပေးရပါမည်။"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} လက်ရှိ {1} ပေးသွင်း Scorecard ရပ်တည်မှုရှိပါတယ်, ဤကုန်ပစ္စည်းပေးသွင်းဖို့အမိန့်ဝယ်ရန်သတိနဲ့ထုတ်ပေးရပါမည်။"
DocType: Asset Maintenance Team,Asset Maintenance Team,ပိုင်ဆိုင်မှုကို Maintenance ရေးအဖွဲ့
DocType: Employee Loan,Loan Type,ချေးငွေအမျိုးအစား
DocType: Scheduling Tool,Scheduling Tool,စီစဉ်ခြင်း Tool ကို
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index a9a70eb..157c896 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorteer op prijs
,Delay Days,Vertragingen dagen
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,dienst Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Factuur
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Maak retentie aandelenboeking
DocType: Purchase Invoice Item,Item Weight Details,Item Gewicht Details
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referentie: {0}, Artikelcode: {1} en klant: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vacature voor een baan.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},Stuklijst is niet gespecificeerd voor uitbesteding van item {0} in rij {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},Stuklijst is niet gespecificeerd voor uitbesteding van item {0} in rij {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultaat ingediend
DocType: Item Attribute,Increment,Aanwas
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tijdspanne
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Niet toegestaan voor {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Krijgen items uit
DocType: Price List,Price Not UOM Dependant,Prijs niet afhankelijk van UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Geen artikelen vermeld
DocType: Asset Repair,Error Description,Foutbeschrijving
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Kruidenierswinkel
DocType: Quality Inspection Reading,Reading 1,Meting 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,pensioenfondsen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Volgende afschrijvingen datum kan niet vóór Aankoopdatum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Volgende afschrijvingen datum kan niet vóór Aankoopdatum
DocType: Crop,Perennial,eeuwigdurend
DocType: Consultation,Consultation Date,Raadplegingsdatum
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Productvermelding en ontdekking voor ERPNext-gebruikers
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",bijvoorbeeld "Primary School" of "University"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Stock Reports
DocType: Warehouse,Warehouse Detail,Magazijn Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,De Term Einddatum kan niet later dan het jaar Einddatum van het studiejaar waarop de term wordt gekoppeld zijn (Academisch Jaar {}). Corrigeer de data en probeer het opnieuw.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Is vaste activa"" kan niet worden uitgeschakeld, als Asset record bestaat voor dit item"
DocType: Delivery Trip,Departure Time,Vertrektijd
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Get Specificatie Details
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Sjablonen van leveranciers standings.
DocType: Lead,Interested,Geïnteresseerd
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Opening
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Opening
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Van {0} tot {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Het instellen van belastingen is mislukt
DocType: Item,Copy From Item Group,Kopiëren van Item Group
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Verlaat per jaar
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rij {0}: Kijk 'Is Advance' tegen Account {1} als dit is een voorschot binnenkomst.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
DocType: Email Digest,Profit & Loss,Verlies
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,liter
DocType: Task,Total Costing Amount (via Time Sheet),Totaal bedrag Costing (via Urenregistratie)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dit is gebaseerd op transacties tegen dit bedrijf. Zie de tijdlijn hieronder voor details
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificeer per e-mail bij automatisch aanmaken van Materiaal Aanvraag
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistant
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Valuta
DocType: Opening Invoice Creation Tool,Invoice Type,Factuur Type
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Vrachtbrief
@@ -530,7 +531,6 @@
DocType: Employee,Widowed,Weduwe
DocType: Request for Quotation,Request for Quotation,Offerte
DocType: Healthcare Settings,Require Lab Test Approval,Vereist laboratoriumtest goedkeuring
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Artikelcode> Artikelgroep> Merk
DocType: Salary Slip Timesheet,Working Hours,Werkuren
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Totaal uitstekend
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Wijzig het start-/ huidige volgnummer van een bestaande serie.
@@ -559,7 +559,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vul kostenplaats in
DocType: Drug Prescription,Dosage,Dosering
DocType: Journal Entry Account,Sales Order,Verkooporder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Gem. Verkoopkoers
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Gem. Verkoopkoers
DocType: Assessment Plan,Examiner Name,Examinator Naam
DocType: Lab Test Template,No Result,Geen resultaat
DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
@@ -609,6 +609,7 @@
DocType: Payroll Entry,Select Payroll Period,Selecteer Payroll Periode
DocType: Purchase Invoice,Unpaid,Onbetaald
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Gereserveerd voor verkoop
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Stel Employee Naming System in Human Resource> HR-instellingen in
DocType: Packing Slip,From Package No.,Van Pakket No
DocType: Item Attribute,To Range,Om Bereik
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Effecten en Deposito's
@@ -633,11 +634,11 @@
DocType: Training Event,Workshop,werkplaats
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Waarschuwing Aankooporders
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Genoeg Parts te bouwen
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genoeg Parts te bouwen
DocType: POS Profile User,POS Profile User,POS-profielgebruiker
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Directe Inkomsten
DocType: Patient Appointment,Date TIme,Datum Tijd
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan niet filteren op basis van Rekening, indien gegroepeerd op Rekening"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Kan niet filteren op basis van Rekening, indien gegroepeerd op Rekening"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Boekhouder
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Opzetten van bedrijf en belastingen
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Selecteer de cursus
@@ -648,7 +649,7 @@
DocType: Stock Entry Detail,Difference Account,Verschillenrekening
DocType: Purchase Invoice,Supplier GSTIN,Leverancier GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan taak niet afsluiten als haar afhankelijke taak {0} niet is afgesloten.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
DocType: Production Order,Additional Operating Cost,Additionele Operationele Kosten
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Cosmetica
@@ -819,7 +820,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relatie met Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
DocType: Payment Entry,Payment From / To,Betaling van / naar
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},New kredietlimiet lager is dan de huidige uitstaande bedrag voor de klant. Kredietlimiet moet minstens zijn {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},New kredietlimiet lager is dan de huidige uitstaande bedrag voor de klant. Kredietlimiet moet minstens zijn {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Stel een account in in Magazijn {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Gebaseerd op' en 'Groepeer per' kunnen niet hetzelfde zijn
DocType: Sales Person,Sales Person Targets,Verkoper Doelen
@@ -830,7 +831,7 @@
DocType: Student Batch Name,Batch Name,batch Naam
DocType: Fee Validity,Max number of visit,Max. Aantal bezoeken
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Rooster gemaakt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Inschrijven
DocType: GST Settings,GST Settings,GST instellingen
DocType: Selling Settings,Customer Naming By,Klant Naming Door
@@ -956,7 +957,7 @@
DocType: Budget,Budget Against,budget Against
DocType: Employee,Cell Number,Mobiel nummer
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Er is geen medewerker voor de gegeven criteria. Controleer of salarisstroken nog niet zijn gemaakt.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,U kan geen 'Voucher' invoeren in een 'Tegen Journal Entry' kolom
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Gereserveerd voor productie
@@ -964,7 +965,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
DocType: Opportunity,Opportunity From,Opportuniteit Van
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Maandsalaris overzicht.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rij {0}: {1} Serienummers vereist voor item {2}. U heeft {3} verstrekt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rij {0}: {1} Serienummers vereist voor item {2}. U heeft {3} verstrekt.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selecteer een tafel
DocType: BOM,Website Specifications,Website Specificaties
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} is een ongeldig e-mailadres in 'Ontvangers'
@@ -1052,7 +1053,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Offerte aangevraagd
DocType: Vital Signs,Heart Rate / Pulse,Hartslag / Pulse
DocType: Company,Default Bank Account,Standaard bankrekening
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Bijwerken voorraad' kan niet worden aangevinkt omdat items niet worden geleverd via {0}
DocType: Vehicle,Acquisition Date,Aankoopdatum
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nrs
@@ -1076,7 +1077,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Upload uw briefhoofd (houd het webvriendelijk als 900px bij 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} kan geen Group zijn
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DocName} bestaat niet in bovenstaande '{} doctype' table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} is al voltooid of geannuleerd
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} is al voltooid of geannuleerd
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,geen taken
DocType: Item Variant Settings,Copy Fields to Variant,Kopieer velden naar variant
DocType: Asset,Opening Accumulated Depreciation,Het openen van de cumulatieve afschrijvingen
@@ -1188,9 +1189,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan materiaal voor onderdelen
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners en Territory
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,Stuklijst {0} moet actief zijn
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Sluiten (Opening + totaal)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Sluiten (Opening + totaal)
DocType: Journal Entry,Depreciation Entry,afschrijvingen Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Selecteer eerst het documenttype
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Afdrukken in accountvaluta
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuleren Materiaal Bezoeken {0} voor het annuleren van deze Maintenance Visit
DocType: Crop Cycle,ISO 8016 standard,ISO 8016-norm
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serienummer {0} behoort niet tot Artikel {1}
@@ -1216,7 +1218,7 @@
DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
DocType: Fee Structure,Components,Components
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Item Varianten {0} bijgewerkt
DocType: Quality Inspection Reading,Reading 6,Meting 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1268,6 +1270,7 @@
,Company Name,Bedrijfsnaam
DocType: SMS Center,Total Message(s),Totaal Bericht(en)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series in voor {0} via Setup> Instellingen> Serie benoemen
DocType: Purchase Invoice,Additional Discount Percentage,Extra Korting Procent
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Bekijk een overzicht van alle hulp video's
DocType: Agriculture Analysis Criteria,Soil Texture,Bodemstructuur
@@ -1296,7 +1299,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website Item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Volgende Afschrijvingen Date wordt ingevoerd als datum in het verleden
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Volgende Afschrijvingen Date wordt ingevoerd als datum in het verleden
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Wit
DocType: SMS Center,All Lead (Open),Alle Leads (Open)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rij {0}: Aantal niet beschikbaar voor {4} in het magazijn van {1} op het plaatsen van tijd van de invoer ({2} {3})
@@ -1313,7 +1316,7 @@
DocType: Lead,Next Contact Date,Volgende Contact Datum
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Opening Aantal
DocType: Healthcare Settings,Appointment Reminder,Benoemingsherinnering
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Vul Account for Change Bedrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Vul Account for Change Bedrag
DocType: Program Enrollment Tool Student,Student Batch Name,Student batchnaam
DocType: Consultation,Doctor,dokter
DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
@@ -1329,6 +1332,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Verlof Toewijzing Tool
DocType: Item,Hub Category to Publish,Hubcategorie om te publiceren
DocType: Leave Block List,Leave Block List Dates,Laat Block List Data
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Stel nummeringsreeksen in voor Aanwezigheid via Setup> Nummeringserie
DocType: Sales Invoice,Billing Address GSTIN,Factuuradres GSTIN
DocType: Assessment Plan,Evaluate,schatten
DocType: Workstation,Net Hour Rate,Netto uurtarief
@@ -1362,7 +1366,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-terugwerkende
DocType: POS Profile,Sales Invoice Payment,Sales Invoice Betaling
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerd Magazijn in Verkooporder / Magazijn Gereed Product
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Selling Bedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selling Bedrag
DocType: Repayment Schedule,Interest Amount,Interestbedrag
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Onkosten Goedkeurder voor dit record. Werk de 'Status' bij en sla op.
DocType: Serial No,Creation Document No,Aanmaken Document nr
@@ -1454,7 +1458,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Het openen van Accounting Balance
,GST Sales Register,GST Sales Register
DocType: Sales Invoice Advance,Sales Invoice Advance,Verkoopfactuur Voorschot
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Niets aan te vragen
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Niets aan te vragen
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Selecteer uw domeinen
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Een andere Budget plaat '{0}' bestaat al tegen {1} {2} 'voor het fiscale jaar {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Velden worden alleen gekopieerd op het moment van creatie.
@@ -1464,11 +1468,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit zal worden toegevoegd aan de Code van het punt van de variant. Bijvoorbeeld, als je de afkorting is ""SM"", en de artikelcode is ""T-SHIRT"", de artikelcode van de variant zal worden ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettoloon (in woorden) zal zichtbaar zijn zodra de Salarisstrook wordt opgeslagen.
DocType: Purchase Invoice,Is Return,Is Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Voorzichtigheid
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Voorzichtigheid
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Return / betaalkaart Note
DocType: Price List Country,Price List Country,Prijslijst Land
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} geldig serienummers voor Artikel {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} geldig serienummers voor Artikel {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelcode kan niet worden gewijzigd voor Serienummer
DocType: Purchase Invoice Item,UOM Conversion Factor,Eenheid Omrekeningsfactor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vul de artikelcode voor Batch Number krijgen
@@ -1574,7 +1578,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
DocType: Supplier Scorecard,Warn for new Request for Quotations,Waarschuw voor nieuw verzoek om offertes
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Inkooporders helpen bij het plannen en opvolgen van uw aankopen
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",De totale Issue / Transfer hoeveelheid {0} in Materiaal Request {1} \ kan niet groter zijn dan de gevraagde hoeveelheid {2} voor post zijn {3}
@@ -1612,7 +1616,6 @@
DocType: Warehouse,Warehouse Contact Info,Magazijn Contact Info
DocType: Payment Entry,Write Off Difference Amount,Schrijf Off Verschil Bedrag
DocType: Volunteer,Volunteer Name,Vrijwilligers naam
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Stel het systeem voor instructeursbenaming in Onderwijs> Onderwijsinstellingen in
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Employee e-mail niet gevonden, dus geen e-mail verzonden"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Verzendregel niet van toepassing voor land {0}
DocType: Item,Foreign Trade Details,Buitenlandse Handel Details
@@ -1625,7 +1628,7 @@
DocType: Student Group Student,Group Roll Number,Groepsrolnummer
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taak gewichten moeten 1. Pas gewichten van alle Project taken dienovereenkomstig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitaalgoederen
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prijsbepalingsregel wordt eerst geselecteerd op basis van 'Toepassen op' veld, dat kan zijn artikel, artikelgroep of merk."
@@ -1650,7 +1653,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Child magazijn bestaat voor dit magazijn. U kunt dit magazijn niet verwijderen.
DocType: Item,Website Item Groups,Website Artikelgroepen
DocType: Purchase Invoice,Total (Company Currency),Totaal (Company valuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serienummer {0} meer dan eens ingevoerd
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serienummer {0} meer dan eens ingevoerd
DocType: Journal Entry,Journal Entry,Journaalpost
DocType: Expense Claim Advance,Unclaimed amount,Niet-opgeëist bedrag
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} items in progress
@@ -1746,7 +1749,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Communicatie log.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Offerte is uitgeschakeld om de toegang van portal, voor meer controle portaal instellingen."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverancier Scorecard Scorevariabele
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Aankoop Bedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Aankoop Bedrag
DocType: Sales Invoice,Shipping Address Name,Verzenden Adres Naam
DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Er zijn fouten opgetreden bij het maken van cursusplanning
@@ -2011,7 +2014,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dit is gebaseerd op stammen tegen dit voertuig. Zie tijdlijn hieronder voor meer informatie
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
DocType: Customer,Default Price List,Standaard Prijslijst
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Je kunt niet verwijderen boekjaar {0}. Boekjaar {0} is ingesteld als standaard in Global Settings
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Er bestaat al een klant met dezelfde naam
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dit zal loonstrookjes indienen en een periodedagboek aanmaken. Wil je doorgaan?
@@ -2025,6 +2028,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,pricing
DocType: Quotation,Term Details,Voorwaarde Details
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kan niet meer dan {0} studenten voor deze groep studenten inschrijven.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Totaal (zonder BTW)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Loodtelling
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} moet groter zijn dan 0
@@ -2045,7 +2049,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Ontkoppelen Betaling bij annulering van de factuur
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Huidige kilometerstand ingevoerd moet groter zijn dan de initiële kilometerstand van het voertuig zijn {0}
DocType: Restaurant Reservation,No Show,Geen voorstelling
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series in voor {0} via Instellingen> Instellingen> Serie benoemen
DocType: Shipping Rule Country,Shipping Rule Country,Verzenden Regel Land
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Verlaat en Aanwezigheid
DocType: Maintenance Visit,Partially Completed,Gedeeltelijk afgesloten
@@ -2138,7 +2141,7 @@
DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
DocType: Grant Application,Assessment Mark (Out of 10),Beoordelingstabel (van de 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hoofd
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Hoofd
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
DocType: Employee Attendance Tool,Employees HTML,medewerkers HTML
@@ -2188,7 +2191,7 @@
DocType: Course,Course Abbreviation,cursus Afkorting
DocType: Student Leave Application,Student Leave Application,Student verlofaanvraag
DocType: Item,Will also apply for variants,Geldt ook voor varianten
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} op een halve dag op {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Totaal aantal werkuren mag niet groter zijn dan max werktijden {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Op
@@ -2375,9 +2378,10 @@
DocType: Task,Actual End Date (via Time Sheet),Werkelijke Einddatum (via Urenregistratie)
DocType: Soil Texture,Soil Type,Grondsoort
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Bedrag {0} {1} tegen {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nieuw bericht
,Quotation Trends,Offerte Trends
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
DocType: Shipping Rule,Shipping Amount,Verzendbedrag
DocType: Supplier Scorecard Period,Period Score,Periode Score
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Voeg klanten toe
@@ -2388,7 +2392,7 @@
,Vehicle Expenses,Voertuig kosten
DocType: Serial No,Invoice Details,Factuurgegevens
DocType: Grant Application,Show on Website,Weergeven op website
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Verwachtingswaarde na levensduur groter dan of gelijk aan {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Verwachtingswaarde na levensduur groter dan of gelijk aan {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Begin maar
DocType: Hub Category,Hub Category,Hubcategorie
DocType: Purchase Invoice,SEZ,SEZ
@@ -2420,7 +2424,7 @@
DocType: Patient,B Positive,B positief
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Rij # {0}: Aantal moet 1 als item is een vaste activa. Gebruik aparte rij voor meerdere aantal.
DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Groep om Non-groep
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2471,6 +2475,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Kan geen ontvangen RFQ zonder citaat instellen
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Totaal Aftrek
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Selecteer een account om in rekeningsvaluta af te drukken
,Production Analytics,Production Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dit is gebaseerd op transacties tegen deze patiënt. Zie de tijdlijn hieronder voor details
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kosten Bijgewerkt
@@ -2525,7 +2530,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecteer Bedrijf ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Laat leeg indien dit voor alle afdelingen is
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
DocType: Payroll Entry,Fortnightly,van twee weken
DocType: Currency Exchange,From Currency,Van Valuta
DocType: Vital Signs,Weight (In Kilogram),Gewicht (in kilogram)
@@ -2603,7 +2608,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,De prijzen zullen niet worden weergegeven als prijslijst niet is ingesteld
DocType: Stock Entry,Total Incoming Value,Totaal Inkomende Waarde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debet Om vereist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debet Om vereist
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets helpen bijhouden van de tijd, kosten en facturering voor activiteiten gedaan door uw team"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Purchase Price List
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Sjablonen van leveranciers scorecard variabelen.
@@ -2706,7 +2711,7 @@
DocType: Company,For Reference Only.,Alleen voor referentie.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Arts {0} niet beschikbaar op {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Selecteer batchnummer
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ongeldige {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Ongeldige {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-terugwerkende
DocType: Fee Validity,Reference Inv,Referentie Inv
@@ -2743,8 +2748,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties, operationele kosten en geef een unieke operatienummer aan uw activiteiten ."
DocType: Water Analysis,Origin,Oorsprong
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dit document is dan limiet van {0} {1} voor punt {4}. Bent u het maken van een andere {3} tegen dezelfde {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Stel terugkerende na het opslaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Selecteer verandering bedrag rekening
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Stel terugkerende na het opslaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Selecteer verandering bedrag rekening
DocType: Purchase Invoice,Price List Currency,Prijslijst Valuta
DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
DocType: Stock Settings,Allow Negative Stock,Laat Negatieve voorraad
@@ -2800,7 +2805,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Waarschuw voor nieuwe inkooporders
DocType: Quality Inspection Reading,Reading 9,Meting 9
DocType: Supplier,Is Frozen,Is Bevroren
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Groep knooppunt magazijn is niet toegestaan om te kiezen voor transacties
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Groep knooppunt magazijn is niet toegestaan om te kiezen voor transacties
DocType: Buying Settings,Buying Settings,Inkoop Instellingen
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stuklijst nr voor een Gereed Product Artikel
DocType: Upload Attendance,Attendance To Date,Aanwezigheid graag:
@@ -2814,6 +2819,7 @@
DocType: Grant Application,Organization,Organisatie
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Student Group Name
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Show exploded view
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Fees creëren
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Zorg ervoor dat u echt wilt alle transacties voor dit bedrijf te verwijderen. Uw stamgegevens zal blijven zoals het is. Deze actie kan niet ongedaan gemaakt worden.
DocType: Room,Room Number,Kamernummer
@@ -2824,7 +2830,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Maak belastingsjabloon
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Gebruikers Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick Journal Entry
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
@@ -2895,7 +2901,7 @@
DocType: Membership,USD,Amerikaanse Dollar
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak Factuur
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto dicht Opportunity na 15 dagen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Aankooporders zijn niet toegestaan voor {0} door een scorecard van {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Aankooporders zijn niet toegestaan voor {0} door een scorecard van {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Eindjaar
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -3008,7 +3014,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Boven
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rij # {0}: Journal Entry {1} heeft geen account {2} of al vergeleken met een ander voucher
DocType: Supplier Scorecard Criteria,Criteria Weight,Criteria Gewicht
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Leverancier> leverancier type
DocType: Buying Settings,Default Buying Price List,Standaard Inkoop Prijslijst
DocType: Payroll Entry,Salary Slip Based on Timesheet,Salarisstrook Op basis van Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Koopsnelheid
@@ -3097,7 +3102,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Houd Leads bij per de industrie type.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Ga naar Briefhoofden
DocType: Item Supplier,Item Supplier,Artikel Leverancier
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Vul de artikelcode in om batchnummer op te halen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Vul de artikelcode in om batchnummer op te halen
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adressen.
DocType: Company,Stock Settings,Voorraad Instellingen
@@ -3287,6 +3292,7 @@
DocType: Company,Default Inventory Account,Standaard Inventaris Account
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rij {0}: Voltooid Aantal moet groter zijn dan nul.
DocType: Antibiotic,Antibiotic Name,Antibiotische naam
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Artikelcode> Artikelgroep> Merk
DocType: Purchase Invoice,Apply Additional Discount On,Breng Extra Korting op
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Selecteer type...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Een link naar alle landeenheden waarin het gewas groeit
@@ -3482,6 +3488,7 @@
DocType: Supplier,Credit Limit,Kredietlimiet
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Gem. Prijslijst tarief verkopen
DocType: Production Plan Sales Order,Salse Order Date,Salse Orderdatum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Leverancier> leverancier type
DocType: Salary Component,Salary Component,salaris Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Betaling Entries {0} zijn un-linked
DocType: GL Entry,Voucher No,Voucher nr.
@@ -3491,7 +3498,7 @@
DocType: Leave Allocation,Leave Allocation,Verlof Toewijzing
DocType: Payment Request,Recipient Message And Payment Details,Ontvanger Bericht en betalingsgegevens
DocType: Training Event,Trainer Email,trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiaal Aanvragen {0} aangemaakt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materiaal Aanvragen {0} aangemaakt
DocType: Restaurant Reservation,No of People,Nee van mensen
DocType: Production Planning Tool,Include sub-contracted raw materials,Inclusief uitbesteed grondstoffen
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sjabloon voor contractvoorwaarden
@@ -3556,7 +3563,7 @@
DocType: Production Planning Tool,Create Material Requests,Maak Materiaal Aanvragen
DocType: Employee Education,School/University,School / Universiteit
DocType: Payment Request,Reference Details,Reference Details
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwachte waarde na Praktische Het leven moet minder dan Gross Aankoopbedrag zijn
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwachte waarde na Praktische Het leven moet minder dan Gross Aankoopbedrag zijn
DocType: Sales Invoice Item,Available Qty at Warehouse,Qty bij Warehouse
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Gefactureerd Bedrag
DocType: Asset,Double Declining Balance,Double degressief
@@ -3568,7 +3575,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Blijf op de hoogte
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} behoort niet tot Company {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Selecteer ten minste één waarde uit elk van de kenmerken.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Laat management
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Groeperen volgens Rekening
DocType: Sales Order,Fully Delivered,Volledig geleverd
@@ -3579,14 +3586,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Uitbetaalde bedrag kan niet groter zijn dan Leningen zijn {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Ga naar Programma's
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rij {0} # Toegewezen hoeveelheid {1} kan niet groter zijn dan het niet-opgeëiste bedrag {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Stel nummeringsreeksen in voor Aanwezigheid via Setup> Nummeringserie
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Productieorder niet gemaakt
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan niet status als student te veranderen {0} is gekoppeld aan student toepassing {1}
DocType: Asset,Fully Depreciated,volledig is afgeschreven
,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Attendance HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Offertes zijn voorstellen, biedingen u uw klanten hebben gestuurd"
DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
@@ -3671,7 +3677,7 @@
DocType: Stock Settings,Item Naming By,Artikel benoeming door
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Een ander Periode sluitpost {0} is gemaakt na {1}
DocType: Production Order,Material Transferred for Manufacturing,Materiaal Overgedragen voor Manufacturing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Rekening {0} bestaat niet
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Rekening {0} bestaat niet
DocType: Project,Project Type,Project Type
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Child Task bestaat voor deze taak. U kunt deze taak niet verwijderen.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ofwel doelwit aantal of streefbedrag is verplicht.
@@ -3775,11 +3781,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Afschrijvingen kostenplaats
DocType: Sales Order Item,Sales Order Date,Verkooporder Datum
DocType: Sales Invoice Item,Delivered Qty,Geleverd Aantal
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Totaal Excl. belasting
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Indien aangevinkt, zullen alle kinderen van elk artikel, worden opgenomen in de Material Verzoeken."
DocType: Assessment Plan,Assessment Plan,assessment Plan
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Klant {0} is gemaakt.
DocType: Stock Settings,Limit Percent,Limit Procent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Stel het systeem voor instructeursbenaming in Onderwijs> Onderwijsinstellingen in
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Momenteel geen voorraad beschikbaar in een magazijn
,Payment Period Based On Invoice Date,Betaling Periode gebaseerd op factuurdatum
DocType: Sample Collection,No. of print,Aantal afdrukken
@@ -3795,12 +3801,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Debiteuren ({0})
DocType: Pricing Rule,Margin,Marge
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nieuwe klanten
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Brutowinst%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Brutowinst%
DocType: Appraisal Goal,Weightage (%),Weging (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS-profiel wijzigen
DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Beoordelingsverslag
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Aankoopbedrag is verplicht
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross Aankoopbedrag is verplicht
DocType: Lead,Address Desc,Adres Omschr
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party is verplicht
DocType: Journal Entry,JV-,JV-
@@ -3832,7 +3838,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Staande naam
DocType: Stock Entry,Customer or Supplier Details,Klant of leverancier Details
DocType: Employee Loan Application,Required by Date,Vereist door Date
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Closing Balance (Dr - Cr)
DocType: Lead,Lead Owner,Lead Eigenaar
DocType: Bin,Requested Quantity,gevraagde hoeveelheid
DocType: Patient,Marital Status,Burgerlijke staat
@@ -3846,7 +3851,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Meerdere varianten
DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Geleverd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelijkse Verdeling Percentage
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Meld u aan als een andere gebruiker.
DocType: Territory,Territory Targets,Regio Doelen
@@ -3947,7 +3952,7 @@
DocType: Serial No,Out of AMC,Uit AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maak Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
DocType: Company,Default Cash Account,Standaard Kasrekening
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dit is gebaseerd op de aanwezigheid van de Student
@@ -4099,7 +4104,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Geen werknemers voor de genoemde criteria
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
DocType: Restaurant,Default Customer,Standaard klant
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Stel Employee Naming System in Human Resource> HR-instellingen in
DocType: Assessment Plan,Supervisor Name,supervisor Naam
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bevestig niet of afspraak voor dezelfde dag is gemaakt
DocType: Program Enrollment Course,Program Enrollment Course,Programma Inschrijvingscursus
@@ -4222,7 +4226,7 @@
DocType: BOM,Website Description,Website Beschrijving
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto wijziging in het eigen vermogen
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nieuwste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadres moet uniek zijn, bestaat al voor {0}"
DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Ontvangst
@@ -4239,7 +4243,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kasstroomoverzicht
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Geleende bedrag kan niet hoger zijn dan maximaal bedrag van de lening van {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licentie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Selecteer Carry Forward als u ook wilt opnemen vorige boekjaar uit balans laat dit fiscale jaar
DocType: GL Entry,Against Voucher Type,Tegen Voucher Type
DocType: Physician,Phone (R),Telefoon (R)
@@ -4251,7 +4255,7 @@
DocType: Patient,B Negative,B Negatief
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Onderhoudsstatus moet worden geannuleerd of voltooid om te verzenden
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} behoort niet tot bedrijf {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Serienummers in rij {0} komt niet overeen met bezorgingsnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Serienummers in rij {0} komt niet overeen met bezorgingsnota
DocType: Student,Guardian Details,Guardian Details
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Attendance voor meerdere medewerkers
@@ -4293,7 +4297,7 @@
DocType: Stock Entry Detail,Basic Amount,Basisbedrag
DocType: Training Event,Exam,tentamen
DocType: Complaint,Complaint,Klacht
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
DocType: Leave Allocation,Unused leaves,Ongebruikte afwezigheden
DocType: Patient,Alcohol Past Use,Alcohol voorbij gebruik
DocType: Fertilizer Content,Fertilizer Content,Kunstmestinhoud
@@ -4422,6 +4426,7 @@
DocType: Salary Detail,Formula,Formule
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Verkoopaccount
DocType: Purchase Invoice Item,Total Weight,Totale gewicht
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Commissie op de verkoop
DocType: Offer Letter Term,Value / Description,Waarde / Beschrijving
@@ -4580,7 +4585,7 @@
DocType: Customer,From Lead,Van Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Orders vrijgegeven voor productie.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecteer boekjaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
DocType: Program Enrollment Tool,Enroll Students,inschrijven Studenten
DocType: Lab Test,Approved Date,Goedgekeurde Datum
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaard Verkoop
@@ -4657,7 +4662,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Productie Item
,Employee Information,Werknemer Informatie
DocType: Stock Entry Detail,Additional Cost,Bijkomende kosten
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van vouchernummer, indien gegroepeerd per voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van vouchernummer, indien gegroepeerd per voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Maak Leverancier Offerte
DocType: Quality Inspection,Incoming,Inkomend
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standaardbelastingsjablonen voor verkopen en kopen worden gemaakt.
@@ -4674,7 +4679,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Opmerking : {0}
,Delivery Note Trends,Vrachtbrief Trends
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Samenvatting van deze week
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Op voorraad Aantal
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Op voorraad Aantal
DocType: Delivery Trip,Calculate Estimated Arrival Times,Bereken geschatte aankomsttijden
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} kan alleen worden bijgewerkt via Voorraad Transacties
DocType: Student Group Creation Tool,Get Courses,krijg Cursussen
@@ -4690,7 +4695,7 @@
DocType: Material Request,% Ordered,% Besteld
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Voor cursusgerichte studentengroep wordt de cursus voor elke student gevalideerd van de ingeschreven cursussen in de inschrijving van het programma.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,stukwerk
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Gem. Buying Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Gem. Buying Rate
DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
DocType: Employee,History In Company,Geschiedenis In Bedrijf
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nieuw bericht van {sender}
@@ -4738,7 +4743,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rij {0}: Munt van de BOM # {1} moet gelijk zijn aan de geselecteerde valuta zijn {2}
DocType: Journal Entry Account,Exchange Rate,Wisselkoers
DocType: Patient,Additional information regarding the patient,Aanvullende informatie over de patiënt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
DocType: Homepage,Tag Line,tag Line
DocType: Fee Component,Fee Component,fee Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Vloot beheer
@@ -4952,7 +4957,7 @@
DocType: Employee Education,Employee Education,Werknemer Opleidingen
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicate artikelgroep gevonden in de artikelgroep tafel
DocType: Land Unit,Parent Land Unit,Parent Land Unit
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
DocType: Fertilizer,Fertilizer Name,Meststofnaam
DocType: Salary Slip,Net Pay,Nettoloon
DocType: Account,Account,Rekening
@@ -5031,7 +5036,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Klantengroep is verplicht in het POS-profiel
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Werknemer regel.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Stel Volgende Afschrijvingen Date
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Stel Volgende Afschrijvingen Date
DocType: HR Settings,Payroll Settings,Loonadministratie Instellingen
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
DocType: POS Settings,POS Settings,POS-instellingen
@@ -5199,7 +5204,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
DocType: Asset Maintenance Task,Last Completion Date,Laatste voltooiingsdatum
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagen sinds laatste Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
DocType: Buying Settings,Naming Series,Benoemen Series
DocType: Leave Block List,Leave Block List Name,Laat Block List Name
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum moet kleiner zijn dan de verzekering einddatum
@@ -5328,6 +5333,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Krijg Betaling Entries
DocType: Quotation Item,Against Docname,Tegen Docname
DocType: SMS Center,All Employee (Active),Alle medewerkers (Actief)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klant> Klantengroep> Gebied
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bekijk nu
DocType: BOM,Raw Material Cost,Grondstofprijzen
DocType: Item Reorder,Re-Order Level,Re-order Niveau
@@ -5428,7 +5434,6 @@
DocType: Room,Seating Capacity,zitplaatsen
DocType: Issue,ISS-,ISS
DocType: Lab Test Groups,Lab Test Groups,Lab Testgroepen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klant> Klantengroep> Gebied
DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via declaraties)
DocType: GST Settings,GST Summary,GST Samenvatting
DocType: Assessment Result,Total Score,Totale score
@@ -5442,7 +5447,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Volgende cursusroosters zijn gemaakt
DocType: Journal Entry,Total Debit,Totaal Debet
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standaard Finished Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Verkoper
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Verkoper
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Begroting en Cost Center
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Meerdere standaard betalingswijze is niet toegestaan
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,voor de
@@ -5618,7 +5623,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overweeg belasting of heffing voor
DocType: Driver,Driving License Category,Rijbewijscategorie
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werkelijke aantal is verplicht
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} heeft momenteel een {1} Leveranciers Scorecard, en er worden voorzichtige waarborgen uitgegeven bij inkooporders."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} heeft momenteel een {1} Leveranciers Scorecard, en er worden voorzichtige waarborgen uitgegeven bij inkooporders."
DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
DocType: Employee Loan,Loan Type,Loan Type
DocType: Scheduling Tool,Scheduling Tool,scheduling Tool
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index d7d2b08..8671bdb 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sorter etter pris
,Delay Days,Forsinkelsesdager
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Lag Retention Stock Entry
DocType: Purchase Invoice Item,Item Weight Details,Vektdetaljer
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Henvisning: {0}, Varenummer: {1} og kunde: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Åpning for en jobb.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM er ikke spesifisert for underleverandørelementet {0} på rad {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM er ikke spesifisert for underleverandørelementet {0} på rad {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultat sendt
DocType: Item Attribute,Increment,Tilvekst
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tidsrom
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ikke tillatt for {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Få elementer fra
DocType: Price List,Price Not UOM Dependant,Pris Ikke UOM Avhengig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ingen elementer oppført
DocType: Asset Repair,Error Description,Feilbeskrivelse
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Dagligvare
DocType: Quality Inspection Reading,Reading 1,Lesing 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pensjonsfondene
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Neste Avskrivninger Datoen kan ikke være før Kjøpsdato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Neste Avskrivninger Datoen kan ikke være før Kjøpsdato
DocType: Crop,Perennial,Flerårig
DocType: Consultation,Consultation Date,Høringsdato
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktoppføring og oppdagelse for ERPNext-brukere
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",for eksempel "Primary School" eller "University"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,lager rapporter
DocType: Warehouse,Warehouse Detail,Warehouse Detalj
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Sluttdato kan ikke være senere enn året sluttdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Er Fixed Asset" ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
DocType: Delivery Trip,Departure Time,Avgangstid
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Få Spesifikasjon Detaljer
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Maler av leverandørstillinger.
DocType: Lead,Interested,Interessert
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Åpning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Åpning
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Fra {0} til {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Kunne ikke sette opp skatt
DocType: Item,Copy From Item Group,Kopier fra varegruppe
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Later per år
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk 'Er Advance "mot Account {1} hvis dette er et forskudd oppføring.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
DocType: Email Digest,Profit & Loss,Profitt tap
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,liter
DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Beløp (via Timeregistrering)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Dette er basert på transaksjoner mot dette selskapet. Se tidslinjen nedenfor for detaljer
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Varsle på e-post om opprettelse av automatisk Material Request
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistant
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi Valuta
DocType: Opening Invoice Creation Tool,Invoice Type,Faktura Type
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Levering Note
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Enke
DocType: Request for Quotation,Request for Quotation,Forespørsel om kostnadsoverslag
DocType: Healthcare Settings,Require Lab Test Approval,Krever godkjenning av laboratorietest
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Varenummer> Varegruppe> Varemerke
DocType: Salary Slip Timesheet,Working Hours,Arbeidstid
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Totalt Utestående
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Skriv inn kostnadssted
DocType: Drug Prescription,Dosage,Dosering
DocType: Journal Entry Account,Sales Order,Salgsordre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. Salgskurs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Salgskurs
DocType: Assessment Plan,Examiner Name,Examiner Name
DocType: Lab Test Template,No Result,Ingen resultater
DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet og Rate
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Velg Lønn Periode
DocType: Purchase Invoice,Unpaid,Ubetalte
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservert for salg
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vennligst oppsett Medarbeiders navngivningssystem i menneskelig ressurs> HR-innstillinger
DocType: Packing Slip,From Package No.,Fra Package No.
DocType: Item Attribute,To Range,Range
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verdipapirer og innskudd
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,Verksted
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varsle innkjøpsordrer
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Nok Deler bygge
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nok Deler bygge
DocType: POS Profile User,POS Profile User,POS Profil Bruker
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkte Inntekt
DocType: Patient Appointment,Date TIme,Dato tid
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Administrative Officer
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Sette opp selskap og skatter
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vennligst velg Kurs
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Forskjellen konto
DocType: Purchase Invoice,Supplier GSTIN,Leverandør GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
DocType: Lab Test Template,Lab Routine,Lab Rutine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetikk
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relasjon med Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
DocType: Payment Entry,Payment From / To,Betaling fra / til
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kredittgrensen er mindre enn dagens utestående beløp for kunden. Kredittgrense må være atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kredittgrensen er mindre enn dagens utestående beløp for kunden. Kredittgrense må være atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vennligst sett inn konto i Lager {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Based On" og "Grupper etter" ikke kan være det samme
DocType: Sales Person,Sales Person Targets,Sales Person Targets
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,batch Name
DocType: Fee Validity,Max number of visit,Maks antall besøk
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timeregistrering opprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Registrere
DocType: GST Settings,GST Settings,GST-innstillinger
DocType: Selling Settings,Customer Naming By,Kunden Naming Av
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,budsjett Against
DocType: Employee,Cell Number,Cell Number
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Det er ingen ansatt for de oppgitte kriteriene. Sjekk at Lønnslister ikke allerede er opprettet.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i "Against Journal Entry-kolonnen
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservert for produksjon
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energy
DocType: Opportunity,Opportunity From,Opportunity Fra
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedslønn uttalelse.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serienummer som kreves for element {2}. Du har oppgitt {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serienummer som kreves for element {2}. Du har oppgitt {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vennligst velg en tabell
DocType: BOM,Website Specifications,Nettstedet Spesifikasjoner
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} er en ugyldig e-postadresse i "Mottakere"
@@ -1036,7 +1037,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Sitat forespurt
DocType: Vital Signs,Heart Rate / Pulse,Hjertefrekvens / puls
DocType: Company,Default Bank Account,Standard Bank Account
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Oppdater Stock' kan ikke kontrolleres fordi elementene ikke er levert via {0}
DocType: Vehicle,Acquisition Date,Innkjøpsdato
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1061,7 +1062,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Last opp brevhodet ditt (Hold det nettvennlig som 900px ved 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} kan ikke være en gruppe
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Sak Row {idx}: {doctype} {DOCNAME} finnes ikke i oven {doctype} tabellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ingen oppgaver
DocType: Item Variant Settings,Copy Fields to Variant,Kopier felt til variant
DocType: Asset,Opening Accumulated Depreciation,Åpning akkumulerte avskrivninger
@@ -1173,9 +1174,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Territory
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} må være aktiv
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Avslutning (Åpning + Totalt)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Avslutning (Åpning + Totalt)
DocType: Journal Entry,Depreciation Entry,avskrivninger Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Velg dokumenttypen først
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Skriv ut i kontovaluta
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material Besøk {0} før den sletter denne Maintenance Visit
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial No {0} tilhører ikke Element {1}
@@ -1201,7 +1203,7 @@
DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
DocType: Fee Structure,Components,komponenter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Sak Varianter {0} oppdatert
DocType: Quality Inspection Reading,Reading 6,Reading 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1253,6 +1255,7 @@
,Company Name,Selskapsnavn
DocType: SMS Center,Total Message(s),Total melding (er)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vennligst still inn navngivningsserien for {0} via Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatt Prosent
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vis en liste over alle hjelpevideoer
DocType: Agriculture Analysis Criteria,Soil Texture,Jordstruktur
@@ -1281,7 +1284,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Nettstedet Element
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
DocType: Timesheet Detail,Bill,Regning
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Hvit
DocType: SMS Center,All Lead (Open),All Lead (Open)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antall ikke tilgjengelig for {4} i lageret {1} ved å legge tidspunktet for innreise ({2} {3})
@@ -1298,7 +1301,7 @@
DocType: Lead,Next Contact Date,Neste Kontakt Dato
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Antall åpne
DocType: Healthcare Settings,Appointment Reminder,Avtale påminnelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
DocType: Program Enrollment Tool Student,Student Batch Name,Student Batch Name
DocType: Consultation,Doctor,Doktor
DocType: Holiday List,Holiday List Name,Holiday Listenavn
@@ -1314,6 +1317,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,La Allocation Tool
DocType: Item,Hub Category to Publish,Hub kategori for publisering
DocType: Leave Block List,Leave Block List Dates,La Block List Datoer
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett> Nummereringsserie
DocType: Sales Invoice,Billing Address GSTIN,Faktureringsadresse GSTIN
DocType: Assessment Plan,Evaluate,Evaluere
DocType: Workstation,Net Hour Rate,Netto timepris
@@ -1348,7 +1352,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Salg Faktura Betaling
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reservert Industribygg i salgsordre / ferdigvarelageret
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Selge Beløp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selge Beløp
DocType: Repayment Schedule,Interest Amount,rente~~POS=TRUNC
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er den Expense Godkjenner denne posten. Oppdater "Status" og Lagre
DocType: Serial No,Creation Document No,Creation Dokument nr
@@ -1441,7 +1445,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Åpning Regnskap Balanse
,GST Sales Register,GST salgsregistrering
DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ingenting å be om
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ingenting å be om
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Velg domenene dine
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annen Budsjett record '{0} finnes allerede mot {1} {2} for regnskapsåret {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Feltene vil bli kopiert bare på tidspunktet for opprettelsen.
@@ -1451,11 +1455,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er "SM", og elementet kode er "T-SHIRT", elementet koden til variant vil være "T-SHIRT-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
DocType: Purchase Invoice,Is Return,Er Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Forsiktighet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Forsiktighet
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Retur / debitnota
DocType: Price List Country,Price List Country,Prisliste Land
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} gyldig serie nos for Element {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} gyldig serie nos for Element {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Elementkode kan ikke endres for Serial No.
DocType: Purchase Invoice Item,UOM Conversion Factor,Målenheter Omregningsfaktor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Fyll inn Element kode for å få Batch Number
@@ -1561,7 +1565,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
DocType: Supplier Scorecard,Warn for new Request for Quotations,Varsle om ny forespørsel om tilbud
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Innkjøpsordrer hjelpe deg å planlegge og følge opp kjøpene
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Den totale Issue / Transfer mengde {0} i Material Request {1} \ kan ikke være større enn ønsket antall {2} for Element {3}
@@ -1599,7 +1603,6 @@
DocType: Warehouse,Warehouse Contact Info,Warehouse Kontaktinfo
DocType: Payment Entry,Write Off Difference Amount,Skriv Off differansebeløpet
DocType: Volunteer,Volunteer Name,Frivillig navn
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vennligst oppsett Instruktør Navngivningssystem under utdanning> Utdanningsinnstillinger
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Ansattes e-post ikke funnet, derav e-posten ikke sendt"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Fraktregel gjelder ikke for land {0}
DocType: Item,Foreign Trade Details,Foreign Trade Detaljer
@@ -1612,7 +1615,7 @@
DocType: Student Group Student,Group Roll Number,Gruppe-nummer
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summen av alle oppgave vekter bør være 1. Juster vekter av alle prosjektoppgaver tilsvar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Equipments
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prising Rule først valgt basert på "Apply On-feltet, som kan være varen, varegruppe eller Brand."
@@ -1637,7 +1640,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barn lager finnes for dette lageret. Du kan ikke slette dette lageret.
DocType: Item,Website Item Groups,Website varegrupper
DocType: Purchase Invoice,Total (Company Currency),Total (Company Valuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serienummer {0} angitt mer enn én gang
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serienummer {0} angitt mer enn én gang
DocType: Journal Entry,Journal Entry,Journal Entry
DocType: Expense Claim Advance,Unclaimed amount,Uoppfordret beløp
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} elementer i fremgang
@@ -1734,7 +1737,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasjonsloggen.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",Forespørsel om prisanslag er deaktivert tilgang fra portal for flere sjekkportalinnstillingene.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverandør Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Kjøpe Beløp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kjøpe Beløp
DocType: Sales Invoice,Shipping Address Name,Leveringsadresse Navn
DocType: Material Request,Terms and Conditions Content,Betingelser innhold
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Det var feil å opprette kursplan
@@ -1998,7 +2001,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dette er basert på loggene mot denne bilen. Se tidslinjen nedenfor for detaljer
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
DocType: Customer,Default Price List,Standard Prisliste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette regnskapsår {0}. Regnskapsåret {0} er satt som standard i Globale innstillinger
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,En kunde med samme navn eksisterer allerede
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dette vil sende Lønnsslipp og opprette periodiseringstabell. Vil du fortsette?
@@ -2012,6 +2015,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Priser
DocType: Quotation,Term Details,Term Detaljer
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Kan ikke registrere mer enn {0} studentene på denne studentgruppen.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Totalt (uten skatt)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lead Count
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} må være større enn 0
@@ -2031,7 +2035,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Oppheve koblingen Betaling ved kansellering av faktura
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nåværende Kilometerstand inngått bør være større enn første Vehicle Teller {0}
DocType: Restaurant Reservation,No Show,Uteblivelse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vennligst still inn navngivningsserien for {0} via Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Land
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,La og oppmøte
DocType: Maintenance Visit,Partially Completed,Delvis Fullført
@@ -2123,7 +2126,7 @@
DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
DocType: Grant Application,Assessment Mark (Out of 10),Vurderingsmerke (ut av 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Hoved
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
DocType: Employee Attendance Tool,Employees HTML,ansatte HTML
@@ -2171,7 +2174,7 @@
DocType: Course,Course Abbreviation,Kurs forkortelse
DocType: Student Leave Application,Student Leave Application,Student La Application
DocType: Item,Will also apply for variants,Vil også gjelde for varianter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} på halv dag {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Samlet arbeidstid må ikke være større enn maks arbeidstid {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
@@ -2358,9 +2361,10 @@
DocType: Task,Actual End Date (via Time Sheet),Faktisk Sluttdato (via Timeregistrering)
DocType: Soil Texture,Soil Type,Jordtype
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Ny melding
,Quotation Trends,Anførsels Trender
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
DocType: Shipping Rule,Shipping Amount,Fraktbeløp
DocType: Supplier Scorecard Period,Period Score,Periodepoeng
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Legg til kunder
@@ -2371,7 +2375,7 @@
,Vehicle Expenses,Vehicle Utgifter
DocType: Serial No,Invoice Details,Fakturadetaljer
DocType: Grant Application,Show on Website,Vis på nettstedet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Start på
DocType: Hub Category,Hub Category,Hub kategori
DocType: Purchase Invoice,SEZ,SEZ
@@ -2403,7 +2407,7 @@
DocType: Patient,B Positive,B Positiv
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Gruppe til Non-gruppe
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2454,6 +2458,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Kan ikke angi en mottatt RFQ til No Quote
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Total Fradrag
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Velg en konto for å skrive ut i kontovaluta
,Production Analytics,produksjons~~POS=TRUNC Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Dette er basert på transaksjoner mot denne pasienten. Se tidslinjen nedenfor for detaljer
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kostnad Oppdatert
@@ -2509,7 +2514,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Velg Company ...
DocType: Leave Control Panel,Leave blank if considered for all departments,La stå tom hvis vurderes for alle avdelinger
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
DocType: Payroll Entry,Fortnightly,hver fjortende dag
DocType: Currency Exchange,From Currency,Fra Valuta
DocType: Vital Signs,Weight (In Kilogram),Vekt (i kilogram)
@@ -2587,7 +2592,7 @@
DocType: Student,Guardians,Voktere
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Prisene vil ikke bli vist hvis prislisten er ikke satt
DocType: Stock Entry,Total Incoming Value,Total Innkommende Verdi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debet Å kreves
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debet Å kreves
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timelister bidra til å holde styr på tid, kostnader og fakturering for aktiviteter gjort av teamet ditt"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kjøp Prisliste
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Maler av leverandørens scorecard-variabler.
@@ -2690,7 +2695,7 @@
DocType: Company,For Reference Only.,For referanse.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Lege {0} ikke tilgjengelig på {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Velg batchnummer
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Ugyldig {0}: {1}
,GSTR-1,GSTR-en
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Referanse Inv
@@ -2727,8 +2732,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiser drift, driftskostnadene og gi en unik Operation nei til driften."
DocType: Water Analysis,Origin,Opprinnelse
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokumentet er over grensen av {0} {1} for elementet {4}. Er du gjør en annen {3} mot samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Vennligst sett gjentakende etter lagring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Velg endring mengde konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Vennligst sett gjentakende etter lagring
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Velg endring mengde konto
DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
DocType: Naming Series,User must always select,Brukeren må alltid velge
DocType: Stock Settings,Allow Negative Stock,Tillat Negative Stock
@@ -2784,7 +2789,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Varsle om nye innkjøpsordrer
DocType: Quality Inspection Reading,Reading 9,Lese 9
DocType: Supplier,Is Frozen,Er Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Gruppe node lageret er ikke lov til å velge for transaksjoner
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Gruppe node lageret er ikke lov til å velge for transaksjoner
DocType: Buying Settings,Buying Settings,Kjøpe Innstillinger
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for et ferdig God Sak
DocType: Upload Attendance,Attendance To Date,Oppmøte To Date
@@ -2798,6 +2803,7 @@
DocType: Grant Application,Organization,Organisasjon
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Student Gruppenavn
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Vis eksplodert visning
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Opprette avgifter
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sørg for at du virkelig ønsker å slette alle transaksjoner for dette selskapet. Dine stamdata vil forbli som det er. Denne handlingen kan ikke angres.
DocType: Room,Room Number,Romnummer
@@ -2808,7 +2814,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Lag skatteremne
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,bruker~~POS=TRUNC
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Hurtig Journal Entry
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
@@ -2879,7 +2885,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Gjør Faktura
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto nær mulighet etter 15 dager
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Innkjøpsordrer er ikke tillatt for {0} på grunn av et scorecard som står på {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Innkjøpsordrer er ikke tillatt for {0} på grunn av et scorecard som står på {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,slutt År
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2972,7 +2978,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Bilagsregistrering {1} har ikke konto {2} eller allerede matchet mot en annen kupong
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterier Vekt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Leverandør> Leverandør Type
DocType: Buying Settings,Default Buying Price List,Standard Kjøpe Prisliste
DocType: Payroll Entry,Salary Slip Based on Timesheet,Lønn Slip Basert på Timeregistrering
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kjøpspris
@@ -3062,7 +3067,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spor Leads etter bransje Type.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Gå til Letterheads
DocType: Item Supplier,Item Supplier,Sak Leverandør
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
DocType: Company,Stock Settings,Aksje Innstillinger
@@ -3240,6 +3245,7 @@
DocType: Company,Default Inventory Account,Standard lagerkonto
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rad {0}: Fullført Antall må være større enn null.
DocType: Antibiotic,Antibiotic Name,Antibiotisk navn
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Varenummer> Varegruppe> Varemerke
DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Velg type ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,En kobling til alle arealene der grøften vokser
@@ -3435,6 +3441,7 @@
DocType: Supplier,Credit Limit,Kredittgrense
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Nr. Selge prisliste rate
DocType: Production Plan Sales Order,Salse Order Date,Salse Ordredato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Leverandør> Leverandør Type
DocType: Salary Component,Salary Component,lønn Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Betalings Innlegg {0} er un-linked
DocType: GL Entry,Voucher No,Kupong Ingen
@@ -3444,7 +3451,7 @@
DocType: Leave Allocation,Leave Allocation,La Allocation
DocType: Payment Request,Recipient Message And Payment Details,Mottakers Message og betalingsinformasjon
DocType: Training Event,Trainer Email,trener E-post
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
DocType: Restaurant Reservation,No of People,Ingen av mennesker
DocType: Production Planning Tool,Include sub-contracted raw materials,Inkluder underleverandør råvarer
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mal av begreper eller kontrakt.
@@ -3509,7 +3516,7 @@
DocType: Production Planning Tool,Create Material Requests,Opprett Material Forespørsler
DocType: Employee Education,School/University,Skole / universitet
DocType: Payment Request,Reference Details,Referanse Detaljer
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgjengelig Antall på Warehouse
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturert beløp
DocType: Asset,Double Declining Balance,Dobbel degressiv
@@ -3521,7 +3528,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Få oppdateringer
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ikke tilhører selskapet {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Velg minst én verdi fra hver av attributter.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
apps/erpnext/erpnext/config/hr.py +310,Leave Management,La Ledelse
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupper etter Account
DocType: Sales Order,Fully Delivered,Fullt Leveres
@@ -3532,14 +3539,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Utbetalt Mengde kan ikke være større enn låne beløpet {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Gå til Programmer
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Tilordnet mengde {1} kan ikke være større enn uanmeldt beløp {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett> Nummereringsserie
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Produksjonsordre ikke opprettet
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Fra dato" må være etter 'To Date'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
DocType: Asset,Fully Depreciated,fullt avskrevet
,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Merket Oppmøte HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Sitater er forslag, bud du har sendt til dine kunder"
DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
@@ -3623,7 +3629,7 @@
DocType: Stock Settings,Item Naming By,Sak Naming Av
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annen periode Closing Entry {0} har blitt gjort etter {1}
DocType: Production Order,Material Transferred for Manufacturing,Materialet Overført for Manufacturing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} ikke eksisterer
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Konto {0} ikke eksisterer
DocType: Project,Project Type,Prosjekttype
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Barneoppgave eksisterer for denne oppgaven. Du kan ikke slette denne oppgaven.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten målet stk eller mål beløpet er obligatorisk.
@@ -3727,11 +3733,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Avskrivninger kostnadssted
DocType: Sales Order Item,Sales Order Date,Salgsordre Dato
DocType: Sales Invoice Item,Delivered Qty,Leveres Antall
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Totalt ekskl. Avgift
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Hvis det er merket, vil alle barn i hver produksjon element inkluderes i materialet forespørsler."
DocType: Assessment Plan,Assessment Plan,Assessment Plan
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Kunden {0} er opprettet.
DocType: Stock Settings,Limit Percent,grense Prosent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vennligst oppsett Instruktør Navngivningssystem under utdanning> Utdanningsinnstillinger
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Foreløpig ingen lager tilgjengelig i varehus
,Payment Period Based On Invoice Date,Betaling perioden basert på Fakturadato
DocType: Sample Collection,No. of print,Antall utskrifter
@@ -3747,12 +3753,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Skyldnere ({0})
DocType: Pricing Rule,Margin,Margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruttofortjeneste%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruttofortjeneste%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Endre POS-profil
DocType: Bank Reconciliation Detail,Clearance Date,Klaring Dato
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Vurderingsrapport
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
DocType: Lead,Address Desc,Adresse Desc
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party er obligatorisk
DocType: Journal Entry,JV-,JV-
@@ -3784,7 +3790,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stående navn
DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
DocType: Employee Loan Application,Required by Date,Kreves av Dato
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Sluttbalanse (Dr - Cr)
DocType: Lead,Lead Owner,Lead Eier
DocType: Bin,Requested Quantity,Requested Antall
DocType: Patient,Marital Status,Sivilstatus
@@ -3798,7 +3803,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Flere variasjoner
DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Leveres
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Vennligst logg inn som en annen bruker.
DocType: Territory,Territory Targets,Terri Targets
@@ -3899,7 +3904,7 @@
DocType: Serial No,Out of AMC,Ut av AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gjør Vedlikehold Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
DocType: Company,Default Cash Account,Standard Cash konto
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er basert på tilstedeværelse av denne Student
@@ -4051,7 +4056,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ingen ansatte for de nevnte kriteriene
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
DocType: Restaurant,Default Customer,Standardkund
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vennligst oppsett Medarbeiders navngivningssystem i menneskelig ressurs> HR-innstillinger
DocType: Assessment Plan,Supervisor Name,Supervisor Name
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bekreft ikke om avtalen er opprettet for samme dag
DocType: Program Enrollment Course,Program Enrollment Course,Programopptakskurs
@@ -4174,7 +4178,7 @@
DocType: BOM,Website Description,Website Beskrivelse
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto endring i egenkapital
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nyeste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-post adresse må være unikt, allerede eksisterer for {0}"
DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Kvittering
@@ -4191,7 +4195,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kontantstrømoppstilling
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløp kan ikke overstige maksimalt lånebeløp på {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Tillatelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vennligst velg bære frem hvis du også vil ha med forrige regnskapsår balanse later til dette regnskapsåret
DocType: GL Entry,Against Voucher Type,Mot Voucher Type
DocType: Physician,Phone (R),Telefon (R)
@@ -4203,7 +4207,7 @@
DocType: Patient,B Negative,B Negativ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Vedlikeholdsstatus må avbrytes eller fullføres for å sende inn
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i rad {0} stemmer ikke overens med leveringsnotat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i rad {0} stemmer ikke overens med leveringsnotat
DocType: Student,Guardian Details,Guardian Detaljer
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Oppmøte for flere ansatte
@@ -4245,7 +4249,7 @@
DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
DocType: Training Event,Exam,Eksamen
DocType: Complaint,Complaint,Klage
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
DocType: Leave Allocation,Unused leaves,Ubrukte blader
DocType: Patient,Alcohol Past Use,Alkohol Tidligere Bruk
DocType: Fertilizer Content,Fertilizer Content,Gjødselinnhold
@@ -4374,6 +4378,7 @@
DocType: Salary Detail,Formula,Formel
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Salgskonto
DocType: Purchase Invoice Item,Total Weight,Total vekt
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Provisjon på salg
DocType: Offer Letter Term,Value / Description,Verdi / beskrivelse
@@ -4531,7 +4536,7 @@
DocType: Customer,From Lead,Fra Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Bestillinger frigitt for produksjon.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
DocType: Program Enrollment Tool,Enroll Students,Meld Studenter
DocType: Lab Test,Approved Date,Godkjent dato
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -4607,7 +4612,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produksjon Element
,Employee Information,Informasjon ansatt
DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Gjør Leverandør sitat
DocType: Quality Inspection,Incoming,Innkommende
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standard skattemaler for salg og kjøp opprettes.
@@ -4624,7 +4629,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Merk: {0}
,Delivery Note Trends,Levering Note Trender
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Denne ukens oppsummering
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,På lager Antall
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,På lager Antall
DocType: Delivery Trip,Calculate Estimated Arrival Times,Beregn anslåtte ankomsttider
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan bare oppdateres via lagertransaksjoner
DocType: Student Group Creation Tool,Get Courses,Få Kurs
@@ -4640,7 +4645,7 @@
DocType: Material Request,% Ordered,% Bestilt
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",For kursbasert studentgruppe vil kurset bli validert for hver student fra de innmeldte kursene i programopptaket.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Akkord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Kjøpe Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Kjøpe Rate
DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
DocType: Employee,History In Company,Historie I selskapet
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Ny melding fra {avsender}
@@ -4688,7 +4693,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: valuta BOM # {1} bør være lik den valgte valutaen {2}
DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
DocType: Patient,Additional information regarding the patient,Ytterligere informasjon om pasienten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
DocType: Homepage,Tag Line,tag Linje
DocType: Fee Component,Fee Component,Fee Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Flåtestyring
@@ -4900,7 +4905,7 @@
DocType: Employee Education,Employee Education,Ansatt Utdanning
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicate varegruppe funnet i varegruppen bordet
DocType: Land Unit,Parent Land Unit,Moderselskap
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
DocType: Fertilizer,Fertilizer Name,Navn på gjødsel
DocType: Salary Slip,Net Pay,Netto Lønn
DocType: Account,Account,Konto
@@ -4979,7 +4984,7 @@
DocType: Item Customer Detail,Ref Code,Ref Kode
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Kundegruppe er påkrevd i POS-profil
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Medarbeider poster.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
DocType: HR Settings,Payroll Settings,Lønn Innstillinger
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Matche ikke bundet fakturaer og betalinger.
DocType: POS Settings,POS Settings,POS-innstillinger
@@ -5146,7 +5151,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Bursdag Påminnelse for {0}
DocType: Asset Maintenance Task,Last Completion Date,Siste sluttdato
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dager siden siste Bestill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
DocType: Buying Settings,Naming Series,Navngi Series
DocType: Leave Block List,Leave Block List Name,La Block List Name
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdatoen må være mindre enn Forsikring Sluttdato
@@ -5275,6 +5280,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Få Betalings Entries
DocType: Quotation Item,Against Docname,Mot Docname
DocType: SMS Center,All Employee (Active),All Employee (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kunde> Kundegruppe> Territorium
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vis nå
DocType: BOM,Raw Material Cost,Raw Material Cost
DocType: Item Reorder,Re-Order Level,Re-Order nivå
@@ -5375,7 +5381,6 @@
DocType: Room,Seating Capacity,Antall seter
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Lab Test Grupper
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kunde> Kundegruppe> Territorium
DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Utgifts Krav)
DocType: GST Settings,GST Summary,GST Sammendrag
DocType: Assessment Result,Total Score,Total poengsum
@@ -5389,7 +5394,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Følgende kursplaner ble opprettet
DocType: Journal Entry,Total Debit,Total debet
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standardferdigvarelageret
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budsjett og kostnadssted
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Flere standard betalingsmåter er ikke tillatt
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,for
@@ -5565,7 +5570,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenk Skatte eller Charge for
DocType: Driver,Driving License Category,Kjørelisens kategori
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Selve Antall er obligatorisk
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øyeblikket en {1} leverandør scorecard, og innkjøpsordre til denne leverandøren skal utstedes med forsiktighet."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har for øyeblikket en {1} leverandør scorecard, og innkjøpsordre til denne leverandøren skal utstedes med forsiktighet."
DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
DocType: Employee Loan,Loan Type,låne~~POS=TRUNC
DocType: Scheduling Tool,Scheduling Tool,planlegging Tool
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index f1373e1..094a9c8 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sortuj według ceny
,Delay Days,Dni opóźnienia
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Koszty usługi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Dokonaj wpisu do magazynu retencyjnego
DocType: Purchase Invoice Item,Item Weight Details,Szczegóły dotyczące wagi przedmiotu
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odniesienie: {0}, Kod pozycji: {1} i klient: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ogłoszenie o pracę
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},Zestawienie materiałów nie zostało określone dla przedmiotu podwykonawstwa {0} w wierszu {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},Zestawienie materiałów nie zostało określone dla przedmiotu podwykonawstwa {0} w wierszu {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Wynik złożony
DocType: Item Attribute,Increment,Przyrost
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Okres czasu
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nie dopuszczony do {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Pobierz zawartość z
DocType: Price List,Price Not UOM Dependant,Cena nie zależna od UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Brak elementów na liście
DocType: Asset Repair,Error Description,Opis błędu
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Artykuły spożywcze
DocType: Quality Inspection Reading,Reading 1,Odczyt 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fundusze Emerytalne
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Następny Amortyzacja Data nie może być wcześniejsza Data zakupu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Następny Amortyzacja Data nie może być wcześniejsza Data zakupu
DocType: Crop,Perennial,Bylina
DocType: Consultation,Consultation Date,Data konsultacji
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Lista produktów i odkrycie dla użytkowników ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",np "Szkoła Podstawowa" lub "Uniwersytet"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Raporty seryjne
DocType: Warehouse,Warehouse Detail,Szczegóły magazynu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termin Data zakończenia nie może być późniejsza niż data zakończenia roku na rok akademicki, którego termin jest związany (Academic Year {}). Popraw daty i spróbuj ponownie."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Jest Środkiem Trwałym"" nie może być odznaczone, jeśli istnieją pozycje z takim ustawieniem"
DocType: Delivery Trip,Departure Time,Godzina odjazdu
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Pobierz szczegóły specyfikacji
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Szablony standings dostawców.
DocType: Lead,Interested,Jestem zainteresowany
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Otwarcie
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Otwarcie
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Od {0} do {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Nie udało się ustawić podatków
DocType: Item,Copy From Item Group,Skopiuj z Grupy Przedmiotów
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Urlopy na Rok
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Wiersz {0}: Proszę sprawdzić ""Czy Advance"" przeciw konta {1}, jeśli jest to zaliczka wpis."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
DocType: Email Digest,Profit & Loss,Rachunek zysków i strat
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litr
DocType: Task,Total Costing Amount (via Time Sheet),Całkowita kwota Costing (przez czas arkuszu)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,"Opiera się to na transakcjach przeciwko tej firmie. Zobacz poniżej linię czasu, aby uzyskać szczegółowe informacje"
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne)
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Odporny
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Wielowalutowy
DocType: Opening Invoice Creation Tool,Invoice Type,Typ faktury
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Dowód dostawy
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Wdowiec / Wdowa
DocType: Request for Quotation,Request for Quotation,Zapytanie ofertowe
DocType: Healthcare Settings,Require Lab Test Approval,Wymagaj zatwierdzenia testu laboratoryjnego
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kod towaru> Grupa produktów> Marka
DocType: Salary Slip Timesheet,Working Hours,Godziny pracy
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total Outstanding
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Wprowadź Centrum Kosztów
DocType: Drug Prescription,Dosage,Dawkowanie
DocType: Journal Entry Account,Sales Order,Zlecenie sprzedaży
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Średnia. Cena sprzedaży
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Średnia. Cena sprzedaży
DocType: Assessment Plan,Examiner Name,Nazwa Examiner
DocType: Lab Test Template,No Result,Brak wyników
DocType: Purchase Invoice Item,Quantity and Rate,Ilość i Wskaźnik
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Wybierz Okres Payroll
DocType: Purchase Invoice,Unpaid,Niezapłacone
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Zarezerwowane na sprzedaż
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Proszę ustawić system nazewnictwa pracownika w dziale Zasoby ludzkie> Ustawienia HR
DocType: Packing Slip,From Package No.,Nr Przesyłki
DocType: Item Attribute,To Range,Do osiągnięcia
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Papiery wartościowe i depozyty
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,Warsztat
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Ostrzegaj Zamówienia Zakupu
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Wystarczające elementy do budowy
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Wystarczające elementy do budowy
DocType: POS Profile User,POS Profile User,Użytkownik profilu POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Przychody bezpośrednie
DocType: Patient Appointment,Date TIme,Data TIm
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nie można przefiltrować na podstawie Konta, jeśli pogrupowano z użuciem konta"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Nie można przefiltrować na podstawie Konta, jeśli pogrupowano z użuciem konta"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Urzędnik administracyjny
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Zakładanie firmy i podatków
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Proszę wybrać Kurs
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Konto Różnic
DocType: Purchase Invoice,Supplier GSTIN,Dostawca GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nie można zamknąć zadanie, jak jego zależne zadaniem {0} nie jest zamknięta."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,
DocType: Production Order,Additional Operating Cost,Dodatkowy koszt operacyjny
DocType: Lab Test Template,Lab Routine,Lab Rutyna
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetyki
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relacja z Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Menager
DocType: Payment Entry,Payment From / To,Płatność Od / Do
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nowy limit kredytowy wynosi poniżej aktualnej kwoty należności dla klienta. Limit kredytowy musi być conajmniej {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nowy limit kredytowy wynosi poniżej aktualnej kwoty należności dla klienta. Limit kredytowy musi być conajmniej {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Ustaw konto w magazynie {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Pola ""Bazuje na"" i ""Grupuj wg."" nie mogą być takie same"
DocType: Sales Person,Sales Person Targets,Cele Sprzedawcy
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,Batch Nazwa
DocType: Fee Validity,Max number of visit,Maksymalna liczba wizyt
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Grafiku stworzył:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Zapisać
DocType: GST Settings,GST Settings,Ustawienia GST
DocType: Selling Settings,Customer Naming By,
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,budżet Against
DocType: Employee,Cell Number,Numer komórki
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Dla danego kryterium nie ma pracownika. Sprawdź, czy Salary Slips nie zostały jeszcze utworzone."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Wnioski Auto Materiał Generated
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Wnioski Auto Materiał Generated
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Straty
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Zarezerwowana dla produkcji
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
DocType: Opportunity,Opportunity From,Szansa od
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Wiersz {0}: {1} wymagane numery seryjne dla elementu {2}. Podałeś {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Wiersz {0}: {1} wymagane numery seryjne dla elementu {2}. Podałeś {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Proszę wybrać tabelę
DocType: BOM,Website Specifications,Specyfikacja strony WWW
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0} jest nieprawidłowym adresem e-mail w polu ""Odbiorcy"""
@@ -1055,7 +1056,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Zapytanie o wycenę
DocType: Vital Signs,Heart Rate / Pulse,Częstość tętna / impuls
DocType: Company,Default Bank Account,Domyślne konto bankowe
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Aktualizuj Stan' nie może być zaznaczone, ponieważ elementy nie są dostarczane przez {0}"
DocType: Vehicle,Acquisition Date,Data nabycia
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Numery
@@ -1080,7 +1081,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Prześlij swoją literę (Keep it web friendly jako 900px na 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Rachunek {2} nie może być grupą
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Przedmiot Row {idx} {} {doctype DOCNAME} nie istnieje w wyżej '{doctype}' Stół
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Grafiku {0} jest już zakończone lub anulowane
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Grafiku {0} jest już zakończone lub anulowane
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Brak zadań
DocType: Item Variant Settings,Copy Fields to Variant,Skopiuj pola do wariantu
DocType: Asset,Opening Accumulated Depreciation,Otwarcie Skumulowana amortyzacja
@@ -1192,9 +1193,10 @@
DocType: Production Order,Plan material for sub-assemblies,Materiał plan podzespołów
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partnerzy handlowi i terytorium
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} musi być aktywny
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Zamknięcie (otwarcie + suma)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Zamknięcie (otwarcie + suma)
DocType: Journal Entry,Depreciation Entry,Amortyzacja
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Najpierw wybierz typ dokumentu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Drukuj w walucie konta
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuluj Fizyczne Wizyty {0} zanim anulujesz Wizytę Pośrednią
DocType: Crop Cycle,ISO 8016 standard,Norma ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Nr seryjny {0} nie należy do żadnej rzeczy {1}
@@ -1220,7 +1222,7 @@
DocType: Supplier,Default Payable Accounts,Domyślne konta Rozrachunki z dostawcami
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
DocType: Fee Structure,Components,składniki
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
DocType: Quality Inspection Reading,Reading 6,Odczyt 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1272,6 +1274,7 @@
,Company Name,Nazwa firmy
DocType: SMS Center,Total Message(s),Razem ilość wiadomości
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ustaw Serię Nazewnictwa na {0} za pomocą Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Dodatkowy rabat procentowy
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobacz listę wszystkich filmów pomocy
DocType: Agriculture Analysis Criteria,Soil Texture,Tekstura gleby
@@ -1300,7 +1303,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website Element
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
DocType: Timesheet Detail,Bill,Rachunek
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Następny Amortyzacja Data jest wpisana w minionym dniem
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Następny Amortyzacja Data jest wpisana w minionym dniem
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Biały
DocType: SMS Center,All Lead (Open),Wszystkie Leady (Otwarte)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Wiersz {0}: Ilość nie jest dostępny dla {4} w magazynie {1} w delegowania chwili wejścia ({2} {3})
@@ -1317,7 +1320,7 @@
DocType: Lead,Next Contact Date,Data Następnego Kontaktu
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Ilość Otwarcia
DocType: Healthcare Settings,Appointment Reminder,Przypomnienie o spotkaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
DocType: Program Enrollment Tool Student,Student Batch Name,Student Batch Nazwa
DocType: Consultation,Doctor,Lekarz
DocType: Holiday List,Holiday List Name,Lista imion na wakacje
@@ -1333,6 +1336,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Narzędzie do przydziału urlopu
DocType: Item,Hub Category to Publish,Kategoria ośrodka do opublikowania
DocType: Leave Block List,Leave Block List Dates,Opuść Zablokowaną Listę Dat
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Proszę ustawić serię numerów dla Obecności za pośrednictwem Setup> Numbering Series
DocType: Sales Invoice,Billing Address GSTIN,Adres rozliczeniowy GSTIN
DocType: Assessment Plan,Evaluate,Oceniać
DocType: Workstation,Net Hour Rate,Stawka godzinowa Netto
@@ -1367,7 +1371,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET
DocType: POS Profile,Sales Invoice Payment,Faktura sprzedaży Płatność
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Kwota sprzedaży
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Kwota sprzedaży
DocType: Repayment Schedule,Interest Amount,Kwota procentowa
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Zatwierdzasz wydatek dla tego rekordu. Proszę zaktualizować ""status"" i Zachowaj"
DocType: Serial No,Creation Document No,
@@ -1459,7 +1463,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Stan z bilansu otwarcia
,GST Sales Register,Rejestr sprzedaży GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Faktura Zaliczkowa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Brak żądań
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Brak żądań
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Wybierz swoje domeny
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Kolejny rekord budżetu '{0}' już istnieje przeciwko {1} {2} 'za rok obrotowy {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Pola będą kopiowane tylko w momencie tworzenia.
@@ -1469,11 +1473,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Wynagrodzenie netto (słownie) będzie widoczna po zapisaniu na Liście Płac.
DocType: Purchase Invoice,Is Return,Czy Wróć
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Uwaga
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Uwaga
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Powrót / noty obciążeniowej
DocType: Price List Country,Price List Country,Cena Kraj
DocType: Item,UOMs,Jednostki miary
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod przedmiotu nie może być zmieniony na podstawie numeru seryjnego
DocType: Purchase Invoice Item,UOM Conversion Factor,Współczynnik konwersji jednostki miary
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Proszę wpisać kod produkt, aby uzyskać numer partii"
@@ -1579,7 +1583,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
DocType: Supplier Scorecard,Warn for new Request for Quotations,Ostrzegaj przed nowym żądaniem ofert
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Zamówienia pomoże Ci zaplanować i śledzić na zakupy
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Zasady badań laboratoryjnych
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Całkowita ilość Issue / Przelew {0} w dziale Zamówienie {1} \ nie może być większa od ilości wnioskowanej dla {2} {3} Przedmiot
@@ -1617,7 +1621,6 @@
DocType: Warehouse,Warehouse Contact Info,Dane kontaktowe dla magazynu
DocType: Payment Entry,Write Off Difference Amount,Różnica Kwota odpisuje
DocType: Volunteer,Volunteer Name,Nazwisko wolontariusza
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Proszę ustawić Instruktorski System Nazw w Edukacji> Ustawienia edukacyjne
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Email pracownika nie został znaleziony, dlatego wiadomość nie będzie wysłana"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Reguła wysyłki nie dotyczy kraju {0}
DocType: Item,Foreign Trade Details,Handlu Zagranicznego Szczegóły
@@ -1630,7 +1633,7 @@
DocType: Student Group Student,Group Roll Number,Numer grupy
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko Kredytowane konta mogą być połączone z innym zapisem po stronie debetowej"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Suma wszystkich wagach zadanie powinno być 1. Proszę ustawić wagi wszystkich zadań projektowych odpowiednio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Wycena Zasada jest najpierw wybiera się na podstawie ""Zastosuj Na"" polu, które może być pozycja, poz Grupa lub Marka."
@@ -1655,7 +1658,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Magazyn Dziecko nie istnieje dla tego magazynu. Nie można usunąć tego magazynu.
DocType: Item,Website Item Groups,Grupy przedmiotów strony WWW
DocType: Purchase Invoice,Total (Company Currency),Razem (Spółka Waluta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Nr seryjny {0} wprowadzony jest więcej niż jeden raz
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Nr seryjny {0} wprowadzony jest więcej niż jeden raz
DocType: Journal Entry,Journal Entry,Zapis księgowy
DocType: Expense Claim Advance,Unclaimed amount,Nie zgłoszona kwota
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} pozycji w przygotowaniu
@@ -1752,7 +1755,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Rejestr komunikacji
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zapytanie ofertowe zostało wyłączone z dostępem do portalu, więcej ustawień portalowych wyboru."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dostawca Scorecard Zmienna scoringowa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Kwota zakupu
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kwota zakupu
DocType: Sales Invoice,Shipping Address Name,Adres do wysyłki Nazwa
DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Podczas tworzenia harmonogramu kursów wystąpiły błędy
@@ -2017,7 +2020,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Opiera się to na dzienniki przeciwko tego pojazdu. Zobacz harmonogram poniżej w szczegółach
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
DocType: Customer,Default Price List,Domyślna List Cen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nie można usunąć Fiscal Year {0}. Rok fiskalny {0} jest ustawiona jako domyślna w Ustawienia globalne
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Klient o tej samej nazwie już istnieje
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Spowoduje to wysłanie Salary Slips i utworzenie wpisu księgowego. Czy chcesz kontynuować?
@@ -2031,6 +2034,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,cennik
DocType: Quotation,Term Details,Szczegóły warunków
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nie można zapisać więcej niż {0} studentów dla tej grupy studentów.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Razem (bez podatku)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Liczba potencjalnych klientów
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musi być większy niż 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Dostępność towaru
@@ -2050,7 +2054,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odłączanie Przedpłata na Anulowanie faktury
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktualny stan licznika kilometrów wszedł powinien być większy niż początkowy stan licznika kilometrów {0}
DocType: Restaurant Reservation,No Show,Brak pokazu
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ustaw Serię Nazewnictwa na {0} za pomocą Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Zasada Wysyłka Kraj
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leave a frekwencja
DocType: Maintenance Visit,Partially Completed,Częściowo Ukończony
@@ -2143,7 +2146,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
DocType: Grant Application,Assessment Mark (Out of 10),Ocena (na 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Komórka Nie
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Główny
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Główny
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Wariant
DocType: Naming Series,Set prefix for numbering series on your transactions,Ustaw prefiks dla numeracji serii na swoich transakcji
DocType: Employee Attendance Tool,Employees HTML,Pracownicy HTML
@@ -2193,7 +2196,7 @@
DocType: Course,Course Abbreviation,Skrót golfowe
DocType: Student Leave Application,Student Leave Application,Student Application Leave
DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Pracownik {0} na pół dnia na {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Całkowita liczba godzin pracy nie powinna być większa niż max godzinach pracy {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,włączony
@@ -2381,9 +2384,10 @@
DocType: Task,Actual End Date (via Time Sheet),Faktyczna data zakończenia (przez czas arkuszu)
DocType: Soil Texture,Soil Type,Typ gleby
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Kwota {0} {1} przeciwko {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nowa wiadomość
,Quotation Trends,Trendy Wyceny
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Pozycja Grupa nie wymienione w pozycji do pozycji mistrza {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debetowane Konto musi być kontem typu Należności
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debetowane Konto musi być kontem typu Należności
DocType: Shipping Rule,Shipping Amount,Ilość dostawy
DocType: Supplier Scorecard Period,Period Score,Wynik okresu
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj klientów
@@ -2394,7 +2398,7 @@
,Vehicle Expenses,Wydatki Samochodowe
DocType: Serial No,Invoice Details,Dane do faktury
DocType: Grant Application,Show on Website,Pokaż na stronie internetowej
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Oczekiwana wartość po okresie użytkowania musi być większe niż lub równe {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Oczekiwana wartość po okresie użytkowania musi być większe niż lub równe {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Zaczynaj na
DocType: Hub Category,Hub Category,Kategoria koncentratora
DocType: Purchase Invoice,SEZ,SEZ
@@ -2425,7 +2429,7 @@
DocType: Patient,B Positive,B dodatni
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Wiersz # {0}: Ilość musi być jeden, a element jest trwałego. Proszę używać osobny wiersz dla stwardnienia st."
DocType: Leave Block List Allow,Leave Block List Allow,Możesz opuścić Blok Zablokowanych List
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
DocType: Patient Medical Record,Patient Medical Record,Medyczny dokument medyczny pacjenta
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupa do Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sporty
@@ -2475,6 +2479,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Nie można ustawić odebranego RFQ na Żadne Cytat
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Całkowita kwota odliczenia
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Wybierz konto do wydrukowania w walucie konta
,Production Analytics,Analizy produkcyjne
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,"Opiera się to na transakcjach przeciwko temu pacjentowi. Zobacz poniżej linię czasu, aby uzyskać szczegółowe informacje"
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Koszt Zaktualizowano
@@ -2530,7 +2535,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Wybierz firmą ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Zostaw puste jeśli jest to rozważane dla wszystkich departamentów
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Rodzaje zatrudnienia (umowa o pracę, zlecenie, praktyka zawodowa itd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
DocType: Payroll Entry,Fortnightly,Dwutygodniowy
DocType: Currency Exchange,From Currency,Od Waluty
DocType: Vital Signs,Weight (In Kilogram),Waga (w kilogramach)
@@ -2608,7 +2613,7 @@
DocType: Student,Guardians,Strażnicy
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny nie będą wyświetlane, jeśli Cennik nie jest ustawiony"
DocType: Stock Entry,Total Incoming Value,Całkowita wartość przychodów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debetowane Konto jest wymagane
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debetowane Konto jest wymagane
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Ewidencja czasu pomaga śledzić czasu, kosztów i rozliczeń dla aktywnosci przeprowadzonych przez zespół"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cennik zakupowy
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Szablony dostawców zmiennych.
@@ -2711,7 +2716,7 @@
DocType: Company,For Reference Only.,Wyłącznie w celach informacyjnych.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Lekarz {0} niedostępny w {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Wybierz numer partii
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Nieprawidłowy {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Nieprawidłowy {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET
DocType: Fee Validity,Reference Inv,Referencja Inv
@@ -2748,8 +2753,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
DocType: Water Analysis,Origin,Pochodzenie
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Niniejszy dokument ma na granicy przez {0} {1} dla pozycji {4}. Robisz kolejny {3} przeciwko samo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Wybierz opcję Zmień konto kwotę
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Wybierz opcję Zmień konto kwotę
DocType: Purchase Invoice,Price List Currency,Waluta cennika
DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
DocType: Stock Settings,Allow Negative Stock,Dozwolony ujemny stan
@@ -2805,7 +2810,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Ostrzegaj o nowych zamówieniach zakupu
DocType: Quality Inspection Reading,Reading 9,Odczyt 9
DocType: Supplier,Is Frozen,Jest Zamrożony
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,"Magazyn węzeł Grupa nie jest dozwolone, aby wybrać dla transakcji"
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,"Magazyn węzeł Grupa nie jest dozwolone, aby wybrać dla transakcji"
DocType: Buying Settings,Buying Settings,Ustawienia Kupna
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,
DocType: Upload Attendance,Attendance To Date,Obecność do Daty
@@ -2820,6 +2825,7 @@
DocType: Grant Application,Organization,Organizacja
DocType: BOM Update Tool,BOM Update Tool,Narzędzie aktualizacji BOM
DocType: SG Creation Tool Course,Student Group Name,Nazwa grupy studentów
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Pokaż widok rozstrzelony
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Tworzenie opłat
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Upewnij się, że na pewno chcesz usunąć wszystkie transakcje dla tej firmy. Twoje dane podstawowe pozostanie tak jak jest. Ta akcja nie można cofnąć."
DocType: Room,Room Number,Numer pokoju
@@ -2830,7 +2836,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Zrób szablon podatkowy
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum użytkowników
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Surowce nie może być puste.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
DocType: Lab Test Sample,Lab Test Sample,Próbka do badań laboratoryjnych
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Szybkie Księgowanie
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Nie możesz zmienić danych jeśli BOM jest przeciw jakiejkolwiek rzeczy
@@ -2901,7 +2907,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Stwórz Fakturę
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blisko Szansa po 15 dniach
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Zlecenia zakupu nie są dozwolone w {0} z powodu karty wyników {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Zlecenia zakupu nie są dozwolone w {0} z powodu karty wyników {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,koniec roku
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwota / kwota procentowa
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwota / kwota procentowa
@@ -3014,7 +3020,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Ponad
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Wiersz # {0}: Journal Entry {1} nie masz konta {2} lub już porównywana z innym kuponie
DocType: Supplier Scorecard Criteria,Criteria Weight,Kryteria Waga
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dostawca> Dostawca Typ
DocType: Buying Settings,Default Buying Price List,Domyślna Lista Cen Kupowania
DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip Wynagrodzenie podstawie grafiku
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Cena zakupu
@@ -3104,7 +3109,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Śledź leady przez typy przedsiębiorstw
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Idź do Blankiety firmowe
DocType: Item Supplier,Item Supplier,Dostawca
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Wszystkie adresy
DocType: Company,Stock Settings,Ustawienia magazynu
@@ -3294,6 +3299,7 @@
DocType: Company,Default Inventory Account,Domyślne konto zasobów reklamowych
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Wiersz {0}: Zakończony Ilość musi być większa od zera.
DocType: Antibiotic,Antibiotic Name,Nazwa antybiotyku
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kod towaru> Grupa produktów> Marka
DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Wybierz typ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Łącze do wszystkich jednostek lądowych, w których rośnie uprawa"
@@ -3489,6 +3495,7 @@
DocType: Supplier,Credit Limit,
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Śr. Wskaźnik cen sprzedaży
DocType: Production Plan Sales Order,Salse Order Date,Salse Data zamówienia
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dostawca> Dostawca Typ
DocType: Salary Component,Salary Component,Wynagrodzenie Komponent
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Wpisy płatności {0} są un-linked
DocType: GL Entry,Voucher No,Nr Podstawy księgowania
@@ -3498,7 +3505,7 @@
DocType: Leave Allocation,Leave Allocation,
DocType: Payment Request,Recipient Message And Payment Details,Odbiorca wiadomości i szczegóły płatności
DocType: Training Event,Trainer Email,Trener email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,
DocType: Restaurant Reservation,No of People,Liczba osób
DocType: Production Planning Tool,Include sub-contracted raw materials,Obejmują surowce podwykonawstwa
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Szablon z warunkami lub umową.
@@ -3564,7 +3571,7 @@
DocType: Production Planning Tool,Create Material Requests,
DocType: Employee Education,School/University,Szkoła/Uniwersytet
DocType: Payment Request,Reference Details,Szczegóły odniesienia
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Oczekiwana wartość Po okres użytkowania może być mniejsza niż brutto Kwota do zapłaty
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Oczekiwana wartość Po okres użytkowania może być mniejsza niż brutto Kwota do zapłaty
DocType: Sales Invoice Item,Available Qty at Warehouse,Ilość dostępna w magazynie
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Ilość Rozliczenia
DocType: Asset,Double Declining Balance,Podwójne Bilans Spadek
@@ -3576,7 +3583,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Informuj o aktualizacjach
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Rachunek {2} nie należy do firmy {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Wybierz co najmniej jedną wartość z każdego z atrybutów.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Zamówienie produktu {0} jest anulowane lub wstrzymane
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Zamówienie produktu {0} jest anulowane lub wstrzymane
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Zarządzanie urlopami
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupuj według konta
DocType: Sales Order,Fully Delivered,Całkowicie dostarczono
@@ -3587,14 +3594,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Wypłacona kwota nie może być wyższa niż Kwota kredytu {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Przejdź do Programów
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Wiersz {0} # Przydzielona kwota {1} nie może być większa od kwoty nieodebranej {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Proszę ustawić serię numerów dla Obecności za pośrednictwem Setup> Numbering Series
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Produkcja Zamówienie nie stworzył
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nie można zmienić status studenta {0} jest powiązany z aplikacją studentów {1}
DocType: Asset,Fully Depreciated,pełni zamortyzowanych
,Stock Projected Qty,Przewidywana ilość zapasów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Zaznaczona Obecność HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Notowania są propozycje, oferty Wysłane do klientów"
DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
@@ -3679,7 +3685,7 @@
DocType: Stock Settings,Item Naming By,Element Nazwy przez
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Kolejny okres Zamknięcie Wejście {0} została wykonana po {1}
DocType: Production Order,Material Transferred for Manufacturing,Materiał Przeniesiony do Produkowania
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} nie istnieje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Konto {0} nie istnieje
DocType: Project,Project Type,Typ projektu
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Dla tego zadania istnieje zadanie podrzędne. Nie możesz usunąć tego zadania.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Wymagana jest ilość lub kwota docelowa
@@ -3782,11 +3788,11 @@
DocType: Company,Asset Depreciation Cost Center,Zaleta Centrum Amortyzacja kosztów
DocType: Sales Order Item,Sales Order Date,Data Zlecenia
DocType: Sales Invoice Item,Delivered Qty,Dostarczona Liczba jednostek
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Total Excl. Podatek
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jeśli zaznaczone, wszystkie dzieci z każdej pozycji produkcyjnej zostaną zawarte w materiale żądań."
DocType: Assessment Plan,Assessment Plan,Plan oceny
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Utworzono klienta {0}.
DocType: Stock Settings,Limit Percent,Limit Procent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Proszę ustawić Instruktorski System Nazw w Edukacji> Ustawienia edukacyjne
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Obecnie brak dostępnych zasobów w magazynach
,Payment Period Based On Invoice Date,Termin Płatności oparty na dacie faktury
DocType: Sample Collection,No. of print,Liczba wydruków
@@ -3802,12 +3808,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Dłużnicy ({0})
DocType: Pricing Rule,Margin,
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nowi klienci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Zysk brutto%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Zysk brutto%
DocType: Appraisal Goal,Weightage (%),Waga/wiek (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Zmień profil POS
DocType: Bank Reconciliation Detail,Clearance Date,Data Czystki
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Sprawozdanie z oceny
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Zakup Kwota brutto jest obowiązkowe
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Zakup Kwota brutto jest obowiązkowe
DocType: Lead,Address Desc,Opis adresu
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Partia jest obowiązkowe
DocType: Journal Entry,JV-,V-
@@ -3839,7 +3845,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stały Nazwa
DocType: Stock Entry,Customer or Supplier Details,Klienta lub dostawcy Szczegóły
DocType: Employee Loan Application,Required by Date,Wymagane przez Data
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Bilans zamknięcia (Dr - Cr)
DocType: Lead,Lead Owner,Właściciel Tropu
DocType: Bin,Requested Quantity,Oczekiwana ilość
DocType: Patient,Marital Status,Stan cywilny
@@ -3853,7 +3858,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Wiele wariantów
DocType: Sales Invoice,Against Income Account,Konto przychodów
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dostarczono
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Zamówione szt {1} nie może być mniejsza niż minimalna Ilość zamówień {2} (określonego w pkt).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Zaloguj się jako inny użytkownik.
DocType: Territory,Territory Targets,Cele Regionalne
@@ -3954,7 +3959,7 @@
DocType: Serial No,Out of AMC,
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Stwórz Wizytę Konserwacji
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
DocType: Company,Default Cash Account,Domyślne Konto Gotówkowe
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Informacje o własnej firmie.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Jest to oparte na obecności tego Studenta
@@ -4106,7 +4111,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Brak pracowników dla wymienionych kryteriów
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
DocType: Restaurant,Default Customer,Domyślny klient
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Proszę ustawić system nazewnictwa pracownika w dziale Zasoby ludzkie> Ustawienia HR
DocType: Assessment Plan,Supervisor Name,Nazwa Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nie potwierdzaj, czy spotkanie zostanie utworzone na ten sam dzień"
DocType: Program Enrollment Course,Program Enrollment Course,Kurs rejestracyjny programu
@@ -4229,7 +4233,7 @@
DocType: BOM,Website Description,Opis strony WWW
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Zmiana netto w kapitale własnym
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnowszy
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adres e-mail musi być unikalny, istnieje już dla {0}"
DocType: Serial No,AMC Expiry Date,AMC Data Ważności
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Paragon
@@ -4246,7 +4250,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Raport kasowy
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kwota kredytu nie może przekroczyć maksymalna kwota kredytu o {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Proszę wybrać Przeniesienie jeżeli chcesz uwzględnić balans poprzedniego roku rozliczeniowego do tego roku rozliczeniowego
DocType: GL Entry,Against Voucher Type,Rodzaj dowodu
DocType: Physician,Phone (R),Telefon (R)
@@ -4258,7 +4262,7 @@
DocType: Patient,B Negative,B Negatywne
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Stan konserwacji musi zostać anulowany lub uzupełniony do przesłania
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} nie należy do firmy {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Numery seryjne w wierszu {0} nie pasują do opisu dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Numery seryjne w wierszu {0} nie pasują do opisu dostawy
DocType: Student,Guardian Details,Szczegóły Stróża
DocType: C-Form,C-Form,
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Zaznacz Obecność dla wielu pracowników
@@ -4300,7 +4304,7 @@
DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
DocType: Training Event,Exam,Egzamin
DocType: Complaint,Complaint,Skarga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
DocType: Patient,Alcohol Past Use,Alkohol w przeszłości
DocType: Fertilizer Content,Fertilizer Content,Zawartość nawozu
@@ -4429,6 +4433,7 @@
DocType: Salary Detail,Formula,Formuła
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Seryjny #
DocType: Lab Test Template,Lab Test Template,Szablon testu laboratoryjnego
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Konto sprzedaży
DocType: Purchase Invoice Item,Total Weight,Waga całkowita
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Prowizja od sprzedaży
DocType: Offer Letter Term,Value / Description,Wartość / Opis
@@ -4587,7 +4592,7 @@
DocType: Customer,From Lead,Od śladu
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Zamówienia puszczone do produkcji.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
DocType: Program Enrollment Tool,Enroll Students,zapisać studentów
DocType: Lab Test,Approved Date,Zatwierdzona data
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard sprzedaży
@@ -4664,7 +4669,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Pozycja Produkcja
,Employee Information,Informacja o pracowniku
DocType: Stock Entry Detail,Additional Cost,Dodatkowy koszt
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,
DocType: Quality Inspection,Incoming,Przychodzące
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Definiowane są domyślne szablony podatkowe dla sprzedaży i zakupu.
@@ -4681,7 +4686,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Uwaga: {0}
,Delivery Note Trends,Trendy Dowodów Dostawy
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Podsumowanie W tym tygodniu
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Ilość w magazynie
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Ilość w magazynie
DocType: Delivery Trip,Calculate Estimated Arrival Times,Oblicz szacowany czas przyjazdu
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} może być aktualizowana tylko przez operacje magazynowe
DocType: Student Group Creation Tool,Get Courses,Uzyskaj kursy
@@ -4697,7 +4702,7 @@
DocType: Material Request,% Ordered,% Zamówione
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Dla Grupy Studenckiej na Kursie kurs zostanie sprawdzony dla każdego Uczestnika z zapisanych kursów w ramach Rejestracji Programu.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Praca akordowa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Średnia. Kupno Cena
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Średnia. Kupno Cena
DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
DocType: Employee,History In Company,Historia Firmy
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nowa wiadomość od {sender}
@@ -4745,7 +4750,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Wiersz {0}: Waluta BOM # {1} powinna być równa wybranej walucie {2}
DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
DocType: Patient,Additional information regarding the patient,Dodatkowe informacje dotyczące pacjenta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
DocType: Homepage,Tag Line,tag Linia
DocType: Fee Component,Fee Component,opłata Komponent
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
@@ -4960,7 +4965,7 @@
DocType: Employee Education,Employee Education,Wykształcenie pracownika
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplikat grupę pozycji w tabeli grupy produktów
DocType: Land Unit,Parent Land Unit,Jednostka macierzysta
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
DocType: Fertilizer,Fertilizer Name,Nazwa nawozu
DocType: Salary Slip,Net Pay,Stawka Netto
DocType: Account,Account,Konto
@@ -5039,7 +5044,7 @@
DocType: Item Customer Detail,Ref Code,Ref kod
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Grupa klientów jest wymagana w profilu POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekordy pracownika.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Proszę ustawić Następny Amortyzacja Data
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Proszę ustawić Następny Amortyzacja Data
DocType: HR Settings,Payroll Settings,Ustawienia Listy Płac
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Łączenie faktur z płatnościami
DocType: POS Settings,POS Settings,Ustawienia POS
@@ -5207,7 +5212,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
DocType: Asset Maintenance Task,Last Completion Date,Ostatnia data ukończenia
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od ostatniego zamówienia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
DocType: Buying Settings,Naming Series,Seria nazw
DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Data rozpoczęcia ubezpieczenia powinna być mniejsza niż data zakończenia ubezpieczenia
@@ -5338,6 +5343,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Uzyskaj Wpisy płatności
DocType: Quotation Item,Against Docname,
DocType: SMS Center,All Employee (Active),Wszyscy pracownicy (aktywni)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klient> Grupa klientów> Terytorium
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobacz teraz
DocType: BOM,Raw Material Cost,Koszt surowców
DocType: Item Reorder,Re-Order Level,Próg ponowienia zamówienia
@@ -5438,7 +5444,6 @@
DocType: Room,Seating Capacity,Liczba miejsc
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Grupy testów laboratoryjnych
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klient> Grupa klientów> Terytorium
DocType: Project,Total Expense Claim (via Expense Claims),Łączny koszt roszczenie (przez zwrot kosztów)
DocType: GST Settings,GST Summary,Podsumowanie GST
DocType: Assessment Result,Total Score,Całkowity wynik
@@ -5452,7 +5457,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Utworzono harmonogramy kursów
DocType: Journal Entry,Total Debit,Całkowita kwota debetu
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Magazyn wyrobów gotowych domyślne
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sprzedawca
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sprzedawca
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budżet i MPK
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Wielokrotny domyślny tryb płatności nie jest dozwolony
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,dla
@@ -5628,7 +5633,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Rozwać Podatek albo Opłatę za
DocType: Driver,Driving License Category,Kategoria prawa jazdy
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualnie posiada pozycję {1} Karty wyników dostawcy, a zlecenia kupna dostawcy powinny być wydawane z ostrożnością."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualnie posiada pozycję {1} Karty wyników dostawcy, a zlecenia kupna dostawcy powinny być wydawane z ostrożnością."
DocType: Asset Maintenance Team,Asset Maintenance Team,Zespół ds. Utrzymania aktywów
DocType: Employee Loan,Loan Type,Rodzaj kredytu
DocType: Scheduling Tool,Scheduling Tool,Narzędzie Scheduling
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index f859088..45c1298 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,د قیمت په اساس ترتیب کړئ
,Delay Days,ناوخته ورځ
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,خدمتونو د اخراجاتو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,صورتحساب
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,د ساتلو د ذخیرې انټرنټ جوړ کړئ
DocType: Purchase Invoice Item,Item Weight Details,د وزن وزن توضیحات
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ماخذ: {0}، شمیره کوډ: {1} او پيرودونکو: {2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,کيلوګرام
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,د دنده پرانيستل.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM د فرعي قرارداد کولو توکي لپاره {0} د صفر {1} لپاره مشخص نه دی
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM د فرعي قرارداد کولو توکي لپاره {0} د صفر {1} لپاره مشخص نه دی
DocType: Item Attribute,Increment,بهرمن
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,د وخت موده
apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,وټاکئ ګدام ...
@@ -149,7 +149,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},لپاره نه اجازه {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,له توکي ترلاسه کړئ
DocType: Price List,Price Not UOM Dependant,بیه د UOM پرځای نه ده
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},د محصول د {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,هیڅ توکي لست
DocType: Asset Repair,Error Description,تېروتنه
@@ -157,7 +157,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,دغذا
DocType: Quality Inspection Reading,Reading 1,لوستلو 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,د تقاعد د بسپنو
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
DocType: Crop,Perennial,پیړۍ
DocType: Consultation,Consultation Date,د مشورې نیټه
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,د محصول لیست او د ERPNext کاروونکو لپاره پلټنه
@@ -172,7 +172,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",د بيلګې په توګه: "لومړنی ښوونځی" یا "پوهنتون"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,دحمل راپورونه
DocType: Warehouse,Warehouse Detail,ګدام تفصیلي
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پای نیټه نه وروسته د کال د پای د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","آیا ثابته شتمني" کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
DocType: Delivery Trip,Departure Time,د روانېدو وخت
@@ -192,7 +192,7 @@
DocType: Quality Inspection,Get Specification Details,ترلاسه کړئ د ځانګړتیاوو په بشپړه توګه کتل
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,د عرضه کوونکي موقف نمونه.
DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,د پرانستلو
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,د پرانستلو
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},څخه د {0} د {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,د مالیې په ټاکلو کې پاتې راغلل
DocType: Item,Copy From Item Group,کاپي له قالب ګروپ
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,روان شو هر کال
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,د کتارونو تر {0}: مهرباني وکړئ وګورئ 'آیا پرمختللی' حساب په وړاندې د {1} که دا د يو داسې پرمختللي ننوتلو ده.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},ګدام {0} نه شرکت سره تړاو نه لري {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},ګدام {0} نه شرکت سره تړاو نه لري {1}
DocType: Email Digest,Profit & Loss,ګټه او زیان
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,ني
DocType: Task,Total Costing Amount (via Time Sheet),Total لګښت مقدار (د وخت پاڼه له لارې)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,دا د دې شرکت په وړاندې د راکړې ورکړې پر بنسټ دی. د جزیاتو لپاره لاندې مهال ویش وګورئ
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,د اتومات د موادو غوښتنه رامنځته کېدو له امله دبرېښنا ليک خبر
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,مقاومت
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,مشوره
DocType: Journal Entry,Multi Currency,څو د اسعارو
DocType: Opening Invoice Creation Tool,Invoice Type,صورتحساب ډول
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,د سپارنې پرمهال یادونه
@@ -531,7 +532,6 @@
DocType: Employee,Widowed,کونډې
DocType: Request for Quotation,Request for Quotation,لپاره د داوطلبۍ غوښتنه
DocType: Healthcare Settings,Require Lab Test Approval,د لابراتوار ازموینې ته اړتیا
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,د توکو کود> توکي ګروپ> برنامه
DocType: Salary Slip Timesheet,Working Hours,کار ساعتونه
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,بشپړ شوی
DocType: Naming Series,Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.
@@ -560,7 +560,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لطفا لګښت مرکز ته ننوځي
DocType: Drug Prescription,Dosage,ډوډۍ
DocType: Journal Entry Account,Sales Order,خرڅلاو نظم
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. د پلورلو نرخ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. د پلورلو نرخ
DocType: Assessment Plan,Examiner Name,Examiner نوم
DocType: Lab Test Template,No Result,نه د پايلو
DocType: Purchase Invoice Item,Quantity and Rate,کمیت او Rate
@@ -609,6 +609,7 @@
DocType: Payroll Entry,Select Payroll Period,انتخاب د معاشاتو د دورې
DocType: Purchase Invoice,Unpaid,معاش
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,خرڅلاو لپاره خوندي دي
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,مهرباني وکړئ د بشري منابعو> بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
DocType: Packing Slip,From Package No.,له مجموعې شمیره
DocType: Item Attribute,To Range,ته Range
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,امنيت او د سپما
@@ -633,11 +634,11 @@
DocType: Training Event,Workshop,د ورکشاپ
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,د پیرودونکو لارښوونه وڅېړئ
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,لست د خپل پېرېدونکي يو څو. هغوی کولی شي، سازمانونو یا وګړو.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,بس برخي د جوړولو
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,بس برخي د جوړولو
DocType: POS Profile User,POS Profile User,د پی ایس پی پی ایل کارن
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,مستقيم عايداتو
DocType: Patient Appointment,Date TIme,نیټه او وخت
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",نه په حساب پر بنسټ کولای شي Filter، که د حساب ګروپ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",نه په حساب پر بنسټ کولای شي Filter، که د حساب ګروپ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,اداري مامور
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,د شرکت او مالیاتو ترتیب کول
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
@@ -648,7 +649,7 @@
DocType: Stock Entry Detail,Difference Account,توپير اکانټ
DocType: Purchase Invoice,Supplier GSTIN,عرضه GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,نږدې دنده په توګه خپل دنده پورې تړلې {0} تړلي نه ده نه شي کولای.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
DocType: Production Order,Additional Operating Cost,اضافي عملياتي لګښت
DocType: Lab Test Template,Lab Routine,لابراتوار
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,د سينګار
@@ -819,7 +820,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,سره د اړیکو Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مدير
DocType: Payment Entry,Payment From / To,د پیسو له / د
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},مهرباني وکړئ په ګودام کې حساب ورکړئ {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'پر بنسټ' او 'ډله په' کولای شي په څېر نه وي
DocType: Sales Person,Sales Person Targets,خرڅلاو شخص موخې
@@ -830,7 +831,7 @@
DocType: Student Batch Name,Batch Name,دسته نوم
DocType: Fee Validity,Max number of visit,د کتنې ډیره برخه
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet جوړ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,کې شامل کړي
DocType: GST Settings,GST Settings,GST امستنې
DocType: Selling Settings,Customer Naming By,پيرودونکو نوم By
@@ -957,7 +958,7 @@
DocType: Budget,Budget Against,د بودجې پر وړاندې د
DocType: Employee,Cell Number,ګرځنده شمیره
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,د ورکړل شوي معیارونو لپاره هیڅ کارمند نشته. وګورۍ چې د معاش سلپسونه لا دمخه ندي رامینځته شوي.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,د موټرونو د موادو غوښتنه تولید شوی
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,د موټرونو د موادو غوښتنه تولید شوی
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,له لاسه
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,تاسې کولای شی نه په اوسنیو کوپون 'پر وړاندې د ژورنال انفاذ' کالم ننوځي
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,د توليدي خوندي دي
@@ -965,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,د انرژۍ د
DocType: Opportunity,Opportunity From,فرصت له
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,میاشتنی معاش خبرپاڼه.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,د {0}: {1} سیریل شمېره د 2 {2} لپاره اړین ده. تاسو {3} چمتو کړی.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,د {0}: {1} سیریل شمېره د 2 {2} لپاره اړین ده. تاسو {3} چمتو کړی.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,مهرباني وکړئ یو میز انتخاب کړئ
DocType: BOM,Website Specifications,وېب پاڼه ځانګړتیاو
DocType: Special Test Items,Particulars,درسونه
@@ -1032,7 +1033,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,غوښتل شوی غوښتنه
DocType: Vital Signs,Heart Rate / Pulse,د زړه درجه / پلس
DocType: Company,Default Bank Account,Default بانک حساب
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پر بنسټ د ګوند چاڼ، غوره ګوند د لومړي ډول
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",پر بنسټ د ګوند چاڼ، غوره ګوند د لومړي ډول
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'تازه دحمل' چک نه شي ځکه چې توکي له لارې ونه وېشل {0}
DocType: Vehicle,Acquisition Date,د استملاک نېټه
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,وځيري
@@ -1057,7 +1058,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),خپل خط سر ته پورته کړئ (دا ویب دوستانه د 900px په 100px سره وساتئ)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} د {1}: Account {2} نه شي کولای د يو ګروپ وي
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,د قالب د کتارونو تر {idx}: {doctype} {docname} په پورته نه شته '{doctype}' جدول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,نه دندو
DocType: Item Variant Settings,Copy Fields to Variant,د ویډیو لپاره کاپی ډګرونه
DocType: Asset,Opening Accumulated Depreciation,د استهلاک د پرانيستلو
@@ -1169,9 +1170,10 @@
DocType: Production Order,Plan material for sub-assemblies,فرعي شوراګانو لپاره پلان مواد
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,خرڅلاو همکارانو او خاوره
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,هیښ {0} بايد فعال وي
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),تړل (کلینګ + ټول)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),تړل (کلینګ + ټول)
DocType: Journal Entry,Depreciation Entry,د استهالک د داخلولو
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,مهرباني وکړئ لومړی انتخاب سند ډول
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,په حساب حساب کې چاپ کړه
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغوه مواد ليدنه {0} بندول د دې د ساتنې سفر مخکې
DocType: Crop Cycle,ISO 8016 standard,د ISO 8016 معیارونه
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},شعبه {0} نه د قالب سره تړاو نه لري {1}
@@ -1196,7 +1198,7 @@
DocType: Supplier,Default Payable Accounts,Default د راتلوونکې حسابونه
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
DocType: Fee Structure,Components,د اجزاو
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,د قالب تانبه {0} تازه
DocType: Quality Inspection Reading,Reading 6,لوستلو 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1248,6 +1250,7 @@
,Company Name,دکمپنی نوم
DocType: SMS Center,Total Message(s),Total پيغام (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,د انتقال انتخاب د قالب
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup> ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
DocType: Purchase Invoice,Additional Discount Percentage,اضافي کمښت سلنه
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ښکاره د په مرسته د ټولو ویډیوګانو يو لست
DocType: Agriculture Analysis Criteria,Soil Texture,د خاوری جوړښت
@@ -1276,7 +1279,7 @@
DocType: BOM Website Item,BOM Website Item,هیښ وېب پاڼه شمیره
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,پورته ستاسو لیک مشر او لوګو. (کولی شئ چې وروسته د سمولو لپاره).
DocType: Timesheet Detail,Bill,بیل
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,سپین
DocType: SMS Center,All Lead (Open),ټول کوونکۍ (خلاص)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),د کتارونو تر {0}: Qty لپاره نه {4} په ګودام {1} د ننوتلو وخت امخ د ({2} {3})
@@ -1293,7 +1296,7 @@
DocType: Lead,Next Contact Date,بل د تماس نېټه
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,پرانيستل Qty
DocType: Healthcare Settings,Appointment Reminder,د استیناف یادونې
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
DocType: Program Enrollment Tool Student,Student Batch Name,د زده کونکو د دسته نوم
DocType: Consultation,Doctor,ډاکټر
DocType: Holiday List,Holiday List Name,رخصتي بشپړفهرست نوم
@@ -1309,6 +1312,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,پريږدئ تخصيص اوزار
DocType: Item,Hub Category to Publish,د خپرېدو نېټه:
DocType: Leave Block List,Leave Block List Dates,بالک بشپړفهرست نیټی څخه ووځي
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,مهرباني وکړئ د سیٹ اپ> شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
DocType: Sales Invoice,Billing Address GSTIN,د بلنگ پته GSTIN
DocType: Assessment Plan,Evaluate,ارزونه
DocType: Workstation,Net Hour Rate,خالص قيامت Rate
@@ -1343,7 +1347,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,خرڅلاو صورتحساب د پیسو
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,په خرڅلاو نظم / د بشپړو شویو جنسونو ګدام خوندي دي ګدام
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,پلورل مقدار
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,پلورل مقدار
DocType: Repayment Schedule,Interest Amount,په زړه مقدار
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,تاسو د دې ریکارډ د اخراجاتو Approver. لطفا د 'حالت او د Save اوسمهالی
DocType: Serial No,Creation Document No,خلقت Document No
@@ -1436,7 +1440,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,پرانيستل محاسبې بیلانس
,GST Sales Register,GST خرڅلاو د نوم ثبتول
DocType: Sales Invoice Advance,Sales Invoice Advance,خرڅلاو صورتحساب پرمختللی
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,هېڅ غوښتنه
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,هېڅ غوښتنه
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,خپل ډومین انتخاب کړئ
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},بل د بودجې د ریکارډ '{0}' لا د وړاندې موجود {1} '{2}' مالي کال لپاره د {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ساحې به یوازې د جوړونې په وخت کې کاپي شي.
@@ -1446,11 +1450,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",دا به د د variant د قالب کوډ appended شي. د بیلګې په توګه، که ستا اختصاري دی "SM"، او د توکي کوډ دی "T-کميس"، د variant توکی کوډ به "T-کميس-SM"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,خالص د معاشونو (په لفظ) به د ليدو وړ وي. هر کله چې تاسو د معاش ټوټه وژغوري.
DocType: Purchase Invoice,Is Return,آیا بیرته
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,احتیاط
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,احتیاط
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,بیرته / ګزارې يادونه
DocType: Price List Country,Price List Country,بیې په لېست کې د هېواد
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} لپاره د قالب د اعتبار وړ سریال ترانسفارمرونو د {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} لپاره د قالب د اعتبار وړ سریال ترانسفارمرونو د {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,د قالب قانون د سریال شمیره بدلون نه شي کولای
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM د تغیر فکتور
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,لطفا شمیره کود داخل ته د بستې شمېره تر لاسه
@@ -1554,7 +1558,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
DocType: Supplier Scorecard,Warn for new Request for Quotations,د کوډونو لپاره د نوی غوښتنه لپاره خبردارۍ
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,رانيول امر تاسو سره مرسته پلان او ستاسو د اخیستلو تعقيب
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,د لابراتوار ازموینه
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",په مادي غوښتنه د Issue / انتقال مجموعي مقدار {0} د {1} \ نه غوښتنه کمیت لپاره د قالب {2} څخه ډيره وي {3}
@@ -1592,7 +1596,6 @@
DocType: Warehouse,Warehouse Contact Info,ګدام تماس پيژندنه
DocType: Payment Entry,Write Off Difference Amount,ولیکئ پړاو بدلون مقدار
DocType: Volunteer,Volunteer Name,رضاکار نوم
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,مهرباني وکړئ په تعلیم کې د ښوونکي د نومونې سیسټم جوړ کړئ> د زده کړې ترتیبات
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
DocType: Item,Foreign Trade Details,د بهرنیو چارو د سوداګرۍ نورولوله
,Assessment Plan Status,د ارزونې پلان حالت
@@ -1604,7 +1607,7 @@
DocType: Student Group Student,Group Roll Number,ګروپ رول شمیره
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,د قالب {0} باید یو فرعي قرارداد د قالب وي
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,پلازمیینه تجهیزاتو
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",د بیې د حاکمیت لومړی پر بنسټ ټاکل 'Apply د' ډګر، چې کولای شي د قالب، د قالب ګروپ یا نښې وي.
@@ -1629,7 +1632,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,د ماشومانو د ګدام د دې ګودام موجود دی. تاسو نه شي کولای د دې ګودام ړنګول.
DocType: Item,Website Item Groups,وېب پاڼه د قالب ډلې
DocType: Purchase Invoice,Total (Company Currency),Total (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,سریال {0} ننوتل څخه یو ځل بیا
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,سریال {0} ننوتل څخه یو ځل بیا
DocType: Journal Entry,Journal Entry,په ورځپانه کی ثبت شوی مطلب
DocType: Expense Claim Advance,Unclaimed amount,نا اعلان شوي مقدار
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} په پرمختګ توکي
@@ -1726,7 +1729,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,د مخابراتو يادښت.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",لپاره د داوطلبۍ د غوښتنې له تانبه ته لاسرسی ناچارن شوی، د زياتو چک تانبه امستنې.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,د سپریري کرایه کارونې متغیر سکریټ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,د خريداري مقدار
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,د خريداري مقدار
DocType: Sales Invoice,Shipping Address Name,استونې پته نوم
DocType: Material Request,Terms and Conditions Content,د قرارداد شرايط منځپانګه
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,د غلطۍ شتون شتون لري د کورس مهال ویش جوړول
@@ -1989,7 +1992,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,دا په دې د موټرو پر وړاندې د يادښتونه پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
DocType: Customer,Default Price List,Default د بیې په لېست
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,تاسې کولای شی نه ړنګول مالي کال {0}. مالي {0} کال په توګه په نړیوال امستنې default ټاکل
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,یو ورته پیرود چې ورته نوم یې شتون لري لا دمخه لا شتون لري
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,دا به د معاش سلپس وسپاري او د ثانوي ژورنال ننوتنې چمتو کړي. ایا تاسو غواړئ چې پرمختګ وکړئ؟
@@ -2003,6 +2006,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,د بیې
DocType: Quotation,Term Details,اصطلاح په بشپړه توګه کتل
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,په پرتله {0} د زده کوونکو لپاره له دغه زده ډلې نور شامل نه شي.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),ټول (د مالیې پرته)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,اداره کوونکۍ سازمان د شمېرنې
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,اداره کوونکۍ سازمان د شمېرنې
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} بايد په پرتله ډيره وي 0
@@ -2023,7 +2027,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,د صورتحساب د فسخ کولو د پیسو Unlink
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},اوسني Odometer لوستلو ته ننوتل بايد لومړنۍ د موټرو Odometer څخه ډيره وي {0}
DocType: Restaurant Reservation,No Show,نه ښکاره ول
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup> ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
DocType: Shipping Rule Country,Shipping Rule Country,انتقال د حاکمیت د هېواد
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,پريږدئ او د حاضرۍ
DocType: Maintenance Visit,Partially Completed,تر یوه بریده بشپړ شوي
@@ -2115,7 +2118,7 @@
DocType: Student Group Instructor,Student Group Instructor,د زده کوونکو د ډلې د لارښوونکي
DocType: Grant Application,Assessment Mark (Out of 10),د ارزونې نښه (له 10 څخه بهر)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 د موبايل په هيڅ
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,اصلي
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,اصلي
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variant
DocType: Naming Series,Set prefix for numbering series on your transactions,چې د خپلې راکړې ورکړې شمیر لړ جوړ مختاړی
DocType: Employee Attendance Tool,Employees HTML,د کارکوونکو د HTML
@@ -2165,7 +2168,7 @@
DocType: Course,Course Abbreviation,کورس Abbreviation
DocType: Student Leave Application,Student Leave Application,د زده کوونکو ته لاړل کاریال
DocType: Item,Will also apply for variants,به هم د بېرغونو درخواست
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارکوونکی د {0} په نيمه ورځ په {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Total کار ساعتونو کې باید په پرتله max کار ساعتونو زيات نه وي {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,د
@@ -2352,9 +2355,10 @@
DocType: Task,Actual End Date (via Time Sheet),واقعي د پای نیټه (د وخت پاڼه له لارې)
DocType: Soil Texture,Soil Type,د خاوری ډول
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,نوی پیغام
,Quotation Trends,د داوطلبۍ رجحانات
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},د قالب ګروپ نه د توکی په توکی بادار ذکر {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
DocType: Shipping Rule,Shipping Amount,انتقال مقدار
DocType: Supplier Scorecard Period,Period Score,د دورې کچه
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,پېرېدونکي ورزیات کړئ
@@ -2365,7 +2369,7 @@
,Vehicle Expenses,موټر داخراجاتو
DocType: Serial No,Invoice Details,صورتحساب نورولوله
DocType: Grant Application,Show on Website,په ویب پاڼه کې ښودل
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,پېل کول
DocType: Hub Category,Hub Category,حب کټګوري
DocType: Purchase Invoice,SEZ,SEZ
@@ -2397,7 +2401,7 @@
DocType: Patient,B Positive,B مثبت
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
DocType: Leave Block List Allow,Leave Block List Allow,پريږدئ بالک بشپړفهرست اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
DocType: Patient Medical Record,Patient Medical Record,د ناروغ درملنه
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,د غیر ګروپ ګروپ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,لوبې
@@ -2448,6 +2452,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,نشي کولی د ترلاسه شوي آر ایف پی ترلاسه کولو لپاره هیڅ معرفي نه کړي
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Total Deduction
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,د حساب په چاپیریال کې د چاپ کولو لپاره یو حساب وټاکئ
,Production Analytics,تولید کړي.
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,دا د دې ناروغۍ په وړاندې د راکړې ورکړې پر بنسټ والړ دی. د جزیاتو لپاره لاندې مهال ویش وګورئ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,لګښت Updated
@@ -2503,7 +2508,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,وټاکئ شرکت ...
DocType: Leave Control Panel,Leave blank if considered for all departments,خالي پريږدئ که د ټولو څانګو په پام کې
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
DocType: Payroll Entry,Fortnightly,جلالت
DocType: Currency Exchange,From Currency,څخه د پیسو د
DocType: Vital Signs,Weight (In Kilogram),وزن (کلوگرام)
@@ -2581,7 +2586,7 @@
DocType: Student,Guardians,ساتونکو
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,بيې به که بیې په لېست کې نه دی جوړ نه ښودل شي
DocType: Stock Entry,Total Incoming Value,Total راتلونکي ارزښت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ډیبیټ ته اړتيا ده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ډیبیټ ته اړتيا ده
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,رانيول بیې لېست
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,د عرضه کونکي سکورټ کارډ متغیرات.
@@ -2683,7 +2688,7 @@
apps/erpnext/erpnext/crm/doctype/lead/lead.py +51,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
DocType: Company,For Reference Only.,د ماخذ یوازې.
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,انتخاب دسته نه
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},باطلې {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},باطلې {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,حواله انو
@@ -2720,8 +2725,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",د عملیاتو، د عملیاتي مصارفو ليکئ او نه ستاسو په عملیاتو یو بې ساری عملياتو ورکړي.
DocType: Water Analysis,Origin,اصلي
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,دغه سند له خوا حد دی {0} د {1} لپاره توکی {4}. آیا تاسو د ورته په وړاندې د بل {3} {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,انتخاب بدلون اندازه حساب
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,انتخاب بدلون اندازه حساب
DocType: Purchase Invoice,Price List Currency,د اسعارو بیې لېست
DocType: Naming Series,User must always select,کارن بايد تل انتخاب
DocType: Stock Settings,Allow Negative Stock,د منفی دحمل اجازه
@@ -2777,7 +2782,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,د نویو پیرودونکو لپاره خبرداری
DocType: Quality Inspection Reading,Reading 9,لوستلو 9
DocType: Supplier,Is Frozen,ده ګنګل
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,ګروپ غوټه ګودام اجازه نه وي چې د معاملو وټاکئ
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,ګروپ غوټه ګودام اجازه نه وي چې د معاملو وټاکئ
DocType: Buying Settings,Buying Settings,د خريداري امستنې
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,لپاره د ختم ښه قالب هیښ شمیره
DocType: Upload Attendance,Attendance To Date,د نېټه حاضرۍ
@@ -2792,6 +2797,7 @@
DocType: Grant Application,Organization,سازمان د
DocType: BOM Update Tool,BOM Update Tool,د بوم تازه ډاټا
DocType: SG Creation Tool Course,Student Group Name,د زده کونکو د ډلې نوم
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,چاودیدونکي لید ښکاره کړئ
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,د فیس جوړول
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا باوري تاسو په رښتيا غواړئ چې د دې شرکت د ټولو معاملو کې د ړنګولو. ستاسو بادار ارقام به پاتې شي دا. دا عمل ناکړل نه شي.
DocType: Room,Room Number,کوټه شمېر
@@ -2802,7 +2808,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,د مالیې ټیکنالوژي جوړه کړئ
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,کارن فورم
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
DocType: Lab Test Sample,Lab Test Sample,د لابراتوار ازموینه
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,د چټک ژورنال انفاذ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,تاسو نه شي کولای کچه بدلون که هیښ agianst مواد یاد
@@ -2873,7 +2879,7 @@
DocType: Membership,USD,امریکايي ډالر
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,انوائس جوړ کړئ
DocType: Selling Settings,Auto close Opportunity after 15 days,د موټرونو په 15 ورځو وروسته نږدې فرصت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,د پیرود کارډونه د {1} د سایټ کارډ ولاړ کیدو له امله {0} ته اجازه نه لري.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,د پیرود کارډونه د {1} د سایټ کارډ ولاړ کیدو له امله {0} ته اجازه نه لري.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,د پای کال
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
@@ -2966,7 +2972,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-پورته
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,د کتارونو تر # {0}: ژورنال انفاذ {1} نه ګڼون لری {2} يا لا نه خوری بل کوپون پر وړاندې د
DocType: Supplier Scorecard Criteria,Criteria Weight,معیارونه وزن
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,عرضه کوونکي> د عرضه کوونکي ډول
DocType: Buying Settings,Default Buying Price List,Default د خريداري د بیې په لېست
DocType: Payroll Entry,Salary Slip Based on Timesheet,معاش ټوټه پر بنسټ Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,د پیرودلو کچه
@@ -3056,7 +3061,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track له خوا د صنعت ډول ځای شوی.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,ليټر هير ته لاړ شه
DocType: Item Supplier,Item Supplier,د قالب عرضه
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ټول Addresses.
DocType: Company,Stock Settings,دحمل امستنې
@@ -3234,6 +3239,7 @@
DocType: Company,Default Inventory Account,Default موجودي حساب
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,د کتارونو تر {0}: بشپړ Qty باید له صفر څخه زیات وي.
DocType: Antibiotic,Antibiotic Name,د انټي بيوټي نوم
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,د توکو کود> توکي ګروپ> برنامه
DocType: Purchase Invoice,Apply Additional Discount On,Apply اضافي کمښت د
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,ډول وټاکئ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,د ټولو ځمکو واحدونو لپاره چې پکښې کرهنه وده کوي
@@ -3427,6 +3433,7 @@
DocType: Supplier,Credit Limit,پورونو د حد
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,اوسط. د نرخ لیست نرخ
DocType: Production Plan Sales Order,Salse Order Date,Salse نظم نېټه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,عرضه کوونکي> د عرضه کوونکي ډول
DocType: Salary Component,Salary Component,معاش برخه
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,د پیسو توکي {0} دي un-سره تړاو لري
DocType: GL Entry,Voucher No,کوپون نه
@@ -3436,7 +3443,7 @@
DocType: Leave Allocation,Leave Allocation,تخصیص څخه ووځي
DocType: Payment Request,Recipient Message And Payment Details,دترلاسه کوونکي پيغام او د پیسو په بشپړه توګه کتل
DocType: Training Event,Trainer Email,د روزونکي دبرېښنا ليک
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,مادي غوښتنې {0} جوړ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,مادي غوښتنې {0} جوړ
DocType: Restaurant Reservation,No of People,د خلکو شمیر
DocType: Production Planning Tool,Include sub-contracted raw materials,فرعي قرارداد خام مواد شامل دي
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,د شرایطو یا د قرارداد په کينډۍ.
@@ -3502,7 +3509,7 @@
DocType: Production Planning Tool,Create Material Requests,د موادو غوښتنه جوړول
DocType: Employee Education,School/University,ښوونځی / پوهنتون
DocType: Payment Request,Reference Details,ماخذ په بشپړه توګه کتل
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,د تمی وړ ارزښت ګټور ژوند وروسته باید Gross رانيول مقدار څخه لږ وي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,د تمی وړ ارزښت ګټور ژوند وروسته باید Gross رانيول مقدار څخه لږ وي
DocType: Sales Invoice Item,Available Qty at Warehouse,موجود Qty په ګدام
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,د بلونو د مقدار
DocType: Asset,Double Declining Balance,Double کموالی بیلانس
@@ -3514,7 +3521,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ترلاسه تازه خبرونه
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} د {1}: Account {2} کوي چې د دې شرکت سره تړاو نه لري {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,لږ تر لږه یو ځانګړتیاوې د هر صفتونو څخه غوره کړئ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,د موادو غوښتنه {0} دی لغوه یا ودرول
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,د موادو غوښتنه {0} دی لغوه یا ودرول
apps/erpnext/erpnext/config/hr.py +310,Leave Management,د مدیریت څخه ووځي
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,له خوا د حساب ګروپ
DocType: Sales Order,Fully Delivered,په بشپړه توګه وسپارل شول
@@ -3525,14 +3532,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ورکړل شوي مقدار نه شي کولای د پور مقدار زیات وي {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,پروګرامونو ته لاړ شئ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} تخصیص شوی رقم {1} د ناپیژندل شوی مقدار څخه ډیر نه وی. {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,مهرباني وکړئ د سیٹ اپ> شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},نظم لپاره د قالب اړتیا پیري {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,تولید نظم نه جوړ
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','له نېټه باید وروسته' ته د نېټه وي
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
DocType: Asset,Fully Depreciated,په بشپړه توګه راکم شو
,Stock Projected Qty,دحمل وړاندوینی Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,د پام وړ د حاضرۍ د HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",د داوطلبۍ دي وړانديزونه، د داوطلبۍ د خپل مشتريان تاسو ته ليږلي دي
DocType: Sales Order,Customer's Purchase Order,پيرودونکو د اخستلو امر
@@ -3617,7 +3623,7 @@
DocType: Stock Settings,Item Naming By,د قالب نوم By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},وروسته يو بل د دورې په تړلو انفاذ {0} شوی دی {1}
DocType: Production Order,Material Transferred for Manufacturing,د دفابريکي مواد سپارل
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ګڼون {0} نه شتون
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,ګڼون {0} نه شتون
DocType: Project,Project Type,د پروژې ډول
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,د دې دندې لپاره د ماشوم دندې شتون لري. تاسو دا کار نشي کولی.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,يا هدف qty يا هدف اندازه فرض ده.
@@ -3721,11 +3727,11 @@
DocType: Company,Asset Depreciation Cost Center,د شتمنيو د استهالک لګښت مرکز
DocType: Sales Order Item,Sales Order Date,خرڅلاو نظم نېټه
DocType: Sales Invoice Item,Delivered Qty,تحویلوونکی Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,ټوله اضافه. مالیه
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",که وکتل، د هر تولید توکي د ټولو ماشومانو به په مادي غوښتنې شامل شي.
DocType: Assessment Plan,Assessment Plan,د ارزونې پلان
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,پیرودونکی {0} جوړ شوی.
DocType: Stock Settings,Limit Percent,حد سلنه
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,مهرباني وکړئ په تعلیم کې د ښوونکي د نومونې سیسټم جوړ کړئ> د زده کړې ترتیبات
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,اوس مهال په کوم ګودام کې هیڅ ذخیره شتون نلري
,Payment Period Based On Invoice Date,د پیسو د دورې پر بنسټ د صورتحساب نېټه
DocType: Sample Collection,No. of print,د چاپ شمیره
@@ -3741,12 +3747,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),پوروړو ({0})
DocType: Pricing Rule,Margin,څنډی
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نوي پېرېدونکي
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,ټولټال ګټه ٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,ټولټال ګټه ٪
DocType: Appraisal Goal,Weightage (%),Weightage)٪ (
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,د POS پېژندل بدل کړئ
DocType: Bank Reconciliation Detail,Clearance Date,بېلوګډو چاڼېزو نېټه
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,د ارزونې راپور
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross رانيول مقدار الزامی دی
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross رانيول مقدار الزامی دی
DocType: Lead,Address Desc,د حل نزولی
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,ګوند الزامی دی
DocType: Journal Entry,JV-,JV-
@@ -3778,7 +3784,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,تړل نوم
DocType: Stock Entry,Customer or Supplier Details,پیرودونکي یا عرضه نورولوله
DocType: Employee Loan Application,Required by Date,د اړتیا له خوا نېټه
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),د تړلو بیلانس (ډاکټر - کر)
DocType: Lead,Lead Owner,سرب د خاوند
DocType: Bin,Requested Quantity,غوښتل شوي مقدار
DocType: Patient,Marital Status,مدني حالت
@@ -3792,7 +3797,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,ګڼ شمیر متغیرات
DocType: Sales Invoice,Against Income Account,په وړاندې پر عايداتو باندې حساب
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تحویلوونکی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,د قالب {0}: د سپارښتنې qty {1} نه نظم لږ تر لږه qty {2} (په قالب تعریف) په پرتله کمه وي.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,د قالب {0}: د سپارښتنې qty {1} نه نظم لږ تر لږه qty {2} (په قالب تعریف) په پرتله کمه وي.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,میاشتنی ویش سلنه
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,لطفا د بل کاروونکي په توګه ننوتل
DocType: Territory,Territory Targets,خاوره موخې
@@ -3893,7 +3898,7 @@
DocType: Serial No,Out of AMC,د AMC له جملې څخه
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
DocType: Company,Default Cash Account,Default د نقدو پیسو حساب
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,شرکت (نه پيرودونکو يا عرضه) بادار.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,دا د دې د زده کوونکو د ګډون پر بنسټ
@@ -4044,7 +4049,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,د ذکر شویو معیارونو لپاره هیڅ کارمندان نشته
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
DocType: Restaurant,Default Customer,اصلي پیرودونکی
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,مهرباني وکړئ د بشري منابعو> بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
DocType: Assessment Plan,Supervisor Name,څارونکي نوم
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,دا تایید نه کړئ که چیرې د ورته ورځې لپاره ټاکنې جوړې شي
DocType: Program Enrollment Course,Program Enrollment Course,پروګرام شمولیت کورس
@@ -4167,7 +4171,7 @@
DocType: BOM,Website Description,وېب پاڼه Description
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,په مساوات خالص د بدلون
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,نوي
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,رسيد
@@ -4184,7 +4188,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,منښتليک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,مهرباني غوره مخ په وړاندې ترسره کړي که تاسو هم غواړي چې عبارت دي د تېر مالي کال د توازن د دې مالي کال ته روان شو
DocType: GL Entry,Against Voucher Type,په وړاندې د ګټمنو ډول
DocType: Physician,Phone (R),تلیفون (R)
@@ -4196,7 +4200,7 @@
DocType: Patient,B Negative,B منفي
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,د ساتنې حالت باید فسخ شي یا بشپړ شي
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
DocType: Student,Guardian Details,د ګارډین په بشپړه توګه کتل
DocType: C-Form,C-Form,C-فورمه
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,د څو کارکوونکي مارک حاضريدل
@@ -4238,7 +4242,7 @@
DocType: Stock Entry Detail,Basic Amount,اساسي مقدار
DocType: Training Event,Exam,ازموينه
DocType: Complaint,Complaint,شکایت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
DocType: Leave Allocation,Unused leaves,ناکارېدلې پاڼي
DocType: Patient,Alcohol Past Use,الکولي پخوانی کارول
DocType: Fertilizer Content,Fertilizer Content,د سرې وړ منځپانګه
@@ -4367,6 +4371,7 @@
DocType: Salary Detail,Formula,فورمول
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,سریال #
DocType: Lab Test Template,Lab Test Template,د لابراتوار ازموینه
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,د پلور حساب
DocType: Purchase Invoice Item,Total Weight,ټول وزن
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,د کمیسیون په خرڅلاو
DocType: Offer Letter Term,Value / Description,د ارزښت / Description
@@ -4523,7 +4528,7 @@
DocType: Customer,From Lead,له کوونکۍ
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,امر د تولید لپاره د خوشې شول.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,مالي کال لپاره وټاکه ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
DocType: Program Enrollment Tool,Enroll Students,زده کوونکي شامل کړي
DocType: Lab Test,Approved Date,منظور شوی نیټه
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,معياري پلورل
@@ -4600,7 +4605,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,د توليد د قالب
,Employee Information,د کارګر معلومات
DocType: Stock Entry Detail,Additional Cost,اضافي لګښت
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",نه ګټمنو نه پر بنسټ کولای شي Filter، که ګروپ له خوا د ګټمنو
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",نه ګټمنو نه پر بنسټ کولای شي Filter، که ګروپ له خوا د ګټمنو
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
DocType: Quality Inspection,Incoming,راتلونکي
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,د پلور او اخیستلو لپاره د اصلي مالیې ټیکنالوژي جوړېږي.
@@ -4617,7 +4622,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},یادونه: {0}
,Delivery Note Trends,د سپارنې پرمهال يادونه رجحانات
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,دا اونۍ د لنډيز
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,په سټاک Qty
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,په سټاک Qty
DocType: Delivery Trip,Calculate Estimated Arrival Times,اټکل شوي را رسید ټایمز محاسبه کړئ
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ګڼون: {0} يوازې دحمل معاملې له لارې تازه شي
DocType: Student Group Creation Tool,Get Courses,کورسونه ترلاسه کړئ
@@ -4633,7 +4638,7 @@
DocType: Material Request,% Ordered,٪ د سپارښتنې
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",د کورس پر بنسټ د زده کوونکو د ډلې، د کورس لپاره به په پروګرام شموليت شامل کورسونه هر زده کوونکو اعتبار ورکړ شي.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. د خريداري Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. د خريداري Rate
DocType: Task,Actual Time (in Hours),واقعي وخت (په ساعتونه)
DocType: Employee,History In Company,تاریخ په شرکت
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},د {sender} څخه نوی پیغام
@@ -4681,7 +4686,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},د کتارونو تر {0}: د هیښ # د اسعارو د {1} بايد مساوي د ټاکل اسعارو وي {2}
DocType: Journal Entry Account,Exchange Rate,د بدلولو نرخ
DocType: Patient,Additional information regarding the patient,د ناروغ په اړه اضافي معلومات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
DocType: Homepage,Tag Line,Tag کرښې
DocType: Fee Component,Fee Component,فیس برخه
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,د بیړیو د مدیریت
@@ -4894,7 +4899,7 @@
DocType: Employee Education,Employee Education,د کارګر ښوونه
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,دوه ګونو توکی ډلې په توکی ډلې جدول کې وموندل
DocType: Land Unit,Parent Land Unit,د مور د ځمکې څانګه
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
DocType: Fertilizer,Fertilizer Name,د سرې نوم
DocType: Salary Slip,Net Pay,خالص د معاشونو
DocType: Account,Account,ګڼون
@@ -4972,7 +4977,7 @@
DocType: Item Customer Detail,Ref Code,دسرچینی یادونه کوډ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,د پیرودونکي ګروپ د POS پروفیور ته اړتیا لري
apps/erpnext/erpnext/config/hr.py +12,Employee records.,د کارګر اسناد.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
DocType: HR Settings,Payroll Settings,د معاشاتو په امستنې
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,غیر تړاو بلونه او د تادياتو لوبه.
DocType: POS Settings,POS Settings,POS ترتیبات
@@ -5140,7 +5145,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
DocType: Asset Maintenance Task,Last Completion Date,د پای بشپړولو نیټه
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ورځو راهیسې تېر نظم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
DocType: Buying Settings,Naming Series,نوم لړۍ
DocType: Leave Block List,Leave Block List Name,پريږدئ بالک بشپړفهرست نوم
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,د بيمې د پیل نیټه بايد د بيمې د پای نیټه په پرتله کمه وي
@@ -5269,6 +5274,7 @@
DocType: Bank Reconciliation,Get Payment Entries,د پیسو توکي ترلاسه کړئ
DocType: Quotation Item,Against Docname,Docname پر وړاندې د
DocType: SMS Center,All Employee (Active),ټول کارکوونکی (فعال)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,پیرودونکي> پیرودونکي ګروپ> ساحه
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ښکاره اوس
DocType: BOM,Raw Material Cost,لومړنیو توکو لګښت
DocType: Item Reorder,Re-Order Level,Re-نظم د ليول
@@ -5369,7 +5375,6 @@
DocType: Room,Seating Capacity,ناستل او د ظرفیت
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,د لابراتوار ټسټ ګروپونه
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,پیرودونکي> پیرودونکي ګروپ> ساحه
DocType: Project,Total Expense Claim (via Expense Claims),Total اخراجاتو ادعا (اخراجاتو د ادعا له لارې)
DocType: GST Settings,GST Summary,GST لنډيز
DocType: Assessment Result,Total Score,ټولې نمرې
@@ -5383,7 +5388,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,د کورس کورسونه جوړ شول
DocType: Journal Entry,Total Debit,Total ګزارې
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default توکو د ګدام
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,خرڅلاو شخص
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,خرڅلاو شخص
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,د بودجې او لګښتونو مرکز
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,د پیسو ډیری ډیزاین موډل اجازه نه لري
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,لپاره
@@ -5558,7 +5563,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,لپاره د مالياتو او يا چارج په پام کې
DocType: Driver,Driving License Category,د موټر چلولو د جواز کټګوري
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,واقعي Qty الزامی دی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} په اوسني وخت کې {1} د سپارل شوي کارت کارت لري، او د دې عرضه کوونکي لپاره د پیرودونکي سپارښتنې باید احتیاط سره خپور شي.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} په اوسني وخت کې {1} د سپارل شوي کارت کارت لري، او د دې عرضه کوونکي لپاره د پیرودونکي سپارښتنې باید احتیاط سره خپور شي.
DocType: Asset Maintenance Team,Asset Maintenance Team,د شتمنیو د ساتنې ټیم
DocType: Employee Loan,Loan Type,د پور ډول
DocType: Scheduling Tool,Scheduling Tool,مهال ويش له اوزار
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 5b57878..21b4a0c 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -76,13 +76,13 @@
apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Mesma empresa está inscrita mais de uma vez
DocType: Patient,Married,Casado
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Não permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra nota de entrega {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra nota de entrega {0}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Estrutura salarial ausente
DocType: Sales Invoice Item,Sales Invoice Item,Item da Nota Fiscal de Venda
DocType: POS Profile,Write Off Cost Center,Centro de custo do abatimento
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Relatórios de Estoque
DocType: Warehouse,Warehouse Detail,Detalhes do Armazén
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É Ativo Fixo"" não pode ser desmarcado se já existe um registro de Ativo relacionado ao item"
DocType: Vehicle Service,Brake Oil,Óleo de Freio
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
@@ -93,7 +93,7 @@
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Produtos Entregues
DocType: Student Log,Student Log,Log do Aluno
DocType: Quality Inspection,Get Specification Details,Obter Detalhes de Inspeção
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Abertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Abertura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},A partir de {0} a {1}
DocType: Item,Copy From Item Group,Copiar do item do grupo
DocType: Journal Entry,Opening Entry,Lançamento de Abertura
@@ -189,7 +189,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,A Data da Licença deve ser maior que Data de Contratação
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Folhas por ano
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Linha {0}: Por favor, selecione 'É Adiantamento' se este é um lançamento de adiantamento relacionado à conta {1}."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
DocType: Email Digest,Profit & Loss,Lucro e Perdas
DocType: Task,Total Costing Amount (via Time Sheet),Custo Total (via Registro de Tempo)
DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
@@ -299,7 +299,7 @@
DocType: Lab Test Template,Single,Solteiro
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, indique Centro de Custo"
DocType: Journal Entry Account,Sales Order,Pedido de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Valor Médio de Venda
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Valor Médio de Venda
DocType: Delivery Note,% Installed,Instalado %
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o manual de ERPNext
DocType: Email Digest,Pending Purchase Orders,Pedidos de Compra Pendentes
@@ -339,15 +339,15 @@
DocType: Pricing Rule,Valid Upto,Válido até
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avisar em Pedidos de Compra
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Peças suficientes para construir
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Peças suficientes para construir
DocType: POS Profile User,POS Profile User,Perfil de Usuário do PDV
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Receita Direta
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Não é possível filtrar com base em conta , se agrupados por Conta"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Não é possível filtrar com base em conta , se agrupados por Conta"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Escritório Administrativo
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +350,Please select Company,"Por favor, selecione Empresa"
DocType: Stock Entry Detail,Difference Account,Conta Diferença
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Material serão levantadas"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Material serão levantadas"
DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
apps/erpnext/erpnext/stock/doctype/item/item.py +526,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
,Serial No Warranty Expiry,Vencimento da Garantia com Nº de Série
@@ -436,13 +436,13 @@
apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Gestão de Emprestimos à Colaboradores
DocType: Employee,Passport Number,Número do Passaporte
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gerente
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novo limite de crédito é inferior ao saldo devedor atual do cliente. O limite de crédito deve ser de pelo menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novo limite de crédito é inferior ao saldo devedor atual do cliente. O limite de crédito deve ser de pelo menos {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupar por' não podem ser o mesmo
DocType: Sales Person,Sales Person Targets,Metas do Vendedor
DocType: Production Order Operation,In minutes,Em Minutos
DocType: Issue,Resolution Date,Data da Solução
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Registro de Tempo criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
DocType: Selling Settings,Customer Naming By,Nomeação de Cliente por
DocType: Depreciation Schedule,Depreciation Amount,Valor de Depreciação
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converter em Grupo
@@ -508,7 +508,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +93,Account with existing transaction cannot be converted to ledger,Contas com transações existentes não pode ser convertidas em livro-razão
DocType: Delivery Note,Customer's Purchase Order No,Nº do Pedido de Compra do Cliente
DocType: Employee,Cell Number,Telefone Celular
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Requisições de Material Geradas Automaticamente
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Requisições de Material Geradas Automaticamente
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para fabricação
DocType: Opportunity,Opportunity From,Oportunidade de
@@ -567,12 +567,12 @@
apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurando Conta de Email
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Por favor, indique primeiro item"
DocType: Account,Liability,Passivo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +234,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +234,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Liberado não pode ser maior do que no Pedido de Reembolso na linha {0}.
DocType: Company,Default Cost of Goods Sold Account,Conta de Custo Padrão de Mercadorias Vendidas
apps/erpnext/erpnext/stock/get_item_details.py +367,Price List not selected,Lista de Preço não selecionado
DocType: Employee,Family Background,Antecedentes familiares
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,Nenhuma permissão
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar baseado em Sujeito, selecione o Tipo de Sujeito primeiro"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Para filtrar baseado em Sujeito, selecione o Tipo de Sujeito primeiro"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Atualização do Estoque 'não pode ser verificado porque os itens não são entregues via {0}"
DocType: Vehicle,Acquisition Date,Data da Aquisição
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -588,7 +588,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +352,"If you have any questions, please get back to us.","Se você tem alguma pergunta, por favor nos contate."
DocType: Item,Website Warehouse,Armazém do Site
DocType: Payment Reconciliation,Minimum Invoice Amount,Valor Mínimo da Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontuação deve ser inferior ou igual a 5
apps/erpnext/erpnext/config/accounts.py +335,C-Form records,Registros C -Form
DocType: Email Digest,Email Digest Settings,Configurações do Resumo por Email
@@ -683,6 +683,7 @@
apps/erpnext/erpnext/accounts/page/pos/pos.js +794,Sync Offline Invoices,Sincronizar Faturas Offline
DocType: Program Fee,Program Fee,Taxa do Programa
DocType: Material Request Item,Lead Time Date,Prazo de Entrega
+DocType: Employee Loan,Sanctioned,Liberada
apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,é obrigatório. Talvez o registro de taxas de câmbios não está criado para
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +122,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens 'pacote de produtos ", Armazém, Serial e não há Batch Não será considerada a partir do' Packing List 'tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de 'Bundle Produto', esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para 'Packing List' tabela."
@@ -705,6 +706,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +775,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
DocType: Workstation,Electricity Cost,Custo de Energia Elétrica
DocType: HR Settings,Don't send Employee Birthday Reminders,Não envie aos colaboradores lembretes de aniversários
+DocType: Expense Claim,Total Advance Amount,Valor Total do Adiantamento
DocType: BOM Website Item,BOM Website Item,LDM do Item do Site
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
DocType: SMS Center,All Lead (Open),Todos os Clientes em Potencial em Aberto
@@ -741,7 +743,7 @@
DocType: Landed Cost Item,Purchase Receipt Item,Item do Recibo de Compra
DocType: POS Profile,Sales Invoice Payment,Pagamento da Nota Fiscal de Venda
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém reservada no Pedido de Venda / Armazém de Produtos Acabados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Valor de Venda
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Valor de Venda
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Você é o aprovador de despesa para esse registro. Atualize o 'Status' e salve
DocType: Serial No,Creation Document No,Número de Criação do Documento
DocType: Asset,Scrapped,Sucateada
@@ -795,7 +797,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +421,Finished Item {0} must be entered for Manufacture type entry,O Item finalizado {0} deve ser digitado para a o lançamento de tipo de fabricação
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Saldo de Abertura da Conta
DocType: Sales Invoice Advance,Sales Invoice Advance,Adiantamento da Nota Fiscal de Venda
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nada para pedir
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nada para pedir
apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser maior que a 'Data Final Real'
DocType: Cheque Print Template,Payer Settings,Configurações do Pagador
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
@@ -804,7 +806,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Devolução / Nota de Débito
DocType: Price List Country,Price List Country,Preço da lista País
DocType: Item,UOMs,Unidades de Medida
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} números de série válidos para o item {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} números de série válidos para o item {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Código do item não pode ser alterado para o nº de série.
DocType: Purchase Invoice Item,UOM Conversion Factor,Fator de Conversão da Unidade de Medida
DocType: Stock Settings,Default Item Group,Grupo de Itens padrão
@@ -865,7 +867,7 @@
DocType: Journal Entry,Get Outstanding Invoices,Obter notas pendentes
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Pedido de Venda {0} não é válido
DocType: Supplier Scorecard,Warn for new Request for Quotations,Avisar ao criar novas solicitações de orçamentos
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",A quantidade total Saída / Transferir {0} na Requisição de Material {1} \ não pode ser maior do que a quantidade solicitada {2} para o Item {3}
DocType: Education Settings,Employee Number,Número do Colaborador
@@ -906,7 +908,7 @@
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este Centro de Custo é um grupo . Não pode fazer lançamentos contábeis contra grupos .
DocType: Item,Website Item Groups,Grupos de Itens do Site
DocType: Purchase Invoice,Total (Company Currency),Total (moeda da empresa)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Número de série {0} entrou mais de uma vez
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Número de série {0} entrou mais de uma vez
DocType: Journal Entry,Journal Entry,Lançamento no Livro Diário
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} itens em andamento
DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
@@ -963,7 +965,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +382,Max: {0},Max: {0}
apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir da data e hora
apps/erpnext/erpnext/config/support.py +17,Communication log.,Log de Comunicação.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Valor de Compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Valor de Compra
DocType: Sales Invoice,Shipping Address Name,Endereço de Entrega
DocType: Material Request,Terms and Conditions Content,Conteúdo dos Termos e Condições
apps/erpnext/erpnext/stock/doctype/item/item.py +720,Item {0} is not a stock Item,Item {0} não é um item de estoque
@@ -1109,7 +1111,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Supplier must be debit,Linha {0}: Adiantamento relacionado com o fornecedor deve ser um débito
DocType: Expense Claim,Total Amount Reimbursed,Quantia total reembolsada
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Relacionado à nota fiscal do fornecedor nº {0} emitida em {1}
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
DocType: Journal Entry,Entry Type,Tipo de Lançamento
,Customer Credit Balance,Saldo de Crédito do Cliente
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Necessário para ' Customerwise Discount ' Cliente
@@ -1204,7 +1206,7 @@
DocType: Course,Course Abbreviation,Abreviação do Curso
DocType: Student Leave Application,Student Leave Application,Pedido de Licença do Aluno
DocType: Item,Will also apply for variants,Também se aplica às variantes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Empacotar itens no momento da venda.
DocType: Quotation Item,Actual Qty,Qtde Real
DocType: Hub Category,Hub Node,Hub Node
@@ -1318,9 +1320,10 @@
apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina "de ativos Centro de Custo Depreciação 'in Company {0}"
,Maintenance Schedules,Horários de Manutenção
DocType: Task,Actual End Date (via Time Sheet),Data Final Real (via Registro de Tempo)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nova Mensagem
,Quotation Trends,Tendência de Orçamentos
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
DocType: Shipping Rule,Shipping Amount,Valor do Transporte
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Adicionar Clientes
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Total pendente
@@ -1340,7 +1343,7 @@
DocType: Purchase Invoice,Additional Discount Amount,Total do Desconto Adicional
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtde deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para múltiplas qtdes."
DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupo para Não-Grupo
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Esportes
DocType: Loan Type,Loan Name,Nome do Empréstimo
@@ -1402,7 +1405,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecione a Empresa...
DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se considerado para todos os departamentos
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente , contrato, estagiário, etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Custo da Nova Compra
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},Pedido de Venda necessário para o item {0}
@@ -1448,7 +1451,7 @@
DocType: BOM Scrap Item,Basic Amount (Company Currency),Total Base (moeda da empresa)
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não serão mostrados se a lista de preços não estiver configurada
DocType: Stock Entry,Total Incoming Value,Valor Total Recebido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Para Débito é necessária
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Para Débito é necessária
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Preço de Compra Lista
DocType: Offer Letter Term,Offer Term,Termos da Oferta
DocType: Asset,Quality Manager,Gerente de Qualidade
@@ -1522,8 +1525,8 @@
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +463,Show Salary Slip,Mostrar Contracheque
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custos operacionais e dar um número único de operação às suas operações."
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está fora do limite {0} {1} para o item {4}. Você está fazendo outro(a) {3} relacionado(a) a(o) mesmo(a) {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Selecione a conta de troco
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Selecione a conta de troco
DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
DocType: Topic,Topic,Tópico
@@ -1568,7 +1571,7 @@
DocType: Shipping Rule,Shipping Rule Label,Rótulo da Regra de Envio
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Usuários
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Lançamento no Livro Diário Rápido
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa se a LDM é mencionada em algum item
DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
@@ -1744,7 +1747,7 @@
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Imposto de Renda
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como Pedido de Venda, Pedido de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Valor na Lista de Preços""."
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,"Rastreia Clientes em Potencial, por Segmento."
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Por favor selecione um valor para {0} orçamento_para {1}
DocType: Company,Stock Settings,Configurações de Estoque
apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
@@ -1968,7 +1971,7 @@
,Lead Owner Efficiency,Eficiência do Administrador do Cliente em Potencial
DocType: Leave Allocation,Leave Allocation,Alocação de Licenças
DocType: Training Event,Trainer Email,Email do Instrutor
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Requisições de Material {0} criadas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Requisições de Material {0} criadas
DocType: Purchase Invoice,Address and Contact,Endereço e Contato
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +276,Stock cannot be updated against Purchase Receipt {0},O estoque não pode ser atualizado em relação ao Recibo de Compra {0}
DocType: Company,Last Day of the Next Month,Último dia do mês seguinte
@@ -2009,7 +2012,7 @@
DocType: Production Planning Tool,Create Material Requests,Criar Requisição de Material
DocType: Employee Education,School/University,Escola / Universidade
DocType: Payment Request,Reference Details,Detalhes Referência
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Valor Bruto de Compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Valor Bruto de Compra
DocType: Sales Invoice Item,Available Qty at Warehouse,Qtde Disponível no Estoque
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Total Faturado
DocType: Asset,Double Declining Balance,Equilíbrio decrescente duplo
@@ -2019,7 +2022,7 @@
DocType: Attendance,On Leave,De Licença
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Receber notícias
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Conta {2} não pertence à empresa {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Requisição de Material {0} é cancelada ou parada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Requisição de Material {0} é cancelada ou parada
DocType: Lead,Lower Income,Baixa Renda
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Número do Pedido de Compra necessário para o item {0}
@@ -2027,7 +2030,7 @@
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o status pois o aluno {0} está relacionado à candidatura à vaga de estudo {1}
DocType: Asset,Fully Depreciated,Depreciados Totalmente
,Stock Projected Qty,Projeção de Estoque
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Presença marcante HTML
DocType: Sales Order,Customer's Purchase Order,Pedido de Compra do Cliente
apps/erpnext/erpnext/config/stock.py +109,Serial No and Batch,Número de Série e Lote
@@ -2063,11 +2066,12 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Account with child nodes cannot be set as ledger,Conta com nós filho não pode ser definido como contabilidade
DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base do cliente
DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (moeda da empresa)
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +229,Total advance amount cannot be greater than total sanctioned amount,O montante do adiantamento total não pode ser maior do que o montante liberado total
DocType: Salary Slip,Hour Rate,Valor por Hora
DocType: Stock Settings,Item Naming By,Nomeação de Item por
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada no Período de Encerramento {0} foi feita após {1}
DocType: Production Order,Material Transferred for Manufacturing,Material Transferido para Fabricação
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Conta {0} não existe
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Conta {0} não existe
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Meta de qtde ou valor da meta são obrigatórios.
apps/erpnext/erpnext/config/projects.py +51,Cost of various activities,Custo das diferentes actividades
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Configurando eventos para {0}, uma vez que o colaborador relacionado aos vendedores abaixo não tem um ID do usuário {1}"
@@ -2132,9 +2136,9 @@
DocType: Vehicle,Insurance Details,Detalhes do Seguro
DocType: Account,Payable,A pagar
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes Novos
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Lucro Bruto %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Lucro Bruto %
DocType: Bank Reconciliation Detail,Clearance Date,Data de Liberação
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Valor Bruto de Compra é obrigatório
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Valor Bruto de Compra é obrigatório
DocType: Lead,Address Desc,Descrição do Endereço
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,É obrigatório colocar o sujeito
DocType: Topic,Topic Name,Nome do tópico
@@ -2153,7 +2157,7 @@
apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,ID da folha de pagamento
apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Contratação
DocType: Sales Invoice,Against Income Account,Contra a Conta de Recebimentos
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qtde pedida {1} não pode ser inferior a qtde mínima de pedido {2} (definido no cadastro do Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qtde pedida {1} não pode ser inferior a qtde mínima de pedido {2} (definido no cadastro do Item).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
DocType: Territory,Territory Targets,Metas do Território
DocType: Delivery Note,Transporter Info,Informações da Transportadora
@@ -2179,6 +2183,7 @@
DocType: Academic Term,Term Name,Nome do Período Letivo
DocType: Buying Settings,Purchase Order Required,Pedido de Compra Obrigatório
,Item-wise Sales History,Histórico de Vendas por Item
+DocType: Expense Claim,Total Sanctioned Amount,Valor Total Liberado
,Purchase Analytics,Analítico de Compras
DocType: Purchase Taxes and Charges,Reference Row #,Referência Linha #
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
@@ -2219,7 +2224,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Por favor, selecione data de lançamento antes de selecionar o sujeito"
DocType: Serial No,Out of AMC,Fora do CAM
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Criar Visita de Manutenção
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente de Cadastros de Vendas"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente de Cadastros de Vendas"
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,"Cadastro da Empresa (a própria companhia, não se refere ao cliente, nem ao fornecedor)"
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Isto é baseado na frequência do aluno
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,A Guia de Remessa {0} deve ser cancelada antes de cancelar este Pedido de Venda
@@ -2358,7 +2363,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
DocType: BOM,Website Description,Descrição do Site
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Mudança no Patrimônio Líquido
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
DocType: Serial No,AMC Expiry Date,Data de Validade do CAM
,Sales Register,Registro de Vendas
DocType: Daily Work Summary Settings Company,Send Emails At,Enviar Emails em
@@ -2367,7 +2372,7 @@
apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada a ser editado.
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +483,Form View,Ver Formulário
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstrativo de Fluxo de Caixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Encaminhar se você também quer incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
DocType: GL Entry,Against Voucher Type,Contra o Tipo de Comprovante
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +226,Please enter Write Off Account,"Por favor, indique a conta de abatimento"
@@ -2394,7 +2399,7 @@
DocType: Student Sibling,Student ID,ID do Aluno
apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tipos de Atividades para Registros de Tempo
DocType: Stock Entry Detail,Basic Amount,Valor Base
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
DocType: Tax Rule,Billing State,Estado de Faturamento
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +916,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
@@ -2555,7 +2560,7 @@
DocType: Customer,From Lead,Do Cliente em Potencial
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordens liberadas para produção.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecione o Ano Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
DocType: Program Enrollment Tool,Enroll Students,Matricular Alunos
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda padrão
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +148,Atleast one warehouse is mandatory,Pelo menos um armazém é obrigatório
@@ -2598,14 +2603,14 @@
DocType: Employee,Held On,Realizada em
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Bem de Produção
,Employee Information,Informações do Colaborador
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Não é possível filtrar com base no Comprovante Não, se agrupados por voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Não é possível filtrar com base no Comprovante Não, se agrupados por voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Criar Orçamento do Fornecedor
DocType: BOM,Materials Required (Exploded),Materiais necessários (lista explodida)
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Casual Deixar
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Observação: {0}
,Delivery Note Trends,Tendência de Remessas
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Quantidade no Estoque
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Quantidade no Estoque
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Conta: {0} só pode ser atualizado via transações de ações
DocType: GL Entry,Party,Sujeito
DocType: Opportunity,Opportunity Date,Data da Oportunidade
@@ -2614,7 +2619,7 @@
DocType: Purchase Order,To Bill,Para Faturar
DocType: Material Request,% Ordered,% Comprado
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,trabalho por peça
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Méd. Valor de Compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Méd. Valor de Compra
DocType: Task,Actual Time (in Hours),Tempo Real (em horas)
DocType: Employee,History In Company,Histórico na Empresa
apps/erpnext/erpnext/config/learn.py +107,Newsletters,Boletim de Notícias
@@ -2637,7 +2642,7 @@
apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausente
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Linha {0}: Moeda da LDM # {1} deve ser igual à moeda selecionada {2}
DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
DocType: Homepage,Tag Line,Slogan
DocType: Fee Component,Fee Component,Componente da Taxa
apps/erpnext/erpnext/education/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,O peso total de todos os Critérios de Avaliação deve ser 100%
@@ -2750,11 +2755,12 @@
DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar lista de embalagem para os pacotes a serem entregues. Usado para identificar número do pacote, o conteúdo do pacote e seu peso."
DocType: Sales Invoice Item,Sales Order Item,Item do Pedido de Venda
DocType: Salary Slip,Payment Days,Datas de Pagamento
+DocType: Stock Settings,Convert Item Description to Clean HTML,Converter a Descrição do Item para HTML Limpo
DocType: BOM,Manage cost of operations,Gerenciar custo das operações
DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações marcadas são ""Enviadas"", um pop-up abre automaticamente para enviar um email para o ""Contato"" associado a transação, com a transação como um anexo. O usuário pode ou não enviar o email."
apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configurações Globais
DocType: Employee Education,Employee Education,Escolaridade do Colaborador
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Isto é necessário para buscar detalhes de itens
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Isto é necessário para buscar detalhes de itens
DocType: Salary Slip,Net Pay,Pagamento Líquido
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Nº de Série {0} já foi recebido
,Requested Items To Be Transferred,"Items Solicitados, mas não Transferidos"
@@ -2798,7 +2804,7 @@
,Project wise Stock Tracking,Rastreio de Estoque por Projeto
DocType: Stock Entry Detail,Actual Qty (at source/target),Qtde Real (na origem / destino)
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de colaboradores.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Por favor configure a próxima data de depreciação
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Por favor configure a próxima data de depreciação
DocType: HR Settings,Payroll Settings,Configurações da Folha de Pagamento
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não relacionados.
DocType: POS Settings,POS Settings,Configurações do PDV
@@ -2897,7 +2903,7 @@
DocType: Item,Customer Code,Código do Cliente
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Lembrete de aniversário para {0}
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias desde a última compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
DocType: Buying Settings,Naming Series,Código dos Documentos
DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de início da cobertura do seguro deve ser inferior a data de término da cobertura
@@ -3037,7 +3043,7 @@
apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Não expirado
DocType: Journal Entry,Total Debit,Débito total
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Armazén de Produtos Acabados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vendedor
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedor
DocType: Vehicle Service,Half Yearly,Semestral
DocType: Assessment Plan Criteria,Maximum Score,Nota Máxima
apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Criar regras para restringir operações com base em valores.
@@ -3129,7 +3135,7 @@
apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere Imposto ou Encargo para
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qtde Real é obrigatória
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} já possui um {1} Scorecard de Fornecedor em aberto, portanto, os Pedidos de Compra para este fornecedor devem ser emitidos com cautela."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} já possui um {1} Scorecard de Fornecedor em aberto, portanto, os Pedidos de Compra para este fornecedor devem ser emitidos com cautela."
DocType: Employee Loan,Loan Type,Tipo de Empréstimo
DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcionais
DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -3174,7 +3180,7 @@
DocType: Employee,Reason for Leaving,Motivo da saída
DocType: BOM Operation,Operating Cost(Company Currency),Custo operacional (moeda da empresa)
DocType: Employee Loan Application,Rate of Interest,Taxa de Juros
-DocType: Expense Claim Detail,Sanctioned Amount,Valor Sancionado
+DocType: Expense Claim Detail,Sanctioned Amount,Valor Liberado
DocType: GL Entry,Is Opening,É Abertura
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +194,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Lançamento de débito não pode ser relacionado a uma {1}
DocType: Journal Entry,Subscription Section,Seção de Inscrição
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 9a90181..00464b2 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Classificar por Preço
,Delay Days,Delay Days
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Despesa de Serviço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Fatura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Faça a Entrada de Estoque de Retenção
DocType: Purchase Invoice Item,Item Weight Details,Detalhes do peso do item
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referência: {0}, Código do Item: {1} e Cliente: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vaga para um Emprego.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},A lista técnica não está especificada para o item de subcontratação {0} na linha {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},A lista técnica não está especificada para o item de subcontratação {0} na linha {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultado enviado
DocType: Item Attribute,Increment,Aumento
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Intervalo de tempo
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Não tem permissão para {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obter itens de
DocType: Price List,Price Not UOM Dependant,Preço não Dependente do UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produto {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nenhum item listado
DocType: Asset Repair,Error Description,Descrição de erro
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Mercearia
DocType: Quality Inspection Reading,Reading 1,Leitura 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fundos de Pensão
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Próxima Depreciação A data não pode ser antes Data da compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Próxima Depreciação A data não pode ser antes Data da compra
DocType: Crop,Perennial,Perene
DocType: Consultation,Consultation Date,Data de consulta
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Listagem de produtos e descoberta para usuários ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","ex: ""Escola Primária"" ou ""Universidade"""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Relatórios de Stock
DocType: Warehouse,Warehouse Detail,Detalhe Armazém
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},O cliente {0} {1}/{2} ultrapassou o limite de crédito
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},O cliente {0} {1}/{2} ultrapassou o limite de crédito
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"O Prazo de Data de Término não pode ser posterior à Data de Término de Ano do Ano Letivo, com a qual está relacionado o termo (Ano Lectivo {}). Por favor, corrija as datas e tente novamente."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É um Ativo Imobilizado"" não pode ser desmarcado, pois existe um registo de ativos desse item"
DocType: Delivery Trip,Departure Time,Hora de partida
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Obter Dados Específicos
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Modelos de classificação de fornecedores.
DocType: Lead,Interested,Interessado
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,A Abrir
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,A Abrir
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},De {0} a {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Falha na configuração de impostos
DocType: Item,Copy From Item Group,Copiar do Grupo do Item
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,A Data de Dispensa deve ser mais recente que a Data de Adesão
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Licenças por Ano
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Linha {0}: Por favor, selecione ""É um Adiantamento"" na Conta {1} se for um registo dum adiantamento."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},O Armazém {0} não pertence à empresa {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},O Armazém {0} não pertence à empresa {1}
DocType: Email Digest,Profit & Loss,Lucros e Perdas
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litro
DocType: Task,Total Costing Amount (via Time Sheet),Quantia de Custo Total (através da Folha de Serviço)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Isso é baseado em transações contra esta empresa. Veja a linha abaixo para detalhes
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por Email na criação de Solicitações de Material automáticas
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistente
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consulta
DocType: Journal Entry,Multi Currency,Múltiplas Moedas
DocType: Opening Invoice Creation Tool,Invoice Type,Tipo de Fatura
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Guia de Remessa
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Viúvo/a
DocType: Request for Quotation,Request for Quotation,Solicitação de Cotação
DocType: Healthcare Settings,Require Lab Test Approval,Exigir aprovação de teste de laboratório
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Código do Item> Item Group> Brand
DocType: Salary Slip Timesheet,Working Hours,Horas de Trabalho
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total pendente
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Altera o número de sequência inicial / atual duma série existente.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, insira o Centro de Custos"
DocType: Drug Prescription,Dosage,Dosagem
DocType: Journal Entry Account,Sales Order,Ordem de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Preço de Venda Médio
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Preço de Venda Médio
DocType: Assessment Plan,Examiner Name,Nome do Examinador
DocType: Lab Test Template,No Result,nenhum resultado
DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Valor
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Selecione o Período de Pagamento
DocType: Purchase Invoice,Unpaid,Não Pago
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservado para venda
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configure o Sistema de Nomeação de Empregados em Recursos Humanos> Configurações de RH
DocType: Packing Slip,From Package No.,Do Pacote Nr.
DocType: Item Attribute,To Range,Para Gama
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Títulos e Depósitos
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,Workshop
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avisar ordens de compra
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Insira alguns dos seus clientes. Podem ser organizações ou indivíduos.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Peças suficiente para construir
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Peças suficiente para construir
DocType: POS Profile User,POS Profile User,Usuário do perfil POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Rendimento Direto
DocType: Patient Appointment,Date TIme,Data hora
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Não é possivel filtrar com base na Conta, se estiver agrupado por Conta"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Não é possivel filtrar com base na Conta, se estiver agrupado por Conta"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Funcionário Administrativo
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Criando empresa e impostos
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Por favor selecione Curso
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Conta de Diferenças
DocType: Purchase Invoice,Supplier GSTIN,Fornecedor GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Não pode encerrar a tarefa pois a sua tarefa dependente {0} não está encerrada.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, insira o Armazém em que será levantanda a Solicitação de Material"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Por favor, insira o Armazém em que será levantanda a Solicitação de Material"
DocType: Production Order,Additional Operating Cost,Custos Operacionais Adicionais
DocType: Lab Test Template,Lab Routine,Rotina de laboratório
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Cosméticos
@@ -819,7 +820,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relação com Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gestor
DocType: Payment Entry,Payment From / To,Pagamento De / Para
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},O novo limite de crédito é inferior ao montante em dívida atual para o cliente. O limite de crédito tem que ser pelo menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},O novo limite de crédito é inferior ao montante em dívida atual para o cliente. O limite de crédito tem que ser pelo menos {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Defina conta no Warehouse {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e 'Agrupado por' não podem ser iguais
DocType: Sales Person,Sales Person Targets,Metas de Vendedores
@@ -830,7 +831,7 @@
DocType: Student Batch Name,Batch Name,Nome de Lote
DocType: Fee Validity,Max number of visit,Número máximo de visitas
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Registo de Horas criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Matricular
DocType: GST Settings,GST Settings,Configurações de GST
DocType: Selling Settings,Customer Naming By,Nome de Cliente Por
@@ -954,7 +955,7 @@
DocType: Budget,Budget Against,Orçamento Em
DocType: Employee,Cell Number,Numero de Telemóvel
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Não há empregado para os critérios fornecidos. Verifique se os Slides Salariais ainda não foram criados.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Solicitações de Materiais Geradas Automaticamente
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Solicitações de Materiais Geradas Automaticamente
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Não pode inserir o voucher atual na coluna ""Lançamento Contabilístico Em"""
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para fabrico
@@ -962,7 +963,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
DocType: Opportunity,Opportunity From,Oportunidade De
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declaração salarial mensal.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Linha {0}: {1} Números de série necessários para o Item {2}. Você forneceu {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Linha {0}: {1} Números de série necessários para o Item {2}. Você forneceu {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selecione uma tabela
DocType: BOM,Website Specifications,Especificações do Website
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} é um endereço de e-mail inválido em 'Destinatários'
@@ -1050,7 +1051,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citação solicitada
DocType: Vital Signs,Heart Rate / Pulse,Frequência cardíaca / pulso
DocType: Company,Default Bank Account,Conta Bancária Padrão
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar com base nas Partes, selecione o Tipo de Parte primeiro"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Para filtrar com base nas Partes, selecione o Tipo de Parte primeiro"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Atualizar Stock' não pode ser ativado porque os itens não são entregues através de {0}"
DocType: Vehicle,Acquisition Date,Data de Aquisição
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nrs.
@@ -1074,7 +1075,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Carregue o seu cabeçalho de letra (Mantenha-o amigável na web como 900px por 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: A Conta {2} não pode ser um Grupo
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,A Linha do Item {idx}: {doctype} {docname} não existe na tabela '{doctype}'
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,O Registo de Horas {0} já está concluído ou foi cancelado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,O Registo de Horas {0} já está concluído ou foi cancelado
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,não há tarefas
DocType: Item Variant Settings,Copy Fields to Variant,Copiar campos para variante
DocType: Asset,Opening Accumulated Depreciation,Depreciação Acumulada Inicial
@@ -1186,9 +1187,10 @@
DocType: Production Order,Plan material for sub-assemblies,Planear material para subconjuntos
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parceiros de Vendas e Território
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,A LDM {0} deve estar ativa
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Fechamento (Abertura + Total)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Fechamento (Abertura + Total)
DocType: Journal Entry,Depreciation Entry,Registo de Depreciação
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione primeiro o tipo de documento"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Imprimir em moeda da conta
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Visitas Materiais {0} antes de cancelar esta Visita de Manutenção
DocType: Crop Cycle,ISO 8016 standard,Padrão ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},O Nr. de Série {0} não pertence ao Item {1}
@@ -1214,7 +1216,7 @@
DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,O(A) Funcionário(a) {0} não está ativo(a) ou não existe
DocType: Fee Structure,Components,Componentes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Por favor, insira a Categoria de Ativo no Item {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Por favor, insira a Categoria de Ativo no Item {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Variantes do Item {0} atualizadas
DocType: Quality Inspection Reading,Reading 6,Leitura 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1266,6 +1268,7 @@
,Company Name,Nome da Empresa
DocType: SMS Center,Total Message(s),Mensagens Totais
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Selecionar Item para Transferência
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Defina Naming Series para {0} via Setup> Configurações> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Percentagem de Desconto Adicional
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
DocType: Agriculture Analysis Criteria,Soil Texture,Textura do solo
@@ -1294,7 +1297,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Site item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Carregue o cabeçalho e logótipo da carta. (Pode editá-los mais tarde.)
DocType: Timesheet Detail,Bill,Fatura
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,A Próxima Data de Depreciação é inserida como data passada
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,A Próxima Data de Depreciação é inserida como data passada
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Branco
DocType: SMS Center,All Lead (Open),Todos Potenciais Clientes (Abertos)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Linha {0}: A qtd não está disponível para {4} no armazém {1} no momento da postagem do registo ({2} {3})
@@ -1311,7 +1314,7 @@
DocType: Lead,Next Contact Date,Data do Próximo Contacto
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Qtd Inicial
DocType: Healthcare Settings,Appointment Reminder,Lembrete de compromisso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
DocType: Program Enrollment Tool Student,Student Batch Name,Nome de Classe de Estudantes
DocType: Consultation,Doctor,Médico
DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
@@ -1327,6 +1330,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ferramenta de Atribuição de Licenças
DocType: Item,Hub Category to Publish,Categoria Hub para Publicar
DocType: Leave Block List,Leave Block List Dates,Datas de Lista de Bloqueio de Licenças
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Por favor, configure as séries de numeração para Atendimento via Configuração> Série de numeração"
DocType: Sales Invoice,Billing Address GSTIN,Endereço de cobrança GSTIN
DocType: Assessment Plan,Evaluate,Avalie
DocType: Workstation,Net Hour Rate,Taxa Líquida por Hora
@@ -1361,7 +1365,7 @@
DocType: Purchase Receipt,PREC-RET-,RECC-DEV-
DocType: POS Profile,Sales Invoice Payment,Pagamento de Fatura de Vendas
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém Reservado na Ordem de Vendas / Armazém de Produtos Acabados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Valor de Vendas
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Valor de Vendas
DocType: Repayment Schedule,Interest Amount,Montante de juros
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Você é o Aprovador de Gastos para este registo. Por favor, atualize o ""Estado"" e Guarde"
DocType: Serial No,Creation Document No,Nr. de Documento de Criação
@@ -1454,7 +1458,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Saldo Contabilístico Inicial
,GST Sales Register,GST Sales Register
DocType: Sales Invoice Advance,Sales Invoice Advance,Avanço de Fatura de Vendas
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nada a requesitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nada a requesitar
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Selecione seus domínios
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Já existe outro registo '{0}' em {1} '{2}' para o ano fiscal {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Os campos serão copiados apenas no momento da criação.
@@ -1464,11 +1468,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isto será anexado ao Código do Item da variante. Por exemplo, se a sua abreviatura for ""SM"", e o código do item é ""T-SHIRT"", o código do item da variante será ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,A Remuneração Líquida (por extenso) será visível assim que guardar a Folha de Vencimento.
DocType: Purchase Invoice,Is Return,É um Retorno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Cuidado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Cuidado
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Retorno / Nota de Débito
DocType: Price List Country,Price List Country,País da Lista de Preços
DocType: Item,UOMs,UNIDs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},Nr. de série válido {0} para o Item {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},Nr. de série válido {0} para o Item {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,O Código de Item não pode ser alterado por um Nr. de Série.
DocType: Purchase Invoice Item,UOM Conversion Factor,Fator de Conversão de UNID
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Por favor insira o Código Item para obter número de lote
@@ -1572,7 +1576,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,A Ordem de Vendas {0} não é válida
DocType: Supplier Scorecard,Warn for new Request for Quotations,Avise o novo pedido de citações
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,As ordens de compra ajudá-lo a planejar e acompanhar suas compras
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescrições de teste de laboratório
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",A quantidade total da Emissão / Transferência {0} no Pedido de Material {1} \ não pode ser maior do que a quantidade pedida {2} para o Item {3}
@@ -1610,7 +1614,6 @@
DocType: Warehouse,Warehouse Contact Info,Informações de Contacto do Armazém
DocType: Payment Entry,Write Off Difference Amount,Liquidar Montante de Diferença
DocType: Volunteer,Volunteer Name,Nome do voluntário
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Configura o sistema de nomeação do instrutor em Educação> Configurações de Educação
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Não foi encontrado o email do funcionário, portanto, o email não será enviado"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Regra de envio não aplicável para o país {0}
DocType: Item,Foreign Trade Details,Detalhes Comércio Exterior
@@ -1622,7 +1625,7 @@
DocType: Student Group Student,Group Roll Number,Número de rolo de grupo
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, só podem ser ligadas contas de crédito noutro registo de débito"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,O total de todos os pesos da tarefa deve ser 1. Por favor ajuste os pesos de todas as tarefas do Projeto em conformidade
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,O Item {0} deve ser um Item Subcontratado
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Bens de Equipamentos
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","A Regra de Fixação de Preços é selecionada primeiro com base no campo ""Aplicar Em"", que pode ser um Item, Grupo de Itens ou Marca."
@@ -1647,7 +1650,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Existe um armazém secundário para este armazém. Não pode eliminar este armazém.
DocType: Item,Website Item Groups,Website de Grupos de Itens
DocType: Purchase Invoice,Total (Company Currency),Total (Moeda da Empresa)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,O número de série {0} foi introduzido mais do que uma vez
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,O número de série {0} foi introduzido mais do que uma vez
DocType: Journal Entry,Journal Entry,Lançamento Contabilístico
DocType: Expense Claim Advance,Unclaimed amount,Montante não reclamado
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} itens em progresso
@@ -1744,7 +1747,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Registo de comunicação.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","A Solicitação de Cotação é desativada para o acesso a partir do portal, para saber mais vá às definições do portal."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Variável de pontuação do Scorecard do fornecedor
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Montante de Compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Montante de Compra
DocType: Sales Invoice,Shipping Address Name,Nome de Endereço de Envio
DocType: Material Request,Terms and Conditions Content,Conteúdo de Termos e Condições
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Houve erros na criação da programação do curso
@@ -2009,7 +2012,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Isto é baseado em registos deste veículo. Veja o cronograma abaixo para obter mais detalhes
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Na Fatura de Fornecedor {0} datada de {1}
DocType: Customer,Default Price List,Lista de Preços Padrão
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Não pode eliminar o Ano Fiscal de {0}. O Ano Fiscal de {0} está definido como padrão nas Definições Gerais
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Um cliente com o mesmo nome já existe
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Isso enviará os Slides salariais e criará a entrada no diário de acumulação. Você quer prosseguir?
@@ -2023,6 +2026,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Fix. de Preços
DocType: Quotation,Term Details,Dados de Término
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Não pode inscrever mais de {0} estudantes neste grupo de alunos.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (Sem Imposto)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Contagem de leads
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Contagem de leads
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} tem de ser maior do que 0
@@ -2043,7 +2047,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvincular Pagamento no Cancelamento da Fatura
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},A leitura do Conta-quilómetros atual deve ser superior à leitura inicial do Conta-quilómetros {0}
DocType: Restaurant Reservation,No Show,No Show
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Defina Naming Series para {0} via Setup> Configurações> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,País de Regra de Envio
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Licenças e Assiduidade
DocType: Maintenance Visit,Partially Completed,Parcialmente Concluído
@@ -2136,7 +2139,7 @@
DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
DocType: Grant Application,Assessment Mark (Out of 10),Marca de avaliação (fora de 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 móvel Não
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Principal
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variante
DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
DocType: Employee Attendance Tool,Employees HTML,HTML de Funcionários
@@ -2186,7 +2189,7 @@
DocType: Course,Course Abbreviation,Abreviação de Curso
DocType: Student Leave Application,Student Leave Application,Solicitação de Licença de Estudante
DocType: Item,Will also apply for variants,Também se aplicará para as variantes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} no Meio dia em {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},O total de horas de trabalho não deve ser maior que o nr. máx. de horas de trabalho {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Em
@@ -2374,9 +2377,10 @@
DocType: Task,Actual End Date (via Time Sheet),Data de Término Efetiva (através da Folha de Presenças)
DocType: Soil Texture,Soil Type,Tipo de solo
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Quantidade {0} {1} em {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nova mensagem
,Quotation Trends,Tendências de Cotação
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},O Grupo do Item não foi mencionado no definidor de item para o item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta A Receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta A Receber
DocType: Shipping Rule,Shipping Amount,Montante de Envio
DocType: Supplier Scorecard Period,Period Score,Pontuação do período
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Adicionar clientes
@@ -2387,7 +2391,7 @@
,Vehicle Expenses,Despesas de Veículos
DocType: Serial No,Invoice Details,Detalhes da fatura
DocType: Grant Application,Show on Website,Mostrar no site
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},O valor previsto após a vida útil deve ser maior ou igual a {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},O valor previsto após a vida útil deve ser maior ou igual a {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Comece em
DocType: Hub Category,Hub Category,Categoria Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2419,7 +2423,7 @@
DocType: Patient,B Positive,B Positivo
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtd deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para diversas qtds."
DocType: Leave Block List Allow,Leave Block List Allow,Permissão de Lista de Bloqueio de Licenças
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
DocType: Patient Medical Record,Patient Medical Record,Registro Médico do Paciente
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupo a Fora do Grupo
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Desportos
@@ -2470,6 +2474,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Não é possível definir um RFQ recebido para nenhuma cotação
DocType: Quotation,QTN-,QUEST-
DocType: Salary Slip,Total Deduction,Total de Reduções
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Selecione uma conta para imprimir na moeda da conta
,Production Analytics,Analytics produção
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Isso é baseado em transações contra este Paciente. Veja a linha de tempo abaixo para detalhes
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Custo Atualizado
@@ -2525,7 +2530,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecionar Empresa...
DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se for para todos os departamentos
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente, a contrato, estagiário, etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
DocType: Payroll Entry,Fortnightly,Quinzenal
DocType: Currency Exchange,From Currency,De Moeda
DocType: Vital Signs,Weight (In Kilogram),Peso (em quilograma)
@@ -2603,7 +2608,7 @@
DocType: Student,Guardians,Responsáveis
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não será mostrado se Preço de tabela não está definido
DocType: Stock Entry,Total Incoming Value,Valor Total de Entrada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,É necessário colocar o Débito Para
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,É necessário colocar o Débito Para
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","O Registo de Horas ajudar a manter o controlo do tempo, custo e faturação para atividades feitas pela sua equipa"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de Preços de Compra
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelos de variáveis do scorecard do fornecedor.
@@ -2706,7 +2711,7 @@
DocType: Company,For Reference Only.,Só para Referência.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Médico {0} não disponível no {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Selecione lote não
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Inválido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Inválido {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,FPAG-DEV-
DocType: Fee Validity,Reference Inv,Referência Inv
@@ -2743,8 +2748,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custo operacional e dar um só Nr. Operação às suas operações."
DocType: Water Analysis,Origin,Origem
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está acima do limite por {0} {1} para o item {4}. Está a fazer outra {3} no/a mesmo/a {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Selecionar alterar montante de conta
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Selecionar alterar montante de conta
DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
DocType: Naming Series,User must always select,O utilizador tem sempre que escolher
DocType: Stock Settings,Allow Negative Stock,Permitir Stock Negativo
@@ -2800,7 +2805,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Avisar novas ordens de compra
DocType: Quality Inspection Reading,Reading 9,Leitura 9
DocType: Supplier,Is Frozen,Está Congelado
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Não é permitido selecionar o subgrupo de armazém para as transações
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Não é permitido selecionar o subgrupo de armazém para as transações
DocType: Buying Settings,Buying Settings,Definições de Compra
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Produto Acabado
DocType: Upload Attendance,Attendance To Date,Assiduidade Até À Data
@@ -2814,6 +2819,7 @@
DocType: Grant Application,Organization,Organização
DocType: BOM Update Tool,BOM Update Tool,Ferramenta de atualização da lista técnica
DocType: SG Creation Tool Course,Student Group Name,Nome do Grupo de Estudantes
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Mostrar vista explodida
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Criando Taxas
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, certifique-se de que realmente deseja apagar todas as transações para esta empresa. Os seus dados principais permanecerão como estão. Esta ação não pode ser anulada."
DocType: Room,Room Number,Número de Sala
@@ -2824,7 +2830,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Criar modelo de imposto
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Utilizadores
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,As Matérias-primas não podem ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
DocType: Lab Test Sample,Lab Test Sample,Amostra de teste de laboratório
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Lançamento Contabilístico Rápido
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Não pode alterar a taxa se a LDM for mencionada nalgum item
@@ -2895,7 +2901,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Maak Factuur
DocType: Selling Settings,Auto close Opportunity after 15 days,perto Opportunity Auto após 15 dias
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,As ordens de compra não são permitidas para {0} devido a um ponto de avaliação de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,As ordens de compra não são permitidas para {0} devido a um ponto de avaliação de {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fim do Ano
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -3008,7 +3014,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Acima-de-90
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Linha # {0}: O Lançamento Contabilístico {1} não tem uma conta {2} ou está relacionado a outro voucher
DocType: Supplier Scorecard Criteria,Criteria Weight,Critérios Peso
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Fornecedor> Tipo de Fornecedor
DocType: Buying Settings,Default Buying Price List,Lista de Compra de Preço Padrão
DocType: Payroll Entry,Salary Slip Based on Timesheet,Folha de Vencimento Baseada no Registo de Horas
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Taxa de compra
@@ -3098,7 +3103,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Acompanhar Potenciais Clientes por Tipo de Setor.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Ir para cabeçalho
DocType: Item Supplier,Item Supplier,Fornecedor do Item
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para {0} a cotação_para {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todos os Endereços.
DocType: Company,Stock Settings,Definições de Stock
@@ -3288,6 +3293,7 @@
DocType: Company,Default Inventory Account,Conta de inventário padrão
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Linha {0}: A Qtd Concluída deve superior a zero.
DocType: Antibiotic,Antibiotic Name,Nome do antibiótico
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Código do Item> Item Group> Brand
DocType: Purchase Invoice,Apply Additional Discount On,Aplicar Desconto Adicional Em
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Selecione o tipo...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Um link para todas as Unidades Terrestres em que a Cultivo está crescendo
@@ -3483,6 +3489,7 @@
DocType: Supplier,Credit Limit,Limite de Crédito
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Taxa de taxa de venda de preços
DocType: Production Plan Sales Order,Salse Order Date,Data da Ordem de Venda
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Fornecedor> Tipo de Fornecedor
DocType: Salary Component,Salary Component,Componente Salarial
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Os Registos de Pagamento {0} não estão vinculados
DocType: GL Entry,Voucher No,Voucher Nr.
@@ -3492,7 +3499,7 @@
DocType: Leave Allocation,Leave Allocation,Atribuição de Licenças
DocType: Payment Request,Recipient Message And Payment Details,Mensagem E Dados De Pagamento Do Destinatário
DocType: Training Event,Trainer Email,Email do Formador
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Foram criadas as Solicitações de Material {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Foram criadas as Solicitações de Material {0}
DocType: Restaurant Reservation,No of People,Não há pessoas
DocType: Production Planning Tool,Include sub-contracted raw materials,Incluir matérias-primas subcontratadas
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Modelo de termos ou contratos.
@@ -3557,7 +3564,7 @@
DocType: Production Planning Tool,Create Material Requests,Criar Solicitações de Materiais
DocType: Employee Education,School/University,Escola/Universidade
DocType: Payment Request,Reference Details,Dados de Referência
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,O Valor Previsto Após a Vida Útil deve ser inferior ao Valor de Compra a Grosso
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,O Valor Previsto Após a Vida Útil deve ser inferior ao Valor de Compra a Grosso
DocType: Sales Invoice Item,Available Qty at Warehouse,Qtd Disponível no Armazém
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Montante Faturado
DocType: Asset,Double Declining Balance,Saldo Decrescente Duplo
@@ -3569,7 +3576,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obter Atualizações
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: A Conta {2} não pertence à Empresa {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Selecione pelo menos um valor de cada um dos atributos.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,A Solicitação de Material {0} foi cancelada ou interrompida
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,A Solicitação de Material {0} foi cancelada ou interrompida
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Gestão de Licenças
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Agrupar por Conta
DocType: Sales Order,Fully Delivered,Totalmente Entregue
@@ -3580,14 +3587,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Desembolso Valor não pode ser maior do que o valor do empréstimo {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Ir para Programas
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},A linha {0} # O valor alocado {1} não pode ser maior do que a quantidade não reclamada {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Por favor, configure as séries de numeração para Atendimento via Configuração> Série de numeração"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nº da Ordem de Compra necessário para o Item {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Ordem de produção não foi criado
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"A ""Data De"" deve ser depois da ""Data Para"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o estado pois o estudante {0} está ligado à candidatura de estudante {1}
DocType: Asset,Fully Depreciated,Totalmente Depreciados
,Stock Projected Qty,Qtd Projetada de Stock
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},O Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},O Cliente {0} não pertence ao projeto {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,HTML de Presenças Marcadas
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citações são propostas, as propostas que enviou aos seus clientes"
DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
@@ -3672,7 +3678,7 @@
DocType: Stock Settings,Item Naming By,Dar Nome de Item Por
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Foi efetuado outro Registo de Encerramento de Período {0} após {1}
DocType: Production Order,Material Transferred for Manufacturing,Material Transferido para Fabrico
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,A Conta {0} não existe
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,A Conta {0} não existe
DocType: Project,Project Type,Tipo de Projeto
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Tarefa infantil existe para esta Tarefa. Você não pode excluir esta Tarefa.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,É obrigatório colocar a qtd prevista ou o montante previsto.
@@ -3776,11 +3782,11 @@
DocType: Company,Asset Depreciation Cost Center,Centro de Custo de Depreciação de Ativo
DocType: Sales Order Item,Sales Order Date,Data da Ordem de Venda
DocType: Sales Invoice Item,Delivered Qty,Qtd Entregue
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Total Excl. Imposto
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Se for selecionado, todos os subitens de cada item de produção serão incluídos nas Solicitações de Material."
DocType: Assessment Plan,Assessment Plan,Plano de avaliação
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,O cliente {0} é criado.
DocType: Stock Settings,Limit Percent,limite Percent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Configura o sistema de nomeação do instrutor em Educação> Configurações de Educação
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Atualmente não há estoque disponível em qualquer armazém
,Payment Period Based On Invoice Date,Período De Pagamento Baseado Na Data Da Fatura
DocType: Sample Collection,No. of print,Número de impressão
@@ -3796,12 +3802,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Devedores ({0})
DocType: Pricing Rule,Margin,Margem
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novos Clientes
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,% de Lucro Bruto
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,% de Lucro Bruto
DocType: Appraisal Goal,Weightage (%),Peso (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Alterar o perfil do POS
DocType: Bank Reconciliation Detail,Clearance Date,Data de Liquidação
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Relatório de avaliação
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,É obrigatório colocar o Montante de Compra Bruto
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,É obrigatório colocar o Montante de Compra Bruto
DocType: Lead,Address Desc,Descrição de Endereço
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,É obrigatório colocar a parte
DocType: Journal Entry,JV-,JV-
@@ -3833,7 +3839,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Nome permanente
DocType: Stock Entry,Customer or Supplier Details,Dados de Cliente ou Fornecedor
DocType: Employee Loan Application,Required by Date,Exigido por Data
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Balanço de encerramento (Dr-Cr)
DocType: Lead,Lead Owner,Dono de Potencial Cliente
DocType: Bin,Requested Quantity,Quantidade Solicitada
DocType: Patient,Marital Status,Estado Civil
@@ -3847,7 +3852,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variantes múltiplas
DocType: Sales Invoice,Against Income Account,Na Conta de Rendimentos
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Entregue
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: A Qtd Pedida {1} não pode ser inferior à qtd mínima pedida {2} (definida no Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: A Qtd Pedida {1} não pode ser inferior à qtd mínima pedida {2} (definida no Item).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentagem de Distribuição Mensal
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Faça o login como outro usuário.
DocType: Territory,Territory Targets,Metas de Território
@@ -3948,7 +3953,7 @@
DocType: Serial No,Out of AMC,Sem CMA
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Efetuar Visita de Manutenção
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Por favor, contacte o utilizador com a função de Gestor Definidor de Vendas {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Por favor, contacte o utilizador com a função de Gestor Definidor de Vendas {0}"
DocType: Company,Default Cash Account,Conta Caixa Padrão
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Definidor da Empresa (não Cliente ou Fornecedor).
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Isto baseia-se na assiduidade deste Estudante
@@ -4100,7 +4105,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nenhum empregado pelos critérios mencionados
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
DocType: Restaurant,Default Customer,Cliente padrão
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configure o Sistema de Nomeação de Empregados em Recursos Humanos> Configurações de RH
DocType: Assessment Plan,Supervisor Name,Nome do Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Não confirme se o compromisso foi criado no mesmo dia
DocType: Program Enrollment Course,Program Enrollment Course,Curso de inscrição no programa
@@ -4222,7 +4226,7 @@
DocType: BOM,Website Description,Descrição do Website
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variação Líquida na Equidade
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,O mais novo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","O ID de Email deve ser único, já existe para {0}"
DocType: Serial No,AMC Expiry Date,Data de Validade do CMA
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Recibo
@@ -4239,7 +4243,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstração dos Fluxos de Caixa
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Valor do Empréstimo não pode exceder Máximo Valor do Empréstimo de {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licença
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Continuar se também deseja incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
DocType: GL Entry,Against Voucher Type,No Tipo de Voucher
DocType: Physician,Phone (R),Telefone (R)
@@ -4251,7 +4255,7 @@
DocType: Patient,B Negative,B Negativo
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,O status de manutenção deve ser cancelado ou concluído para enviar
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},A conta {0} não pertence à empresa {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Os números de série na linha {0} não correspondem à nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Os números de série na linha {0} não correspondem à nota de entrega
DocType: Student,Guardian Details,Dados de Responsável
DocType: C-Form,C-Form,Form-C
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Presença em vários funcionários
@@ -4293,7 +4297,7 @@
DocType: Stock Entry Detail,Basic Amount,Montante de Base
DocType: Training Event,Exam,Exame
DocType: Complaint,Complaint,Queixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
DocType: Leave Allocation,Unused leaves,Licensas não utilizadas
DocType: Patient,Alcohol Past Use,Uso passado do álcool
DocType: Fertilizer Content,Fertilizer Content,Conteúdo de fertilizante
@@ -4422,6 +4426,7 @@
DocType: Salary Detail,Formula,Fórmula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Série #
DocType: Lab Test Template,Lab Test Template,Modelo de teste de laboratório
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Conta de vendas
DocType: Purchase Invoice Item,Total Weight,Peso total
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comissão sobre Vendas
DocType: Offer Letter Term,Value / Description,Valor / Descrição
@@ -4580,7 +4585,7 @@
DocType: Customer,From Lead,Do Potencial Cliente
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pedidos lançados para a produção.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecione o Ano Fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
DocType: Program Enrollment Tool,Enroll Students,Matricular Estudantes
DocType: Lab Test,Approved Date,Data aprovada
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda Padrão
@@ -4657,7 +4662,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Item de Produção
,Employee Information,Informações do Funcionário
DocType: Stock Entry Detail,Additional Cost,Custo Adicional
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Não pode filtrar com base no Nr. de Voucher, se estiver agrupado por Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Não pode filtrar com base no Nr. de Voucher, se estiver agrupado por Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Efetuar Cotação de Fornecedor
DocType: Quality Inspection,Incoming,Entrada
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Os modelos de imposto padrão para vendas e compra são criados.
@@ -4674,7 +4679,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Nota: {0}
,Delivery Note Trends,Tendências das Guias de Remessa
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Resumo da Semana
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Quantidade em stock
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Quantidade em stock
DocType: Delivery Trip,Calculate Estimated Arrival Times,Calcule os horários de chegada estimados
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,A Conta: {0} só pode ser atualizada através das Transações de Stock
DocType: Student Group Creation Tool,Get Courses,Obter Cursos
@@ -4690,7 +4695,7 @@
DocType: Material Request,% Ordered,% Pedida
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para o Grupo de Estudantes com Curso, o Curso será validado para cada Estudante dos Cursos Inscritos em Inscrição no Programa."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Trabalho à Peça
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Preço de compra médio
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Preço de compra médio
DocType: Task,Actual Time (in Hours),Tempo Real (em Horas)
DocType: Employee,History In Company,Historial na Empresa
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nova mensagem de {sender}
@@ -4738,7 +4743,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Linha {0}: A Moeda da LDM # {1} deve ser igual à moeda selecionada {2}
DocType: Journal Entry Account,Exchange Rate,Valor de Câmbio
DocType: Patient,Additional information regarding the patient,Informações adicionais sobre o paciente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,A Ordem de Vendas {0} não foi enviada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,A Ordem de Vendas {0} não foi enviada
DocType: Homepage,Tag Line,Linha de tag
DocType: Fee Component,Fee Component,Componente de Propina
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestão de Frotas
@@ -4959,7 +4964,7 @@
DocType: Employee Education,Employee Education,Educação do Funcionário
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Foi encontrado um grupo item duplicado na tabela de grupo de itens
DocType: Land Unit,Parent Land Unit,Unidade de Terra Parental
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,É preciso buscar os Dados do Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,É preciso buscar os Dados do Item.
DocType: Fertilizer,Fertilizer Name,Nome do fertilizante
DocType: Salary Slip,Net Pay,Rem. Líquida
DocType: Account,Account,Conta
@@ -5038,7 +5043,7 @@
DocType: Item Customer Detail,Ref Code,Código de Ref.
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Grupo de clientes é obrigatório no perfil POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registos de Funcionários.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Por favor, defina a Próximo Data de Depreciação"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Por favor, defina a Próximo Data de Depreciação"
DocType: HR Settings,Payroll Settings,Definições de Folha de Pagamento
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não vinculados.
DocType: POS Settings,POS Settings,Configurações de POS
@@ -5206,7 +5211,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Lembrete de Aniversário para o/a {0}
DocType: Asset Maintenance Task,Last Completion Date,Última Data de Conclusão
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias Desde a última Ordem
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
DocType: Buying Settings,Naming Series,Série de Atrib. de Nomes
DocType: Leave Block List,Leave Block List Name,Nome de Lista de Bloqueio de Licenças
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de Início do Seguro deve ser anterior à data de Término do Seguro
@@ -5336,6 +5341,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Obter Registos de Pagamento
DocType: Quotation Item,Against Docname,No Nomedoc
DocType: SMS Center,All Employee (Active),Todos os Funcionários (Ativos)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Cliente> Grupo de Clientes> Território
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Já
DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
DocType: Item Reorder,Re-Order Level,Nível de Reencomenda
@@ -5436,7 +5442,6 @@
DocType: Room,Seating Capacity,Capacidade de Lugares
DocType: Issue,ISS-,PROB-
DocType: Lab Test Groups,Lab Test Groups,Grupos de teste de laboratório
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Cliente> Grupo de Clientes> Território
DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (através de Reinvidicações de Despesas)
DocType: GST Settings,GST Summary,Resumo do GST
DocType: Assessment Result,Total Score,Pontuação total
@@ -5449,7 +5454,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Seguiram os horários dos cursos criados
DocType: Journal Entry,Total Debit,Débito Total
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Armazém de Produtos Acabados Padrão
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Vendedor/a
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedor/a
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Orçamento e Centro de Custo
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,O modo de pagamento padrão múltiplo não é permitido
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,para o
@@ -5624,7 +5629,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar Imposto ou Encargo para
DocType: Driver,Driving License Category,Categoria de licença de condução
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,É obrigatório colocar a Qtd Efetiva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} atualmente tem um {1} Guia de Scorecard do Fornecedor e as Ordens de Compra para este fornecedor devem ser emitidas com cautela.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} atualmente tem um {1} Guia de Scorecard do Fornecedor e as Ordens de Compra para este fornecedor devem ser emitidas com cautela.
DocType: Asset Maintenance Team,Asset Maintenance Team,Equipe de manutenção de ativos
DocType: Employee Loan,Loan Type,Tipo de empréstimo
DocType: Scheduling Tool,Scheduling Tool,Ferramenta de Agendamento
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 409304d..2839126 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sortați după Preț
,Delay Days,Zilele întârziate
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Cheltuieli de serviciu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Factură
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Asigurați intrarea stocului de retenție
DocType: Purchase Invoice Item,Item Weight Details,Greutate Detalii articol
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referință: {0}, Cod articol: {1} și Client: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Deschidere pentru un loc de muncă.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM nu este specificat pentru subcontractarea elementului {0} la rândul {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM nu este specificat pentru subcontractarea elementului {0} la rândul {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Rezultat transmis
DocType: Item Attribute,Increment,Creștere
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Interval de timp
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nu este permisă {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obține elemente din
DocType: Price List,Price Not UOM Dependant,Pretul nu este dependent de UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produs {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nu sunt enumerate elemente
DocType: Asset Repair,Error Description,Descrierea erorii
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Băcănie
DocType: Quality Inspection Reading,Reading 1,Lectura 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fondurile de pensii
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Data următoarei amortizări nu poate fi înainte de Data achiziției
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Data următoarei amortizări nu poate fi înainte de Data achiziției
DocType: Crop,Perennial,peren
DocType: Consultation,Consultation Date,Data consultării
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Catalog de produse și descoperire pentru utilizatorii ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","de exemplu, "Școala primară" sau "Universitatea""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Rapoarte de stoc
DocType: Warehouse,Warehouse Detail,Depozit Detaliu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Pe termen Data de încheiere nu poate fi mai târziu de Anul Data de încheiere a anului universitar la care este legat termenul (anului universitar {}). Vă rugăm să corectați datele și încercați din nou.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Este activ fix"" nu poate fi debifată deoarece există informații împotriva produsului"
DocType: Delivery Trip,Departure Time,Timp de plecare
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Obține detaliile specificațiilor
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Modele de clasificare a furnizorilor.
DocType: Lead,Interested,Interesat
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Deschidere
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Deschidere
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},De la {0} {1} la
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Eroare la instalarea taxelor
DocType: Item,Copy From Item Group,Copiere din Grupul de Articole
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Frunze pe an
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rând {0}: Vă rugăm să verificați ""Este Advance"" împotriva Cont {1} dacă aceasta este o intrare în avans."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
DocType: Email Digest,Profit & Loss,Pierderea profitului
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litru
DocType: Task,Total Costing Amount (via Time Sheet),Suma totală de calculație a costurilor (prin timp Sheet)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Aceasta se bazează pe tranzacții împotriva acestei companii. Consultați linia temporală de mai jos pentru detalii
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica prin e-mail la crearea de cerere automată Material
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Rezistent
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi valutar
DocType: Opening Invoice Creation Tool,Invoice Type,Factura Tip
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Nota de Livrare
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Văduvit
DocType: Request for Quotation,Request for Quotation,Cerere de ofertă
DocType: Healthcare Settings,Require Lab Test Approval,Necesita aprobarea laboratorului de test
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Codul elementului> Element Grup> Brand
DocType: Salary Slip Timesheet,Working Hours,Ore de lucru
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total deosebit
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Schimbați secventa de numar de inceput / curent a unei serii existente.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Va rugam sa introduceti Cost Center
DocType: Drug Prescription,Dosage,Dozare
DocType: Journal Entry Account,Sales Order,Comandă de vânzări
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Rată de vânzare medie
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Rată de vânzare medie
DocType: Assessment Plan,Examiner Name,Nume examinator
DocType: Lab Test Template,No Result,Nici un rezultat
DocType: Purchase Invoice Item,Quantity and Rate,Cantitatea și rata
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Perioada de selectare Salarizare
DocType: Purchase Invoice,Unpaid,Neachitat
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervat pentru vânzare
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configurați sistemul de numire a angajaților în Resurse umane> Setări HR
DocType: Packing Slip,From Package No.,Din Pachetul Nr.
DocType: Item Attribute,To Range,La gama
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titluri de valoare și depozite
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,Atelier
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avertizați comenzile de cumpărare
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Piese de schimb suficient pentru a construi
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Piese de schimb suficient pentru a construi
DocType: POS Profile User,POS Profile User,Utilizator de profil POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Venituri Directe
DocType: Patient Appointment,Date TIme,Data TIme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Ofițer administrativ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Înființarea companiei și a taxelor
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Selectați cursul
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Diferența de Cont
DocType: Purchase Invoice,Supplier GSTIN,Furnizor GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Nu poate sarcină aproape ca misiune dependente {0} nu este închis.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
DocType: Lab Test Template,Lab Routine,Laboratorul de rutină
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Cosmetică
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relația cu Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
DocType: Payment Entry,Payment From / To,Plata De la / la
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Noua limită de credit este mai mică decât valoarea curentă restante pentru client. Limita de credit trebuie să fie atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Noua limită de credit este mai mică decât valoarea curentă restante pentru client. Limita de credit trebuie să fie atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vă rugăm să configurați un cont în Warehouse {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Bazat pe' și 'Grupat dupa' nu pot fi identice
DocType: Sales Person,Sales Person Targets,Obiective de vânzări Persoana
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,Nume lot
DocType: Fee Validity,Max number of visit,Numărul maxim de vizite
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Pontajul creat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,A se inscrie
DocType: GST Settings,GST Settings,Setări GST
DocType: Selling Settings,Customer Naming By,Numire Client de catre
@@ -958,7 +959,7 @@
DocType: Budget,Budget Against,Buget împotriva
DocType: Employee,Cell Number,Număr Celula
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Nu există angajat pentru criteriile date. Verificați dacă salariile nu au fost deja create.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Cereri materiale Auto Generat
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Cereri materiale Auto Generat
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Pierdut
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervat pentru fabricare
@@ -966,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
DocType: Opportunity,Opportunity From,Oportunitate de la
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declarația salariu lunar.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rând {0}: {1} Numerele de serie necesare pentru articolul {2}. Ați oferit {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rând {0}: {1} Numerele de serie necesare pentru articolul {2}. Ați oferit {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selectați un tabel
DocType: BOM,Website Specifications,Site-ul Specificații
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} este o adresă de e-mail nevalidă în secțiunea "Destinatari"
@@ -1054,7 +1055,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Citat Solicitat
DocType: Vital Signs,Heart Rate / Pulse,Ritm cardiac / puls
DocType: Company,Default Bank Account,Cont Bancar Implicit
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Actualizare stoc"" nu poate fi activat, deoarece obiectele nu sunt livrate prin {0}"
DocType: Vehicle,Acquisition Date,Data achiziției
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1079,7 +1080,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Încărcați capul scrisorii dvs. (Păstrați-l prietenos pe web ca 900px la 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cont {2} nu poate fi un grup
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Postul rând {IDX}: {DOCTYPE} {DOCNAME} nu există în sus "{DOCTYPE} 'masă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizat sau anulat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizat sau anulat
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nu există nicio sarcină
DocType: Item Variant Settings,Copy Fields to Variant,Copiați câmpurile în varianta
DocType: Asset,Opening Accumulated Depreciation,Deschidere Amortizarea Acumulate
@@ -1191,9 +1192,10 @@
DocType: Production Order,Plan material for sub-assemblies,Material Plan de subansambluri
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parteneri de vânzări și teritoriu
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} trebuie să fie activ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Închidere (deschidere + total)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Închidere (deschidere + total)
DocType: Journal Entry,Depreciation Entry,amortizare intrare
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vă rugăm să selectați tipul de document primul
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Imprimați în moneda contului
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuleaza Vizite Material {0} înainte de a anula această Vizita de întreținere
DocType: Crop Cycle,ISO 8016 standard,Standardul ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Nu {0} nu aparține postul {1}
@@ -1219,7 +1221,7 @@
DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
DocType: Fee Structure,Components,Componente
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Vă rugăm să introduceți activ Categorie la postul {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Vă rugăm să introduceți activ Categorie la postul {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Postul variante {0} actualizat
DocType: Quality Inspection Reading,Reading 6,Lectura 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1271,6 +1273,7 @@
,Company Name,Denumire Furnizor
DocType: SMS Center,Total Message(s),Total mesaj(e)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setați seria de numire pentru {0} prin Configurare> Setări> Serii de numire
DocType: Purchase Invoice,Additional Discount Percentage,Procentul discount suplimentar
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vizualizați o listă cu toate filmele de ajutor
DocType: Agriculture Analysis Criteria,Soil Texture,Textura solului
@@ -1299,7 +1302,7 @@
DocType: BOM Website Item,BOM Website Item,Site-ul BOM Articol
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
DocType: Timesheet Detail,Bill,Factură
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Data următoarei amortizări este introdusă ca dată trecută
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Data următoarei amortizări este introdusă ca dată trecută
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Alb
DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rândul {0}: Cant nu este disponibil pentru {4} în depozit {1} în postarea momentul înscrierii ({2} {3})
@@ -1316,7 +1319,7 @@
DocType: Lead,Next Contact Date,Următor Contact Data
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Deschiderea Cantitate
DocType: Healthcare Settings,Appointment Reminder,Memento pentru numire
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
DocType: Program Enrollment Tool Student,Student Batch Name,Nume elev Lot
DocType: Consultation,Doctor,Doctor
DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
@@ -1332,6 +1335,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Mijloc pentru Alocare Concediu
DocType: Item,Hub Category to Publish,Categorie Hub pentru publicare
DocType: Leave Block List,Leave Block List Dates,Date Lista Concedii Blocate
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare> Serie de numerotare
DocType: Sales Invoice,Billing Address GSTIN,Adresa de facturare GSTIN
DocType: Assessment Plan,Evaluate,A evalua
DocType: Workstation,Net Hour Rate,Net Rata de ore
@@ -1366,7 +1370,7 @@
DocType: Purchase Receipt,PREC-RET-,CCRP-RET-
DocType: POS Profile,Sales Invoice Payment,Vânzări factură de plată
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Depozit rezervat în Comanda de Vânzări / Depozit Produse Finite
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Vanzarea Suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Vanzarea Suma
DocType: Repayment Schedule,Interest Amount,Suma Dobânda
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sunteți aprobator cheltuieli pentru acest record. Vă rugăm Actualizați ""statutul"" și Salvare"
DocType: Serial No,Creation Document No,Creare Document Nr.
@@ -1458,7 +1462,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Sold Contabilitate
,GST Sales Register,Registrul vânzărilor GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Vanzare Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nimic de a solicita
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nimic de a solicita
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Selectați-vă domeniile
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un alt record buget '{0} "există deja împotriva {1}' {2} 'pentru anul fiscal {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Câmpurile vor fi copiate numai în momentul creării.
@@ -1468,11 +1472,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Acest lucru va fi adăugat la Codul punctul de varianta. De exemplu, în cazul în care abrevierea este ""SM"", iar codul produs face ""T-SHIRT"", codul punctul de varianta va fi ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay net (în cuvinte) vor fi vizibile după ce salvați fluturasul de salariu.
DocType: Purchase Invoice,Is Return,Este de returnare
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Prudență
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Prudență
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Returnare / debit Notă
DocType: Price List Country,Price List Country,Lista de preturi Țară
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} numere de serie valabile pentru articolul {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} numere de serie valabile pentru articolul {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Cod articol nu pot fi schimbate pentru Serial No.
DocType: Purchase Invoice Item,UOM Conversion Factor,Factorul de conversie UOM
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vă rugăm să introduceți codul de articol pentru a obține numărul de lot
@@ -1578,7 +1582,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
DocType: Supplier Scorecard,Warn for new Request for Quotations,Avertizare pentru o nouă solicitare de ofertă
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Comenzile de aprovizionare vă ajuta să planificați și să urmați pe achizițiile dvs.
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Cerințe privind testarea la laborator
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Cantitatea totală de emisie / transfer {0} din solicitarea materialului {1} nu poate fi mai mare decât cantitatea cerută {2} pentru articolul {3}
@@ -1618,7 +1622,6 @@
DocType: Warehouse,Warehouse Contact Info,Date de contact depozit
DocType: Payment Entry,Write Off Difference Amount,Diferență Sumă Piertdute
DocType: Volunteer,Volunteer Name,Nume de voluntar
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vă rugăm să configurați Sistemul de denumire a instructorului în Educație> Setări educaționale
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: E-mail-ul angajatului nu a fost găsit, prin urmare, nu a fost trimis mail"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Norma de transport nu se aplică țării {0}
DocType: Item,Foreign Trade Details,Detalii Comerț Exterior
@@ -1630,7 +1633,7 @@
DocType: Student Group Student,Group Roll Number,Numărul rolurilor de grup
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totală a tuturor greutăților sarcinii trebuie să fie 1. Ajustați greutățile tuturor sarcinilor de proiect în consecință
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Echipamente de Capital
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regula de stabilire a prețurilor este selectat în primul rând bazat pe ""Aplicați pe"" teren, care poate fi produs, Grupa de articole sau de brand."
@@ -1655,7 +1658,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Există depozit copil pentru acest depozit. Nu puteți șterge acest depozit.
DocType: Item,Website Item Groups,Site-ul Articol Grupuri
DocType: Purchase Invoice,Total (Company Currency),Total (Company valutar)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Număr de serie {0} a intrat de mai multe ori
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Număr de serie {0} a intrat de mai multe ori
DocType: Journal Entry,Journal Entry,Intrare în jurnal
DocType: Expense Claim Advance,Unclaimed amount,Sumă nerevendicată
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} elemente în curs
@@ -1752,7 +1755,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicare.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Accesul din portal la Cererea de Oferta este dezactivat, verificați setările portalului."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Scorul variabil al scorului de performanță al furnizorului
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Suma de Cumpărare
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Suma de Cumpărare
DocType: Sales Invoice,Shipping Address Name,Transport Adresa Nume
DocType: Material Request,Terms and Conditions Content,Termeni și condiții de conținut
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Au apărut erori la crearea programului de curs
@@ -2018,7 +2021,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Aceasta se bazează pe bușteni împotriva acestui vehicul. A se vedea calendarul de mai jos pentru detalii
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Contra facturii furnizorului {0} din data {1}
DocType: Customer,Default Price List,Lista de Prețuri Implicita
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nu puteți șterge Anul fiscal {0}. Anul fiscal {0} este setat ca implicit în Setări globale
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Un client cu același nume există deja
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Aceasta va trimite salariile de salarizare și va crea înregistrarea de înregistrare în jurnal. Doriți să continuați?
@@ -2032,6 +2035,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Stabilirea pretului
DocType: Quotation,Term Details,Detalii pe termen
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nu se poate inscrie mai mult de {0} studenți pentru acest grup de studenți.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Total (fără taxe)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conducerea contabilă
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Conducerea contabilă
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} trebuie să fie mai mare decât 0
@@ -2052,7 +2056,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Plata unlink privind anularea facturii
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Kilometrajul curentă introdusă trebuie să fie mai mare decât inițială a vehiculului odometru {0}
DocType: Restaurant Reservation,No Show,Neprezentare
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setați seria de numire pentru {0} prin Configurare> Setări> Serii de numire
DocType: Shipping Rule Country,Shipping Rule Country,Regula de transport maritim Tara
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Plece și prezență
DocType: Maintenance Visit,Partially Completed,Parțial finalizate
@@ -2145,7 +2148,7 @@
DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
DocType: Grant Application,Assessment Mark (Out of 10),Marca de evaluare (din 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 mobil nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Principal
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variantă
DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
DocType: Employee Attendance Tool,Employees HTML,Angajații HTML
@@ -2195,7 +2198,7 @@
DocType: Course,Course Abbreviation,Abreviere curs de
DocType: Student Leave Application,Student Leave Application,Aplicație elev Concediul
DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Activul nu poate fi anulat, deoarece este deja {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Activul nu poate fi anulat, deoarece este deja {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Angajat {0} pe jumătate de zi pe {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Numărul total de ore de lucru nu trebuie sa fie mai mare de ore de lucru max {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pornit
@@ -2382,9 +2385,10 @@
DocType: Task,Actual End Date (via Time Sheet),Data de încheiere efectivă (prin Pontaj)
DocType: Soil Texture,Soil Type,Tipul de sol
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Suma {0} {1} împotriva {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Mesaj nou
,Quotation Trends,Cotație Tendințe
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
DocType: Shipping Rule,Shipping Amount,Suma de transport maritim
DocType: Supplier Scorecard Period,Period Score,Scorul perioadei
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Adăugați clienți
@@ -2395,7 +2399,7 @@
,Vehicle Expenses,Cheltuielile pentru vehicule
DocType: Serial No,Invoice Details,Detaliile facturii
DocType: Grant Application,Show on Website,Afișați pe site
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valoarea așteptată după viață utilă trebuie să fie mai mare sau egal cu {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Valoarea așteptată după viață utilă trebuie să fie mai mare sau egal cu {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Începe
DocType: Hub Category,Hub Category,Categorie Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2427,7 +2431,7 @@
DocType: Patient,B Positive,B pozitiv
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rând # {0}: Cant trebuie să fie 1, ca element este un activ fix. Vă rugăm să folosiți rând separat pentru cantitati multiple."
DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abr. nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abr. nu poate fi gol sau spațiu
DocType: Patient Medical Record,Patient Medical Record,Dosarul medical al pacientului
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grup non-grup
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2478,6 +2482,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Nu se poate seta un RFQ primit la nici o cotatie
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Total de deducere
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Selectați un cont pentru a imprima în moneda contului
,Production Analytics,Google Analytics de producție
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Aceasta se bazează pe tranzacțiile împotriva acestui pacient. Consultați linia temporală de mai jos pentru detalii
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Cost actualizat
@@ -2532,7 +2537,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selectați compania ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Lăsați necompletat dacă se consideră pentru toate departamentele
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tipuri de locuri de muncă (permanent, contractul, intern etc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
DocType: Payroll Entry,Fortnightly,bilunară
DocType: Currency Exchange,From Currency,Din moneda
DocType: Vital Signs,Weight (In Kilogram),Greutate (în kilograme)
@@ -2610,7 +2615,7 @@
DocType: Student,Guardians,tutorii
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Prețurile nu vor fi afișate în cazul în care Prețul de listă nu este setat
DocType: Stock Entry,Total Incoming Value,Valoarea totală a sosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Pentru debit este necesar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Pentru debit este necesar
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Pontaje ajuta să urmăriți timp, costuri și de facturare pentru activitati efectuate de echipa ta"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cumparare Lista de preturi
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Șabloane ale variabilelor pentru scorurile pentru furnizori.
@@ -2713,7 +2718,7 @@
DocType: Company,For Reference Only.,Numai Pentru referință.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Medic {0} nu este disponibil la {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Selectați numărul lotului
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Invalid {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Referință Inv
@@ -2750,8 +2755,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifica operațiunilor, costurile de exploatare și să dea o operațiune unică nu pentru operațiunile dumneavoastră."
DocType: Water Analysis,Origin,Origine
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Acest document este peste limita de {0} {1} pentru elementul {4}. Faci un alt {3} împotriva aceleași {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Vă rugăm să setați recurente după salvare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,cont Selectați suma schimbare
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Vă rugăm să setați recurente după salvare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,cont Selectați suma schimbare
DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
DocType: Stock Settings,Allow Negative Stock,Permiteţi stoc negativ
@@ -2807,7 +2812,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Avertizați pentru comenzi noi de achiziție
DocType: Quality Inspection Reading,Reading 9,Lectură 9
DocType: Supplier,Is Frozen,Este înghețat
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,depozit nod grup nu este permis să selecteze pentru tranzacții
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,depozit nod grup nu este permis să selecteze pentru tranzacții
DocType: Buying Settings,Buying Settings,Configurări cumparare
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nr. BOM pentru un articol tip produs finalizat
DocType: Upload Attendance,Attendance To Date,Prezenţa până la data
@@ -2821,6 +2826,7 @@
DocType: Grant Application,Organization,Organizare
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Numele grupului studențesc
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Afișați vizualizarea explodată
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Crearea de taxe
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Vă rugăm să asigurați-vă că într-adevăr să ștergeți toate tranzacțiile pentru această companie. Datele dvs. de bază vor rămâne așa cum este. Această acțiune nu poate fi anulată.
DocType: Room,Room Number,Numărul de cameră
@@ -2831,7 +2837,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Faceți șablon de taxă
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utilizator
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Materii Prime nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
DocType: Lab Test Sample,Lab Test Sample,Test de laborator
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick Jurnal de intrare
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
@@ -2902,7 +2908,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Realizare Factura
DocType: Selling Settings,Auto close Opportunity after 15 days,Închidere automata Oportunitate după 15 zile
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Comenzile de cumpărare nu sunt permise pentru {0} datorită unui punctaj din {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Comenzile de cumpărare nu sunt permise pentru {0} datorită unui punctaj din {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Anul de încheiere
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Cota / Plumb%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
@@ -3014,7 +3020,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-si mai mult
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rând # {0}: Jurnal de intrare {1} nu are cont {2} sau deja compensată împotriva unui alt voucher
DocType: Supplier Scorecard Criteria,Criteria Weight,Criterii Greutate
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Furnizor> Tipul furnizorului
DocType: Buying Settings,Default Buying Price List,Lista de POrețuri de Cumparare Implicita
DocType: Payroll Entry,Salary Slip Based on Timesheet,Bazat pe salariu Slip Pontaj
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Rata de cumparare
@@ -3104,7 +3109,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track conduce de Industrie tip.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Mergeți la Letterheads
DocType: Item Supplier,Item Supplier,Furnizor Articol
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toate adresele.
DocType: Company,Stock Settings,Setări stoc
@@ -3294,6 +3299,7 @@
DocType: Company,Default Inventory Account,Contul de inventar implicit
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Rândul {0}: Completat Cant trebuie să fie mai mare decât zero.
DocType: Antibiotic,Antibiotic Name,Numele antibioticului
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Codul elementului> Element Grup> Brand
DocType: Purchase Invoice,Apply Additional Discount On,Aplicați Discount suplimentare La
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Selectați Tip ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,O legătură cu toate unitățile terestre în care cultura crește
@@ -3489,6 +3495,7 @@
DocType: Supplier,Credit Limit,Limita de Credit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Med. Rata de listare a prețurilor de vânzare
DocType: Production Plan Sales Order,Salse Order Date,Salse Data comenzii
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Furnizor> Tipul furnizorului
DocType: Salary Component,Salary Component,Componenta de salarizare
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Intrările de plată {0} sunt nesemnalate legate
DocType: GL Entry,Voucher No,Voletul nr
@@ -3498,7 +3505,7 @@
DocType: Leave Allocation,Leave Allocation,Alocare Concediu
DocType: Payment Request,Recipient Message And Payment Details,Mesaj destinatar și Detalii de plată
DocType: Training Event,Trainer Email,trainer e-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Cererile de materiale {0} a creat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Cererile de materiale {0} a creat
DocType: Restaurant Reservation,No of People,Nr de oameni
DocType: Production Planning Tool,Include sub-contracted raw materials,Includ materii prime contractate sub-
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Șablon de termeni sau contractului.
@@ -3563,7 +3570,7 @@
DocType: Production Planning Tool,Create Material Requests,Creare Necesar de Materiale
DocType: Employee Education,School/University,Școlar / universitar
DocType: Payment Request,Reference Details,Detalii de referință
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valoarea așteptată după viață utilă trebuie să fie mai mică Sumă brută Cumpărare
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Valoarea așteptată după viață utilă trebuie să fie mai mică Sumă brută Cumpărare
DocType: Sales Invoice Item,Available Qty at Warehouse,Cantitate disponibilă în depozit
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Sumă facturată
DocType: Asset,Double Declining Balance,Dublu degresive
@@ -3575,7 +3582,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obțineți actualizări
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Cont {2} nu aparține Companiei {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Selectați cel puțin o valoare din fiecare dintre atribute.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Lasă Managementul
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grup in functie de Cont
DocType: Sales Order,Fully Delivered,Livrat complet
@@ -3586,14 +3593,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma debursate nu poate fi mai mare decât Suma creditului {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Accesați Programe
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rândul {0} # Suma alocată {1} nu poate fi mai mare decât suma nerevendicată {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare> Serie de numerotare
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Comanda de producție nu a fost creat
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie dupã 'Până în Data'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nu se poate schimba statutul de student ca {0} este legat cu aplicația de student {1}
DocType: Asset,Fully Depreciated,Depreciata pe deplin
,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Participarea marcat HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Cotațiile sunt propuneri, sumele licitate le-ați trimis clienților dvs."
DocType: Sales Order,Customer's Purchase Order,Comandă clientului
@@ -3678,7 +3684,7 @@
DocType: Stock Settings,Item Naming By,Denumire Articol Prin
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},O altă intrare închidere de perioada {0} a fost efectuată după {1}
DocType: Production Order,Material Transferred for Manufacturing,Materii Transferate pentru fabricarea
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Contul {0} nu există
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Contul {0} nu există
DocType: Project,Project Type,Tip de proiect
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Sarcina pentru copii există pentru această sarcină. Nu puteți șterge această activitate.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cantitatea țintă sau valoarea țintă este obligatorie.
@@ -3782,11 +3788,11 @@
DocType: Company,Asset Depreciation Cost Center,Centru de cost Amortizare Activ
DocType: Sales Order Item,Sales Order Date,Comandă de vânzări Data
DocType: Sales Invoice Item,Delivered Qty,Cantitate Livrata
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Total Excl. Impozit
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Dacă este bifată, toți copiii fiecărui element de producție vor fi incluse în Cererile materiale."
DocType: Assessment Plan,Assessment Plan,Plan de evaluare
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Clientul {0} este creat.
DocType: Stock Settings,Limit Percent,Limita procentuală
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vă rugăm să configurați Sistemul de denumire a instructorului în Educație> Setări educaționale
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,În prezent nu există stoc disponibil în niciun depozit
,Payment Period Based On Invoice Date,Perioada de plată Bazat pe Data facturii
DocType: Sample Collection,No. of print,Nr. De imprimare
@@ -3802,12 +3808,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Debitorilor ({0})
DocType: Pricing Rule,Margin,Margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clienți noi
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Profit Brut%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Profit Brut%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Schimbarea profilului POS
DocType: Bank Reconciliation Detail,Clearance Date,Data Aprobare
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Raport de evaluare
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Valoarea brută Achiziția este obligatorie
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Valoarea brută Achiziția este obligatorie
DocType: Lead,Address Desc,Adresă Desc
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party este obligatorie
DocType: Journal Entry,JV-,JV-
@@ -3839,7 +3845,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Numele permanent
DocType: Stock Entry,Customer or Supplier Details,Client sau furnizor Detalii
DocType: Employee Loan Application,Required by Date,Cerere livrare la data de
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Bilanțul de închidere (Dr-Cr)
DocType: Lead,Lead Owner,Proprietar Conducere
DocType: Bin,Requested Quantity,Cantitate solicitată
DocType: Patient,Marital Status,Stare civilă
@@ -3853,7 +3858,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variante multiple
DocType: Sales Invoice,Against Income Account,Comparativ contului de venit
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Livrat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postul {0}: Cantitate comandat {1} nu poate fi mai mică de cantitate minimă de comandă {2} (definită la punctul).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postul {0}: Cantitate comandat {1} nu poate fi mai mică de cantitate minimă de comandă {2} (definită la punctul).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Conectați-vă ca un alt utilizator.
DocType: Territory,Territory Targets,Obiective Territory
@@ -3954,7 +3959,7 @@
DocType: Serial No,Out of AMC,Din AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
DocType: Company,Default Cash Account,Cont de Numerar Implicit
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Aceasta se bazează pe prezența acestui student
@@ -4106,7 +4111,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Nu există angajați pentru criteriile menționate
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
DocType: Restaurant,Default Customer,Clientul implicit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Configurați sistemul de numire a angajaților în Resurse umane> Setări HR
DocType: Assessment Plan,Supervisor Name,Nume supervizor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Nu confirmați dacă se creează o întâlnire pentru aceeași zi
DocType: Program Enrollment Course,Program Enrollment Course,Curs de înscriere la curs
@@ -4229,7 +4233,7 @@
DocType: BOM,Website Description,Site-ul Descriere
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Schimbarea net în capitaluri proprii
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Cele mai noi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa de e-mail trebuie să fie unic, există deja pentru {0}"
DocType: Serial No,AMC Expiry Date,Dată expirare AMC
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Chitanţă
@@ -4246,7 +4250,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Situația fluxurilor de trezorerie
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma creditului nu poate depăși valoarea maximă a împrumutului de {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licență
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vă rugăm să selectați reporta dacă doriți și să includă echilibrul de anul precedent fiscal lasă în acest an fiscal
DocType: GL Entry,Against Voucher Type,Contra tipului de voucher
DocType: Physician,Phone (R),Telefon (R)
@@ -4258,7 +4262,7 @@
DocType: Patient,B Negative,B Negativ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Starea de întreținere trebuie anulată sau finalizată pentru a fi trimisă
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Numerele de serie din rândul {0} nu se potrivesc cu Nota de livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Numerele de serie din rândul {0} nu se potrivesc cu Nota de livrare
DocType: Student,Guardian Details,Detalii tutore
DocType: C-Form,C-Form,Formular-C
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcă Participarea pentru mai mulți angajați
@@ -4300,7 +4304,7 @@
DocType: Stock Entry Detail,Basic Amount,Suma de bază
DocType: Training Event,Exam,Examen
DocType: Complaint,Complaint,Plângere
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
DocType: Leave Allocation,Unused leaves,Frunze neutilizate
DocType: Patient,Alcohol Past Use,Utilizarea anterioară a alcoolului
DocType: Fertilizer Content,Fertilizer Content,Conținut de îngrășăminte
@@ -4429,6 +4433,7 @@
DocType: Salary Detail,Formula,Formulă
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Cont de vanzari
DocType: Purchase Invoice Item,Total Weight,Greutate totală
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comision pentru Vânzări
DocType: Offer Letter Term,Value / Description,Valoare / Descriere
@@ -4587,7 +4592,7 @@
DocType: Customer,From Lead,Din Conducere
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comenzi lansat pentru producție.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selectați anul fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
DocType: Program Enrollment Tool,Enroll Students,Studenți Enroll
DocType: Lab Test,Approved Date,Data aprobarii
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vanzarea Standard
@@ -4664,7 +4669,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Producția Postul
,Employee Information,Informații angajat
DocType: Stock Entry Detail,Additional Cost,Cost aditional
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Realizeaza Ofertă Furnizor
DocType: Quality Inspection,Incoming,Primite
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Se creează șabloane fiscale predefinite pentru vânzări și achiziții.
@@ -4681,7 +4686,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Notă: {0}
,Delivery Note Trends,Tendințe Nota de Livrare
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Rezumat această săptămână
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,În stoc Cantitate
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,În stoc Cantitate
DocType: Delivery Trip,Calculate Estimated Arrival Times,Calculați orele estimate de sosire
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Contul: {0} poate fi actualizat doar prin Tranzacții stoc
DocType: Student Group Creation Tool,Get Courses,Cursuri de a lua
@@ -4697,7 +4702,7 @@
DocType: Material Request,% Ordered,% Comandat
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Pentru grupul de studenți bazat pe cursuri, cursul va fi validat pentru fiecare student din cursurile înscrise în înscrierea în program."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Muncă în acord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Rată de cumparare medie
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Rată de cumparare medie
DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
DocType: Employee,History In Company,Istoric In Companie
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Mesaj nou de la {expeditor}
@@ -4745,7 +4750,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rând {0}: Moneda de BOM # {1} ar trebui să fie egal cu moneda selectată {2}
DocType: Journal Entry Account,Exchange Rate,Rata de schimb
DocType: Patient,Additional information regarding the patient,Informații suplimentare privind pacientul
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
DocType: Homepage,Tag Line,Eticheta linie
DocType: Fee Component,Fee Component,Taxa de Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Conducerea flotei
@@ -4959,7 +4964,7 @@
DocType: Employee Education,Employee Education,Educație Angajat
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Grup de element dublu exemplar găsit în tabelul de grup de elemente
DocType: Land Unit,Parent Land Unit,Unitatea pământului părinte
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
DocType: Fertilizer,Fertilizer Name,Denumirea îngrășămintelor
DocType: Salary Slip,Net Pay,Plată netă
DocType: Account,Account,Cont
@@ -5039,7 +5044,7 @@
DocType: Item Customer Detail,Ref Code,Cod de Ref
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Grupul de clienți este solicitat în profilul POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Înregistrări angajat.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vă rugăm să setați Următoarea amortizare Data
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Vă rugăm să setați Următoarea amortizare Data
DocType: HR Settings,Payroll Settings,Setări de salarizare
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Potrivesc Facturi non-legate și plăți.
DocType: POS Settings,POS Settings,Setări POS
@@ -5207,7 +5212,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Memento dată naştere pentru {0}
DocType: Asset Maintenance Task,Last Completion Date,Ultima dată de finalizare
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Zile de la ultima comandă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
DocType: Buying Settings,Naming Series,Naming Series
DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Asigurare Data de pornire ar trebui să fie mai mică de asigurare Data terminării
@@ -5338,6 +5343,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Participările de plată
DocType: Quotation Item,Against Docname,Comparativ denumirii documentului
DocType: SMS Center,All Employee (Active),Toți angajații (activi)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Client> Grup de clienți> Teritoriu
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vizualizează acum
DocType: BOM,Raw Material Cost,Cost Materie Primă
DocType: Item Reorder,Re-Order Level,Nivelul de re-comandă
@@ -5437,7 +5443,6 @@
DocType: Room,Seating Capacity,Numărul de locuri
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Grupuri de testare în laborator
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Client> Grup de clienți> Teritoriu
DocType: Project,Total Expense Claim (via Expense Claims),Revendicarea Total cheltuieli (prin formularele de decont)
DocType: GST Settings,GST Summary,Rezumatul GST
DocType: Assessment Result,Total Score,Scorul total
@@ -5451,7 +5456,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Următoarele programe au fost create
DocType: Journal Entry,Total Debit,Total debit
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Implicite terminat Marfuri Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Persoana de vânzări
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Persoana de vânzări
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Buget și centru de cost
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Modul implicit de plată multiple nu este permis
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pentru
@@ -5626,7 +5631,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerare Taxa sau Cost pentru
DocType: Driver,Driving License Category,Categoria permiselor de conducere
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} are în prezent {1} Scor de Furnizor, iar comenzile de achiziție catre acest furnizor ar trebui emise cu prudență."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} are în prezent {1} Scor de Furnizor, iar comenzile de achiziție catre acest furnizor ar trebui emise cu prudență."
DocType: Asset Maintenance Team,Asset Maintenance Team,Echipa de întreținere a activelor
DocType: Employee Loan,Loan Type,Tip credit
DocType: Scheduling Tool,Scheduling Tool,Instrumentul de programare
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index ab4b171..05ba50e 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -12,7 +12,7 @@
DocType: Item,Publish Item to hub.erpnext.com,Опубликовать деталь к hub.erpnext.com
apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Уведомления электронной почты
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,оценка
-DocType: Item,Default Unit of Measure,По умолчанию Единица измерения
+DocType: Item,Default Unit of Measure,Единица измерения по умолчанию
DocType: SMS Center,All Sales Partner Contact,Все Партнеры по сбыту Связаться
DocType: Employee,Leave Approvers,Оставьте Утверждающие
DocType: Sales Partner,Dealer,Дилер
@@ -38,7 +38,7 @@
DocType: Delivery Note,Return Against Delivery Note,Вернуться На накладной
DocType: Purchase Order,% Billed,% Выставлено
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Курс должен быть таким же, как {0} {1} ({2})"
-DocType: Sales Invoice,Customer Name,Наименование заказчика
+DocType: Sales Invoice,Customer Name,Имя клиента
DocType: Vehicle,Natural Gas,Природный газ
apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Банковский счет не может быть назван {0}
DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (или группы), против которого бухгалтерских проводок производится и остатки сохраняются."
@@ -52,7 +52,7 @@
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,"Проверять, выписываться"
DocType: Pricing Rule,Apply On,Применить на
DocType: Item Price,Multiple Item prices.,Несколько цены товара.
-,Purchase Order Items To Be Received,"Покупка Заказ позиции, которые будут получены"
+,Purchase Order Items To Be Received,Поставленные заказанные позиции к поставке
DocType: SMS Center,All Supplier Contact,Все контакты поставщиков
DocType: Support Settings,Support Settings,Настройки поддержки
apps/erpnext/erpnext/projects/doctype/project/project.py +72,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Сортировать по цене
,Delay Days,Дни задержки
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Услуги Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Счет
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Сделать запись запаса запаса
DocType: Purchase Invoice Item,Item Weight Details,Деталь Вес Подробности
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Ссылка: {0}, Код товара: {1} и Заказчик: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,кг
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Открытие на работу.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM не указывается для объекта субподряда {0} в строке {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM не указывается для объекта субподряда {0} в строке {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Результат отправлен
DocType: Item Attribute,Increment,Приращение
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Промежуток времени
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Не допускается для {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Получить продукты от
DocType: Price List,Price Not UOM Dependant,Цена не зависит от УОМ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Нет списка продуктов
DocType: Asset Repair,Error Description,Описание ошибки
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Продуктовый
DocType: Quality Inspection Reading,Reading 1,Чтение 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Пенсионные фонды
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следующая амортизация Дата не может быть перед покупкой Даты
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Следующая амортизация Дата не может быть перед покупкой Даты
DocType: Crop,Perennial,круглогодичный
DocType: Consultation,Consultation Date,Дата консультации
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Список продуктов и открытие для пользователей ERPNext
@@ -171,9 +171,9 @@
DocType: Account,Credit,Кредит
DocType: POS Profile,Write Off Cost Center,Списание МВЗ
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","например, "Начальная школа" или "Университет""
-apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Отчеты по Запасам
+apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Отчеты по запасам
DocType: Warehouse,Warehouse Detail,Подробности склада
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Срок Дата окончания не может быть позднее, чем за год Дата окончания учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","Нельзя отменить выбор ""Является основным средством"", поскольку по данному пункту имеется запись по активам"
DocType: Delivery Trip,Departure Time,Время отправления
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Получить спецификации подробно
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Шаблоны позиций поставщиков.
DocType: Lead,Interested,Заинтересованный
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Открытие
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Открытие
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},От {0} до {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Не удалось установить налоги
DocType: Item,Copy From Item Group,Скопируйте Из группы товаров
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Листья в год
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
DocType: Email Digest,Profit & Loss,Потеря прибыли
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Литр
DocType: Task,Total Costing Amount (via Time Sheet),Общая калькуляция Сумма (с помощью Time Sheet)
@@ -391,7 +391,7 @@
DocType: Student Admission,Student Admission,приёму студентов
,Terretory,Terretory
apps/erpnext/erpnext/stock/doctype/item/item.py +729,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +952,Material Request,Заказ материалов
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +952,Material Request,Запрос материала
DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
DocType: Item,Purchase Details,Покупка Подробности
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +387,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в "давальческое сырье" таблицы в Заказе {1}
@@ -428,7 +428,7 @@
DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Электронные письма зарплаты скольжения сотруднику на основе предпочтительного электронной почты, выбранного в Employee"
DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Оставить утверждающий в списке будет установлен по умолчанию Оставить утверждающего
DocType: Tax Rule,Shipping County,графство Доставка
-apps/erpnext/erpnext/config/desktop.py +167,Learn,Обучение
+apps/erpnext/erpnext/config/desktop.py +167,Learn,Справка
DocType: Asset,Next Depreciation Date,Следующий Износ Дата
apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Деятельность Стоимость одного работника
DocType: Accounts Settings,Settings for Accounts,Настройки для счетов
@@ -455,11 +455,12 @@
DocType: Employee,Job Profile,Профиль работы
DocType: BOM Item,Rate & Amount,Стоимость и сумма
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Это основано на сделках с этой Компанией. См. Ниже подробное описание
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Сообщите по электронной почте по созданию автоматической запрос материалов
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Уведомлять по электронной почте о создании автоматического запроса материала
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,резистентный
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Мультивалютность
DocType: Opening Invoice Creation Tool,Invoice Type,Тип счета
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Документы Отгрузки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Накладная
DocType: Consultation,Encounter Impression,Впечатление от Encounter
apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Настройка Налоги
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Себестоимость проданных активов
@@ -480,7 +481,7 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Ценность заказа
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Ценность заказа
apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банк / Кассовые операции против партии или для внутренней передачи
-DocType: Shipping Rule,Valid for Countries,Действительно для странам
+DocType: Shipping Rule,Valid for Countries,Действительно для стран
apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Этот пункт является шаблоном и не могут быть использованы в операциях. Атрибуты Деталь будет копироваться в вариантах, если ""не копировать"" не установлен"
DocType: Grant Application,Grant Application,Заявка на грант
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Итоговый заказ считается
@@ -532,20 +533,19 @@
DocType: Employee,Widowed,Овдовевший
DocType: Request for Quotation,Request for Quotation,Запрос предложения
DocType: Healthcare Settings,Require Lab Test Approval,Требовать лабораторное тестирование
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Код товара> Группа товаров> Марка
DocType: Salary Slip Timesheet,Working Hours,Часы работы
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Всего выдающихся
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Изменение начального / текущий порядковый номер существующей серии.
DocType: Dosage Strength,Strength,Прочность
apps/erpnext/erpnext/accounts/page/pos/pos.js +1524,Create a new Customer,Создание нового клиента
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Если несколько правил ценообразования продолжают преобладать, пользователям предлагается установить приоритет вручную разрешить конфликт."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Если превалируют несколько правил ценообразования, пользователям предлагается установить приоритет вручную для разрешения конфликта."
apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Создание заказов на поставку
,Purchase Register,Покупка Становиться на учет
DocType: Scheduling Tool,Rechedule,Rechedule
-DocType: Landed Cost Item,Applicable Charges,Взимаемых платежах
+DocType: Landed Cost Item,Applicable Charges,Применимые сборы
DocType: Workstation,Consumable Cost,Расходные Стоимость
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Согласующий отпуска"""
-DocType: Purchase Receipt,Vehicle Date,Дата
+DocType: Purchase Receipt,Vehicle Date,Дата транспортного средства
DocType: Student Log,Medical,Медицинский
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Причина потери
apps/erpnext/erpnext/accounts/doctype/account/account.js +52,Update Account Number,Обновить номер учетной записи
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Пожалуйста, введите МВЗ"
DocType: Drug Prescription,Dosage,дозировка
DocType: Journal Entry Account,Sales Order,Заказ клиента
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Средняя Цена Продажи
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Средняя Цена Продажи
DocType: Assessment Plan,Examiner Name,Имя Examiner
DocType: Lab Test Template,No Result,Безрезультатно
DocType: Purchase Invoice Item,Quantity and Rate,Количество и курс
@@ -570,9 +570,9 @@
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Пожалуйста, введите название компании сначала"
DocType: Purchase Invoice,Supplier Name,Наименование поставщика
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитайте руководство ERPNext
-DocType: Account,Is Group,Является Группа
+DocType: Account,Is Group,Группа
DocType: Email Digest,Pending Purchase Orders,В ожидании заказов на поставку
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматически присваивать серийные номера по принципу FIFO
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматически устанавливать серийные номера на основе ФИФО
DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверять Уникальность Номера Счетов получаемых от Поставщика
apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +34,Primary Address Details,Основная информация о адресе
DocType: Vehicle Service,Oil Change,Замена масла
@@ -596,7 +596,7 @@
DocType: Sales Order,Not Applicable,Не применяется
apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер выходных.
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +77,Opening Invoice Item,Открытие счета-фактуры
-DocType: Request for Quotation Item,Required Date,Требуется Дата
+DocType: Request for Quotation Item,Required Date,Требуемая дата
DocType: Delivery Note,Billing Address,Адрес для выставления счетов
DocType: BOM,Costing,Стоимость
DocType: Tax Rule,Billing County,Платежный County
@@ -611,7 +611,8 @@
DocType: Payroll Entry,Select Payroll Period,Выберите Период начисления заработной платы
DocType: Purchase Invoice,Unpaid,Неоплачено
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Зарезервировано для продажи
-DocType: Packing Slip,From Package No.,Из пакета №
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Пожалуйста, настройте систему имен пользователей в человеческих ресурсах> Настройки персонажа"
+DocType: Packing Slip,From Package No.,Номер упаковки
DocType: Item Attribute,To Range,В диапазоне
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Невозможно изменить метод оценки, так как существуют транзакции в отношении некоторых продуктов, у которых нет собственного метода оценки"
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,мастерская
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреждать заказы на поставку
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Это могут быть как организации так и частные лица.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Достаточно части для сборки
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Достаточно части для сборки
DocType: POS Profile User,POS Profile User,Пользователь профиля POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Прямая прибыль
DocType: Patient Appointment,Date TIme,Дата и время
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не можете фильтровать на основе счета, если сгруппированы по Счет"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Не можете фильтровать на основе счета, если сгруппированы по Счет"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Администратор
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Создание компаний и налогов
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Выберите курс
@@ -647,10 +648,10 @@
DocType: Codification Table,Codification Table,Таблица кодирования
DocType: Timesheet Detail,Hrs,часов
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +350,Please select Company,"Пожалуйста, выберите компанию"
-DocType: Stock Entry Detail,Difference Account,Счет разницы
+DocType: Stock Entry Detail,Difference Account,Учетная запись
DocType: Purchase Invoice,Supplier GSTIN,Поставщик GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Невозможно закрыть задача, как ее зависит задача {0} не закрыт."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
DocType: Production Order,Additional Operating Cost,Дополнительные Эксплуатационные расходы
DocType: Lab Test Template,Lab Routine,Лабораторная работа
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Косметика
@@ -659,7 +660,7 @@
DocType: Shipping Rule,Net Weight,Вес нетто
DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,купить
-,Serial No Warranty Expiry,Серийный номер срока действия гарантии
+,Serial No Warranty Expiry,Гарантийный срок серийного номера
DocType: Sales Invoice,Offline POS Name,Offline POS Имя
apps/erpnext/erpnext/utilities/user_progress.py +177,Student Application,Студенческое приложение
apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Пожалуйста, определите оценку для Threshold 0%"
@@ -674,7 +675,7 @@
DocType: Patient,Risk Factors,Факторы риска
DocType: Patient,Occupational Hazards and Environmental Factors,Профессиональные опасности и факторы окружающей среды
DocType: Vital Signs,Respiratory rate,Частота дыхания
-apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Управление субподряда
+apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Управление субподрядом
DocType: Vital Signs,Body Temperature,Температура тела
DocType: Project,Project will be accessible on the website to these users,Проект будет доступен на веб-сайте для этих пользователей
DocType: Detected Disease,Disease,болезнь
@@ -814,14 +815,14 @@
DocType: Buying Settings,Supplier Naming By,Поставщик Именование По
DocType: Activity Type,Default Costing Rate,По умолчанию Калькуляция Оценить
DocType: Maintenance Schedule,Maintenance Schedule,График технического обслуживания
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогда ценообразование Правила отфильтровываются на основе Заказчика, Группа клиентов, Территория, поставщиков, Тип Поставщик, Кампания, Партнеры по сбыту и т.д."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Затем Правила ценообразования отфильтровываются на основе Клиента, Группы клиентов, Территории, Поставщика, Типа поставщика, Кампании, Партнера по продажам и т. д."
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Чистое изменение в запасах
apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Управление кредитов сотрудников
DocType: Employee,Passport Number,Номер паспорта
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Связь с Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Менеджер
DocType: Payment Entry,Payment From / To,Оплата с / по
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новый кредитный лимит меньше текущей суммы задолженности для клиента. Кредитный лимит должен быть зарегистрировано не менее {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новый кредитный лимит меньше текущей суммы задолженности для клиента. Кредитный лимит должен быть зарегистрировано не менее {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Укажите учетную запись в Складском {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
DocType: Sales Person,Sales Person Targets,Цели продавца
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,Наименование партии
DocType: Fee Validity,Max number of visit,Максимальное количество посещений
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Табель создан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,зачислять
DocType: GST Settings,GST Settings,Настройки GST
DocType: Selling Settings,Customer Naming By,Именование клиентов По
@@ -850,7 +851,7 @@
apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,"Заказы, выданные поставщикам."
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +43,Publishing,Издательское дело
DocType: Activity Cost,Projects User,Исполнитель проектов
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Потребляемая
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Потребляемый
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0} {1} не найден в таблице детализации счета
DocType: Asset,Asset Owner Company,Компания по управлению активами
DocType: Company,Round Off Cost Center,Округление Стоимость центр
@@ -921,6 +922,7 @@
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} действует до {1}
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Дерево Тип
DocType: BOM Explosion Item,Qty Consumed Per Unit,"Кол-во, потребляемое за единицу"
+DocType: GST Account,IGST Account,Учет IGST
DocType: Serial No,Warranty Expiry Date,Срок действия гарантии
DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
DocType: Hub Settings,Unregister,Разрегистрировать
@@ -934,6 +936,7 @@
DocType: Journal Entry,Credit Card Entry,Вступление Кредитная карта
apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Компания и счетам
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,In Value,В цене
+apps/erpnext/erpnext/utilities/transaction_base.py +33,Invalid Posting Time,Недопустимое время проводки
DocType: Lead,Campaign Name,Название кампании
DocType: Selling Settings,Close Opportunity After Days,Закрыть Opportunity После дней
,Reserved,Зарезервировано
@@ -956,7 +959,7 @@
DocType: Budget,Budget Against,Бюджет против
DocType: Employee,Cell Number,Количество звонков
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Для данного критерия нет сотрудника. Убедитесь, что зарплатные слайды еще не созданы."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,"Запросы Авто материал, полученный"
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,"Запросы Авто материал, полученный"
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Поражений
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Зарезервировано для изготовления
@@ -964,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Энергоэффективность
DocType: Opportunity,Opportunity From,Возможность От
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Ежемесячная выписка зарплата.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Строка {0}: {1} Необходимы серийные номера продукта {2}. Вы предоставили {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Строка {0}: {1} Необходимы серийные номера продукта {2}. Вы предоставили {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Выберите таблицу
DocType: BOM,Website Specifications,Сайт характеристики
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - неверный адрес электронной почты в поле «Получатели»
@@ -1052,7 +1055,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Ответить Цитировать
DocType: Vital Signs,Heart Rate / Pulse,Частота сердечных сокращений / пульс
DocType: Company,Default Bank Account,По умолчанию Банковский счет
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"Нельзя выбрать «Обновить запасы», так как продукты не поставляются через {0}"
DocType: Vehicle,Acquisition Date,Дата приобретения
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,кол-во
@@ -1077,7 +1080,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Загрузите свою букву (сохраните ее в Интернете как 900px на 100 пикселей)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Счет {2} не может быть группой
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Строка {IDX}: {доктайп} {DOCNAME} не существует в выше '{доктайп}' таблица
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} уже завершен или отменен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} уже завершен или отменен
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Нет задач
DocType: Item Variant Settings,Copy Fields to Variant,Копировать поля в вариант
DocType: Asset,Opening Accumulated Depreciation,Начальная Накопленная амортизация
@@ -1101,7 +1104,7 @@
DocType: Request for Quotation Supplier,Quote Status,Статус цитаты
DocType: Maintenance Visit,Completion Status,Статус завершения
DocType: HR Settings,Enter retirement age in years,Введите возраст выхода на пенсию в ближайшие годы
-DocType: Crop,Target Warehouse,Целевая Склад
+DocType: Crop,Target Warehouse,Склад готовой продукции
DocType: Payroll Employee Detail,Payroll Employee Detail,Сведения о сотрудниках по расчетам
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please select a warehouse,Выберите склад
DocType: Cheque Print Template,Starting location from left edge,Начиная расположение от левого края
@@ -1117,7 +1120,7 @@
DocType: Employee,Provide Email Address registered in company,"Предоставить адрес электронной почты, зарегистрированный в компании"
DocType: Shopping Cart Settings,Enable Checkout,Включить Checkout
apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Заказ на Оплата
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозируемый Количество
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозируемое кол-во
DocType: Sales Invoice,Payment Due Date,Дата платежа
DocType: Drug Prescription,Interval UOM,Интервал UOM
apps/erpnext/erpnext/stock/doctype/item/item.js +490,Item Variant {0} already exists with same attributes,Вариант продукта {0} уже существует с теми же атрибутами
@@ -1129,7 +1132,7 @@
DocType: Expense Claim,Expenses,Расходы
DocType: Delivery Stop,Delivery Notes,Накладные
DocType: Item Variant Attribute,Item Variant Attribute,Атрибуты варианта продукта
-,Purchase Receipt Trends,Покупка чеков тенденции
+,Purchase Receipt Trends,Динамика Получения Поставок
DocType: Payroll Entry,Bimonthly,Раз в два месяца
DocType: Vehicle Service,Brake Pad,Комплект тормозных колодок
DocType: Fertilizer,Fertilizer Contents,Содержание удобрений
@@ -1139,7 +1142,7 @@
DocType: Timesheet,Total Billed Amount,Общая сумма Объявленный
DocType: Item Reorder,Re-Order Qty,Кол-во перезаказа
DocType: Leave Block List Date,Leave Block List Date,Оставьте Блок-лист Дата
-DocType: Pricing Rule,Price or Discount,Цена или Скидка
+DocType: Pricing Rule,Price or Discount,Цена или скидка
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +91,BOM #{0}: Raw material cannot be same as main Item,"BOM # {0}: Сырье не может быть таким же, как основной элемент"
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всего Применимые сборы в таблице Purchase квитанций Элементов должны быть такими же, как все налоги и сборы"
DocType: Sales Team,Incentives,Стимулы
@@ -1160,14 +1163,14 @@
DocType: Account,Balance must be,Баланс должен быть
DocType: Hub Settings,Publish Pricing,Опубликовать Цены
DocType: Notification Control,Expense Claim Rejected Message,Сообщение от Отклонении Авансового Отчета
-,Available Qty,Доступное Кол-во
+,Available Qty,Доступное количество
DocType: Purchase Taxes and Charges,On Previous Row Total,На Итого предыдущей строки
DocType: Purchase Invoice Item,Rejected Qty,Отклонено Кол-во
DocType: Setup Progress Action,Action Field,Поле действия
DocType: Healthcare Settings,Manage Customer,Управление клиентом
DocType: Delivery Trip,Delivery Stops,Остановки доставки
DocType: Salary Slip,Working Days,В рабочие дни
-DocType: Serial No,Incoming Rate,Входящий Оценить
+DocType: Serial No,Incoming Rate,Входящая цена
DocType: Packing Slip,Gross Weight,Вес брутто
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Включить концентратор
apps/erpnext/erpnext/public/js/setup_wizard.js +110,The name of your company for which you are setting up this system.,"Название вашей компании, для которой вы настраиваете эту систему."
@@ -1181,7 +1184,7 @@
DocType: Restaurant Table,Minimum Seating,Минимальное размещение
DocType: Item Attribute,Item Attribute Values,Пункт значений атрибутов
DocType: Examination Result,Examination Result,Экспертиза Результат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +843,Purchase Receipt,Покупка Получение
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +843,Purchase Receipt,Товарный чек
,Received Items To Be Billed,"Полученные товары, на которые нужно выписать счет"
apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Мастер Валютный курс.
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +198,Reference Doctype must be one of {0},Справочник Doctype должен быть одним из {0}
@@ -1189,9 +1192,10 @@
DocType: Production Order,Plan material for sub-assemblies,План материал для Субсборки
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Партнеры по сбыту и территории
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,ВМ {0} должен быть активным
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Закрытие (Открытие + Итого)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Закрытие (Открытие + Итого)
DocType: Journal Entry,Depreciation Entry,Износ Вход
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Пожалуйста, выберите тип документа сначала"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Печать в валюте счета
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
DocType: Crop Cycle,ISO 8016 standard,Стандарт ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
@@ -1207,7 +1211,7 @@
apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Сохраните перед назначением задачи.
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Balance Value,Валюта баланса
DocType: Lab Test,Lab Technician,Лаборант
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Прайс-лист продаж
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Прайс-лист продажи
DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.","Если этот флажок установлен, клиент будет создан, привязанный к пациенту. С этого клиента будет создан счет-фактура пациента. Вы также можете выбрать существующего клиента при создании Пациента."
DocType: Bank Reconciliation,Account Currency,Валюта счета
@@ -1217,7 +1221,7 @@
DocType: Supplier,Default Payable Accounts,По умолчанию задолженность Кредиторская
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
DocType: Fee Structure,Components,Компоненты
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Пункт Варианты {0} обновляются
DocType: Quality Inspection Reading,Reading 6,Чтение 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1269,7 +1273,8 @@
,Company Name,Название компании
DocType: SMS Center,Total Message(s),Всего сообщений
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Выбрать пункт трансфера
-DocType: Purchase Invoice,Additional Discount Percentage,Дополнительная скидка в процентах
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Пожалуйста, установите Naming Series для {0} через Setup> Settings> Naming Series"
+DocType: Purchase Invoice,Additional Discount Percentage,Дополнительная процентная ставка
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Просмотреть список всех справочных видео
DocType: Agriculture Analysis Criteria,Soil Texture,Текстура почвы
DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Выберите учетную запись глава банка, в котором проверка была размещена."
@@ -1297,7 +1302,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Сайт товара
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Загрузить шапку фирменного бланка и логотип. (Вы можете отредактировать их позднее).
DocType: Timesheet Detail,Bill,Билл
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следующий Износ Дата вводится как дату в прошлом
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Следующий Износ Дата вводится как дату в прошлом
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Белый
DocType: SMS Center,All Lead (Open),Все лиды (Открыть)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Строка {0}: Кол-во не доступен для {4} на складе {1} при проводки время вступления ({2} {3})
@@ -1312,9 +1317,9 @@
apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моя корзина
apps/erpnext/erpnext/controllers/selling_controller.py +129,Order Type must be one of {0},Тип заказа должен быть одним из {0}
DocType: Lead,Next Contact Date,Дата следующего контакта
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Начальное количество
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Открытое кол-во
DocType: Healthcare Settings,Appointment Reminder,Напоминание о назначении
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
DocType: Program Enrollment Tool Student,Student Batch Name,Student Пакетное Имя
DocType: Consultation,Doctor,Доктор
DocType: Holiday List,Holiday List Name,Название списка выходных
@@ -1322,7 +1327,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Расписание курса
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Stock Options,Опционы
DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,Отключить получение последней информации о покупке в заказе на поставку
-DocType: Journal Entry Account,Expense Claim,Авансовый Отчет
+DocType: Journal Entry Account,Expense Claim,Заявка на возмещение
apps/erpnext/erpnext/assets/doctype/asset/asset.js +254,Do you really want to restore this scrapped asset?,Вы действительно хотите восстановить этот актив на слом?
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +381,Qty for {0},Кол-во для {0}
DocType: Leave Application,Leave Application,Оставить заявку
@@ -1330,7 +1335,9 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Оставьте Allocation Tool
DocType: Item,Hub Category to Publish,Категория концентратора для публикации
DocType: Leave Block List,Leave Block List Dates,Оставьте черных списков Даты
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Пожалуйста, установите серию нумерации для участия через Setup> Numbering Series"
DocType: Sales Invoice,Billing Address GSTIN,Адрес выставления счета GSTIN
+DocType: Assessment Plan,Evaluate,оценивать
DocType: Workstation,Net Hour Rate,Чистая стоимость часа
DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Посадка стоимости покупки Квитанция
DocType: Company,Default Terms,По умолчанию Условия
@@ -1339,7 +1346,7 @@
DocType: Purchase Invoice,Cash/Bank Account,Наличные / Банковский счет
apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Введите {0}
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +73,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
-DocType: Delivery Note,Delivery To,Доставка Для
+DocType: Delivery Note,Delivery To,Доставка
apps/erpnext/erpnext/stock/doctype/item/item.js +384,Variant creation has been queued.,Создание вариантов было поставлено в очередь.
apps/erpnext/erpnext/stock/doctype/item/item.py +668,Attribute table is mandatory,Таблица атрибутов является обязательной
DocType: Production Planning Tool,Get Sales Orders,Получить заказ клиента
@@ -1363,11 +1370,11 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Накладная Оплата
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервировано Склад в заказ клиента / склад готовой продукции
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Продажа Сумма
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продажа Сумма
DocType: Repayment Schedule,Interest Amount,Проценты Сумма
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
-DocType: Serial No,Creation Document No,Создание документа Нет
-DocType: Issue,Issue,Проблема
+DocType: Serial No,Creation Document No,Создание номера документа
+DocType: Issue,Issue,Запрос
apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Записи
DocType: Asset,Scrapped,Уничтоженный
DocType: Purchase Invoice,Returns,Возвращает
@@ -1377,7 +1384,7 @@
DocType: Lead,Organization Name,Название организации
DocType: Tax Rule,Shipping State,Государственный Доставка
,Projected Quantity as Source,Планируемое количество как источник
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Продукт должен быть добавлен с помощью кнопки ""Получить продукты из покупки '"
DocType: Delivery Trip,Delivery Trip,Доставка поездки
DocType: Student,A-,A-
DocType: Production Planning Tool,Include non-stock items,Включить внебиржевые пункты
@@ -1454,7 +1461,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Начальный бухгалтерский баланс
,GST Sales Register,Реестр продаж GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Счет Продажи предварительный
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ничего просить
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ничего просить
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Выберите свои домены
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Еще один рекорд Бюджет '{0}' уже существует против {1} {2} 'для финансового года {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Поля будут скопированы только во время создания.
@@ -1464,15 +1471,15 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Это будет добавлена в Кодекс пункта варианте. Например, если ваш аббревиатура ""SM"", и код деталь ""Футболка"", код товара из вариантов будет ""T-Shirt-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистая Платное (прописью) будут видны, как только вы сохраните Зарплата Слип."
DocType: Purchase Invoice,Is Return,Является Вернуться
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,предосторожность
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,предосторожность
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Возврат / дебетовые Примечание
DocType: Price List Country,Price List Country,Цены Страна
-DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} действительные серийные номера для продукта {1}
+DocType: Item,UOMs,Единицы измерения
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} действительные серийные номера для продукта {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Код товара не может быть изменен для серийный номер
DocType: Purchase Invoice Item,UOM Conversion Factor,Коэффициент пересчета единицы измерения
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Пожалуйста, введите код товара, чтобы получить номер партии"
-DocType: Stock Settings,Default Item Group,Группа продукта по умолчанию
+DocType: Stock Settings,Default Item Group,Продуктовая группа по умолчанию
DocType: Employee Loan,Partially Disbursed,Частично Освоено
apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,Предоставить информацию.
apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База данных поставщиков.
@@ -1493,7 +1500,7 @@
DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +147,Please select a customer,Выберите клиента
DocType: Purchase Invoice Item,Purchase Invoice Item,Покупка Счет Пункт
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток-Ledger Записи и GL Записи повторно отправил для выбранных Покупка расписок
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Записи складской книги и записи GL запасов отправляются для выбранных покупок
apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Пункт 1
DocType: Holiday,Holiday,Выходной
DocType: Support Settings,Close Issue After Days,Закрыть Issue После дней
@@ -1560,7 +1567,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Оценка Оцените необходимый для пункта в строке {0}
DocType: Supplier Scorecard,Scorecard Actions,Действия в Scorecard
apps/erpnext/erpnext/utilities/user_progress.py +166,Example: Masters in Computer Science,Пример: Мастера в области компьютерных наук
-DocType: Purchase Invoice,Rejected Warehouse,Отклонен Склад
+DocType: Purchase Invoice,Rejected Warehouse,Склад непринятой продукции
DocType: GL Entry,Against Voucher,Против ваучером
DocType: Item,Default Buying Cost Center,По умолчанию Покупка МВЗ
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Чтобы получить лучшее из ERPNext, мы рекомендуем вам потребуется некоторое время и смотреть эти справки видео."
@@ -1573,7 +1580,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
DocType: Supplier Scorecard,Warn for new Request for Quotations,Предупреждать о новом запросе котировок
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Заказы помогут вам планировать и следить за ваши покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Лабораторные тесты
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Общее количество выпуска / передачи {0} в Material Request {1} \ не может быть больше требуемого количества {2} для п {3}
@@ -1623,10 +1630,10 @@
DocType: Student Group Student,Group Roll Number,Номер рулона группы
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с дебетовой записью"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сумма всех весов задача должна быть 1. Пожалуйста, измените веса всех задач проекта, соответственно,"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитальные оборудование
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правило ценообразования сначала выбирается на основе поля «Применить на», значением которого может быть Позиция, Группа Позиций, Торговая Марка."
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +246,Please set the Item Code first,Сначала укажите код товара
DocType: Item,ITEM-,ПУНКТ-
apps/erpnext/erpnext/controllers/selling_controller.py +122,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
@@ -1640,15 +1647,15 @@
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,Плата создана
apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Не нашли какой-либо пункт под названием {0}
DocType: Supplier Scorecard Criteria,Criteria Formula,Формула критериев
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всего Исходящие
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всего исходящих
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +39,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Там может быть только один Правило Начальные с 0 или пустое значение для ""To Размер"""
DocType: Authorization Rule,Transaction,Транзакция
DocType: Patient Appointment,Duration,Продолжительность
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Примечание: Эта МВЗ является Группа. Невозможно сделать бухгалтерские проводки против групп.
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Детский склад существует для этого склада. Вы не можете удалить этот склад.
-DocType: Item,Website Item Groups,Сайт Группы товаров
+DocType: Item,Website Item Groups,Сайт продуктовых групп
DocType: Purchase Invoice,Total (Company Currency),Всего (Компания валют)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Серийный номер {0} вошли более одного раза
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Серийный номер {0} вошли более одного раза
DocType: Journal Entry,Journal Entry,Запись в дневнике
DocType: Expense Claim Advance,Unclaimed amount,Невостребованная сумма
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} продуктов в работе
@@ -1681,6 +1688,7 @@
apps/erpnext/erpnext/templates/includes/product_page.js +18,per,в
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Вам необходимо включить «корзину»
DocType: Payment Entry,Writeoff,Списать
+DocType: Stock Settings,Naming Series Prefix,Префикс серии имен
DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка шаблона Гол
DocType: Salary Component,Earning,Зарабатывание
DocType: Supplier Scorecard,Scoring Criteria,Критерии оценки
@@ -1704,12 +1712,13 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Открыть ВОМ {0}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не может быть изменен для серийный номер
DocType: Authorization Rule,Average Discount,Средняя скидка
-DocType: Purchase Invoice Item,UOM,UOM
+DocType: Purchase Invoice Item,UOM,Единица измерения
DocType: Rename Tool,Utilities,Инженерное оборудование
DocType: POS Profile,Accounting,Бухгалтерия
DocType: Employee,EMP/,EMP /
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +133,Please select batches for batched item ,Выберите партии для партии товара
DocType: Asset,Depreciation Schedules,Амортизационные Расписания
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +159,Following accounts might be selected in GST Settings:,В настройках GST можно выбрать следующие учетные записи:
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
DocType: Activity Cost,Projects,Проекты
DocType: Payment Request,Transaction Currency,Валюта сделки
@@ -1718,7 +1727,7 @@
DocType: Item,Will also apply to variants,Будут также применяться к вариантам
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Невозможно изменить финансовый год Дата начала и финансовый год Дата окончания сразу финансовый год будет сохранен.
DocType: Quotation,Shopping Cart,Корзина
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Среднее Daily Исходящие
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Среднедневные исходящие
DocType: POS Profile,Campaign,Кампания
DocType: Supplier,Name and Type,Наименование и тип
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +66,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или ""Отклонено"""
@@ -1730,7 +1739,7 @@
DocType: Sales Order Item,Planned Quantity,Планируемый Количество
DocType: Purchase Invoice Item,Item Tax Amount,Сумма налогов продукта
DocType: Water Analysis,Water Analysis Criteria,Критерии анализа воды
-DocType: Item,Maintain Stock,Поддержание складе
+DocType: Item,Maintain Stock,Поддержание запасов
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
DocType: Employee,Prefered Email,Предпочитаемый E-mail
DocType: Student Admission,Eligibility and Details,Приемлемость и подробная информация
@@ -1743,7 +1752,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал соединений.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запрос предложения отключен доступ из портала, для большего количества настроек портала проверки."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Переменная переменной Scorecard поставщика
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Сумма покупки
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Сумма покупки
DocType: Sales Invoice,Shipping Address Name,Адрес доставки Имя
DocType: Material Request,Terms and Conditions Content,Условия Содержимое
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Были ошибки, связанные с расписанием курсов"
@@ -1764,7 +1773,7 @@
DocType: Payment Entry Reference,Payment Entry Reference,Оплата запись Ссылка
DocType: GL Entry,GL Entry,GL Вступление
DocType: HR Settings,Employee Settings,Работники Настройки
-,Batch-Wise Balance History,Партиями Баланс История
+,Batch-Wise Balance History,История баланса партий
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Настройки печати обновляется в соответствующем формате печати
DocType: Package Code,Package Code,Код пакета
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Ученик
@@ -1790,7 +1799,7 @@
DocType: Lab Test Template,Collection Details,Сведения о собрании
DocType: POS Profile,Allow Print Before Pay,Разрешить печать перед оплатой
DocType: Land Unit,Linked Soil Texture,Связанная текстура почвы
-DocType: Shipping Rule,Shipping Account,Доставка счета
+DocType: Shipping Rule,Shipping Account,Счет доставки
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Счет {2} неактивен
apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,"Сделать заказы клиентов, чтобы помочь вам спланировать работу и поставить на время"
DocType: Quality Inspection,Readings,Чтения
@@ -1819,10 +1828,10 @@
DocType: Quality Inspection,QI-,Qi-
DocType: Opportunity,With Items,С продуктами
DocType: Asset Maintenance,Maintenance Team,Группа поддержки
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,В Кол-во
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,В кол-ве
DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Подтвердить зарегистрированный курс для студентов в студенческой группе
DocType: Notification Control,Expense Claim Rejected,Авансовый Отчет Отклонен
-DocType: Item,Item Attribute,Атрибуты продукта
+DocType: Item,Item Attribute,Атрибут продукта
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Правительство
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Авансовый Отчет {0} уже существует для журнала автомобиля
apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,Название института
@@ -1873,14 +1882,14 @@
DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступные Пакетная Кол-во на складе
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Обновление Формат печати
DocType: Landed Cost Voucher,Landed Cost Help,Земельные Стоимость Помощь
-DocType: Purchase Invoice,Select Shipping Address,Выборите адрес доставки
+DocType: Purchase Invoice,Select Shipping Address,Выберите адрес доставки
apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Меморандум
DocType: Leave Block List,Block Holidays on important days.,Блок Отдых на важных дней.
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,Сводка дебиторской задолженности
DocType: Employee Loan,Monthly Repayment Amount,Ежемесячная сумма погашения
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,Открытие счетов-фактур
apps/erpnext/erpnext/hr/doctype/employee/employee.py +195,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
-DocType: UOM,UOM Name,Имя единица измерения
+DocType: UOM,UOM Name,Название единицы измерения
DocType: GST HSN Code,HSN Code,Код HSN
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Вклад Сумма
DocType: Purchase Invoice,Shipping Address,Адрес доставки
@@ -1891,8 +1900,8 @@
apps/erpnext/erpnext/education/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} несколько раз появляется в строке {2} и {3}
DocType: Healthcare Settings,Manage Sample Collection,Управление коллекцией проб
DocType: Patient,Tobacco Past Use,Предыдущее использование табака
-DocType: Sales Invoice Item,Brand Name,Имя Бренда
-DocType: Purchase Receipt,Transporter Details,Transporter Детали
+DocType: Sales Invoice Item,Brand Name,Имя бренда
+DocType: Purchase Receipt,Transporter Details,Детали транспорта
apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},Пользователь {0} уже назначен врачу {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2658,Default warehouse is required for selected item,Требуется основной склад для выбранного продукта
apps/erpnext/erpnext/utilities/user_progress.py +143,Box,Рамка
@@ -1917,7 +1926,7 @@
,Lead Name,Имя лида
,POS,POS
DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,Открытие акции Остаток
+apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,Открытие баланса запасов
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} должен появиться только один раз
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Отпуск успешно распределен для {0}
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,Нет объектов для упаковки
@@ -1992,7 +2001,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +179,Sort by Price ...,Сортировать по цене ...
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Зарезервированное кол-во
DocType: Party Account,Party Account,Партия аккаунт
-apps/erpnext/erpnext/config/setup.py +122,Human Resources,Кадры
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Персонал
DocType: Lead,Upper Income,Высокий доход
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,отклонять
DocType: Journal Entry Account,Debit in Company Currency,Дебет в валюте компании
@@ -2007,7 +2016,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Это основано на бревнах против этого транспортного средства. См график ниже для получения подробной информации
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
DocType: Customer,Default Price List,По умолчанию Прайс-лист
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,запись Движение активов {0} создано
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,запись Движение активов {0} создано
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Нельзя удалить {0} финансовый год. Финансовый год {0} установлен основным в глобальных параметрах
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Клиент с тем же именем уже существует
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Это предоставит декларации о зарплате и создаст запись в журнале начисления. Вы хотите продолжить?
@@ -2021,6 +2030,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,ценообразование
DocType: Quotation,Term Details,Срочные Подробнее
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не удается зарегистрировать более {0} студентов для этой группы студентов.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Всего (без налога)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Счетчик лида
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Счетчик лида
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} должно быть больше 0
@@ -2058,6 +2068,7 @@
DocType: Student Sibling,Studying in Same Institute,Обучение в том же институте
DocType: Territory,Territory Manager,Territory Manager
DocType: Packed Item,To Warehouse (Optional),На склад (Необязательно)
+DocType: GST Settings,GST Accounts,Учетные записи GST
DocType: Payment Entry,Paid Amount (Company Currency),Оплаченная сумма (в валюте компании)
DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
DocType: Selling Settings,Selling Settings,Продажа Настройки
@@ -2067,7 +2078,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,свершение
apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Смотрите в корзину
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Маркетинговые расходы
-,Item Shortage Report,Пункт Нехватка Сообщить
+,Item Shortage Report,Отчет о нехватке продуктов
apps/erpnext/erpnext/stock/doctype/item/item.js +275,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Материал Запрос используется, чтобы сделать эту Stock запись"
apps/erpnext/erpnext/assets/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следующий Износ Дата является обязательным для нового актива
@@ -2132,7 +2143,7 @@
DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
DocType: Grant Application,Assessment Mark (Out of 10),Оценка Оценка (из 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Нет
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Основные
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Основные
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Вариант
DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
DocType: Employee Attendance Tool,Employees HTML,Сотрудники HTML
@@ -2147,14 +2158,14 @@
DocType: Payment Reconciliation Payment,Allocated amount,Выделенная сумма
DocType: Sales Team,Contribution to Net Total,Вклад в Net Всего
DocType: Sales Invoice Item,Customer's Item Code,Клиентам Код товара
-DocType: Stock Reconciliation,Stock Reconciliation,Сверка Запасов
+DocType: Stock Reconciliation,Stock Reconciliation,Инвентаризация запасов
DocType: Territory,Territory Name,Территория Имя
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Work-in-Progress Warehouse is required before Submit,Работа-в-Прогресс Склад требуется перед Отправить
apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявитель на работу.
DocType: Purchase Order Item,Warehouse and Reference,Склад и справочники
DocType: Supplier,Statutory info and other general information about your Supplier,Уставный информации и другие общие сведения о вашем Поставщик
DocType: Item,Serial Nos and Batches,Серийные номера и партии
-DocType: Item,Serial Nos and Batches,Серийные номера и партии
+DocType: Item,Serial Nos and Batches,Серийные номера и партии
apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Сила студенческой группы
apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Сила студенческой группы
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
@@ -2182,7 +2193,7 @@
DocType: Course,Course Abbreviation,Аббревиатура для гольфа
DocType: Student Leave Application,Student Leave Application,Студент Оставить заявку
DocType: Item,Will also apply for variants,Будет также применяться для вариантов
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Сотрудник {0} на полдня на {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Всего продолжительность рабочего времени не должна быть больше, чем максимальное рабочее время {0}"
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Вкл
@@ -2198,7 +2209,7 @@
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
DocType: SMS Center,Create Receiver List,Создать список получателей
DocType: Vehicle,Wheels,Колеса
-DocType: Packing Slip,To Package No.,Для пакета №
+DocType: Packing Slip,To Package No.,Номер пакета
DocType: Patient Relation,Family,семья
DocType: Production Planning Tool,Material Requests,Материал просит
DocType: Warranty Claim,Issue Date,Дата выдачи
@@ -2218,9 +2229,9 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку, только если тип заряда «О Предыдущая сумма Row» или «Предыдущая Row Всего"""
DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Дерево центров финансовых затрат.
-DocType: Serial No,Delivery Document No,Документы Отгрузки №
+DocType: Serial No,Delivery Document No,Номер документа доставки
apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Пожалуйста, установите "прибыль / убыток Счет по обращению с отходами актива в компании {0}"
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Получить товары от покупки расписок
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Получить продукты из покупки.
DocType: Serial No,Creation Date,Дата создания
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Пункт {0} несколько раз появляется в прайс-лист {1}
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}","Продажа должна быть проверена, если выбран Применимо для как {0}"
@@ -2256,10 +2267,10 @@
DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,По словам будет виден только вы сохраните Расходная накладная.
DocType: Lead,Follow Up,Следовать за
DocType: Item,Is Sales Item,Продаваемый продукт
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт Group Tree
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Структура продуктовых групп
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
DocType: Maintenance Visit,Maintenance Time,Техническое обслуживание Время
-,Amount to Deliver,Сумма Доставка
+,Amount to Deliver,Сумма доставки
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +324,Same item has been entered multiple times. {0},Один и тот же элемент был введен несколько раз. {0}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Срок Дата начала не может быть раньше, чем год Дата начала учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +192,There were errors.,Были ошибки.
@@ -2268,8 +2279,9 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +272,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год"
DocType: Education Settings,Instructor Records to be created by,Записи инструкторов должны быть созданы
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,Создано {0}
+DocType: GST Account,GST Account,Учетная запись GST
DocType: Delivery Note Item,Against Sales Order,Против заказ клиента
-,Serial No Status,Серийный номер статус
+,Serial No Status,Статус серийного номера
DocType: Payment Entry Reference,Outstanding,выдающийся
DocType: Supplier,Warn POs,Предупредить ПО
,Daily Timesheet Summary,Ежедневно Timesheet Резюме
@@ -2289,7 +2301,7 @@
DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблица продукта, которая будет показана на веб-сайте"
DocType: Purchase Order Item Supplied,Supplied Qty,Поставляемое кол-во
DocType: Purchase Order Item,Material Request Item,Материал Запрос товара
-apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дерево товарные группы.
+apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Структура продуктовых групп
DocType: Payroll Entry,Get Employee Details,Получить информацию о сотрудниках
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
DocType: Asset,Sold,Продан
@@ -2340,7 +2352,7 @@
DocType: Volunteer,Anytime,В любой момент
DocType: Patient,Surgical History,Хирургическая история
DocType: Employee,Resignation Letter Date,Отставка Письмо Дата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Цены Правила дополнительно фильтруются на основе количества.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Правила ценообразования далее фильтруются в зависимости от количества.
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
DocType: Task,Total Billing Amount (via Time Sheet),Общая сумма Billing (через табель)
@@ -2369,24 +2381,25 @@
DocType: Task,Actual End Date (via Time Sheet),Фактическая дата окончания (с помощью табеля рабочего времени)
DocType: Soil Texture,Soil Type,Тип почвы
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Сумма {0} {1} против {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Новое сообщение
,Quotation Trends,Котировочные тенденции
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
-DocType: Shipping Rule,Shipping Amount,Доставка Количество
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
+DocType: Shipping Rule,Shipping Amount,Сумма доставки
DocType: Supplier Scorecard Period,Period Score,Период
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Добавить клиентов
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,В ожидании Сумма
DocType: Lab Test Template,Special,Особый
-DocType: Purchase Order Item Supplied,Conversion Factor,Коэффициент преобразования
+DocType: Purchase Order Item Supplied,Conversion Factor,Коэффициент конверсии
DocType: Purchase Order,Delivered,Доставлено
,Vehicle Expenses,Расходы транспортных средств
DocType: Serial No,Invoice Details,Сведения о счете
DocType: Grant Application,Show on Website,Показать на сайте
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Начать
DocType: Hub Category,Hub Category,Категория концентратора
DocType: Purchase Invoice,SEZ,SEZ
-DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
+DocType: Purchase Receipt,Vehicle Number,Номер транспортного средства
DocType: Employee Loan,Loan Amount,Сумма кредита
apps/erpnext/erpnext/utilities/user_progress.py +88,Add Letterhead,Добавить бланки
DocType: Program Enrollment,Self-Driving Vehicle,Самоходное транспортное средство
@@ -2402,19 +2415,19 @@
DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Родительский курс (оставьте поле пустым, если это не является частью родительского курса)"
DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Родительский курс (оставьте поле пустым, если это не является частью родительского курса)"
DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставьте пустым, если считать для всех типов сотрудников"
-DocType: Landed Cost Voucher,Distribute Charges Based On,Распределите плату на основе
+DocType: Landed Cost Voucher,Distribute Charges Based On,Распределите платежи на основе
apps/erpnext/erpnext/hooks.py +144,Timesheets,Timesheets
DocType: HR Settings,HR Settings,Настройки HR
DocType: Salary Slip,net pay info,Чистая информация платить
DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Это значение обновляется в прейскуранте продаж по умолчанию.
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +122,Expense Claim is pending approval. Only the Expense Approver can update status.,Авансовый Отчет ожидает одобрения. Только Утверждающий Сотрудник может обновлять статус.
DocType: Email Digest,New Expenses,Новые расходы
-DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
+DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка
DocType: Patient,Patient Details,Сведения о пациенте
DocType: Patient,B Positive,В позитивный
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
DocType: Patient Medical Record,Patient Medical Record,Медицинская запись пациента
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Группа не-группы
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Спорт
@@ -2465,6 +2478,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Невозможно установить полученный RFQ без цитаты
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Всего Вычет
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Выберите учетную запись для печати в валюте счета.
,Production Analytics,Производственная аналитика
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Это основано на транзакциях против этого пациента. См. Ниже подробное описание
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Стоимость Обновлено
@@ -2482,7 +2496,7 @@
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Job Description,Описание работы
DocType: Student Applicant,Applied,прикладная
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +863,Re-open,Снова откройте
-DocType: Sales Invoice Item,Qty as per Stock UOM,Кол-во в соответствии со UOM
+DocType: Sales Invoice Item,Qty as per Stock UOM,Кол-во в соответствии с ед.измерения запасов
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Имя Guardian2
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специальные символы, кроме ""-"" ""."", ""#"", и ""/"" не пускают в серию имен"
DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следите за кампаниями по продажам. Отслеживайте лидов, предложения, заказы и т. п. в «Кампаниях» и оцените отдачу от инвестиций."
@@ -2520,12 +2534,14 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Выберите компанию ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставьте пустым, если рассматривать для всех отделов"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} является обязательным для продукта {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} является обязательным для продукта {1}
DocType: Payroll Entry,Fortnightly,раз в две недели
DocType: Currency Exchange,From Currency,Из валюты
DocType: Vital Signs,Weight (In Kilogram),Вес (в килограммах)
DocType: Chapter,"chapters/chapter_name
leave blank automatically set after saving chapter.",главы / chapter_name оставить пустым автоматически после сохранения главы.
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +169,Please set GST Accounts in GST Settings,"Пожалуйста, установите учетные записи GST в настройках GST"
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +31,Type of Business,Тип бизнеса
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Стоимость новой покупки
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},Заказ клиента требуется для позиции {0}
@@ -2555,7 +2571,7 @@
apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Дерево финансовых счетов.
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +362,{0} against Sales Order {1},{0} против заказов клиентов {1}
DocType: Account,Fixed Asset,Основное средство
-apps/erpnext/erpnext/config/stock.py +320,Serialized Inventory,Серийный Инвентарь
+apps/erpnext/erpnext/config/stock.py +320,Serialized Inventory,Учет сериями
DocType: Employee Loan,Account Info,Информация об аккаунте
DocType: Activity Type,Default Billing Rate,По умолчанию Платежная Оценить
DocType: Fees,Include Payment,Включить оплату
@@ -2591,14 +2607,14 @@
DocType: Payroll Entry,Employees,Сотрудники
DocType: Employee,Contact Details,Контактная информация
DocType: C-Form,Received Date,Дата получения
-DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Если вы создали стандартный шаблон в продажах налоги и сборы шаблон, выберите одну и нажмите на кнопку ниже."
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Если вы создали стандартный шаблон в шаблонах Налоги с налогами и сбором платежей, выберите его и нажмите кнопку ниже."
DocType: BOM Scrap Item,Basic Amount (Company Currency),Базовая сумма (Компания Валюта)
DocType: Student,Guardians,Опекуны
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Цены не будут показаны, если прайс-лист не установлен"
DocType: Stock Entry,Total Incoming Value,Всего входное значение
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Дебет требуется
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Дебет требуется
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets поможет отслеживать время, стоимость и выставление счетов для Активности сделанной вашей команды"
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Прайс-лист
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Прайс-лист закупки
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблоны переменных показателей поставщика.
DocType: Offer Letter Term,Offer Term,Условие предложения
DocType: Asset,Quality Manager,Менеджер по качеству
@@ -2634,14 +2650,15 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1009,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,Максимальные образцы - {0} могут сохраняться для Batch {1} и Item {2}.
apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,Добавление временных интервалов
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Серийные номера необходимы для продукта {1}. Вы предоставили {2}.
-DocType: Stock Reconciliation Item,Current Valuation Rate,Текущая оценка Оценить
+DocType: Stock Reconciliation Item,Current Valuation Rate,Текущая оценка
DocType: Item,Customer Item Codes,Заказчик Предмет коды
DocType: Training Event,Advance,авансировать
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,for making recurring again.,для повторного повторения.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,Обмен Прибыль / убыток
DocType: Opportunity,Lost Reason,Забыли Причина
+apps/erpnext/erpnext/controllers/accounts_controller.py +264,Row #{0}: Account {1} does not belong to company {2},Строка # {0}: Учетная запись {1} не принадлежит компании {2}
apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Новый адрес
-DocType: Quality Inspection,Sample Size,Размер выборки
+DocType: Quality Inspection,Sample Size,Размер образца
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,"Пожалуйста, введите Квитанция документ"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +369,All items have already been invoiced,На все продукты уже выписаны счета
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',"Пожалуйста, сформулируйте действительный 'От делу №'"
@@ -2656,7 +2673,7 @@
DocType: Company,Total Monthly Sales,Всего ежемесячных продаж
DocType: Agriculture Analysis Criteria,Weather,Погода
DocType: Bin,Actual Quantity,Фактическое количество
-DocType: Shipping Rule,example: Next Day Shipping,пример: Следующий день доставка
+DocType: Shipping Rule,example: Next Day Shipping,Пример: доставка на следующий день
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серийный номер {0} не найден
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +289,Subscription has been {0},Подписка была {0}
DocType: Fee Schedule Program,Fee Schedule Program,Планирование программы
@@ -2698,7 +2715,8 @@
DocType: Company,For Reference Only.,Только для справки.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Врач {0} недоступен в {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Выберите номер партии
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неверный {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Неверный {0}: {1}
+,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Ссылка Inv
DocType: Sales Invoice Advance,Advance Amount,Предварительная сумма
@@ -2734,17 +2752,17 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
DocType: Water Analysis,Origin,происхождения
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Этот документ находится над пределом {0} {1} для элемента {4}. Вы делаете другой {3} против того же {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Сумма счета Выберите изменения
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Сумма счета Выберите изменения
DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
-DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
-DocType: Installation Note,Installation Note,Установка Примечание
+DocType: Stock Settings,Allow Negative Stock,Разрешить отрицательный запас
+DocType: Installation Note,Installation Note,Замечания по установке
DocType: Soil Texture,Clay,глина
DocType: Topic,Topic,тема
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Поток денежных средств от финансовой
DocType: Budget Account,Budget Account,Бюджет аккаунта
-DocType: Quality Inspection,Verified By,Verified By
+DocType: Quality Inspection,Verified By,Утверждено
apps/erpnext/erpnext/setup/doctype/company/company.py +77,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании, потому что есть существующие операции. Сделки должны быть отменены, чтобы поменять валюту."
DocType: Grading Scale Interval,Grade Description,Описание класса
DocType: Stock Entry,Purchase Receipt No,Покупка Получение Нет
@@ -2791,7 +2809,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Предупреждать о новых заказах на поставку
DocType: Quality Inspection Reading,Reading 9,Чтение 9
DocType: Supplier,Is Frozen,Замерз
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,"склад группы узлов не допускается, чтобы выбрать для сделок"
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,"склад группы узлов не допускается, чтобы выбрать для сделок"
DocType: Buying Settings,Buying Settings,Настройка покупки
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Номер ВМ для готового продукта
DocType: Upload Attendance,Attendance To Date,Посещаемость To Date
@@ -2805,16 +2823,18 @@
DocType: Grant Application,Organization,Организация
DocType: BOM Update Tool,BOM Update Tool,Инструмент обновления спецификации
DocType: SG Creation Tool Course,Student Group Name,Имя Студенческая группа
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Показать в разобранном виде
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Создание сборов
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
DocType: Room,Room Number,Номер комнаты
apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},Недопустимая ссылка {0} {1}
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +187,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не может быть больше, чем запланированное количество ({2}) в Производственном Заказе {3}"
-DocType: Shipping Rule,Shipping Rule Label,Правило ярлыке
+DocType: Shipping Rule,Shipping Rule Label,Название правила доставки
DocType: Journal Entry Account,Payroll Entry,Ввод зарплаты
+apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Сделать шаблон налога
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум пользователей
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Сырьё не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
DocType: Lab Test Sample,Lab Test Sample,Лабораторный пробный образец
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Быстрый журнал запись
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить рейтинг, если ВМ упоминается agianst любого продукта"
@@ -2837,7 +2857,7 @@
DocType: UOM,Check this to disallow fractions. (for Nos),"Проверьте это, чтобы запретить фракции. (Для №)"
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,The following Production Orders were created:,Были созданы следующие Производственные заказы:
DocType: Student Admission Program,Naming Series (for Student Applicant),Именование Series (для студентов Заявителем)
-DocType: Delivery Note,Transporter Name,Transporter Имя
+DocType: Delivery Note,Transporter Name,Название транспорта
DocType: Authorization Rule,Authorized Value,Уставный Значение
DocType: BOM,Show Operations,Показать операции
,Minutes to First Response for Opportunity,Время первого отклика на возможности
@@ -2846,7 +2866,7 @@
apps/erpnext/erpnext/config/stock.py +187,Unit of Measure,Единица Измерения
DocType: Fiscal Year,Year End Date,Дата окончания года
DocType: Task Depends On,Task Depends On,Задачи зависит от
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1024,Opportunity,Возможность
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1024,Opportunity,Выявление
,Completed Production Orders,Завершенные Производственные заказы
DocType: Operation,Default Workstation,По умолчанию Workstation
DocType: Notification Control,Expense Claim Approved Message,Сообщение об Одобрении Авансового Отчета
@@ -2854,7 +2874,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +245,{0} {1} is closed,{0} {1} закрыт
DocType: Email Digest,How frequently?,Как часто?
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +58,Total Collected: {0},Всего собранных: {0}
-DocType: Purchase Receipt,Get Current Stock,Получить Текущие запасы
+DocType: Purchase Receipt,Get Current Stock,Получить текущий запас
apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дерево Билла материалов
DocType: Student,Joining Date,Дата вступления
,Employees working on a holiday,"Сотрудники, работающие на празднике"
@@ -2876,7 +2896,7 @@
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,Группа оценки:
DocType: Item Reorder,Request for,Запрос
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Утвержденный Пользователь не может быть тем же пользователем, к которому применимо правило"
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (как в фондовой UOM)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Базовая ставка (согласно ед.измерения запасов на складе)
DocType: SMS Log,No of Requested SMS,Кол-во запрошенных СМС
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Оставьте без оплаты не совпадает с утвержденными записями Оставить заявку
DocType: Campaign,Campaign-.####,Кампания-.# # # #
@@ -2885,7 +2905,7 @@
DocType: Membership,USD,доллар США
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Создать счет-фактуру
DocType: Selling Settings,Auto close Opportunity after 15 days,Авто близко Возможность через 15 дней
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Заказы на поставку не допускаются для {0} из-за того, что система показателей имеет значение {1}."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,"Заказы на поставку не допускаются для {0} из-за того, что система показателей имеет значение {1}."
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Конец года
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Предл/Лид %
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
@@ -2979,14 +2999,14 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
DocType: Crop,Planting Area,Площадь посадки
apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всего (кол-во)
-DocType: Installation Note Item,Installed Qty,Установленная Кол-во
+DocType: Installation Note Item,Installed Qty,Установленное количество
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,Это может быть связано с некоторыми недействительными адресами электронной почты в
apps/erpnext/erpnext/utilities/user_progress.py +28,You added ,Вы добавили
DocType: Purchase Taxes and Charges,Parenttype,ParentType
apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Обучение Результат
DocType: Purchase Invoice,Is Paid,Оплачено
DocType: Salary Structure,Total Earning,Всего Заработок
-DocType: Purchase Receipt,Time at which materials were received,"Момент, в который были получены материалы"
+DocType: Purchase Receipt,Time at which materials were received,Время получения материалов
DocType: Products Settings,Products per Page,Продукты на страницу
DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Организация филиал мастер.
@@ -3009,7 +3029,7 @@
DocType: Opportunity,Potential Sales Deal,Сделка потенциальных продаж
DocType: Complaint,Complaints,жалобы
DocType: Payment Entry,Cheque/Reference Date,Чеками / Исходная дата
-DocType: Purchase Invoice,Total Taxes and Charges,Всего Налоги и сборы
+DocType: Purchase Invoice,Total Taxes and Charges,Общие налоги и сборы
DocType: Employee,Emergency Contact,Экстренная связь
DocType: Bank Reconciliation Detail,Payment Entry,Оплата Вход
DocType: Item,Quality Parameters,Параметры качества
@@ -3028,7 +3048,7 @@
DocType: Purchase Invoice Item,Received Qty,Поступившее кол-во
DocType: Stock Entry Detail,Serial No / Batch,Серийный номер / Партия
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +340,Not Paid and Not Delivered,Не оплачено и не доставлено
-DocType: Product Bundle,Parent Item,Родитель Пункт
+DocType: Product Bundle,Parent Item,Родительский продукт
DocType: Account,Account Type,Тип учетной записи
DocType: Delivery Note,DN-RET-,DN-RET-
apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Нет табелей
@@ -3038,13 +3058,13 @@
apps/erpnext/erpnext/config/hr.py +93,Payroll,Начисление заработной платы
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}
apps/erpnext/erpnext/utilities/activation.py +101,Make User,Создать пользователя
-DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификация отправления для доставки (для печати)
-DocType: Bin,Reserved Quantity,Зарезервировано Количество
+DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификация упаковки для доставки (для печати)
+DocType: Bin,Reserved Quantity,Зарезервированное количество
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Пожалуйста, введите действующий адрес электронной почты"
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Пожалуйста, введите действующий адрес электронной почты"
DocType: Volunteer Skill,Volunteer Skill,Волонтерский навык
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +736,Please select an item in the cart,Выберите товар в корзине
-DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка чеков товары
+DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка продуктов
apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Настройка формы
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +74,Arrear,задолженность
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +158,Depreciation Amount during the period,Амортизация Сумма за период
@@ -3069,23 +3089,23 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Ссылка
DocType: Lab Test,LP-,ЛВ
DocType: Healthcare Settings,Registration Fee,Регистрационный взнос
-DocType: Budget,Cost Center,Центр учета затрат
+DocType: Budget,Cost Center,Центр затрат
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,Ваучер #
DocType: Notification Control,Purchase Order Message,Заказ на сообщение
DocType: Tax Rule,Shipping Country,Доставка Страна
DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Скрыть Налоговый идентификатор клиента от сделки купли-продажи
DocType: Upload Attendance,Upload HTML,Загрузить HTML
DocType: Employee,Relieving Date,Освобождение Дата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цены Правило состоит перезаписать Прайс-лист / определить скидка процент, на основе некоторых критериев."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Правило ценообразования делается для того, чтобы изменить Прайс-лист / определить процент скидки, основанный на некоторых критериях."
DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад может быть изменен только с помощью со входа / накладной / Покупка получении
DocType: Employee Education,Class / Percentage,Класс / в процентах
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Руководитель отделов маркетинга и продаж
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Подоходный налог
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Если выбран Цены правила делается для ""цена"", это приведет к перезаписи прайс-лист. Цены Правило цена окончательная цена, поэтому никакого скидка не следует применять. Таким образом, в таких сделках, как заказ клиента, Заказ и т.д., это будет выбрано в поле 'Rate', а не поле ""Прайс-лист Rate '."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Если выбрано Правило ценообразования для «Цена», оно изменит Прайс-лист. Цена Правило ценообразования - это конечная цена, поэтому дальнейшая скидка не должна применяться. Следовательно, в транзакциях, таких как заказ на продажу, заказ на поставку и т. д., оно будет укахываться в поле «Цена», а не в поле ""Прайс-лист"""
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Отслеживать лиды по отрасли.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Перейти к бланкам
DocType: Item Supplier,Item Supplier,Поставщик продукта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Все адреса.
DocType: Company,Stock Settings,Настройки Запасов
@@ -3104,7 +3124,7 @@
apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,Нет в наличии
DocType: Volunteer,Volunteer Skills,Волонтерские навыки
DocType: Appraisal,HR User,Сотрудник отдела кадров
-DocType: Purchase Invoice,Taxes and Charges Deducted,"Налоги, которые вычитаются"
+DocType: Purchase Invoice,Taxes and Charges Deducted,"Налоги и сборы, вычитаемые"
apps/erpnext/erpnext/hooks.py +142,Issues,Вопросов
apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
DocType: Sales Invoice,Debit To,Дебет Для
@@ -3121,7 +3141,7 @@
DocType: Crop,Scientific Name,Научное название
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,Всего Листья
DocType: Consultation,In print,В печати
-,Profit and Loss Statement,Счет прибылей и убытков
+,Profit and Loss Statement,Счет прибыль/убытки
DocType: Bank Reconciliation Detail,Cheque Number,Чек Количество
,Sales Browser,Браузер по продажам
DocType: Journal Entry,Total Credit,Всего очков
@@ -3136,7 +3156,7 @@
apps/erpnext/erpnext/accounts/report/financial_statements.py +233,Total {0} ({1}),Общая {0} ({1})
DocType: C-Form Invoice Detail,Territory,Территория
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
-DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
+DocType: Stock Settings,Default Valuation Method,Метод оценки по умолчанию
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +26,Fee,плата
apps/erpnext/erpnext/setup/doctype/company/company.js +154,Update in progress. It might take a while.,Производится обновление. Это может занять некоторое время.
DocType: Vehicle Log,Fuel Qty,Топливо Кол-во
@@ -3152,6 +3172,7 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,Общей суммой задолженности
DocType: Sales Partner,Targets,Цели
DocType: Price List,Price List Master,Прайс-лист Мастер
+DocType: GST Account,CESS Account,CESS-аккаунт
DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
,S.O. No.,КО №
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +241,Please create Customer from Lead {0},"Пожалуйста, создайте клиента из лида {0}"
@@ -3163,7 +3184,7 @@
DocType: Homepage,Products to be shown on website homepage,Продукты будут показаны на главную страницу сайта
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Это корневая группа клиентов и не могут быть изменены.
DocType: Student,AB-,AB-
-DocType: POS Profile,Ignore Pricing Rule,Игнорировать Цены Правило
+DocType: POS Profile,Ignore Pricing Rule,Игнорировать правило ценообразования
DocType: Employee Education,Graduate,Выпускник
DocType: Leave Block List,Block Days,Блок дня
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +83,"Shipping Address does not have country, which is required for this Shipping Rule","Адрес доставки не имеет страны, которая требуется для этого правила доставки"
@@ -3204,10 +3225,10 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Ошибка Имя: {0}
apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,недобор
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
-DocType: Packing Slip,If more than one package of the same type (for print),Если более чем один пакет того же типа (для печати)
+DocType: Packing Slip,If more than one package of the same type (for print),Если несколько пакетов одного типа (для печати)
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Укажите клиента по умолчанию в настройках ресторана
,Salary Register,Доход Регистрация
-DocType: Warehouse,Parent Warehouse,родитель Склад
+DocType: Warehouse,Parent Warehouse,Родитель склад
DocType: C-Form Invoice Detail,Net Total,Чистая Всего
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +527,Default BOM not found for Item {0} and Project {1},ВМ (спецификация) по умолчанию для продукта {0} и проекта {1} не найдена
apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Определение различных видов кредита
@@ -3228,7 +3249,7 @@
apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Значение {0} для атрибута {1} не существует в списке действительного пункта значений атрибутов для пункта {2}
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +79,Select Serial Numbers,Выберите серийные номера
DocType: BOM Item,Scrap %,Лом%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Расходы будут распределены пропорционально на основе Поз или суммы, по Вашему выбору"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Расходы будут распределяться пропорционально на основе количества или суммы продукта, согласно вашему выбору"
DocType: Maintenance Visit,Purposes,Цели
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Как минимум один товар должен быть введен с отрицательным количеством в возвратном документе
apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} больше, чем каких-либо имеющихся рабочих часов в рабочей станции {1}, сломать операции в несколько операций"
@@ -3253,7 +3274,7 @@
DocType: Purchase Invoice Item,Net Rate (Company Currency),Чистая скорость (Компания валют)
DocType: Salary Detail,Condition and Formula Help,Состояние и формула Помощь
apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление деревом территорий.
-DocType: Journal Entry Account,Sales Invoice,Счет Продажи
+DocType: Journal Entry Account,Sales Invoice,Счет на продажу
DocType: Journal Entry Account,Party Balance,Баланс партия
apps/erpnext/erpnext/accounts/page/pos/pos.js +498,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
DocType: Stock Settings,Sample Retention Warehouse,Хранилище хранения образцов
@@ -3261,7 +3282,7 @@
DocType: Physician,Physician Schedule,Расписание врачей
DocType: Purchase Invoice,Deemed Export,Рассмотренный экспорт
DocType: Stock Entry,Material Transfer for Manufacture,Материал Передача для производства
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Скидка в процентах можно применять либо против прайс-листа или для всех прайс-листа.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,"Процент скидки может применяться либо к Прайс-листу, либо ко всем Прайс-листам."
DocType: Subscription,Half-yearly,Раз в полгода
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +407,Accounting Entry for Stock,Бухгалтерская Проводка по Запасам
DocType: Lab Test,LabTest Approver,Подтверждение LabTest
@@ -3274,19 +3295,20 @@
DocType: Company,Default Inventory Account,Учетная запись по умолчанию
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Строка {0}: Завершенный Кол-во должно быть больше нуля.
DocType: Antibiotic,Antibiotic Name,Название антибиотика
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Код товара> Группа товаров> Марка
DocType: Purchase Invoice,Apply Additional Discount On,Применить Дополнительную Скидку на
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Выберите тип ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Ссылка на все земельные единицы, в которых растет урожай"
DocType: Account,Root Type,Корневая Тип
DocType: Item,FIFO,FIFO (ФИФО)
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Невозможно вернуть более {1} для п {2}
-apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +45,Plot,Сюжет
+apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +45,Plot,Участок
DocType: Item Group,Show this slideshow at the top of the page,Показать этот слайд-шоу в верхней части страницы
DocType: BOM,Item UOM,ЕИ продукта
DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сумма налога после скидки Сумма (Компания валют)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
DocType: Cheque Print Template,Primary Settings,Основные настройки
-DocType: Purchase Invoice,Select Supplier Address,Выборите Адрес Поставщика
+DocType: Purchase Invoice,Select Supplier Address,Выбрать адрес поставщика
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Add Employees,Добавить сотрудников
DocType: Purchase Invoice Item,Quality Inspection,Контроль качества
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Очень Маленький
@@ -3331,7 +3353,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +540,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Выберите ежемесячное распределение к неравномерно распределять цели по различным месяцам.
apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,Изменить код
-DocType: Purchase Invoice Item,Valuation Rate,Оценка Оцените
+DocType: Purchase Invoice Item,Valuation Rate,Оценка
DocType: Stock Reconciliation,SR/,SR /
DocType: Vehicle,Diesel,дизель
apps/erpnext/erpnext/stock/get_item_details.py +386,Price List Currency not selected,Прайс-лист Обмен не выбран
@@ -3348,7 +3370,7 @@
DocType: BOM,Scrap,лом
apps/erpnext/erpnext/utilities/user_progress.py +214,Go to Instructors,Перейти к инструкторам
apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управление партнерами по сбыту.
-DocType: Quality Inspection,Inspection Type,Инспекция Тип
+DocType: Quality Inspection,Inspection Type,Тип контроля
DocType: Fee Validity,Visited yet,Посетил еще
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,Склады с существующей транзакции не может быть преобразована в группу.
DocType: Assessment Result Tool,Result HTML,Результат HTML
@@ -3411,8 +3433,8 @@
DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введите имя кампании, если источником исследования является кампания"
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,Информационное издательство
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Выберите финансовый год
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +115,Expected Delivery Date should be after Sales Order Date,Ожидаемая дата поставки должна быть после даты заказа клиента
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Изменить порядок Уровень
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +115,Expected Delivery Date should be after Sales Order Date,Ожидаемая дата доставки должна быть после даты заказа клиента
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Уровень переупорядочения
DocType: Company,Chart Of Accounts Template,План счетов бухгалтерского учета шаблона
DocType: Attendance,Attendance Date,Посещаемость Дата
apps/erpnext/erpnext/stock/get_item_details.py +350,Item Price updated for {0} in Price List {1},Цена продукта {0} обновлена в прайс листе {1}
@@ -3449,7 +3471,7 @@
DocType: Assessment Group,Assessment Group Name,Название группы по оценке
DocType: Manufacturing Settings,Material Transferred for Manufacture,"Материал, переданный для производства"
DocType: Expense Claim,"A user with ""Expense Approver"" role","Пользователь с ролью ""Утверждающий расходы"""
-DocType: Landed Cost Item,Receipt Document Type,Квитанция Тип документа
+DocType: Landed Cost Item,Receipt Document Type,Тип документа о получении
DocType: Daily Work Summary Settings,Select Companies,Выбор компаний
,Issued Items Against Production Order,Выпущенные товары против производственного заказа
DocType: Antibiotic,Healthcare,Здравоохранение
@@ -3469,6 +3491,7 @@
DocType: Supplier,Credit Limit,{0}{/0} {1}Кредитный лимит {/1}
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Цена прайс-листа
DocType: Production Plan Sales Order,Salse Order Date,Salse Дата заказа
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Поставщик> Тип поставщика
DocType: Salary Component,Salary Component,Зарплата Компонент
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Записи оплаты {0} ип-сшитый
DocType: GL Entry,Voucher No,Ваучер №
@@ -3478,7 +3501,7 @@
DocType: Leave Allocation,Leave Allocation,Оставьте Распределение
DocType: Payment Request,Recipient Message And Payment Details,Получатель сообщения и платежные реквизиты
DocType: Training Event,Trainer Email,Тренер Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Запросы Материал {0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Запросы Материал {0} создан
DocType: Restaurant Reservation,No of People,Нет людей
DocType: Production Planning Tool,Include sub-contracted raw materials,Включите Субдоговорная сырья
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Шаблон терминов или договором.
@@ -3493,13 +3516,13 @@
DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ОРИГИНАЛ ДЛЯ ПОЛУЧАТЕЛЯ
DocType: Asset Category Account,Accumulated Depreciation Account,Начисленной амортизации Счет
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Это письмо автогенерировано
-DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
+DocType: Stock Settings,Freeze Stock Entries,Замораживание поступления запасов
DocType: Program Enrollment,Boarding Student,Студент-интернат
DocType: Asset,Expected Value After Useful Life,Ожидаемое значение после срока полезного использования
-DocType: Item,Reorder level based on Warehouse,Уровень Изменение порядка на основе Склад
+DocType: Item,Reorder level based on Warehouse,Уровень переупорядочивания на основе склада
DocType: Activity Cost,Billing Rate,Платежная Оценить
,Qty to Deliver,Кол-во для доставки
-,Stock Analytics,Анализ запасов
+,Stock Analytics,Аналитика запасов
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Operations cannot be left blank,"Операции, не может быть оставлено пустым"
DocType: Maintenance Visit Purpose,Against Document Detail No,Против деталях документа Нет
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party Type is mandatory,Тип партии является обязательным
@@ -3520,7 +3543,7 @@
apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управление адресами
DocType: Pricing Rule,Item Code,Код продукта
DocType: Production Planning Tool,Create Production Orders,Создание производственных заказов
-DocType: Serial No,Warranty / AMC Details,Гарантия / АМК Подробнее
+DocType: Serial No,Warranty / AMC Details,Гарантия / подробная информация
apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
DocType: Journal Entry,User Remark,Примечание Пользователь
@@ -3537,14 +3560,14 @@
apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Учетная запись {0} не соответствует компании {1}
DocType: Education Settings,Current Academic Year,Текущий академический год
DocType: Education Settings,Current Academic Year,Текущий академический год
-DocType: Stock Settings,Default Stock UOM,По умолчанию со UOM
+DocType: Stock Settings,Default Stock UOM,Единица измерения запасов по умолчанию
DocType: Asset,Number of Depreciations Booked,Количество отчислений на амортизацию бронирования
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Против Сотрудника кредита: {0}
-DocType: Landed Cost Item,Receipt Document,Прием документов
+DocType: Landed Cost Item,Receipt Document,Документ получения
DocType: Production Planning Tool,Create Material Requests,Создать запросы Материал
DocType: Employee Education,School/University,Школа / университет
DocType: Payment Request,Reference Details,Ссылка Подробнее
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Ожидаемое значение после срока полезного использования должен быть меньше, чем сумма валового Покупка"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,"Ожидаемое значение после срока полезного использования должен быть меньше, чем сумма валового Покупка"
DocType: Sales Invoice Item,Available Qty at Warehouse,Доступное Кол-во на складе
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Счетов выдано количество
DocType: Asset,Double Declining Balance,Двойной баланс Отклонение
@@ -3556,7 +3579,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получить обновления
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Счет {2} не принадлежит Компании {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Выберите по крайней мере одно значение из каждого из атрибутов.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Оставить управления
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Группа по Счет
DocType: Sales Order,Fully Delivered,Полностью Поставляются
@@ -3572,8 +3595,8 @@
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Невозможно изменить статус студента {0} связан с приложением студента {1}
DocType: Asset,Fully Depreciated,Полностью Амортизируется
-,Stock Projected Qty,Прогнозируемое Кол-во Запасов
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+,Stock Projected Qty,Прогнозируемое количество запасов
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Выраженное Посещаемость HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Котировки являются предложениями, предложениями отправленных к своим клиентам"
DocType: Sales Order,Customer's Purchase Order,Заказ клиента
@@ -3618,7 +3641,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +83,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Строка # {0}: выделенная сумма не может превышать невыплаченную сумму.
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Просмотр спецификации
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Обеспеченные кредиты
-DocType: Purchase Invoice,Edit Posting Date and Time,Редактирование проводок Дата и время
+DocType: Purchase Invoice,Edit Posting Date and Time,Изменить дату и время публикации
apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Пожалуйста, установите Амортизация соответствующих счетов в Asset Категория {0} или компании {1}"
DocType: Lab Test Groups,Normal Range,Нормальный диапазон
DocType: Academic Term,Academic Year,Учебный год
@@ -3654,10 +3677,10 @@
DocType: Purchase Invoice Item,Net Amount (Company Currency),Чистая сумма (валюта Компании)
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +229,Total advance amount cannot be greater than total sanctioned amount,Общая сумма аванса не может превышать общую сумму санкций
DocType: Salary Slip,Hour Rate,Часовой разряд
-DocType: Stock Settings,Item Naming By,Название продукта на
+DocType: Stock Settings,Item Naming By,Наименование продукта по
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
DocType: Production Order,Material Transferred for Manufacturing,Материал переведен на Производство
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Счет {0} не существует
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Счет {0} не существует
DocType: Project,Project Type,Тип проекта
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Для этой задачи существует дочерняя задача. Вы не можете удалить эту задачу.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Либо целевой Количество или целевое количество является обязательным.
@@ -3674,7 +3697,7 @@
DocType: Vital Signs,BMI,BMI
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Наличность кассы
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +137,Delivery warehouse required for stock item {0},Склад Доставка требуется для фондового пункта {0}
-DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Общий вес пакета. Обычно вес нетто + вес упаковочного материала. (Для печати)
+DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Общий вес пакета. Обычно вес нетто + вес упаковки. (Для печати)
DocType: Assessment Plan,Program,программа
DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Пользователи с этой ролью могут замороживать счета, а также создавать / изменять бухгалтерские проводки замороженных счетов"
DocType: Serial No,Is Cancelled,Является Отмененные
@@ -3683,7 +3706,7 @@
DocType: Journal Entry,Bill Date,Дата оплаты
DocType: Healthcare Settings,Laboratory SMS Alerts,Лабораторные SMS-оповещения
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Услуга, тип, частота и сумма расходов должны быть указаны"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Даже если есть несколько правил ценообразования с наивысшим приоритетом, то следующие внутренние приоритеты применяются:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Даже если существует несколько Правил ценообразования с наивысшим приоритетом, применяются следующие внутренние приоритеты:"
DocType: Plant Analysis Criteria,Plant Analysis Criteria,Критерии анализа производства
DocType: Cheque Print Template,Cheque Height,Cheque Высота
DocType: Supplier,Supplier Details,Подробная информация о поставщике
@@ -3711,7 +3734,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +140,A Product,Продукт
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +207,Batches,Порции
apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Сделать расписание
-DocType: Purchase Order Item Supplied,Stock UOM,Ед. изм. Запасов
+DocType: Purchase Order Item Supplied,Stock UOM,Единица измерения запасов
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +233,Purchase Order {0} is not submitted,Заказ на закупку {0} не проведен
DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),Нормальный диапазон задания для взрослого составляет 16-20 вдохов / мин (RCP 2012)
DocType: Customs Tariff Number,Tariff Number,Тарифный номер
@@ -3760,19 +3783,19 @@
DocType: C-Form,I,Я
DocType: Company,Asset Depreciation Cost Center,Центр Амортизация Стоимость активов
DocType: Sales Order Item,Sales Order Date,Дата Заказа клиента
-DocType: Sales Invoice Item,Delivered Qty,Поставленное Кол-во
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Всего Excl. налог
+DocType: Sales Invoice Item,Delivered Qty,Поставляемое кол-во
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Если этот флажок установлен, все дети каждого пункта производства будут включены в материале запросов."
DocType: Assessment Plan,Assessment Plan,План оценки
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Клиент {0} создан.
-DocType: Stock Settings,Limit Percent,Предельное Процент
+DocType: Stock Settings,Limit Percent,Предельный процент
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Пожалуйста, настройте систему именования инструкторов в образовании> Настройки образования"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Сейчас нет доступного запаса на складах
,Payment Period Based On Invoice Date,Оплата период на основе Накладная Дата
DocType: Sample Collection,No. of print,Номер печати
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Пропавших без вести Курсы валют на {0}
DocType: Assessment Plan,Examiner,экзаменатор
DocType: Student,Siblings,Братья и сестры
-DocType: Journal Entry,Stock Entry,Складские акты
+DocType: Journal Entry,Stock Entry,Поступление запасов
DocType: Payment Entry,Payment References,Ссылки оплаты
DocType: C-Form,C-FORM-,C-form-
DocType: Vehicle,Insurance Details,Страхование Подробнее
@@ -3781,12 +3804,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Должники ({0})
DocType: Pricing Rule,Margin,Разница
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Новые клиенты
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Валовая Прибыль%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Валовая Прибыль%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Изменить профиль POS
DocType: Bank Reconciliation Detail,Clearance Date,Клиренс Дата
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Отчет об оценке
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Валовая сумма покупки является обязательным
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Валовая сумма покупки является обязательным
DocType: Lead,Address Desc,Адрес по убыванию
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Партия является обязательным
DocType: Journal Entry,JV-,JV-
@@ -3818,7 +3841,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Постоянное имя
DocType: Stock Entry,Customer or Supplier Details,Детали по Заказчику или Поставщику
DocType: Employee Loan Application,Required by Date,Требуется Дата
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Баланс закрытия (Dr-Cr)
DocType: Lead,Lead Owner,Владелец лида
DocType: Bin,Requested Quantity,Требуемое количество
DocType: Patient,Marital Status,Семейное положение
@@ -3832,7 +3854,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Несколько вариантов
DocType: Sales Invoice,Against Income Account,Против ДОХОДОВ
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% доставлено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Заказал Кол-во {1} не может быть меньше минимального заказа Кол-во {2} (определенной в пункте).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Пункт {0}: Заказал Кол-во {1} не может быть меньше минимального заказа Кол-во {2} (определенной в пункте).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ежемесячный Процентное распределение
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Войдите в систему как другой пользователь.
DocType: Territory,Territory Targets,Территория Цели
@@ -3849,12 +3871,13 @@
DocType: Program Enrollment,Walking,Гулять пешком
DocType: Student Guardian,Student Guardian,Студент-хранитель
DocType: Member,Member Name,Имя участника
+DocType: Stock Settings,Use Naming Series,Использование серии имен
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
DocType: POS Profile,Update Stock,Обновление стока
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,в подписке
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные единицы измерения (ЕИ) продуктов приведут к некорректному (общему) значению массы нетто. Убедитесь, что вес нетто каждого продукта находится в одной ЕИ."
DocType: Membership,Payment Details,Детали оплаты
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Оценить
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Цена спецификации
DocType: Asset,Journal Entry for Scrap,Запись в журнале для лома
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Пожалуйста вытяните продукты из транспортной накладной
apps/erpnext/erpnext/accounts/utils.py +472,Journal Entries {0} are un-linked,Записи в журнале {0} не-связаны
@@ -3893,7 +3916,7 @@
DocType: Cheque Print Template,Width of amount in word,Ширина суммы в слове
DocType: Company,Default Letter Head,По умолчанию бланке
DocType: Purchase Order,Get Items from Open Material Requests,Получить товары из Открыть Запросов Материала
-DocType: Lab Test Template,Standard Selling Rate,Стандартный курс продажи
+DocType: Lab Test Template,Standard Selling Rate,Стандартная ставка продажи
DocType: Account,Rate at which this tax is applied,Курс по которому этот налог применяется
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +75,Reorder Qty,Изменить порядок Кол-во
apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Текущие вакансии Вакансии
@@ -3924,7 +3947,7 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Счет Дата размещения
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,продавать
DocType: Purchase Invoice,Rounded Total,Округлые Всего
-DocType: Product Bundle,List items that form the package.,"Список предметов, которые формируют пакет."
+DocType: Product Bundle,List items that form the package.,"Список продуктов, которые формируют пакет"
apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
DocType: Crop Cycle,Linked Land Unit,Связанная земельная единица
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
@@ -3932,7 +3955,7 @@
DocType: Serial No,Out of AMC,Из КУА
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
DocType: Company,Default Cash Account,Расчетный счет по умолчанию
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Это основано на посещаемости этого студента
@@ -3959,7 +3982,7 @@
DocType: Company,Create Chart Of Accounts Based On,"Создание плана счетов бухгалтерского учета, основанные на"
apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,Невозможно преобразовать его в не-группу. Существуют детские задачи.
apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
-,Stock Ageing,Старение запасов
+,Stock Ageing,Старые запасы (Неликвиды)
apps/erpnext/erpnext/education/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} существует против студента заявителя {1}
DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Коррекция округления (валюта компании)
apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,табель
@@ -3987,7 +4010,7 @@
DocType: Sales Person,Sales Person Name,Имя продавца
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1-фактуру в таблице"
apps/erpnext/erpnext/utilities/user_progress.py +244,Add Users,Добавить пользователей
-DocType: POS Item Group,Item Group,Группа продукта
+DocType: POS Item Group,Item Group,Продуктовая группа
DocType: Item,Safety Stock,Страховой запас
DocType: Healthcare Settings,Healthcare Settings,Настройки здравоохранения
apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,"Прогресс% для задачи не может быть больше, чем 100."
@@ -4024,7 +4047,7 @@
DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
apps/erpnext/erpnext/accounts/doctype/account/account.py +251,Account Number {0} already used in account {1},"Номер счета {0}, уже использованный в учетной записи {1}"
DocType: POS Profile,POS Profile Name,Название профиля POS
-DocType: Purchase Invoice Item,Rate,Оценить
+DocType: Purchase Invoice Item,Rate,Цена
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Стажер
DocType: Delivery Stop,Address Name,Адрес
DocType: Stock Entry,From BOM,Из спецификации
@@ -4092,7 +4115,7 @@
DocType: Tax Rule,Shipping City,Доставка Город
DocType: Notification Control,Customize the Notification,Настроить уведомления
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Поток денежных средств от операций
-DocType: Purchase Invoice,Shipping Rule,Правило Доставка
+DocType: Purchase Invoice,Shipping Rule,Правило доставки
DocType: Patient Relation,Spouse,супруга
DocType: Lab Test Groups,Add Test,Добавить тест
DocType: Manufacturer,Limited to 12 characters,Ограничено до 12 символов
@@ -4141,7 +4164,7 @@
apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Включение / отключение валюты.
DocType: Production Planning Tool,Get Material Request,Получить материал Запрос
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Почтовые расходы
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всего (АМТ)
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всего (сумма)
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
,Item Variant Details,Детали деталя детали
DocType: Quality Inspection,Item Serial No,Серийный номер продукта
@@ -4160,7 +4183,7 @@
DocType: Item,Default Material Request Type,По умолчанию Тип материала Запрос
DocType: Supplier Scorecard,Evaluation Period,Период оценки
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,неизвестный
-DocType: Shipping Rule,Shipping Rule Conditions,Правило Доставка Условия
+DocType: Shipping Rule,Shipping Rule Conditions,Правило перевозки груза
DocType: Purchase Invoice,Export Type,Тип экспорта
DocType: Salary Slip Loan,Salary Slip Loan,Зарплатный ссудный кредит
DocType: BOM Update Tool,The new BOM after replacement,Новая спецификация после замены
@@ -4196,7 +4219,7 @@
DocType: Supplier Scorecard,Per Month,В месяц
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +414,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетите отчет за призыв обслуживания.
-DocType: Stock Entry,Update Rate and Availability,Частота обновления и доступность
+DocType: Stock Entry,Update Rate and Availability,Скорость обновления и доступность
DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент вы имеете право принимать или сдавать более против заказанного количества. Например: Если Вы заказали 100 единиц. и ваш Пособие 10%, то вы имеете право на получение 110 единиц."
DocType: POS Customer Group,Customer Group,Группа клиентов
apps/erpnext/erpnext/stock/doctype/batch/batch.js +120,New Batch ID (Optional),Новый идентификатор партии (необязательно)
@@ -4205,9 +4228,9 @@
DocType: BOM,Website Description,Описание
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Чистое изменение в капитале
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,новейший
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адрес электронной почты должен быть уникальным, уже существует для {0}"
-DocType: Serial No,AMC Expiry Date,КУА срок действия
+DocType: Serial No,AMC Expiry Date,Срок действия AMC
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Квитанция
,Sales Register,Книга продаж
DocType: Daily Work Summary Settings Company,Send Emails At,Отправить по электронной почте на
@@ -4222,7 +4245,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,О движении денежных средств
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сумма кредита не может превышать максимальный Сумма кредита {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Лицензия
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Пожалуйста, выберите переносить, если вы также хотите включить баланс предыдущего финансового года оставляет в этом финансовом году"
DocType: GL Entry,Against Voucher Type,Против Сертификаты Тип
DocType: Physician,Phone (R),Телефон (R)
@@ -4234,7 +4257,7 @@
DocType: Patient,B Negative,В негативный
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Статус обслуживания должен быть отменен или завершен для отправки
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Серийные номера в строке {0} не совпадают с полем «Поставка»
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Серийные номера в строке {0} не совпадают с полем «Поставка»
DocType: Student,Guardian Details,Подробнее Гардиан
DocType: C-Form,C-Form,C-образный
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посещаемости для нескольких сотрудников
@@ -4265,7 +4288,7 @@
DocType: Supplier Quotation,Supplier Address,Адрес поставщика
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Бюджет по Счету {1} для {2} {3} составляет {4}. Он будет израсходован к {5}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +695,Row {0}# Account must be of type 'Fixed Asset',Строка {0} # Счет должен быть типа "Fixed Asset"
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Из Кол-во
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Из кол-ва
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,и unchcked Отключено в
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Серия является обязательным
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Финансовые услуги
@@ -4276,7 +4299,7 @@
DocType: Stock Entry Detail,Basic Amount,Основное количество
DocType: Training Event,Exam,Экзамен
DocType: Complaint,Complaint,жалоба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
DocType: Leave Allocation,Unused leaves,Неиспользованные листья
DocType: Patient,Alcohol Past Use,Использование алкоголя в прошлом
DocType: Fertilizer Content,Fertilizer Content,Содержание удобрений
@@ -4297,13 +4320,13 @@
DocType: Student Admission Program,Maximum Age,Максимальный возраст
DocType: Landed Cost Voucher,LCV,LCV
DocType: Landed Cost Voucher,Purchase Receipts,Покупка Поступления
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Как Ценообразование Правило применяется?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Как применяется правило ценообразования?
DocType: Stock Entry,Delivery Note No,Документ Отгрузки №
DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Если этот флажок установлен, только запросы о покупке материалов для конечных сырья будут включены в материале запросов. В противном случае будет создан материал Запросы на родительских элементов"
DocType: Cheque Print Template,Message to show,"Сообщение, чтобы показать"
apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Розничная торговля
DocType: Student Attendance,Absent,Отсутствует
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Связка товаров
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Продуктовый набор
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,"Не удалось найти результат, начинающийся с {0}. Вы должны иметь постоянные баллы, покрывающие 0 до 100"
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +206,No submitted Delivery Notes found,Не найдено
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
@@ -4317,9 +4340,10 @@
DocType: Journal Entry,Write Off Based On,Списание на основе
apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,Создать лид
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Печать и канцелярские
-DocType: Stock Settings,Show Barcode Field,Показать поле Штрих-код
+DocType: Stock Settings,Show Barcode Field,Показать поле штрих-кода
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +807,Send Supplier Emails,Отправить Поставщик электронных писем
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата уже обработали за период между {0} и {1}, Оставьте период применения не может быть в пределах этого диапазона дат."
+DocType: Chapter Member,Leave Reason,Оставить разум
DocType: Guardian Interest,Guardian Interest,Опекун Проценты
DocType: Volunteer,Availability,Доступность
apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Настройка значений по умолчанию для счетов-фактур POS
@@ -4403,12 +4427,13 @@
DocType: Salary Detail,Formula,формула
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Шаблон лабораторных тестов
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Сбыт
DocType: Purchase Invoice Item,Total Weight,Общий вес
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комиссия по продажам
DocType: Offer Letter Term,Value / Description,Значение / Описание
apps/erpnext/erpnext/controllers/accounts_controller.py +629,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Актив {1} не может быть проведен, он уже {2}"
DocType: Tax Rule,Billing Country,Страна плательщика
-DocType: Purchase Order Item,Expected Delivery Date,Ожидаемая дата поставки
+DocType: Purchase Order Item,Expected Delivery Date,Ожидаемая дата доставки
DocType: Restaurant Order Entry,Restaurant Order Entry,Ввод заказа ресторана
apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
DocType: Asset Maintenance Task,Assign To Name,Назначить имя
@@ -4426,7 +4451,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Судебные издержки
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +140,Please select quantity on row ,Выберите количество в строке
apps/erpnext/erpnext/config/accounts.py +277,Make Opening Sales and Purchase Invoices,Сделать открытие счетов-фактур на покупку и покупку
-DocType: Purchase Invoice,Posting Time,Средняя Время
+DocType: Purchase Invoice,Posting Time,Время публикации
DocType: Timesheet,% Amount Billed,% Сумма счета
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",«Время в назначении» не установлено для Dr {0}. Добавьте его в мастер-терапевт.
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Телефон Расходы
@@ -4454,9 +4479,9 @@
apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатные Компоненты
DocType: Program Enrollment Tool,New Academic Year,Новый учебный год
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +809,Return / Credit Note,Возвращение / Кредит Примечание
-DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
+DocType: Stock Settings,Auto insert Price List rate if missing,Автоматическая вставка прайс - листа при отсутствии цены
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +23,Total Paid Amount,Всего уплаченной суммы
-DocType: Production Order Item,Transferred Qty,Переведен Кол-во
+DocType: Production Order Item,Transferred Qty,Передано кол-во
apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигационный
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Планирование
DocType: Material Request,Issued,Выпущен
@@ -4494,14 +4519,14 @@
DocType: Restaurant Order Entry,Restaurant Table,Стол для ресторанов
DocType: Leave Type,Max Days Leave Allowed,Максимальное количество дней отпуска разрешены
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Установите Налоговый Правило корзине
-DocType: Purchase Invoice,Taxes and Charges Added,Налоги и сборы Добавил
+DocType: Purchase Invoice,Taxes and Charges Added,Налоги и сборы добавлены
,Sales Funnel,Воронка продаж
apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation is mandatory,Сокращение является обязательным
DocType: Project,Task Progress,Задача о ходе работы
apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Тележка
,Qty to Transfer,Кол-во для передачи
apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Предложения лидам или клиентам.
-DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
+DocType: Stock Settings,Role Allowed to edit frozen stock,Роль с разрешением редактировать замороженный запас
,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Все Группы клиентов
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Накопленный в месяц
@@ -4534,7 +4559,7 @@
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Ряд # {0}: Серийный номер является обязательным
DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,институт Аббревиатура
-,Item-wise Price List Rate,Пункт мудрый Прайс-лист Оценить
+,Item-wise Price List Rate,Цена продукта в прайс-листе
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +970,Supplier Quotation,Ценовое предложение поставщика
DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
@@ -4561,7 +4586,7 @@
DocType: Customer,From Lead,От лида
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,"Заказы, выпущенные для производства."
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Выберите финансовый год ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
DocType: Program Enrollment Tool,Enroll Students,зачислить студентов
DocType: Lab Test,Approved Date,Утвержденная дата
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартный Продажа
@@ -4595,10 +4620,10 @@
apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Добавить посещаемость от. Файл CSV
apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Выдающийся Amt
DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Установить целевые Пункт Группа стрелке для этого менеджера по продажам.
-DocType: Stock Settings,Freeze Stocks Older Than [Days],"Морозильники Акции старше, чем [дней]"
+DocType: Stock Settings,Freeze Stocks Older Than [Days],"Замороженные запасы старше, чем [Дни]"
apps/erpnext/erpnext/controllers/accounts_controller.py +599,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Строка # {0}: Актив является обязательным для фиксированного актива покупки / продажи
DocType: Asset Maintenance Team,Maintenance Team Name,Название службы технического обслуживания
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Если два или более Ценообразование правила содержатся на основании указанных выше условиях, приоритет применяется. Приоритет номер от 0 до 20, а значение по умолчанию равно нулю (пустой). Большее число означает, что он будет иметь приоритет, если есть несколько правил ценообразования с одинаковыми условиями."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Если найдено два или более Правил ценообразования на основе вышеуказанных условий, применяется Приоритет. Приоритет - это число от 0 до 20, а значение по умолчанию равно нулю (пустое). Более высокий номер означает, что он будет иметь приоритет, если в нем действуют несколько Правил ценообразования с одинаковыми условиями."
apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Финансовый год: {0} не существует
DocType: Currency Exchange,To Currency,В валюту
DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Разрешить следующие пользователи утвердить Leave приложений для блочных дней.
@@ -4610,7 +4635,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,Оплаченные и не доставленные
DocType: Project,Default Cost Center,По умолчанию Центр Стоимость
DocType: Bank Guarantee,End Date,Дата окончания
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Операции с Запасами
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Транзакции запасов
DocType: Budget,Budget Accounts,Счета бюджета
DocType: Employee,Internal Work History,Внутренняя история Работа
DocType: Depreciation Schedule,Accumulated Depreciation Amount,Сумма начисленной амортизации
@@ -4628,16 +4653,17 @@
apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
DocType: Appraisal,APRSL,APRSL
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,Подтвердить этот производственный заказ для дальнейшей обработки.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Чтобы не применяются Цены правило в конкретной сделки, все применимые правила ценообразования должны быть отключены."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Чтобы не применять правило ценообразования в конкретной транзакции, все применимые Правила ценообразования должны быть отключены."
DocType: Payment Term,Day(s) after the end of the invoice month,День (ы) после окончания месяца счета-фактуры
DocType: Assessment Group,Parent Assessment Group,Родитель группа по оценке
apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,работы
,Sales Order Trends,Продажи Заказать Тенденции
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,The 'From Package No.' field must neither be empty nor it's value less than 1.,«Из пакета №» поле не должно быть пустым или его значение меньше 1.
DocType: Employee,Held On,Состоявшемся
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Производство товара
,Employee Information,Сотрудник Информация
DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Сделать Поставщик цитаты
DocType: Quality Inspection,Incoming,Входящий
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Создаются шаблоны налогов по умолчанию для продаж и покупки.
@@ -4652,9 +4678,9 @@
DocType: Agriculture Task,End Day,Конец дня
DocType: Batch,Batch ID,ID партии
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Примечание: {0}
-,Delivery Note Trends,Доставка Примечание тенденции
+,Delivery Note Trends,Динамика Накладных
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Резюме этой недели
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,В наличии Кол-во
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,В наличии Кол-во
DocType: Delivery Trip,Calculate Estimated Arrival Times,Рассчитать расчетное время прибытия
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Счет: {0} можно обновить только через перемещение по складу
DocType: Student Group Creation Tool,Get Courses,Получить курсы
@@ -4670,9 +4696,10 @@
DocType: Material Request,% Ordered,% заказано
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Для студенческой группы, основанной на курсах, курс будет подтвержден для каждого студента с зачисленных курсов по зачислению в программу."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Сдельная работа
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Средняя Цена Покупки
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Средняя Цена Покупки
DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
DocType: Employee,History In Company,История в компании
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Новое сообщение от {sender}
apps/erpnext/erpnext/config/learn.py +107,Newsletters,Рассылки
DocType: Drug Prescription,Description/Strength,Описание / Strength
DocType: Stock Ledger Entry,Stock Ledger Entry,Фото со Ledger Entry
@@ -4717,7 +4744,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Строка {0}: Валюта BOM # {1} должен быть равен выбранной валюте {2}
DocType: Journal Entry Account,Exchange Rate,Курс обмена
DocType: Patient,Additional information regarding the patient,Дополнительная информация о пациенте
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
DocType: Homepage,Tag Line,Tag Line
DocType: Fee Component,Fee Component,Компонент платы
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Управление флотом
@@ -4769,12 +4796,12 @@
DocType: Appointment Type,Appointment Type,Тип назначения
apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
DocType: Healthcare Settings,Valid number of days,Действительное количество дней
-apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,МВЗ
+apps/erpnext/erpnext/setup/doctype/company/company.js +39,Cost Centers,Центр затрат
DocType: Land Unit,Linked Plant Analysis,Анализ связанных растений
DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Курс конвертирования валюты поставщика в базовую валюту компании
apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ряд # {0}: тайминги конфликты с рядом {1}
-DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешить нулевой курс оценки
-DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешить нулевой курс оценки
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешить нулевую оценку
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Разрешить нулевую оценку
DocType: Training Event Employee,Invited,приглашенный
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,"Несколько активных Зарплатные структуры, найденные для работника {0} для указанных дат"
apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Настройка шлюза счета.
@@ -4786,6 +4813,7 @@
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Срок подачи заявлений не может быть по двум alocation записей
apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +25,Combined invoice portion must equal 100%,Комбинированная часть счета должна равняться 100%
DocType: Item Group,Default Expense Account,По умолчанию расходов счета
+DocType: GST Account,CGST Account,Учетная запись CGST
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Student Email ID
DocType: Employee,Notice (days),Уведомление (дней)
DocType: Tax Rule,Sales Tax Template,Шаблон Налога с продаж
@@ -4817,7 +4845,7 @@
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Пожалуйста, сформулируйте из / в диапазоне"
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +28,Opening {0} Invoice created,Открытие {0} счет-фактуры
DocType: Serial No,Under AMC,Под КУА
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Пункт ставка оценка пересчитывается с учетом приземлился затрат количество ваучеров
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Коэффициент оценки стоимости пересчитывается с учетом суммы талонов с затратами
apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок.
DocType: Guardian,Guardian Of ,Хранитель
DocType: Grading Scale Interval,Threshold,порог
@@ -4931,12 +4959,12 @@
DocType: Employee Education,Employee Education,Сотрудник Образование
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Повторяющаяся группа находке в таблице группы товаров
DocType: Land Unit,Parent Land Unit,Группа родительских домов
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Это необходимо для отображения подробностей продукта.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Это необходимо для отображения подробностей продукта.
DocType: Fertilizer,Fertilizer Name,Название удобрения
DocType: Salary Slip,Net Pay,Чистая Платное
DocType: Account,Account,Аккаунт
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Серийный номер {0} уже существует
-,Requested Items To Be Transferred,Требуемые товары должны быть переданы
+,Requested Items To Be Transferred,Запрашиваемые продукты к доставке
DocType: Expense Claim,Vehicle Log,Автомобиль Вход
DocType: Vital Signs,Presence of a fever (temp > 38.5 °C/101.3 °F or sustained temp > 38 °C/100.4 °F),"Наличие лихорадки (темп> 38,5 ° C / 101,3 ° F или постоянная температура> 38 ° C / 100,4 ° F)"
DocType: Customer,Sales Team Details,Описание отдела продаж
@@ -4962,15 +4990,15 @@
DocType: Item,Max Discount (%),Макс Скидка (%)
apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +30,Credit Days cannot be a negative number,Кредитные дни не могут быть отрицательным числом
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Последняя сумма заказа
-apps/erpnext/erpnext/stock/doctype/item/item.py +264," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} Сохранять образец на основе партии, пожалуйста, проверьте, имеет ли партия №, чтобы сохранить образец товара"
+apps/erpnext/erpnext/stock/doctype/item/item.py +264," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} Сохранять образец на основе партии, пожалуйста, проверьте, имеет ли партия №, чтобы сохранить образец продукта"
DocType: Task,Is Milestone,Это этап
DocType: Delivery Stop,Email Sent To,Е-мейл отправлен
DocType: Budget,Warn,Важно
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Вы действительно хотите отменить регистрацию?
DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях."
DocType: Asset Maintenance,Manufacturing User,Сотрудник производства
-DocType: Purchase Invoice,Raw Materials Supplied,Поставленное сырьё
-DocType: C-Form,Series,Серии значений
+DocType: Purchase Invoice,Raw Materials Supplied,Поставка сырья
+DocType: C-Form,Series,Серии
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +273,Currency of the price list {0} must be {1} or {2},Валюта прейскуранта {0} должна быть {1} или {2}
DocType: Appraisal,Appraisal Template,Оценка шаблона
DocType: Soil Texture,Ternary Plot,Тройной участок
@@ -4985,7 +5013,7 @@
apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Посмотреть лиды
DocType: Program Enrollment Tool,New Program,Новая программа
DocType: Item Attribute Value,Attribute Value,Значение атрибута
-,Itemwise Recommended Reorder Level,Itemwise Рекомендуем изменить порядок Уровень
+,Itemwise Recommended Reorder Level,Рекомендация пополнения уровня продукта
DocType: Salary Detail,Salary Detail,Заработная плата: Подробности
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1043,Please select {0} first,"Пожалуйста, выберите {0} первый"
DocType: Appointment Type,Physician,врач
@@ -5010,7 +5038,7 @@
DocType: Item Customer Detail,Ref Code,Код ссылки
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Группа клиентов требуется в профиле POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Сотрудник записей.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Пожалуйста, следующий набор амортизации Дата"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Пожалуйста, следующий набор амортизации Дата"
DocType: HR Settings,Payroll Settings,Настройки по заработной плате
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,"Подходим, не связанных Счета и платежи."
DocType: POS Settings,POS Settings,Настройки POS
@@ -5049,7 +5077,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,Подробный отчет о вариантах
DocType: Setup Progress Action,Setup Progress Action,Действия по созданию установки
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Buying Price List,Ценовой список покупок
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Удалить элемент, если обвинения не относится к этому пункту"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Удалить продукт, если сборы не применимы к этому продукту"
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,Выберите «Состояние обслуживания» как «Завершено» или «Дата завершения»
DocType: Supplier,Default Payment Terms Template,Шаблон условий оплаты по умолчанию
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,"Валюта сделки должна быть такой же, как платежный шлюз валюты"
@@ -5074,7 +5102,7 @@
apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Курс является обязательным в строке {0}
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +268,Add / Edit Prices,Добавить / Изменить цены
+apps/erpnext/erpnext/stock/doctype/item/item.js +268,Add / Edit Prices,Добавить/изменить цены
DocType: Batch,Parent Batch,Родительская партия
DocType: Cheque Print Template,Cheque Print Template,Чеками печати шаблона
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,План МВЗ
@@ -5084,7 +5112,7 @@
DocType: Price List,Price List Name,Цена Имя
apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Ежедневно Резюме Работа для {0}
DocType: BOM,Manufacturing,Производство
-,Ordered Items To Be Delivered,Заказал детали быть поставленным
+,Ordered Items To Be Delivered,Заказанные позиции к отгрузке
DocType: Account,Income,Доход
DocType: Industry Type,Industry Type,Тип индустрии
apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Что-то пошло не так!
@@ -5117,7 +5145,7 @@
DocType: Hub Settings,Company and Seller Profile,Профиль компании и продавца
,GST Itemised Sales Register,Регистр продаж GST
DocType: Soil Texture,Silt Loam,Иловая суса
-,Serial No Service Contract Expiry,Серийный номер сервисного контракта на обслуживание
+,Serial No Service Contract Expiry,Срок обслуживания серийного номера по договору
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,You cannot credit and debit same account at the same time,Нельзя кредитовать и дебетовать один счёт за один раз
DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,Частота пульса взрослых составляет от 50 до 80 ударов в минуту.
DocType: Naming Series,Help HTML,Помощь HTML
@@ -5172,12 +5200,12 @@
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен для сотрудника {0}
DocType: Vehicle,Vehicle Value,Значение автомобиля
DocType: Crop Cycle,Detected Diseases,Обнаруженные заболевания
-DocType: Stock Entry,Default Source Warehouse,По умолчанию Источник Склад
+DocType: Stock Entry,Default Source Warehouse,По умолчанию склад сырья
DocType: Item,Customer Code,Код клиента
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Напоминание о дне рождения для {0}
DocType: Asset Maintenance Task,Last Completion Date,Последняя дата завершения
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни с последнего Заказать
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
DocType: Buying Settings,Naming Series,Наименование серии
DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхование начала должна быть меньше, чем дата страхование End"
@@ -5212,7 +5240,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +489,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Щёлкните продукты, чтобы добавить их сюда."
DocType: Fees,Program Enrollment,Программа подачи заявок
-DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
+DocType: Landed Cost Voucher,Landed Cost Voucher,Талон складской стоимости
apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} - неактивный ученик
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} - неактивный ученик
@@ -5224,7 +5252,7 @@
DocType: Grant Application,Assessment Manager,Менеджер по оценке
DocType: Payment Entry,Allocate Payment Amount,Выделяют Сумма платежа
DocType: Employee External Work History,Salary,Зарплата
-DocType: Serial No,Delivery Document Type,Тип Документа Отгрузки
+DocType: Serial No,Delivery Document Type,Тип документа поставки
DocType: Sales Order,Partly Delivered,Небольшая Поставляются
DocType: Item Variant Settings,Do not update variants on save,Не обновлять варианты при сохранении
DocType: Email Digest,Receivables,Дебиторская задолженность
@@ -5295,6 +5323,7 @@
DocType: Journal Entry,Total Amount Currency,Общая сумма валюты
apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Поиск Sub сборки
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
+DocType: GST Account,SGST Account,Учетная запись SGST
apps/erpnext/erpnext/utilities/user_progress.py +151,Go to Items,Перейти к элементам
DocType: Sales Partner,Partner Type,Тип Партнер
DocType: Purchase Taxes and Charges,Actual,Фактически
@@ -5307,6 +5336,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Получить Записи оплаты
DocType: Quotation Item,Against Docname,Против DOCNAME
DocType: SMS Center,All Employee (Active),Все Сотрудник (Активный)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Клиент> Группа клиентов> Территория
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Просмотр сейчас
DocType: BOM,Raw Material Cost,Стоимость сырья
DocType: Item Reorder,Re-Order Level,Уровень перезаказа
@@ -5319,7 +5349,7 @@
DocType: Training Event,Employee Emails,Письма сотрудников
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +59,Series Updated,Серия Обновлено
apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Report Type is mandatory,Тип отчета является обязательным
-DocType: Item,Serial Number Series,Серийный Номер серии
+DocType: Item,Serial Number Series,Серийный номер серии
apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для Запаса {0} в строке {1}
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
DocType: Issue,First Responded On,Впервые ответил
@@ -5328,6 +5358,7 @@
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Зазор Дата обновления
apps/erpnext/erpnext/stock/doctype/batch/batch.js +138,Split Batch,Сплит-пакет
apps/erpnext/erpnext/stock/doctype/batch/batch.js +138,Split Batch,Сплит-пакет
+DocType: Stock Settings,Batch Identification,Идентификация партии
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Успешно Примирение
DocType: Request for Quotation Supplier,Download PDF,Скачать PDF
DocType: Production Order,Planned End Date,Планируемая Дата завершения
@@ -5373,7 +5404,7 @@
DocType: Asset Category,Asset Category Name,Asset Категория Название
apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Это корень территории и не могут быть изменены.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Имя нового менеджера по продажам
-DocType: Packing Slip,Gross Weight UOM,Вес брутто Единица измерения
+DocType: Packing Slip,Gross Weight UOM,Вес брутто единицы
DocType: Asset Maintenance Task,Preventive Maintenance,Профилактика
DocType: Delivery Note Item,Against Sales Invoice,Против продаж счета-фактуры
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +151,Please enter serial numbers for serialized item ,Введите серийные номера для серийных продуктов
@@ -5389,7 +5420,7 @@
DocType: Payment Reconciliation,Receivable / Payable Account,Счет Дебиторской / Кредиторской задолженности
DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
apps/erpnext/erpnext/stock/doctype/item/item.py +680,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
-DocType: Item,Default Warehouse,По умолчанию Склад
+DocType: Item,Default Warehouse,Склад по умолчанию
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
DocType: Healthcare Settings,Patient Registration,Регистрация пациентов
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
@@ -5419,7 +5450,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Были составлены графики курсов
DocType: Journal Entry,Total Debit,Всего Дебет
DocType: Manufacturing Settings,Default Finished Goods Warehouse,По умолчанию склад готовой продукции
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Продавец
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продавец
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Бюджет и МВЗ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Множественный режим оплаты по умолчанию не разрешен
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,для
@@ -5431,6 +5462,7 @@
DocType: Assessment Plan Criteria,Maximum Score,Максимальный балл
apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Создание правил для ограничения операций на основе значений.
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,№ группы ролей
+DocType: Batch,Manufacturing Date,Дата производства
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Не удалось создать сбор
DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Оставьте пустым, если вы создаете группы студентов в год"
DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Оставьте пустым, если вы создаете группы студентов в год"
@@ -5468,6 +5500,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Cost center is required to book an expense claim,МВЗ требуется заказать требование о расходах
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Это основано на посещаемости этого сотрудника
+DocType: Assessment Result,Summary,Резюме
apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Пометить посещаемость
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +495,Debit Account,Дебетовый счет
DocType: Fiscal Year,Year Start Date,Дата начала года
@@ -5541,7 +5574,7 @@
DocType: Pricing Rule,Min Qty,Мин Кол-во
apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +36,Disable Template,Отключить шаблон
DocType: GL Entry,Transaction Date,Сделка Дата
-DocType: Production Plan Item,Planned Qty,Планируемые Кол-во
+DocType: Production Plan Item,Planned Qty,Планируемое кол-во
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,Совокупная налоговая
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,For Quantity (Manufactured Qty) is mandatory,Для Количество (Изготовитель Количество) является обязательным
DocType: Stock Entry,Default Target Warehouse,Цель по умолчанию Склад
@@ -5592,7 +5625,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Рассмотрим налога или сбора для
DocType: Driver,Driving License Category,Категория водительских удостоверений
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактическая Кол-во обязательно
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} в настоящее время имеет {1} систему показателей поставщика, и Заказы на поставку этому поставщику должны выдаваться с осторожностью."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} в настоящее время имеет {1} систему показателей поставщика, и Заказы на поставку этому поставщику должны выдаваться с осторожностью."
DocType: Asset Maintenance Team,Asset Maintenance Team,Группа поддержки активов
DocType: Employee Loan,Loan Type,Тип кредита
DocType: Scheduling Tool,Scheduling Tool,Планирование Инструмент
@@ -5618,7 +5651,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +473,Make Variant,Создать вариант
apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок отпуска приложений отделом.
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплаты должен быть одним из Присылать, Pay и внутренний перевод"
-apps/erpnext/erpnext/config/selling.py +179,Analytics,Аналитик
+apps/erpnext/erpnext/config/selling.py +179,Analytics,Аналитика
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Корзина Пусто
DocType: Vehicle,Model,Модель
DocType: Production Order,Actual Operating Cost,Фактическая Эксплуатационные расходы
@@ -5663,11 +5696,11 @@
DocType: Fee Schedule,FRQ.,FRQ.
DocType: Leave Type,Is Carry Forward,Является ли переносить
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +840,Get Items from BOM,Получить продукты из ВМ
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Время и дни лида
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Время выполнения
apps/erpnext/erpnext/controllers/accounts_controller.py +620,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Строка # {0}: Дата размещения должна быть такой же, как даты покупки {1} актива {2}"
DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Проверьте это, если Студент проживает в Хостеле Института."
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Пожалуйста, введите Заказы в приведенной выше таблице"
-,Stock Summary,Суммарный сток
+,Stock Summary,Всего запасов
apps/erpnext/erpnext/config/assets.py +50,Transfer an asset from one warehouse to another,Передача актива с одного склада на другой
DocType: Vehicle,Petrol,Бензин
apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Ведомость материалов
@@ -5677,6 +5710,7 @@
DocType: BOM Operation,Operating Cost(Company Currency),Эксплуатационные расходы (Компания Валюта)
DocType: Employee Loan Application,Rate of Interest,Процентная ставка
DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
+DocType: Item,Shelf Life In Days,Срок хранения в днях
DocType: GL Entry,Is Opening,Открывает
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +194,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
DocType: Journal Entry,Subscription Section,Раздел подписки
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 6b10f91..e07829f 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,මිල අනුව වර්ග කරන්න
,Delay Days,ප්රමාද වූ දින
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,සේවා වියදම්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,ඉන්වොයිසිය
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,රඳවා ගැනීමේ කොටස් ප්රවේශය
DocType: Purchase Invoice Item,Item Weight Details,අයිතම බර ප්රමාණය විස්තර
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","මූලාශ්ර: {0}, අයිතමය සංකේතය: {1} සහ පාරිභෝගික: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,රැකියාවක් සඳහා විවෘත.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},උප කොන්ත්රාත්තුවේ අයිතමය {0} හි පේළියෙහි BOM නියම කර නැත {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},උප කොන්ත්රාත්තුවේ අයිතමය {0} හි පේළියෙහි BOM නියම කර නැත {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ප්රතිඵල යවා ඇත
DocType: Item Attribute,Increment,වර්ධකය
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ටයිපේpan
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} සඳහා අවසර නැත
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,සිට භාණ්ඩ ලබා ගන්න
DocType: Price List,Price Not UOM Dependant,මිළ ගණන් නැත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},නිෂ්පාදන {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ලැයිස්තුගත අයිතමයන් කිසිවක් නොමැත
DocType: Asset Repair,Error Description,දෝෂය විස්තරය
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,සිල්ලර බඩු
DocType: Quality Inspection Reading,Reading 1,කියවීම 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,විශ්රාම වැටුප් අරමුදල්
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ඊළඟ ක්ෂය වීම දිනය මිල දී ගත් දිනය පෙර විය නොහැකි
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,ඊළඟ ක්ෂය වීම දිනය මිල දී ගත් දිනය පෙර විය නොහැකි
DocType: Crop,Perennial,බහු වාර්ෂික
DocType: Consultation,Consultation Date,උපදේශන දිනය
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext පරිශීලකයින් සඳහා නිෂ්පාදන ලැයිස්තුගත කිරීම සහ සොයා ගැනීම
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",උදා: "ප්රාථමික පාසල්" හෝ "" විශ්වවිද්යාල
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,කොටස් වාර්තා
DocType: Warehouse,Warehouse Detail,පොත් ගබඩාව විස්තර
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,හදුන්වන අවසානය දිනය පසුව කාලීන සම්බන්ධකම් කිරීමට (අධ්යයන වර්ෂය {}) අධ්යයන වසරේ වසර අවසාන දිනය වඩා විය නොහැකිය. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""ස්ථාවර වත්කම් ද" වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
DocType: Delivery Trip,Departure Time,පිටත්වීමේ වේලාව
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,පිරිවිතර විස්තර ලබා ගන්න
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,සැපයුම්කරුවන්ගේ ආස්ථානයන් ආකෘති.
DocType: Lead,Interested,උනන්දුවක් දක්වන
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,විවෘත
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,විවෘත
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},{0} සිට {1} වෙත
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,බදු පිහිටුවීමට අපොහොසත් විය
DocType: Item,Copy From Item Group,විෂය සමූහ වෙතින් පිටපත්
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,දිනය ලිහිල් සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,වසරකට කොළ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ෙරෝ {0}: මෙම අත්තිකාරම් ප්රවේශය නම් අත්තිකාරම් ලෙසයි 'ගිණුම එරෙහිව පරීක්ෂා කරන්න {1}.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},පොත් ගබඩාව {0} සමාගම අයිති නැත {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},පොත් ගබඩාව {0} සමාගම අයිති නැත {1}
DocType: Email Digest,Profit & Loss,ලාභය සහ අඞු කිරීමට
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,ලීටරයකට
DocType: Task,Total Costing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු සැඳුම්ලත් මුදල
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,මෙම සමාගමට එරෙහිව ගනු ලබන ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල රේඛා බලන්න
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ස්වයංක්රීය ද්රව්ය ඉල්ලීම් නිර්මානය කිරීම මත ඊ-මේල් මගින් දැනුම් දෙන්න
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,ප්රතිරෝධය
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,උපදේශනය
DocType: Journal Entry,Multi Currency,බහු ව්යවහාර මුදල්
DocType: Opening Invoice Creation Tool,Invoice Type,ඉන්වොයිසිය වර්ගය
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,සැපයුම් සටහන
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,වැන්දඹු
DocType: Request for Quotation,Request for Quotation,උද්ධෘත සඳහා ඉල්ලුම්
DocType: Healthcare Settings,Require Lab Test Approval,පරීක්ෂණය සඳහා අනුමැතිය අවශ්ය වේ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,අයිතම කේතය> අයිතමය කාණ්ඩ> වෙළඳ නාමය
DocType: Salary Slip Timesheet,Working Hours,වැඩ කරන පැය
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,විශිෂ්ටයි
DocType: Naming Series,Change the starting / current sequence number of an existing series.,දැනට පවතින මාලාවේ ආරම්භක / වත්මන් අනුක්රමය අංකය වෙනස් කරන්න.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,පිරිවැය මධ්යස්ථානය ඇතුලත් කරන්න
DocType: Drug Prescription,Dosage,ආහාරය
DocType: Journal Entry Account,Sales Order,විකුණුම් න්යාය
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,සාමාන්යය. විකිණීම අනුපාතිකය
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,සාමාන්යය. විකිණීම අනුපාතිකය
DocType: Assessment Plan,Examiner Name,පරීක්ෂක නම
DocType: Lab Test Template,No Result,කිසිදු ප්රතිඵල
DocType: Purchase Invoice Item,Quantity and Rate,ප්රමාණය හා වේගය
@@ -610,6 +610,7 @@
DocType: Payroll Entry,Select Payroll Period,වැටුප් කාලය තෝරන්න
DocType: Purchase Invoice,Unpaid,නොගෙවූ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,විකිණීමට සඳහා දැන්වීම් වෙන්කර
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,කරුණාකර මානව සම්පත්> HR සැකසුම් තුළ සේවක නාමකරණය කිරීමේ පද්ධතිය සැකසීම කරන්න
DocType: Packing Slip,From Package No.,පැකේජය අංක සිට
DocType: Item Attribute,To Range,රංගේ කිරීමට
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,සුරැකුම්පත් හා තැන්පතු
@@ -634,11 +635,11 @@
DocType: Training Event,Workshop,වැඩමුළුව
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,අනතුරු ඇඟවීම් මිලදී ගැනීමේ ඇණවුම්
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,ඔබේ ගනුදෙනුකරුවන් කිහිපයක් සඳහන් කරන්න. ඔවුන් සංවිධාන හෝ පුද්ගලයින් විය හැකි ය.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,ගොඩනගනු කිරීමට තරම් අමතර කොටස්
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ගොඩනගනු කිරීමට තරම් අමතර කොටස්
DocType: POS Profile User,POS Profile User,POS පැතිකඩ පරිශීලක
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,සෘජු ආදායම්
DocType: Patient Appointment,Date TIme,දිනය වෙලාව
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","ගිණුම් වර්ගීකරණය නම්, ගිණුම් මත පදනම් පෙරීමට නොහැකි"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","ගිණුම් වර්ගීකරණය නම්, ගිණුම් මත පදනම් පෙරීමට නොහැකි"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,පරිපාලන නිලධාරී
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,සමාගම් හා බදු පිහිටුවීම
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,තෝරා පාඨමාලාව කරුණාකර
@@ -649,7 +650,7 @@
DocType: Stock Entry Detail,Difference Account,වෙනස ගිණුම
DocType: Purchase Invoice,Supplier GSTIN,සැපයුම්කරු GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,එහි රඳා කාර්ය {0} වසා නොවේ ලෙස සමීප කාර්ය කළ නොහැකි ය.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
DocType: Production Order,Additional Operating Cost,අතිරේක මෙහෙයුම් පිරිවැය
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,අලංකාර ආලේපන
@@ -819,7 +820,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 සමඟ සම්බන්ධය
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,කළමනාකරු
DocType: Payment Entry,Payment From / To,/ සිට දක්වා ගෙවීම්
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},නව ණය සීමාව පාරිභෝගික වත්මන් හිඟ මුදල වඩා අඩු වේ. ණය සීමාව බෙ {0} විය යුතුය
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},නව ණය සීමාව පාරිභෝගික වත්මන් හිඟ මුදල වඩා අඩු වේ. ණය සීමාව බෙ {0} විය යුතුය
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},ගබඩාවෙහි ගිණුම සකසන්න {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'මත පදනම් වූ' සහ 'කණ්ඩායම විසින්' සමාන විය නොහැකි
DocType: Sales Person,Sales Person Targets,විකුණුම් පුද්ගලයා ඉලක්ක
@@ -830,7 +831,7 @@
DocType: Student Batch Name,Batch Name,කණ්ඩායම නම
DocType: Fee Validity,Max number of visit,සංචාරය කරන ලද උපරිම සංඛ්යාව
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet නිර්මාණය:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ලියාපදිංචි
DocType: GST Settings,GST Settings,GST සැකසුම්
DocType: Selling Settings,Customer Naming By,පාරිභෝගික නම් කිරීම මගින්
@@ -957,7 +958,7 @@
DocType: Budget,Budget Against,එරෙහි අයවැය
DocType: Employee,Cell Number,සෛල අංකය
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ලබා දුන් නිර්ණායක සඳහා කිසිදු සේවකයෙකු නොමැත. ප්ලාස්ටි ස්ලිප් දැනටමත් නිර්මාණය කර නැතැයි පරීක්ෂා කරන්න.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,වාහන ද්රව්ය ඉල්ලීම් උත්පාදිත
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,වාහන ද්රව්ය ඉල්ලීම් උත්පාදිත
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,අහිමි
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,ඔබ තීරුව 'සඟරාව සටහන් එරෙහි' වර්තමාන වවුචරය ඇතුල් විය නොහැකියි
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,නිෂ්පාදන සඳහා වෙන්
@@ -965,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,බලශක්ති
DocType: Opportunity,Opportunity From,සිට අවස්ථාව
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,මාසික වැටුප ප්රකාශයක්.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,පේළිය {0}: {1} අයිතමය සඳහා අවශ්ය වන අනුක්රමික අංකයන් {2}. ඔබ සපයා ඇත්තේ {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,පේළිය {0}: {1} අයිතමය සඳහා අවශ්ය වන අනුක්රමික අංකයන් {2}. ඔබ සපයා ඇත්තේ {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,කරුණාකර වගුවක් තෝරන්න
DocType: BOM,Website Specifications,වෙබ් අඩවිය පිරිවිතර
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients','ලබන්නන්' තුළ {0} වලංගු නොවන ඊ-තැපැල් ලිපිනයකි.
@@ -1034,7 +1035,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,ඉල්ලූම් කරන ලද ඉල්ලීම
DocType: Vital Signs,Heart Rate / Pulse,හෘද ස්පන්දනය / ස්පන්දනය
DocType: Company,Default Bank Account,පෙරනිමි බැංකු ගිණුම්
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","පක්ෂය මත පදනම් පෙරහන් කිරීමට ප්රථම, පක්ෂය වර්ගය තෝරා"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","පක්ෂය මත පදනම් පෙරහන් කිරීමට ප්රථම, පක්ෂය වර්ගය තෝරා"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},භාණ්ඩ {0} හරහා ලබා නැති නිසා 'යාවත්කාලීන කොටස්' පරීක්ෂා කළ නොහැකි
DocType: Vehicle,Acquisition Date,අත්පත් කර ගැනීම දිනය
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,අංක
@@ -1059,7 +1060,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),ඔබගේ ලිපියේ ශීර්ෂය උඩුගත කරන්න.
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ගිණුම් {2} සහිත සමූහය විය නොහැකි
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,අයිතමය ෙරෝ {idx}: {doctype} {docname} ඉහත '{doctype}' වගුවේ නොපවතියි
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} වන විට අවසන් කර හෝ අවලංගු වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} වන විට අවසන් කර හෝ අවලංගු වේ
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,කිසිදු කාර්යයන්
DocType: Item Variant Settings,Copy Fields to Variant,ප්රභේදයට පිටපත් කරන්න
DocType: Asset,Opening Accumulated Depreciation,සමුච්චිත ක්ෂය විවෘත
@@ -1171,9 +1172,10 @@
DocType: Production Order,Plan material for sub-assemblies,උප-එකලස්කිරීම් සඳහා සැලසුම් ද්රව්ය
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,විකුණුම් හවුල්කරුවන් සහ ප්රාට්රද්ීයය
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),අවසාන (විවෘත කිරීම + සම්පූර්ණ)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),අවසාන (විවෘත කිරීම + සම්පූර්ණ)
DocType: Journal Entry,Depreciation Entry,ක්ෂය සටහන්
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,කරුණාකර පළමු ලිපි වර්ගය තෝරා
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,ගිණුම් මුදණය මුද්රණය කරන්න
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,මෙම නඩත්තු සංචාරය අවලංගු කර පෙර ද්රව්ය සංචාර {0} අවලංගු කරන්න
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 ප්රමිතිය
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},අනු අංකය {0} අයිතමය අයිති නැත {1}
@@ -1199,7 +1201,7 @@
DocType: Supplier,Default Payable Accounts,පෙරනිමි ගෙවිය යුතු ගිණුම්
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,සේවක {0} සක්රීය නොවන නැත්නම් ස්ථානීකව නොපවතියි
DocType: Fee Structure,Components,සංරචක
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
DocType: Quality Inspection Reading,Reading 6,කියවීම 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1251,6 +1253,7 @@
,Company Name,සමාගම් නාමය
DocType: SMS Center,Total Message(s),මුළු පණිවුඩය (ව)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,හුවමාරුව සඳහා විෂය තෝරා
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,කරුණාකර Setup> Settings> Naming Series මගින් {0} සඳහා නම් කිරීමේ මාලාවක් සකසන්න
DocType: Purchase Invoice,Additional Discount Percentage,අතිරේක වට්ටම් ප්රතිශතය
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,සියළු උපකාර වීඩියෝ ලැයිස්තුවක් බලන්න
DocType: Agriculture Analysis Criteria,Soil Texture,පාංශු සැකැස්ම
@@ -1279,7 +1282,7 @@
DocType: BOM Website Item,BOM Website Item,ද්රව්ය ලේඛණය වෙබ් අඩවිය අයිතමය
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,ඔබේ ලිපිය හිස සහ ලාංඡනය උඩුගත කරන්න. (ඔබ ඔවුන්ට පසුව සංස්කරණය කළ හැකි).
DocType: Timesheet Detail,Bill,පනත් කෙටුම්පත
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ඊළඟ ක්ෂය දිනය පසුගිය දිනය ලෙස ඇතුලත් කර
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ඊළඟ ක්ෂය දිනය පසුගිය දිනය ලෙස ඇතුලත් කර
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,සුදු
DocType: SMS Center,All Lead (Open),සියලු ඊයම් (විවෘත)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ෙරෝ {0}: පිවිසුම් කාලය පළකිරීම ගුදම් තුළ යවන ලද {4} සඳහා ලබා ගත හැකි {1} ({2} {3}) නොවේ
@@ -1296,7 +1299,7 @@
DocType: Lead,Next Contact Date,ඊළඟට අප අමතන්න දිනය
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,විවෘත යවන ලද
DocType: Healthcare Settings,Appointment Reminder,හමුවීම සිහිගැන්වීම
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
DocType: Program Enrollment Tool Student,Student Batch Name,ශිෂ්ය කණ්ඩායම නම
DocType: Consultation,Doctor,වෛද්යවරයා
DocType: Holiday List,Holiday List Name,නිවාඩු ලැයිස්තු නම
@@ -1312,6 +1315,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,වෙන් කිරීම මෙවලම Leave
DocType: Item,Hub Category to Publish,හබ් කාණ්ඩයේ පළ කිරීම
DocType: Leave Block List,Leave Block List Dates,වාරණ ලැයිස්තුව දිනයන් නිවාඩු
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,කරුණාකර Setup> Numbering Series හරහා පැමිණීමේදී සංඛ්යාලේඛන මාලාවක් සකසන්න
DocType: Sales Invoice,Billing Address GSTIN,බිල්පත් ලිපිනය GSTIN
DocType: Assessment Plan,Evaluate,ඇගයීමට ලක්
DocType: Workstation,Net Hour Rate,ශුද්ධ හෝරාව අනුපාතිකය
@@ -1346,7 +1350,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,විකුණුම් ඉන්වොයිසිය ගෙවීම්
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,විකුණුම් න්යාය / නිමි භාණ්ඩ ගබඩා තුළ ඇවිරිනි ගබඩාව
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,මුදල විකිණීම
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,මුදල විකිණීම
DocType: Repayment Schedule,Interest Amount,පොලී මුදල
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,ඔබ මෙම වාර්තාව සඳහා වියදම් Approver වේ. මෙම 'තත්ත්වය' හා සුරකින්න යාවත්කාලීන කරන්න
DocType: Serial No,Creation Document No,නිර්මාණය ලේඛන නොමැත
@@ -1438,7 +1442,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,විවෘත මුල්ය ශේෂය
,GST Sales Register,GST විකුණුම් රෙජිස්ටර්
DocType: Sales Invoice Advance,Sales Invoice Advance,විකුණුම් ඉන්වොයිසිය අත්තිකාරම්
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ඉල්ලා කිසිවක්
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,ඉල්ලා කිසිවක්
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,ඔබගේ වසම් තෝරන්න
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},තවත් අයවැය වාර්තාව '{0}' දැනටමත් මූල්ය වර්ෂය සඳහා {1} එරෙහිව පවතී '{2}' {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,බිම්වල පිටපත් පමණක් පිටපත් කෙරෙනු ඇත.
@@ -1448,11 +1452,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","මෙය ප්රභේද්යයක් යන විෂය සංග්රහයේ ඇත්තා වූ ද, ඇත. උදාහරණයක් ලෙස, ඔබේ වචන සහ "එස් එම්" වන අතර, අයිතමය කේතය "T-shirt" වේ නම්, ප්රභේද්යයක් ක අයිතමය කේතය "T-shirt-එස්.එම්" වනු"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ඔබ වැටුප් පුරවා ඉතිරි වරක් (වචන) ශුද්ධ වැටුප් දෘශ්යමාන වනු ඇත.
DocType: Purchase Invoice,Is Return,ප්රතිලාභ වේ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,අවවාදයයි
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,අවවාදයයි
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,ආපසු / ඩෙබිට් සටහන
DocType: Price List Country,Price List Country,මිල ලැයිස්තුව රට
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},විෂය {1} සඳහා {0} වලංගු අනුක්රමික අංක
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},විෂය {1} සඳහා {0} වලංගු අනුක්රමික අංක
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,අයිතමය සංග්රහයේ අනු අංකය වෙනස් කළ නොහැකි
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM පරිවර්තන සාධකය
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,කණ්ඩායම අංකය ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
@@ -1558,7 +1562,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,විකුණුම් සාමය {0} වලංගු නොවේ
DocType: Supplier Scorecard,Warn for new Request for Quotations,Quotations සඳහා නව ඉල්ලීම සඳහා අවවාද කරන්න
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,මිලදී ගැනීමේ නියෝග ඔබ ඔබේ මිලදී ගැනීම සැලසුම් සහ පසුවිපරම් උදව්
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,පරීක්ෂණ පරීක්ෂණ නිර්දේශ කිරීම
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",මුළු නිකුත් / ස්ථාන මාරු ප්රමාණය {0} ද්රව්ය ඉල්ලීම ගැන {1} \ ඉල්ලා ප්රමාණය {2} අයිතමය {3} සඳහා වඩා වැඩි විය නොහැකි
@@ -1596,7 +1600,6 @@
DocType: Warehouse,Warehouse Contact Info,පොත් ගබඩාව සම්බන්ධ වීම
DocType: Payment Entry,Write Off Difference Amount,වෙනස මුදල කපා
DocType: Volunteer,Volunteer Name,ස්වේච්ඡා නම
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,කරුණාකර අධ්යාපනය> අධ්යාපන සැකසීම් තුළ උපදේශක නාමකරණයක් සැකසීම
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: සේවක ඊ-තැපැල් සොයාගත නොහැකි, ඒ නිසා ඊ-තැපැල් යවා නැත"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},නැව්ගත කිරීමේ නීතිය රටට අදාළ නොවේ {0}
DocType: Item,Foreign Trade Details,විදේශ වෙළෙඳ විස්තර
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,සමූහ Roll අංකය
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0} සඳහා පමණක් ණය ගිණුම් තවත් හර සටහන හා සම්බන්ධ කර ගත හැකි
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,සියලු කාර්ය බර මුළු 1. ඒ අනුව සියලු ව්යාපෘති කාර්යයන් ෙහොන්ඩර වෙනස් කළ යුතු කරුණාකර
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,අයිතමය {0} උප කොන්ත්රාත් අයිතමය විය යුතුය
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,ප්රාග්ධන උපකරණ
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","මිල ගණන් පාලනය පළමු අයිතමය, විෂය සමූහය හෝ වෙළඳ නාමය විය හැකි ක්ෂේත්ර, 'මත යොමු කරන්න' මත පදනම් වූ තෝරා ගනු ලැබේ."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,ළමා ගබඩා සංකීර්ණය මෙම ගබඩා සංකීර්ණය සඳහා පවතී. ඔබ මෙම ගබඩා සංකීර්ණය මකා දැමිය නොහැකි.
DocType: Item,Website Item Groups,වෙබ් අඩවිය අයිතමය කණ්ඩායම්
DocType: Purchase Invoice,Total (Company Currency),එකතුව (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,අනුක්රමික අංකය {0} වරකට වඩා ඇතුල්
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,අනුක්රමික අංකය {0} වරකට වඩා ඇතුල්
DocType: Journal Entry,Journal Entry,ජර්නල් සටහන්
DocType: Expense Claim Advance,Unclaimed amount,නොකෙරුණු මුදල
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ප්රගතිය භාණ්ඩ
@@ -1731,7 +1734,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,සන්නිවේදන ලඝු-සටහන.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","උද්ධෘත සඳහා ඉල්ලුම් තවත් කිව බිහිදොර සැකසුම් සඳහා, බිහිදොර සිට ප්රවේශ අක්රීය කර ඇත."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,සැපයුම්කරුවන් ලකුණු Scorecard ලකුණු කිරීම විචල්යය
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,මිලදී ගැනීමේ ප්රමාණය
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,මිලදී ගැනීමේ ප්රමාණය
DocType: Sales Invoice,Shipping Address Name,නැව් ලිපිනය නම
DocType: Material Request,Terms and Conditions Content,නියමයන් හා කොන්දේසි අන්තර්ගත
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,පාඨමාලාවේ උපලේඛන නිර්මාණය කිරීමේ දෝෂ ඇත
@@ -1995,7 +1998,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,මෙය මේ වාහන එරෙහිව ලඝු-සටහන් මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},සැපයුම්කරු ඉන්වොයිසිය {0} එරෙහිව දිනැති {1}
DocType: Customer,Default Price List,පෙරනිමි මිල ලැයිස්තුව
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ඔබ මුදල් වර්ෂය {0} මකා දැමිය නොහැකි. මුදල් වර්ෂය {0} ගෝලීය සැකසුම් සුපුරුදු ලෙස සකසා ඇත
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,එකම නමක් සහිත පාරිභෝගිකයෙක් දැනටමත් පවතී
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,මේ සඳහා වැටුප් ලේඛන ඉදිරිපත් කිරීම සහ උපචිත දේශන සටහන් ඉදිරිපත් කිරීම. ඉදිරියට යාමට අවශ්යද?
@@ -2009,6 +2012,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,මිල ගණන්
DocType: Quotation,Term Details,කාලීන තොරතුරු
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} මෙම ශිෂ්ය කන්ඩායමක් සඳහා සිසුන් වඩා ලියාපදිංචි කල නොහැක.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),මුළු (බදු රහිත)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ඊයම් ගණන්
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 ට වඩා වැඩි විය යුතුය"
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,තොග ඇත
@@ -2028,7 +2032,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ඉන්වොයිසිය අවලංගු මත ගෙවීම් විසන්ධි කරන්න
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},කියවීම ඇතුළු වත්මන් Odometer මූලික වාහන Odometer {0} වඩා වැඩි විය යුතුය
DocType: Restaurant Reservation,No Show,පෙන්වන්නෙ නැහැ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,කරුණාකර Setup> Settings> Naming Series මගින් {0} සඳහා නම් කිරීමේ මාලාවක් සකසන්න
DocType: Shipping Rule Country,Shipping Rule Country,නැව් පාලනය රට
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,නිවාඩු හා පැමිණීම
DocType: Maintenance Visit,Partially Completed,අර්ධ වශයෙන් නිම කරන
@@ -2121,7 +2124,7 @@
DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
DocType: Grant Application,Assessment Mark (Out of 10),ඇගයීම් ලකුණු (10 න්)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 ජංගම නොමැත
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ප්රධාන
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,ප්රධාන
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ප්රභේද්යයක්
DocType: Naming Series,Set prefix for numbering series on your transactions,ඔබගේ ගනුදෙනු මාලාවක් සංඛ්යාවක් සඳහා උපසර්ගය සකසන්න
DocType: Employee Attendance Tool,Employees HTML,සේවක HTML
@@ -2171,7 +2174,7 @@
DocType: Course,Course Abbreviation,පාඨමාලා කෙටි යෙදුම්
DocType: Student Leave Application,Student Leave Application,ශිෂ්ය නිවාඩු ඉල්ලුම්
DocType: Item,Will also apply for variants,ද ප්රභේද සඳහා අයදුම් කරනු ඇත
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},{1} මත සේවක {0} අඩක් දින
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},මුළු කම්කරු පැය වැඩ කරන පැය {0} උපරිම වඩා වැඩි විය යුතු නැහැ
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,මත
@@ -2358,9 +2361,10 @@
DocType: Task,Actual End Date (via Time Sheet),(කාල පත්රය හරහා) සැබෑ අවසානය දිනය
DocType: Soil Texture,Soil Type,පාංශු වර්ගය
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,නව පණිවිඩය
,Quotation Trends,උද්ධෘත ප්රවණතා
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},අයිතමය {0} සඳහා අයිතමය ස්වාමියා සඳහන් කර නැත අයිතමය සමූහ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
DocType: Shipping Rule,Shipping Amount,නැව් ප්රමාණය
DocType: Supplier Scorecard Period,Period Score,කාල පරතරය
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,ගනුදෙනුකරුවන් එකතු
@@ -2371,7 +2375,7 @@
,Vehicle Expenses,වාහන වියදම්
DocType: Serial No,Invoice Details,ඉන්වොයිසිය විස්තර
DocType: Grant Application,Show on Website,වෙබ් අඩවියෙන් පෙන්වන්න
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,පටන් ගන්න
DocType: Hub Category,Hub Category,ප්රවර්ග කේන්ද්රස්ථානය
DocType: Purchase Invoice,SEZ,SEZ
@@ -2403,7 +2407,7 @@
DocType: Patient,B Positive,B ධනාත්මකයි
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
DocType: Leave Block List Allow,Leave Block List Allow,වාරණ ලැයිස්තුව තබන්න ඉඩ දෙන්න
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
DocType: Patient Medical Record,Patient Medical Record,රෝගියා වෛද්ය වාර්තාව
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,නොවන සමූහ සමූහ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,ක්රීඩා
@@ -2453,6 +2457,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,කිසිදු සෘජු අත්දැකීමක් ලබා ගැනීමට RFQ නැත
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,මුළු අඩු
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,ගිණුම් මුදලේ මුද්රණය කිරීම සඳහා ගිණුමක් තෝරන්න
,Production Analytics,නිෂ්පාදනය විශ්ලේෂණ
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,මෙය මෙම රෝගියාට එරෙහි ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහන බලන්න
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,පිරිවැය යාවත්කාලීන කිරීම
@@ -2507,7 +2512,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,සමාගම තෝරන්න ...
DocType: Leave Control Panel,Leave blank if considered for all departments,සියළුම දෙපාර්තමේන්තු සඳහා සලකා නම් හිස්ව තබන්න
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","රැකියා ආකාර (ස්ථිර, කොන්ත්රාත්, සීමාවාසික ආදිය)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
DocType: Payroll Entry,Fortnightly,දෙසතියකට වරක්
DocType: Currency Exchange,From Currency,ව්යවහාර මුදල් වලින්
DocType: Vital Signs,Weight (In Kilogram),සිරුරේ බර (කිලෝවක)
@@ -2585,7 +2590,7 @@
DocType: Student,Guardians,භාරකරුවන්
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,මිල ලැයිස්තුව සකස් වී නොමැති නම් මිල ගණන් පෙන්වා ඇත කළ නොහැකි වනු ඇත
DocType: Stock Entry,Total Incoming Value,මුළු එන අගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ඔබගේ කණ්ඩායම විසින් සිදු කළ කටයුතුවලදී සඳහා කාලය, පිරිවැය සහ බිල්පත් පිළිබඳ වාර්තාවක් තබා ගැනීමට උදව්"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,මිලදී ගැනීම මිල ලැයිස්තුව
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,සැපයුම්කරුවන් ලකුණු දර්ශක විචල්යයන්හි තේමාවන්.
@@ -2687,7 +2692,7 @@
DocType: Company,For Reference Only.,විමර්ශන පමණක් සඳහා.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},වෛද්යවරයා {0} {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,කණ්ඩායම තේරීම් නොමැත
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},වලංගු නොවන {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},වලංගු නොවන {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,ආශ්රිත Inv
@@ -2724,8 +2729,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", මෙහෙයුම් විශේෂයෙන් සඳහන් මෙහෙයුම් පිරිවැය සහ අද්විතීය මෙහෙයුම ඔබේ ක්රියාකාරිත්වය සඳහා කිසිදු දෙන්න."
DocType: Water Analysis,Origin,මූලාරම්භය
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,මෙම ලේඛනය අයිතමය {4} සඳහා {0} {1} විසින් සීමාව ඉක්මවා ඇත. ඔබ එකම {2} එරෙහිව තවත් {3} ගන්නවාද?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
DocType: Purchase Invoice,Price List Currency,මිල ලැයිස්තුව ව්යවහාර මුදල්
DocType: Naming Series,User must always select,පරිශීලක සෑම විටම තෝරාගත යුතුය
DocType: Stock Settings,Allow Negative Stock,ඍණ කොටස් ඉඩ දෙන්න
@@ -2781,7 +2786,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,නව මිලදී ගැනීමේ ඇණවුම් සඳහා අනතුරු ඇඟවීම
DocType: Quality Inspection Reading,Reading 9,කියවීම් 9
DocType: Supplier,Is Frozen,ශීත කළ ඇත
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,සමූහ node එකක් මතම ඊට අදාල තේ ගබඩාවක් ගනුදෙනු සඳහා තෝරා ගැනීමට ඉඩ නැත
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,සමූහ node එකක් මතම ඊට අදාල තේ ගබඩාවක් ගනුදෙනු සඳහා තෝරා ගැනීමට ඉඩ නැත
DocType: Buying Settings,Buying Settings,සැකසුම් මිලට ගැනීම
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,නිමි යහපත් අයිතමය සඳහා ද ෙව් අංක
DocType: Upload Attendance,Attendance To Date,දිනය සඳහා සහභාගී
@@ -2796,6 +2801,7 @@
DocType: Grant Application,Organization,ආයතනය
DocType: BOM Update Tool,BOM Update Tool,BOM යාවත්කාලීන මෙවලම
DocType: SG Creation Tool Course,Student Group Name,ශිෂ්ය කණ්ඩායම් නම
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,පිපිරෙන දසුන පෙන්වන්න
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,ගාස්තු සැකසීම
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ඔබට නිසැකවම මෙම සමාගම සඳහා වන සියළුම ගනුදෙනු මැකීමට අවශ්ය බවට තහවුරු කරගන්න. එය ඔබගේ ස්වාමියා දත්ත පවතිනු ඇත. මෙම ක්රියාව නැති කළ නොහැක.
DocType: Room,Room Number,කාමර අංකය
@@ -2806,7 +2812,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,බදු ආකෘතියක් සාදන්න
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,පරිශීලක සංසදය
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
DocType: Lab Test Sample,Lab Test Sample,පරීක්ෂණ පරීක්ෂණ නියැදිය
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,ඔබ අනුපාතය වෙනස් කළ නොහැක ද්රව්ය ලේඛණය යම් භාණ්ඩයක agianst සඳහන් නම්
@@ -2877,7 +2883,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ඉන්වොයිසියක් සාදන්න
DocType: Selling Settings,Auto close Opportunity after 15 days,දින 15 කට පසු වාහන සමීප අවස්ථා
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ලකුණු මට්ටමක් නිසා {0} මිලදී ගැනීමේ ඇණවුම්වලට අවසර නැත.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ලකුණු මට්ටමක් නිසා {0} මිලදී ගැනීමේ ඇණවුම්වලට අවසර නැත.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,අවසන් වසර
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2970,7 +2976,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ඉහත
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ෙරෝ # {0}: ජර්නල් සටහන් {1} ගිණුම {2} හෝ දැනටමත් වෙනත් වවුචරය ගැලපීම නැත
DocType: Supplier Scorecard Criteria,Criteria Weight,මිනුම් බර
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,සැපයුම්කරු> සැපයුම් වර්ගය
DocType: Buying Settings,Default Buying Price List,පෙරනිමි මිලට ගැනීම මිල ලැයිස්තුව
DocType: Payroll Entry,Salary Slip Based on Timesheet,වැටුප් පුරවා Timesheet මත පදනම්ව
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,මිලදී ගැනීමේ අනුපාතිකය
@@ -3060,7 +3065,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ධාවන කර්මාන්ත ස්වභාවය අනුව මඟ පෙන්වන.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,ලිපි වලට යන්න
DocType: Item Supplier,Item Supplier,අයිතමය සැපයුම්කරු
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,සියළු ලිපිනයන්.
DocType: Company,Stock Settings,කොටස් සැකසුම්
@@ -3238,6 +3243,7 @@
DocType: Company,Default Inventory Account,පෙරනිමි තොග ගිණුම
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද බිංදුවට වඩා වැඩි විය යුතුය.
DocType: Antibiotic,Antibiotic Name,ප්රතිජීවක නාමය
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,අයිතම කේතය> අයිතමය කාණ්ඩ> වෙළඳ නාමය
DocType: Purchase Invoice,Apply Additional Discount On,අදාළ අතිරේක වට්ටම් මත
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,වර්ගය තෝරන්න ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,භෝග වගා කරන සියලුම බිම් ඒකක වෙත ලින්ක් එකක්
@@ -3433,6 +3439,7 @@
DocType: Supplier,Credit Limit,ණය සීමාව
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,අවු. විකුණුම් මිල ලැයිස්තුව
DocType: Production Plan Sales Order,Salse Order Date,Salse සාමය දිනය
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,සැපයුම්කරු> සැපයුම් වර්ගය
DocType: Salary Component,Salary Component,වැටුප් සංරචක
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,ගෙවීම් අයැදුම්පත් {0} එක්සත් ජාතීන්ගේ-බැඳී ඇත
DocType: GL Entry,Voucher No,වවුචරය නොමැත
@@ -3442,7 +3449,7 @@
DocType: Leave Allocation,Leave Allocation,වෙන් කිරීම Leave
DocType: Payment Request,Recipient Message And Payment Details,පලමු වරට පිරිනැමු පණිවුඩය හා ගෙවීම් විස්තර
DocType: Training Event,Trainer Email,පුහුණුකරු විද්යුත්
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,ද්රව්ය ඉල්ලීම් {0} නිර්මාණය
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,ද්රව්ය ඉල්ලීම් {0} නිර්මාණය
DocType: Restaurant Reservation,No of People,මිනිසුන් ගණන
DocType: Production Planning Tool,Include sub-contracted raw materials,උප කොන්ත්රාත් අමුද්රව්ය ඇතුළත්
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,කොන්දේසි හෝ කොන්ත්රාත්තුව සැකිල්ල.
@@ -3508,7 +3515,7 @@
DocType: Production Planning Tool,Create Material Requests,ද්රව්ය ඉල්ලීම් නිර්මාණය
DocType: Employee Education,School/University,පාසල් / විශ්ව
DocType: Payment Request,Reference Details,විමර්ශන විස්තර
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය දළ මිලදී ගැනීම මුදල වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය දළ මිලදී ගැනීම මුදල වඩා අඩු විය යුතුය
DocType: Sales Invoice Item,Available Qty at Warehouse,ගබඩා ලබා ගත හැක යවන ලද
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,බිල්පතක් මුදල
DocType: Asset,Double Declining Balance,ද්විත්ව පහත වැටෙන ශේෂ
@@ -3520,7 +3527,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,යාවත්කාලීන ලබා ගන්න
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ගිණුම් {2} සමාගම {3} අයත් නොවේ
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,එක් එක් ගුණාංගයෙන් අවම වශයෙන් එක් වටිනාකමක් තෝරන්න.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,ද්රව්ය ඉල්ලීම් {0} අවලංගු කර හෝ නතර
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,ද්රව්ය ඉල්ලීම් {0} අවලංගු කර හෝ නතර
apps/erpnext/erpnext/config/hr.py +310,Leave Management,කළමනාකරණ තබන්න
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,ගිණුම් විසින් සමූහ
DocType: Sales Order,Fully Delivered,සම්පූර්ණයෙන්ම භාර
@@ -3531,14 +3538,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},උපෙයෝජන ණය මුදල {0} ට වඩා වැඩි විය නොහැක
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,වැඩසටහන් වෙත යන්න
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},පේළිය {0} # වෙන් කළ ප්රමාණය {1} නොලැබූ මුදලට වඩා විශාල විය නොහැක {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,කරුණාකර Setup> Numbering Series හරහා පැමිණීමේදී සංඛ්යාලේඛන මාලාවක් සකසන්න
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},විෂය {0} සඳහා අවශ්ය මිලදී ගැනීමේ නියෝගයක් අංකය
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,නිෂ්පාදනය සාමය නිර්මාණය නොවන
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','දිනය සිට' 'මේ දක්වා' 'පසුව විය යුතුය
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ශිෂ්ය {0} ශිෂ්ය අයදුම් {1} සම්බන්ධ වන ලෙස තත්ත්වය වෙනස් කළ නොහැක
DocType: Asset,Fully Depreciated,සම්පූර්ණෙයන් ක්ෂය
,Stock Projected Qty,කොටස් යවන ලද ප්රක්ෂේපිත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
DocType: Employee Attendance Tool,Marked Attendance HTML,කැපී පෙනෙන පැමිණීම HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","මිල ගණන් යෝජනා, ඔබගේ පාරිභෝගිකයන් වෙත යවා ඇති ලංසු"
DocType: Sales Order,Customer's Purchase Order,පාරිභෝගික මිලදී ගැනීමේ නියෝගයක්
@@ -3623,7 +3629,7 @@
DocType: Stock Settings,Item Naming By,කිරීම අනුප්රාප්තිකයා නම් කිරීම අයිතමය
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} පසු කර තිබේ තවත් කාලය අවසාන සටහන්
DocType: Production Order,Material Transferred for Manufacturing,නිෂ්පාදන කම්කරුවන් සඳහා වන ස්ථාන මාරුවී ද්රව්ය
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ගිණුම {0} පවතින්නේ නැත
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,ගිණුම {0} පවතින්නේ නැත
DocType: Project,Project Type,ව්යාපෘති වර්ගය
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,මෙම කාර්යය සඳහා ළමා කාර්යය පවතියි. මෙම කාර්යය මකා දැමිය නොහැක.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ඉලක්කය යවන ලද හෝ ඉලක්කය ප්රමාණය එක්කෝ අනිවාර්ය වේ.
@@ -3727,11 +3733,11 @@
DocType: Company,Asset Depreciation Cost Center,වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය
DocType: Sales Order Item,Sales Order Date,විකුණුම් සාමය දිනය
DocType: Sales Invoice Item,Delivered Qty,භාර යවන ලද
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,සම්පූර්ණ Excl. බද්ද
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","පරීක්ෂා නම්, එක් එක් නිෂ්පාදන අයිතමය සියලු දරුවන් ද්රව්ය ඉල්ලීම් ඇතුලත් කෙරෙනු ඇත."
DocType: Assessment Plan,Assessment Plan,තක්සේරු සැලැස්ම
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,පාරිභෝගිකයා {0} නිර්මාණය වේ.
DocType: Stock Settings,Limit Percent,සියයට සීමා
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,කරුණාකර අධ්යාපනය> අධ්යාපන සැකසීම් තුළ උපදේශක නාමකරණයක් සැකසීම
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,දැනට කිසිදු ගබඩාවක් නොමැත
,Payment Period Based On Invoice Date,ගෙවීම් කාලය ඉන්වොයිසිය දිනය පදනම්
DocType: Sample Collection,No. of print,මුද්රිත ගණන
@@ -3747,12 +3753,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),ණය ගැතියන් ({0})
DocType: Pricing Rule,Margin,ආන්තිකය
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,නව ගනුදෙනුකරුවන්
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,දළ ලාභය %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,දළ ලාභය %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS පැතිකඩ බලන්න
DocType: Bank Reconciliation Detail,Clearance Date,නිශ්කාශනෙය් දිනය
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,තක්සේරු වාර්තාව
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,දළ මිලදී ගැනීම මුදල අනිවාර්ය වේ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,දළ මිලදී ගැනීම මුදල අනිවාර්ය වේ
DocType: Lead,Address Desc,ෙමරට ලිපිනය DESC
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,පක්ෂය අනිවාර්ය වේ
DocType: Journal Entry,JV-,JV-
@@ -3784,7 +3790,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,ස්ථාවර නම
DocType: Stock Entry,Customer or Supplier Details,පාරිභෝගික හෝ සැපයුම්කරු විස්තර
DocType: Employee Loan Application,Required by Date,දිනය අවශ්ය
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),අවසාන සංචිතය (ආචාර්ය-ක්රි)
DocType: Lead,Lead Owner,ඊයම් න
DocType: Bin,Requested Quantity,ඉල්ලන ප්රමාණය
DocType: Patient,Marital Status,විවාහක අවිවාහක බව
@@ -3798,7 +3803,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,බහු ප්රභේද
DocType: Sales Invoice,Against Income Account,ආදායම් ගිණුම එරෙහිව
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% භාර
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,අයිතමය {0}: අනුපිළිවලින් යවන ලද {1} {2} (විෂයාංක අර්ථ දක්වා) අවම පිණිස යවන ලද ට වඩා අඩු විය නොහැක.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,අයිතමය {0}: අනුපිළිවලින් යවන ලද {1} {2} (විෂයාංක අර්ථ දක්වා) අවම පිණිස යවන ලද ට වඩා අඩු විය නොහැක.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,මාසික බෙදාහැරීම් ප්රතිශතය
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,කරුණාකර වෙනත් පරිශීලකයෙකු ලෙස පුරනය වන්න.
DocType: Territory,Territory Targets,භූමි ප්රදේශය ඉලක්ක
@@ -3899,7 +3904,7 @@
DocType: Serial No,Out of AMC,විදේශ මුදල් හුවමාරු කරන්නන් අතරින්
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,නඩත්තු සංචාරය කරන්න
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
DocType: Company,Default Cash Account,පෙරනිමි මුදල් ගිණුම්
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,සමාගම (නැති පාරිභෝගික හෝ සැපයුම්කරු) ස්වාමියා.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,මෙය මේ ශිෂ්ය ඊට සහභාගී මත පදනම් වේ
@@ -4051,7 +4056,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ඉහත නිර්ණායකයන් සඳහා සේවකයින් නොමැත
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
DocType: Restaurant,Default Customer,පාරිබෝගිකයා
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,කරුණාකර මානව සම්පත්> HR සැකසුම් තුළ සේවක නාමකරණය කිරීමේ පද්ධතිය සැකසීම කරන්න
DocType: Assessment Plan,Supervisor Name,සුපරීක්ෂක නම
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,එදිනම හමුවීම සඳහා නිර්මාණය කර ඇත්දැයි තහවුරු නොකරන්න
DocType: Program Enrollment Course,Program Enrollment Course,වැඩසටහන ඇතුලත් පාඨමාලා
@@ -4174,7 +4178,7 @@
DocType: BOM,Website Description,වෙබ් අඩවිය විස්තරය
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,කොටස් ශුද්ධ වෙනස්
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,නවතම
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","විද්යුත් තැපැල් ලිපිනය අනන්ය විය යුතුය, දැනටමත් {0} සඳහා පවතී"
DocType: Serial No,AMC Expiry Date,"විදේශ මුදල් හුවමාරු කරන්නන්, කල් ඉකුත්වන දිනය,"
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,රිසිට්පත
@@ -4191,7 +4195,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ණය මුදල {0} උපරිම ණය මුදල ඉක්මවා නො හැකි
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,බලපත්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ඔබ ද පෙර මූල්ය වර්ෂය ශේෂ මෙම මුදල් වසරේදී පිටත්ව ඇතුළත් කිරීමට අවශ්ය නම් ඉදිරියට ගෙන කරුණාකර තෝරා
DocType: GL Entry,Against Voucher Type,වවුචරයක් වර්ගය එරෙහිව
DocType: Physician,Phone (R),දුරකථන (R)
@@ -4203,7 +4207,7 @@
DocType: Patient,B Negative,B සෘණාත්මක
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,නඩත්තු කිරීමේ තත්වය අවලංගු කිරීමට හෝ සම්පූර්ණ කිරීමට ඉදිරිපත් කළ යුතුය
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,පිට පිට අනු ගණන් {0} සැපයුම් සටහන සමග නොගැලපේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,පිට පිට අනු ගණන් {0} සැපයුම් සටහන සමග නොගැලපේ
DocType: Student,Guardian Details,ගාඩියන් විස්තර
DocType: C-Form,C-Form,C-ආකෘතිය
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,බහු සේවකයන් සඳහා ලකුණ පැමිණීම
@@ -4245,7 +4249,7 @@
DocType: Stock Entry Detail,Basic Amount,මූලික මුදල
DocType: Training Event,Exam,විභාග
DocType: Complaint,Complaint,පැමිණිල්ලක්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
DocType: Leave Allocation,Unused leaves,භාවිතයට නොගත් කොළ
DocType: Patient,Alcohol Past Use,මත්පැන් අතීත භාවිතය
DocType: Fertilizer Content,Fertilizer Content,පොහොර අන්තර්ගතය
@@ -4374,6 +4378,7 @@
DocType: Salary Detail,Formula,සූත්රය
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,අනු #
DocType: Lab Test Template,Lab Test Template,පරීක්ෂණ පරීක්ෂණ ආකෘතිය
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,විකුණුම් ගිණුම
DocType: Purchase Invoice Item,Total Weight,සම්පූර්ණ බර
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,විකුණුම් මත කොමිසම
DocType: Offer Letter Term,Value / Description,අගය / විස්තරය
@@ -4531,7 +4536,7 @@
DocType: Customer,From Lead,ඊයම් සිට
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,නිෂ්පාදනය සඳහා නිකුත් නියෝග.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,රාජ්ය මූල්ය වර්ෂය තෝරන්න ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
DocType: Program Enrollment Tool,Enroll Students,ශිෂ්ය ලියාපදිංචි
DocType: Lab Test,Approved Date,අනුමත දිනය
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,සම්මත විකිණීම
@@ -4608,7 +4613,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,නිෂ්පාදන විෂය
,Employee Information,සේවක තොරතුරු
DocType: Stock Entry Detail,Additional Cost,අමතර පිරිවැය
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","වවුචරයක් වර්ගීකරණය නම්, වවුචරයක් නොමැත මත පදනම් පෙරීමට නොහැකි"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","වවුචරයක් වර්ගීකරණය නම්, වවුචරයක් නොමැත මත පදනම් පෙරීමට නොහැකි"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,සැපයුම්කරු උද්ධෘත කරන්න
DocType: Quality Inspection,Incoming,ලැබෙන
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,විකිණුම් සහ මිලදී ගැනීම සඳහා පෙරනිමි බදු ආකෘති නිර්මාණය කර ඇත.
@@ -4625,7 +4630,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},සටහන: {0}
,Delivery Note Trends,සැපයුම් සටහන ප්රවණතා
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,මෙම සතියේ සාරාංශය
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,කොටස් යවන ලද තුළ
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,කොටස් යවන ලද තුළ
DocType: Delivery Trip,Calculate Estimated Arrival Times,ඇස්තමේන්තුගත පැමිණීමේ වේලාවන් ගණනය කරන්න
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ගිණුම: {0} පමණක් කොටස් ගනුදෙනු හරහා යාවත්කාලීන කළ හැකි
DocType: Student Group Creation Tool,Get Courses,පාඨමාලා ලබා ගන්න
@@ -4641,7 +4646,7 @@
DocType: Material Request,% Ordered,% අනුපිළිවලින්
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","පාඨමාලාව සඳහා පදනම් ශිෂ්ය සමූහය, පාඨමාලා වැඩසටහන ඇතුලත් දී ලියාපදිංචි පාඨමාලා සෑම ශිෂ්ය සඳහා වලංගු වනු ඇත."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,සාමාන්යය. මිලට ගැනීම අනුපාත
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,සාමාන්යය. මිලට ගැනීම අනුපාත
DocType: Task,Actual Time (in Hours),සැබෑ කාලය (පැය දී)
DocType: Employee,History In Company,සමාගම දී ඉතිහාසය
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{Sender} වෙතින් නව පණිවිඩයක්
@@ -4689,7 +4694,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ෙරෝ {0}: සිටිමට # ව්යවහාර මුදල් {1} තෝරාගත් මුදල් {2} සමාන විය යුතුයි
DocType: Journal Entry Account,Exchange Rate,විනිමය අනුපාතය
DocType: Patient,Additional information regarding the patient,රෝගියා පිළිබඳව අමතර තොරතුරු
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
DocType: Homepage,Tag Line,ටැග ලයින්
DocType: Fee Component,Fee Component,ගාස්තු සංරචක
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,රථ වාහන කළමනාකරණය
@@ -4904,7 +4909,7 @@
DocType: Employee Education,Employee Education,සේවක අධ්යාපන
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,අයිතමය පිරිසක් වගුව සොයා ගෙන අනුපිටපත් අයිතමය පිරිසක්
DocType: Land Unit,Parent Land Unit,ෙදමළ ඉඩම් ඒකක
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
DocType: Fertilizer,Fertilizer Name,පොහොර වර්ගය
DocType: Salary Slip,Net Pay,ශුද්ධ වැටුප්
DocType: Account,Account,ගිණුම
@@ -4983,7 +4988,7 @@
DocType: Item Customer Detail,Ref Code,ref සංග්රහයේ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS පැතිකඩ තුළ පාරිභෝගික කණ්ඩායම අවශ්ය වේ
apps/erpnext/erpnext/config/hr.py +12,Employee records.,සේවක වාර්තා.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,ඊළඟට ක්ෂය දිනය සකස් කරන්න
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,ඊළඟට ක්ෂය දිනය සකස් කරන්න
DocType: HR Settings,Payroll Settings,වැටුප් සැකසුම්
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,නොවන සම්බන්ධ ඉන්වොයිසි හා ගෙවීම් නොගැලපේ.
DocType: POS Settings,POS Settings,POS සැකසුම්
@@ -5151,7 +5156,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},{0} සඳහා උපන් දිනය මතක්
DocType: Asset Maintenance Task,Last Completion Date,අවසන් අවසන් දිනය
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,පසුගිය සාමය නිසා දින
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
DocType: Buying Settings,Naming Series,ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
DocType: Leave Block List,Leave Block List Name,"අවසරය, වාරණ ලැයිස්තුව නම"
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,රක්ෂණ අරඹන්න දිනය රක්ෂණ අවසාන දිනය වඩා අඩු විය යුතුය
@@ -5280,6 +5285,7 @@
DocType: Bank Reconciliation,Get Payment Entries,ගෙවීම් සඳහා අයැදුම්පත් ලබා ගන්න
DocType: Quotation Item,Against Docname,Docname එරෙහිව
DocType: SMS Center,All Employee (Active),සියලු සේවක (ක්රියාකාරී)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ගණුදෙනුකරු> පාරිභෝගික කණ්ඩායම> ප්රදේශය
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,දැන් දැක්ම
DocType: BOM,Raw Material Cost,අමු ද්රව්ය පිරිවැය
DocType: Item Reorder,Re-Order Level,නැවත සාමය පෙළ
@@ -5380,7 +5386,6 @@
DocType: Room,Seating Capacity,ආසන සංඛ්යාව
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,පරීක්ෂණ පරීක්ෂණ කණ්ඩායම්
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ගණුදෙනුකරු> පාරිභෝගික කණ්ඩායම> ප්රදේශය
DocType: Project,Total Expense Claim (via Expense Claims),(වියදම් හිමිකම් හරහා) මුළු වියදම් හිමිකම්
DocType: GST Settings,GST Summary,GST සාරාංශය
DocType: Assessment Result,Total Score,මුළු ලකුණු
@@ -5394,7 +5399,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,පහත දැක්වෙන පාඨමාලා කාල සටහන් සකස් කර ඇත
DocType: Journal Entry,Total Debit,මුළු ඩෙබිට්
DocType: Manufacturing Settings,Default Finished Goods Warehouse,පෙරනිමි භාණ්ඩ ගබඩා නිමි
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,විකුණුම් පුද්ගලයෙක්
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,විකුණුම් පුද්ගලයෙක්
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,අයවැය සහ වියදම මධ්යස්ථානය
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ගෙවීමේදී බහුතරයේ පෙරනිමි ආකාරයේ ගෙවීම් කිරීමට අවසර නැත
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,සඳහා
@@ -5570,7 +5575,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,සඳහා බදු හෝ භාර සලකා බලන්න
DocType: Driver,Driving License Category,රියදුරු බලපත්ර කාණ්ඩය
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,සැබෑ යවන ලද අනිවාර්ය වේ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} වර්තමානයේ {1} සැපයුම් කරුවෙකුගේ කාඩ්පතක් තිබෙන අතර, මෙම සැපයුම්කරුට මිලදී ගැනීමේ ඇණවුම් ගැන සැලකිලිමත් විය යුතුය."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} වර්තමානයේ {1} සැපයුම් කරුවෙකුගේ කාඩ්පතක් තිබෙන අතර, මෙම සැපයුම්කරුට මිලදී ගැනීමේ ඇණවුම් ගැන සැලකිලිමත් විය යුතුය."
DocType: Asset Maintenance Team,Asset Maintenance Team,වත්කම් නඩත්තු කණ්ඩායම
DocType: Employee Loan,Loan Type,ණය වර්ගය
DocType: Scheduling Tool,Scheduling Tool,අවස මෙවලම
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 922c7a4..87a48ba 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -50,7 +50,7 @@
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,"Je nevyhnutné, aby sa toto opatrenie vykonalo už dnes samo osebe v súvislosti s vyššie uvedeným opakovaním"
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Řada Aktualizováno Úspěšně
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Odhlásiť sa
-DocType: Pricing Rule,Apply On,Naneste na
+DocType: Pricing Rule,Apply On,Aplikujte na
DocType: Item Price,Multiple Item prices.,Více ceny položku.
,Purchase Order Items To Be Received,Neprijaté položky odoslanej objednávky
DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Zoradiť podľa ceny
,Delay Days,Oneskorené dni
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktúra
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Vytvorte zadanie retenčného skladu
DocType: Purchase Invoice Item,Item Weight Details,Podrobnosti o položke hmotnosti
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, Kód položky: {1} a zákazník: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otevření o zaměstnání.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},Kusovník nie je špecifikovaný pre subdodávateľskú položku {0} v riadku {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},Kusovník nie je špecifikovaný pre subdodávateľskú položku {0} v riadku {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Výsledok bol odoslaný
DocType: Item Attribute,Increment,Prírastok
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Časové rozpätie
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nepovolené pre {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Získať predmety z
DocType: Price List,Price Not UOM Dependant,Cena nie je závislá od UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nie sú uvedené žiadne položky
DocType: Asset Repair,Error Description,Popis chyby
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Potraviny
DocType: Quality Inspection Reading,Reading 1,Čtení 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Vedľa Odpisy dátum nemôže byť pred nákupom Dátum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Vedľa Odpisy dátum nemôže byť pred nákupom Dátum
DocType: Crop,Perennial,trvalka
DocType: Consultation,Consultation Date,Dátum konzultácie
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Zoznam produktov a objavovanie pre používateľov ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",napríklad "Základná škola" alebo "univerzita"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Reporty o zásobách
DocType: Warehouse,Warehouse Detail,Sklad Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Dátum ukončenia nemôže byť neskôr ako v roku Dátum ukončenia akademického roka, ku ktorému termín je spojená (akademický rok {}). Opravte dáta a skúste to znova."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Je Fixed Asset" nemôže byť bez povšimnutia, pretože existuje Asset záznam proti položke"
DocType: Delivery Trip,Departure Time,Čas odchodu
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Šablóny poradia dodávateľov.
DocType: Lead,Interested,Zájemci
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Otvor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Od {0} do {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Nepodarilo sa nastaviť dane
DocType: Item,Copy From Item Group,Kopírovat z bodu Group
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Listy za rok
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
DocType: Email Digest,Profit & Loss,Zisk & Strata
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,liter
DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulácie Čiastka (cez Time Sheet)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Toto je založené na transakciách s touto spoločnosťou. Viac informácií nájdete v časovej osi nižšie
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,odolný
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Viac mien
DocType: Opening Invoice Creation Tool,Invoice Type,Typ faktúry
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Dodací list
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Ovdovělý
DocType: Request for Quotation,Request for Quotation,Žiadosť o cenovú ponuku
DocType: Healthcare Settings,Require Lab Test Approval,Vyžadovať schválenie testu laboratória
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kód položky> Skupina položiek> Značka
DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Celkom nevybavené
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Prosím, zadajte nákladové stredisko"
DocType: Drug Prescription,Dosage,dávkovanie
DocType: Journal Entry Account,Sales Order,Predajné objednávky
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. Prodej Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodej Rate
DocType: Assessment Plan,Examiner Name,Meno Examiner
DocType: Lab Test Template,No Result,žiadny výsledok
DocType: Purchase Invoice Item,Quantity and Rate,Množstvo a Sadzba
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Vyberte mzdové
DocType: Purchase Invoice,Unpaid,Nezaplacený
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Vyhradené pre predaj
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov> Nastavenia personálu"
DocType: Packing Slip,From Package No.,Od č balíčku
DocType: Item Attribute,To Range,K Rozsah
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,Dielňa
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozornenie na nákupné objednávky
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dosť Časti vybudovať
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosť Časti vybudovať
DocType: POS Profile User,POS Profile User,Používateľ profilu POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Přímý příjmů
DocType: Patient Appointment,Date TIme,Dátum Čas
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Správní ředitel
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Založenie spoločnosti a dane
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnosť Kurz
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
DocType: Purchase Invoice,Supplier GSTIN,Dodávateľ GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Nedá zatvoriť úloha, ako jeho závislý úloha {0} nie je uzavretý."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
DocType: Production Order,Additional Operating Cost,Další provozní náklady
DocType: Lab Test Template,Lab Routine,Lab Rutine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetika
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Súvislosť s Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manažér
DocType: Payment Entry,Payment From / To,Platba od / do
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úverový limit je nižšia ako aktuálna dlžnej čiastky za zákazníka. Úverový limit musí byť aspoň {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úverový limit je nižšia ako aktuálna dlžnej čiastky za zákazníka. Úverový limit musí byť aspoň {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Nastavte si účet v službe Warehouse {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založené na"" a ""Zoskupené podľa"", nemôžu byť rovnaké"
DocType: Sales Person,Sales Person Targets,Obchodník cíle
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,Názov šarže
DocType: Fee Validity,Max number of visit,Maximálny počet návštev
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Harmonogramu vytvorenia:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,zapísať
DocType: GST Settings,GST Settings,Nastavenia GST
DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
@@ -958,7 +959,7 @@
DocType: Budget,Budget Against,rozpočet Proti
DocType: Employee,Cell Number,Číslo buňky
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Pre dané kritériá neexistuje žiadny zamestnanec. Skontrolujte, či ešte neboli vytvorené platobné kľúče."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Žiadosti Auto materiál vygenerovaný
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Žiadosti Auto materiál vygenerovaný
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Vyhradené pre výrobu
@@ -966,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
DocType: Opportunity,Opportunity From,Příležitost Z
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riadok {0}: {1} Sériové čísla vyžadované pre položku {2}. Poskytli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riadok {0}: {1} Sériové čísla vyžadované pre položku {2}. Poskytli ste {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vyberte tabuľku
DocType: BOM,Website Specifications,Webových stránek Specifikace
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neplatná e-mailová adresa v priečinku "Príjemcovia"
@@ -1054,7 +1055,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Požadovaná citácia
DocType: Vital Signs,Heart Rate / Pulse,Srdcová frekvencia / pulz
DocType: Company,Default Bank Account,Prednastavený Bankový účet
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Aktualizovať Sklad ' nie je možné skontrolovať, pretože položky nie sú dodané cez {0}"
DocType: Vehicle,Acquisition Date,akvizície Dátum
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Balenie
@@ -1079,7 +1080,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Nahrajte svoje písmeno hlavy (Udržujte web priateľský ako 900 x 100 pixelov)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Účet {2} nemôže byť skupina
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v predchádzajúcom '{typ_dokumentu}' tabuľka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Harmonogramu {0} je už dokončená alebo zrušená
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Harmonogramu {0} je už dokončená alebo zrušená
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,žiadne úlohy
DocType: Item Variant Settings,Copy Fields to Variant,Kopírovať polia na variant
DocType: Asset,Opening Accumulated Depreciation,otvorenie Oprávky
@@ -1191,9 +1192,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneri a teritória
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} musí být aktivní
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Uzávierka (otvorenie + celkom)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Uzávierka (otvorenie + celkom)
DocType: Journal Entry,Depreciation Entry,odpisy Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Najprv vyberte typ dokumentu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Tlačiť v mene účtu
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
DocType: Crop Cycle,ISO 8016 standard,ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
@@ -1219,7 +1221,7 @@
DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zamestnanec {0} nie je aktívny alebo neexistuje
DocType: Fee Structure,Components,komponenty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Prosím, zadajte Kategória majetku v položke {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Prosím, zadajte Kategória majetku v položke {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Varianty Položky {0} aktualizované
DocType: Quality Inspection Reading,Reading 6,Čtení 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1271,6 +1273,7 @@
,Company Name,Názov spoločnosti
DocType: SMS Center,Total Message(s),Celkem zpráv (y)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Nastavte pomenovanie série {0} cez Nastavenie> Nastavenia> Pomenovanie série
DocType: Purchase Invoice,Additional Discount Percentage,Ďalšie zľavy Percento
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobraziť zoznam všetkých videí nápovedy
DocType: Agriculture Analysis Criteria,Soil Texture,Textúra pôdy
@@ -1299,7 +1302,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website Item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
DocType: Timesheet Detail,Bill,Účtenka
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Vedľa Odpisy Dátum sa zadáva ako uplynulom dni
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Vedľa Odpisy Dátum sa zadáva ako uplynulom dni
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Biela
DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riadok {0}: Množstvo nie je k dispozícii pre {4} v sklade {1} pri účtovaní čas zápisu ({2} {3})
@@ -1315,7 +1318,7 @@
DocType: Lead,Next Contact Date,Další Kontakt Datum
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Otevření POČET
DocType: Healthcare Settings,Appointment Reminder,Pripomienka na menovanie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
DocType: Program Enrollment Tool Student,Student Batch Name,Študent Batch Name
DocType: Consultation,Doctor,lekár
DocType: Holiday List,Holiday List Name,Názov zoznamu sviatkov
@@ -1331,6 +1334,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Nástroj na pridelenie voľna
DocType: Item,Hub Category to Publish,Kategória Hubu na publikovanie
DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Prosím, nastavte číselnú sériu pre účasť v programe Setup> Numbering Series"
DocType: Sales Invoice,Billing Address GSTIN,Fakturačná adresa GSTIN
DocType: Assessment Plan,Evaluate,Ohodnotiť
DocType: Workstation,Net Hour Rate,Net Hour Rate
@@ -1365,7 +1369,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Predajná faktúry Platba
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Predajná čiastka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Predajná čiastka
DocType: Repayment Schedule,Interest Amount,záujem Suma
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
DocType: Serial No,Creation Document No,Tvorba dokument č
@@ -1458,7 +1462,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Otvorenie účtovníctva Balance
,GST Sales Register,Obchodný register spoločnosti GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nic požadovat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nic požadovat
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Vyberte svoje domény
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ďalšie rekord Rozpočet '{0}' už existuje proti {1} '{2}' za fiškálny rok {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Polia budú kopírované iba v čase vytvorenia.
@@ -1468,11 +1472,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,pozor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,pozor
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Return / ťarchopis
DocType: Price List Country,Price List Country,Cenník Krajina
DocType: Item,UOMs,Merné Jednotky
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} platné sériové čísla pre položky {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} platné sériové čísla pre položky {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
DocType: Purchase Invoice Item,UOM Conversion Factor,Faktor konverzie MJ
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Prosím, zadajte kód položky sa dostať číslo šarže"
@@ -1529,7 +1533,7 @@
apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
DocType: Grading Scale,Intervals,intervaly
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,"An Item Group exists with same name, please change the item name or rename the item group","Položková skupina s rovnakým názvom už existuje. Prosím, zmeňte názov položky alebo premenujte skupinu položiek"
DocType: Crop Cycle,Less than a year,Menej ako rok
apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Študent Mobile No.
apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +105,Rest Of The World,Zbytek světa
@@ -1578,7 +1582,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
DocType: Supplier Scorecard,Warn for new Request for Quotations,Upozornenie na novú žiadosť o ponuku
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Objednávky pomôžu pri plánovaní a sledovaní na vaše nákupy
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Predpisy pre laboratórne testy
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Celkové emisie / prenosu množstvo {0} v hmotnej Request {1} \ nemôže byť väčšie než množstvo {2} pre položku {3}
@@ -1616,7 +1620,6 @@
DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
DocType: Payment Entry,Write Off Difference Amount,Odpísať Difference Suma
DocType: Volunteer,Volunteer Name,Názov dobrovoľníka
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Prosím, nastavte názov inštruktora systému vo vzdelávaní> Nastavenia vzdelávania"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: e-mail zamestnanec nebol nájdený, a preto je pošta neposlal"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Prepravné pravidlo sa nevzťahuje na krajinu {0}
DocType: Item,Foreign Trade Details,Zahraničný obchod Podrobnosti
@@ -1629,7 +1632,7 @@
DocType: Student Group Student,Group Roll Number,Číslo skupiny rollov
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Súčet všetkých váh úloha by mal byť 1. Upravte váhy všetkých úloh projektu v súlade
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitálové Vybavení
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
@@ -1654,7 +1657,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dieťa sklad existuje pre tento sklad. Nemôžete odstrániť tento sklad.
DocType: Item,Website Item Groups,Webové stránky skupiny položek
DocType: Purchase Invoice,Total (Company Currency),Total (Company meny)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
DocType: Journal Entry,Journal Entry,Zápis do deníku
DocType: Expense Claim Advance,Unclaimed amount,Nevyžiadaná suma
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} položky v prebiehajúcej
@@ -1751,7 +1754,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",Žiadosť o cenovú ponuku je zakázaný prístup z portálu pre viac Skontrolujte nastavenie portálu.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Hodnota ukazovateľa skóre skóre dodávateľa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Nákup Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Nákup Částka
DocType: Sales Invoice,Shipping Address Name,Názov dodacej adresy
DocType: Material Request,Terms and Conditions Content,Podmínky Content
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Pri vytváraní kurzov sa vyskytli chyby
@@ -1857,7 +1860,7 @@
DocType: Program Course,Program Course,program kurzu
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
DocType: Homepage,Company Tagline for website homepage,Firma fb na titulnej stránke webu
-DocType: Item Group,Item Group Name,Položka Název skupiny
+DocType: Item Group,Item Group Name,Názov položkovej skupiny
apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
DocType: Student,Date of Leaving,Dátum Odchádzanie
DocType: Pricing Rule,For Price List,Pro Ceník
@@ -2016,7 +2019,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To je založené na protokoloch proti tomuto vozidlu. Pozri časovú os nižšie podrobnosti
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
DocType: Customer,Default Price List,Výchozí Ceník
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nemožno odstrániť fiškálny rok {0}. Fiškálny rok {0} je nastavený ako predvolený v globálnom nastavení
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Zákazník s rovnakým názvom už existuje
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Týmto sa odošlú výplatné pásky a vytvorí sa účtovníctvo časového rozlíšenia. Chcete pokračovať?
@@ -2030,6 +2033,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Stanovenie ceny
DocType: Quotation,Term Details,Termín Podrobnosti
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nemôže prihlásiť viac ako {0} študentov na tejto študentské skupiny.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Spolu (bez dane)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet iniciatív
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Počet iniciatív
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí byť väčšia ako 0
@@ -2050,7 +2054,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odpojiť Platba o zrušení faktúry
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuálny stav km vstúpil by mala byť väčšia ako počiatočný stav kilometrov {0}
DocType: Restaurant Reservation,No Show,Žiadne zobrazenie
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Nastavte pomenovanie série {0} cez Nastavenie> Nastavenia> Pomenovanie série
DocType: Shipping Rule Country,Shipping Rule Country,Prepravné Pravidlo Krajina
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Priepustky a dochádzky
DocType: Maintenance Visit,Partially Completed,Částečně Dokončeno
@@ -2143,7 +2146,7 @@
DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
DocType: Grant Application,Assessment Mark (Out of 10),Značka hodnotenia (z 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Žiadne
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Hlavné
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Hlavné
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varianta
DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
DocType: Employee Attendance Tool,Employees HTML,Zamestnanci HTML
@@ -2193,7 +2196,7 @@
DocType: Course,Course Abbreviation,skratka ihrisko
DocType: Student Leave Application,Student Leave Application,Študent nechať aplikáciu
DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zamestnancov {0} o pol dňa na {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Celkom pracovná doba by nemala byť väčšia ako maximálna pracovnej doby {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
@@ -2267,7 +2270,7 @@
DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
DocType: Lead,Follow Up,Nasleduj
DocType: Item,Is Sales Item,Je Sales Item
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Položka Group Tree
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Strom položkových skupín
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
DocType: Maintenance Visit,Maintenance Time,Údržba Time
,Amount to Deliver,"Suma, ktorá má dodávať"
@@ -2381,9 +2384,10 @@
DocType: Task,Actual End Date (via Time Sheet),Skutočný dátum ukončenia (cez Time Sheet)
DocType: Soil Texture,Soil Type,Typ pôdy
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Množstvo {0} {1} na {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nová správa
,Quotation Trends,Vývoje ponúk
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položková skupina nie je uvedená v hlavnej položke pre položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
DocType: Shipping Rule,Shipping Amount,Prepravovaná čiastka
DocType: Supplier Scorecard Period,Period Score,Skóre obdobia
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Pridať zákazníkov
@@ -2394,7 +2398,7 @@
,Vehicle Expenses,Náklady pre autá
DocType: Serial No,Invoice Details,Podrobnosti faktúry
DocType: Grant Application,Show on Website,Zobraziť na webovej stránke
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Očakávané hodnoty po celú dobu životnosti, musí byť väčšia ako alebo rovná {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},"Očakávané hodnoty po celú dobu životnosti, musí byť väčšia ako alebo rovná {0}"
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Začnite zapnuté
DocType: Hub Category,Hub Category,Kategória Hubu
DocType: Purchase Invoice,SEZ,SEZ
@@ -2426,7 +2430,7 @@
DocType: Patient,B Positive,B Pozitívne
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riadok # {0}: Množstvo musí byť 1, keď je položka investičného majetku. Prosím použiť samostatný riadok pre viacnásobné Mn."
DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
DocType: Patient Medical Record,Patient Medical Record,Záznam pacienta
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Skupina na Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportovní
@@ -2477,6 +2481,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Nie je možné nastaviť prijatú RFQ na žiadnu ponuku
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Celkem Odpočet
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Vyberte účet, ktorý chcete vytlačiť v mene účtu"
,Production Analytics,Analýza výroby
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Toto je založené na transakciách proti tomuto pacientovi. Viac informácií nájdete v nasledujúcej časovej osi
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Náklady Aktualizované
@@ -2532,7 +2537,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vyberte spoločnost ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Nechajte prázdne ak má platiť pre všetky oddelenia
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} je povinná k položke {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} je povinná k položke {1}
DocType: Payroll Entry,Fortnightly,dvojtýždňové
DocType: Currency Exchange,From Currency,Od Měny
DocType: Vital Signs,Weight (In Kilogram),Hmotnosť (v kilogramoch)
@@ -2610,7 +2615,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny sa nebudú zobrazovať, pokiaľ Cenník nie je nastavený"
DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debetné K je vyžadované
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debetné K je vyžadované
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomôže udržať prehľad o času, nákladov a účtovania pre aktivít hotový svojho tímu"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šablóny premenných ukazovateľa skóre dodávateľa.
@@ -2713,7 +2718,7 @@
DocType: Company,For Reference Only.,Pouze orientační.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Lekár {0} nie je k dispozícii v {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Vyberte položku šarže
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neplatný {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Neplatný {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PInv-RET-
DocType: Fee Validity,Reference Inv,Odkaz Inv
@@ -2750,8 +2755,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
DocType: Water Analysis,Origin,pôvod
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicou {0} {1} pre položku {4}. Robíte si iný {3} proti rovnakej {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Prosím nastavte opakovanie po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Vybrať zmena výšky účet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Prosím nastavte opakovanie po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Vybrať zmena výšky účet
DocType: Purchase Invoice,Price List Currency,Mena cenníka
DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -2807,7 +2812,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Upozornenie na nové nákupné objednávky
DocType: Quality Inspection Reading,Reading 9,Čtení 9
DocType: Supplier,Is Frozen,Je Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Uzol skupina sklad nie je dovolené vybrať pre transakcie
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Uzol skupina sklad nie je dovolené vybrať pre transakcie
DocType: Buying Settings,Buying Settings,Nastavenie nákupu
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
DocType: Upload Attendance,Attendance To Date,Účast na data
@@ -2822,6 +2827,7 @@
DocType: Grant Application,Organization,organizácie
DocType: BOM Update Tool,BOM Update Tool,Nástroj na aktualizáciu kusovníka
DocType: SG Creation Tool Course,Student Group Name,Meno Študent Group
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Zobraziť rozložený pohľad
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Vytváranie poplatkov
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Uistite sa, že naozaj chcete vymazať všetky transakcie pre túto spoločnosť. Vaše kmeňové dáta zostanú, ako to je. Túto akciu nie je možné vrátiť späť."
DocType: Room,Room Number,Číslo izby
@@ -2832,7 +2838,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Vytvoriť daňovú šablónu
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,user Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
DocType: Lab Test Sample,Lab Test Sample,Laboratórna vzorka
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Rýchly vstup Journal
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
@@ -2903,7 +2909,7 @@
DocType: Membership,USD,Americký dolár
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Proveďte faktury
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto zavrieť Opportunity po 15 dňoch
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Objednávky nie sú povolené {0} kvôli postaveniu skóre {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Objednávky nie sú povolené {0} kvôli postaveniu skóre {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,koniec roka
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Olovo%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Olovo%
@@ -3016,7 +3022,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Nad
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Riadok # {0}: Journal Entry {1} nemá účet {2} alebo už uzavreté proti inému poukazu
DocType: Supplier Scorecard Criteria,Criteria Weight,Hmotnosť kritérií
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dodávateľ> Typ dodávateľa
DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
DocType: Payroll Entry,Salary Slip Based on Timesheet,Plat Slip na základe časového rozvrhu
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Sadzba nákupu
@@ -3105,7 +3110,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Prejdite na Letterheads
DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všetky adresy
DocType: Company,Stock Settings,Nastavenie Skladu
@@ -3295,6 +3300,7 @@
DocType: Company,Default Inventory Account,Predvolený inventárny účet
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Riadok {0}: Dokončené množstvo musí byť väčšia ako nula.
DocType: Antibiotic,Antibiotic Name,Názov antibiotika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kód položky> Skupina položiek> Značka
DocType: Purchase Invoice,Apply Additional Discount On,Použiť dodatočné Zľava na
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Vyberte typ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Spojenie so všetkými pozemnými jednotkami, v ktorých rastie plodina"
@@ -3490,6 +3496,7 @@
DocType: Supplier,Credit Limit,Úvěrový limit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Sadzba predajného cenníka
DocType: Production Plan Sales Order,Salse Order Date,Dátum predajnej objednávky
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dodávateľ> Typ dodávateľa
DocType: Salary Component,Salary Component,plat Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Platobné Príspevky {0} sú un-spojený
DocType: GL Entry,Voucher No,Voucher No
@@ -3499,7 +3506,7 @@
DocType: Leave Allocation,Leave Allocation,Nechte Allocation
DocType: Payment Request,Recipient Message And Payment Details,Príjemca správy a platobných informácií
DocType: Training Event,Trainer Email,tréner Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materiál Žádosti {0} vytvořené
DocType: Restaurant Reservation,No of People,Počet ľudí
DocType: Production Planning Tool,Include sub-contracted raw materials,Zahrnúť sub-zmluvné suroviny
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablona podmínek nebo smlouvy.
@@ -3565,7 +3572,7 @@
DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
DocType: Employee Education,School/University,Škola / University
DocType: Payment Request,Reference Details,Odkaz Podrobnosti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očakávaná hodnota Po celú dobu životnosti musí byť menšie ako Gross sumy nákupu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Očakávaná hodnota Po celú dobu životnosti musí byť menšie ako Gross sumy nákupu
DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturovaná čiastka
DocType: Asset,Double Declining Balance,double degresívne
@@ -3577,7 +3584,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získať aktualizácie
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Účet {2} nepatrí do spoločnosti {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Vyberte aspoň jednu hodnotu z každého atribútu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Správa priepustiek
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Seskupit podle účtu
DocType: Sales Order,Fully Delivered,Plně Dodáno
@@ -3588,14 +3595,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplatené čiastky nemôže byť väčšia ako Výška úveru {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Prejdite na položku Programy
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Riadok {0} # Pridelená čiastka {1} nemôže byť väčšia ako suma neoprávnene nárokovaná {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Prosím, nastavte číselnú sériu pre účasť v programe Setup> Numbering Series"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Zákazková výroba nevytvorili
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nemôže zmeniť štatút študenta {0} je prepojený s aplikáciou študentské {1}
DocType: Asset,Fully Depreciated,plne odpísaný
,Stock Projected Qty,Naprojektovaná úroveň zásob
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účasť HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Ponuky sú návrhy, ponuky zaslané vašim zákazníkom"
DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
@@ -3680,7 +3686,7 @@
DocType: Stock Settings,Item Naming By,Položka Pojmenování By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
DocType: Production Order,Material Transferred for Manufacturing,Materiál Prenesená pre výrobu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Účet {0} neexistuje
DocType: Project,Project Type,Typ projektu
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Detská úloha existuje pre túto úlohu. Túto úlohu nemôžete odstrániť.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
@@ -3784,11 +3790,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového strediska
DocType: Sales Order Item,Sales Order Date,Dátum predajnej objednávky
DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Celkom Excl. daň
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ak je zaškrtnuté, budú všetky deti každej výrobné položky zahrnuté v materiáli požiadavky."
DocType: Assessment Plan,Assessment Plan,Plan Assessment
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Zákazník {0} je vytvorený.
DocType: Stock Settings,Limit Percent,limit Percento
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Prosím, nastavte názov inštruktora systému vo vzdelávaní> Nastavenia vzdelávania"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Momentálne nie je k dispozícii žiadny sklad v žiadnom sklade
,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
DocType: Sample Collection,No. of print,Počet potlače
@@ -3804,12 +3810,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Dlžníci ({0})
DocType: Pricing Rule,Margin,Marža
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Hrubý Zisk %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Hrubý Zisk %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Zmeniť profil POS
DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Hodnotiaca správa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Suma nákupu je povinná
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross Suma nákupu je povinná
DocType: Lead,Address Desc,Popis adresy
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party je povinná
DocType: Journal Entry,JV-,JV-
@@ -3841,7 +3847,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stály názov
DocType: Stock Entry,Customer or Supplier Details,Zákazníka alebo dodávateľa Podrobnosti
DocType: Employee Loan Application,Required by Date,Vyžadované podľa dátumu
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Záverečný zostatok (Dr - Cr)
DocType: Lead,Lead Owner,Získateľ Obchodnej iniciatívy
DocType: Bin,Requested Quantity,požadované množstvo
DocType: Patient,Marital Status,Rodinný stav
@@ -3855,7 +3860,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Viac variantov
DocType: Sales Invoice,Against Income Account,Proti účet příjmů
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% dodané
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Prihláste sa ako iný používateľ.
DocType: Territory,Territory Targets,Území Cíle
@@ -3956,7 +3961,7 @@
DocType: Serial No,Out of AMC,Out of AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
DocType: Company,Default Cash Account,Výchozí Peněžní účet
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To je založené na účasti tohto študenta
@@ -3992,7 +3997,7 @@
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvorené
DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
-DocType: Timesheet,Total Billable Amount,Celková suma Fakturovateľná
+DocType: Timesheet,Total Billable Amount,Celková fakturovaná suma
DocType: Customer,Credit Limit and Payment Terms,Úverový limit a platobné podmienky
apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,Zadanie objednávky
@@ -4011,7 +4016,7 @@
DocType: Sales Person,Sales Person Name,Meno predajcu
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
apps/erpnext/erpnext/utilities/user_progress.py +244,Add Users,Pridať používateľa
-DocType: POS Item Group,Item Group,Položka Group
+DocType: POS Item Group,Item Group,Položková skupina
DocType: Item,Safety Stock,bezpečnostné Sklad
DocType: Healthcare Settings,Healthcare Settings,Nastavenia zdravotnej starostlivosti
apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,Pokrok% za úlohu nemôže byť viac ako 100.
@@ -4108,7 +4113,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Žiadni zamestnanci pre uvedené kritériá
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
DocType: Restaurant,Default Customer,Predvolený zákazník
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov> Nastavenia personálu"
DocType: Assessment Plan,Supervisor Name,Meno Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Nepotvrdzujú, či sa schôdzka vytvorí v ten istý deň"
DocType: Program Enrollment Course,Program Enrollment Course,Program na zápis do programu
@@ -4183,7 +4187,7 @@
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +383,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
DocType: Company,Monthly Sales Target,Mesačný cieľ predaja
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
-DocType: Item,Default Material Request Type,Východiskový materiál Typ požiadavky
+DocType: Item,Default Material Request Type,Predvolený typ materiálovej požiadavky
DocType: Supplier Scorecard,Evaluation Period,Hodnotiace obdobie
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,nevedno
DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
@@ -4231,7 +4235,7 @@
DocType: BOM,Website Description,Popis webu
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Čistá zmena vo vlastnom imaní
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnovšie
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí byť jedinečná, už existuje pre {0}"
DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,príjem
@@ -4248,7 +4252,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Prehľad o peňažných tokoch
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výška úveru nesmie prekročiť maximálnu úveru Suma {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
DocType: GL Entry,Against Voucher Type,Proti poukazu typu
DocType: Physician,Phone (R),Telefón (R)
@@ -4260,7 +4264,7 @@
DocType: Patient,B Negative,B Negatívny
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Stav údržby musí byť zrušený alebo dokončený na odoslanie
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Sériové čísla v riadku {0} sa nezhodujú s dodacím listom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Sériové čísla v riadku {0} sa nezhodujú s dodacím listom
DocType: Student,Guardian Details,Guardian Podrobnosti
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark dochádzky pre viac zamestnancov
@@ -4302,7 +4306,7 @@
DocType: Stock Entry Detail,Basic Amount,Základná čiastka
DocType: Training Event,Exam,skúška
DocType: Complaint,Complaint,sťažnosť
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
DocType: Leave Allocation,Unused leaves,Nepoužité listy
DocType: Patient,Alcohol Past Use,Použitie alkoholu v minulosti
DocType: Fertilizer Content,Fertilizer Content,Obsah hnojiva
@@ -4430,6 +4434,7 @@
DocType: Salary Detail,Formula,vzorec
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Šablóna testu laboratória
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Predajný účet
DocType: Purchase Invoice Item,Total Weight,Celková váha
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Provize z prodeje
DocType: Offer Letter Term,Value / Description,Hodnota / Popis
@@ -4588,7 +4593,7 @@
DocType: Customer,From Lead,Od Obchodnej iniciatívy
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vyberte fiškálny rok ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
DocType: Program Enrollment Tool,Enroll Students,zapísať študenti
DocType: Lab Test,Approved Date,Schválený dátum
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Štandardný predaj
@@ -4665,7 +4670,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Výrobná položka
,Employee Information,Informace o zaměstnanci
DocType: Stock Entry Detail,Additional Cost,Dodatočné náklady
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Vytvoriť ponuku od dodávateľa
DocType: Quality Inspection,Incoming,Přicházející
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Predvolené daňové šablóny pre predaj a nákup sú vytvorené.
@@ -4682,7 +4687,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Poznámka: {0}
,Delivery Note Trends,Dodací list Trendy
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Tento týždeň Zhrnutie
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na sklade Množstvo
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Na sklade Množstvo
DocType: Delivery Trip,Calculate Estimated Arrival Times,Vypočítajte odhadované časy príchodu
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
DocType: Student Group Creation Tool,Get Courses,získať kurzy
@@ -4694,11 +4699,11 @@
DocType: Purchase Receipt,Return Against Purchase Receipt,Návrat Proti doklad o kúpe
DocType: Water Analysis,Person Responsible,Zodpovedná osoba
DocType: Request for Quotation Item,Request for Quotation Item,Žiadosť o cenovú ponuku výtlačku
-DocType: Purchase Order,To Bill,Billa
+DocType: Purchase Order,To Bill,K fakturácii
DocType: Material Request,% Ordered,% Objednané
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",V prípade kurzov študentskej skupiny bude kurz potvrdený pre každého študenta z prihlásených kurzov pri zaradení do programu.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Úkolová práce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Nákup Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Nákup Rate
DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
DocType: Employee,History In Company,Historie ve Společnosti
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nová správa od {odosielateľa}
@@ -4746,7 +4751,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Riadok {0}: Mena BOM # {1} by sa mala rovnať vybranej mene {2}
DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
DocType: Patient,Additional information regarding the patient,Ďalšie informácie týkajúce sa pacienta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
DocType: Homepage,Tag Line,tag linka
DocType: Fee Component,Fee Component,poplatok Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,fleet management
@@ -4784,7 +4789,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +114,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Řízení kvality
apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} bol zakázaný
-DocType: Project,Total Billable Amount (via Timesheets),Celková fakturovaná suma (prostredníctvom časových rozpisov)
+DocType: Project,Total Billable Amount (via Timesheets),Celková fakturovaná suma (prostredníctvom dochádzky)
DocType: Agriculture Task,Previous Business Day,Predchádzajúci pracovný deň
DocType: Employee Loan,Repay Fixed Amount per Period,Splácať paušálna čiastka za obdobie
apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Zadajte prosím množstvo pre Položku {0}
@@ -4915,7 +4920,7 @@
DocType: Vehicle,Vehicle,vozidlo
DocType: Purchase Invoice,In Words,Slovy
apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} musí byť odoslaná
-DocType: POS Profile,Item Groups,položka Skupiny
+DocType: POS Profile,Item Groups,Skupiny položiek
apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
DocType: Production Planning Tool,Material Request For Warehouse,Materiál Request For Warehouse
DocType: Sales Order Item,For Production,Pro Výrobu
@@ -4961,7 +4966,7 @@
DocType: Employee Education,Employee Education,Vzdelávanie zamestnancov
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Duplicitné skupinu položiek uvedené v tabuľke na položku v skupine
DocType: Land Unit,Parent Land Unit,Rodičovská jednotka
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
DocType: Fertilizer,Fertilizer Name,Názov hnojiva
DocType: Salary Slip,Net Pay,Net Pay
DocType: Account,Account,Účet
@@ -5040,7 +5045,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Zákaznícka skupina je povinná v POS profile
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zamestnanecké záznamy
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosím, stojí vedľa odpisov Dátum"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Prosím, stojí vedľa odpisov Dátum"
DocType: HR Settings,Payroll Settings,Nastavení Mzdové
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
DocType: POS Settings,POS Settings,Nastavenia POS
@@ -5208,7 +5213,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Narozeninová připomínka pro {0}
DocType: Asset Maintenance Task,Last Completion Date,Posledný dátum dokončenia
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
DocType: Buying Settings,Naming Series,Číselné rady
DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Dátum poistenie štarte by mala byť menšia ako poistenie koncovým dátumom
@@ -5339,6 +5344,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Získať Platobné položky
DocType: Quotation Item,Against Docname,Proti Docname
DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Zákazník> Zákaznícka skupina> Územie
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
DocType: BOM,Raw Material Cost,Cena surovin
DocType: Item Reorder,Re-Order Level,Re-Order Level
@@ -5439,7 +5445,6 @@
DocType: Room,Seating Capacity,Počet miest na sedenie
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Laboratórne testovacie skupiny
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Zákazník> Zákaznícka skupina> Územie
DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nárokov)
DocType: GST Settings,GST Summary,Súhrn GST
DocType: Assessment Result,Total Score,Konečné skóre
@@ -5452,7 +5457,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Boli vytvorené rozvrhy kurzov
DocType: Journal Entry,Total Debit,Celkem Debit
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Východzí hotových výrobkov Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Predajca
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Predajca
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Rozpočet a nákladového strediska
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Nie je povolený viacnásobný predvolený spôsob platby
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,pre
@@ -5482,7 +5487,7 @@
DocType: GL Entry,Credit Amount,Výška úveru
DocType: Cheque Print Template,Signatory Position,signatár Position
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Nastaviť ako Nezískané
-DocType: Timesheet,Total Billable Hours,Celkom zúčtovateľnej hodiny
+DocType: Timesheet,Total Billable Hours,Celkovo zúčtované hodiny
apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Doklad o zaplatení Note
apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,To je založené na transakciách proti tomuto zákazníkovi. Pozri časovú os nižšie podrobnosti
DocType: Company,Credit Days Based On,Úverové Dni Based On
@@ -5627,7 +5632,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
DocType: Driver,Driving License Category,Kategória vodičského preukazu
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutočné množstvo je povinné
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v súčasnosti má postavenie {1} Scorecardu pre dodávateľov a nákupné objednávky tomuto dodávateľovi by mali byť vydané opatrne.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} v súčasnosti má postavenie {1} Scorecardu pre dodávateľov a nákupné objednávky tomuto dodávateľovi by mali byť vydané opatrne.
DocType: Asset Maintenance Team,Asset Maintenance Team,Tím na údržbu aktív
DocType: Employee Loan,Loan Type,pôžička Type
DocType: Scheduling Tool,Scheduling Tool,plánovanie Tool
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index f4205e5..caf599e 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Razvrsti po ceni
,Delay Days,Dnevi zamude
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Račun
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Naredite zadrževalni zalogi
DocType: Purchase Invoice Item,Item Weight Details,Element Teža Podrobnosti
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Oznaka: {1} in stranke: {2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Odpiranje za službo.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM ni določen za podizvajalsko postavko {0} v vrstici {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM ni določen za podizvajalsko postavko {0} v vrstici {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Predloženi rezultat
DocType: Item Attribute,Increment,Prirastek
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Časovni razpon
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ni dovoljeno za {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Pridobi artikle iz
DocType: Price List,Price Not UOM Dependant,Cena ni odvisna od UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Izdelek {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,"Ni elementov, navedenih"
DocType: Asset Repair,Error Description,Opis napake
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Trgovina z živili
DocType: Quality Inspection Reading,Reading 1,Branje 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pokojninski skladi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Naslednja Amortizacija datum ne more biti pred Nakup Datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Naslednja Amortizacija datum ne more biti pred Nakup Datum
DocType: Crop,Perennial,Trajen
DocType: Consultation,Consultation Date,Datum posvetovanja
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Seznam izdelkov in odkritje za uporabnike ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",npr "Osnovna šola" ali "University"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Poročila o zalogi
DocType: Warehouse,Warehouse Detail,Skladišče Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Izraz Končni datum ne more biti najpozneje do leta End Datum študijskem letu, v katerem je izraz povezan (študijsko leto {}). Popravite datum in poskusite znova."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Ali je osnovno sredstvo" ne more biti brez nadzora, saj obstaja evidenca sredstev proti postavki"
DocType: Delivery Trip,Departure Time,Čas odhoda
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Pridobite Specification Podrobnosti
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Predloge dobaviteljevega položaja.
DocType: Lead,Interested,Zanima
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Otvoritev
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Otvoritev
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Od {0} do {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Nastavitev davkov ni uspela
DocType: Item,Copy From Item Group,Kopiranje iz postavke skupine
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Listi na leto
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite "Je Advance" proti račun {1}, če je to predujem vnos."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
DocType: Email Digest,Profit & Loss,Profit & Loss
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Liter
DocType: Task,Total Costing Amount (via Time Sheet),Skupaj Costing Znesek (preko Čas lista)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,To temelji na transakcijah zoper to družbo. Za podrobnosti si oglejte časovni načrt spodaj
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obvesti po e-pošti na ustvarjanje avtomatičnega Material dogovoru
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Odporen
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Posvetovanje
DocType: Journal Entry,Multi Currency,Multi Valuta
DocType: Opening Invoice Creation Tool,Invoice Type,Račun Type
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Poročilo o dostavi
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Ovdovela
DocType: Request for Quotation,Request for Quotation,Zahteva za ponudbo
DocType: Healthcare Settings,Require Lab Test Approval,Zahtevajte odobritev testa za laboratorij
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Koda postavke> Skupina izdelkov> Blagovna znamka
DocType: Salary Slip Timesheet,Working Hours,Delovni čas
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Skupaj izjemen
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščno / trenutno zaporedno številko obstoječega zaporedja.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vnesite stroškovni center
DocType: Drug Prescription,Dosage,Odmerjanje
DocType: Journal Entry Account,Sales Order,Naročilo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. Prodajni tečaj
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodajni tečaj
DocType: Assessment Plan,Examiner Name,Ime Examiner
DocType: Lab Test Template,No Result,Ne Rezultat
DocType: Purchase Invoice Item,Quantity and Rate,Količina in stopnja
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Izberite izplačane Obdobje
DocType: Purchase Invoice,Unpaid,Neplačan
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervirano za prodajo
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Prosimo, nastavite sistem imenovanja zaposlenih v kadri> HR Settings"
DocType: Packing Slip,From Package No.,Od paketa No.
DocType: Item Attribute,To Range,Da Domet
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrednostne papirje in depozite
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,Delavnica
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Opozori na naročila za nakup
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Dovolj deli za izgradnjo
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dovolj deli za izgradnjo
DocType: POS Profile User,POS Profile User,POS profil uporabnika
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Neposredne dohodkovne
DocType: Patient Appointment,Date TIme,Datum čas
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Upravni uradnik
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Ustanovitev podjetja in davkov
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Izberite tečaj
@@ -649,7 +650,7 @@
DocType: Stock Entry Detail,Difference Account,Razlika račun
DocType: Purchase Invoice,Supplier GSTIN,Dobavitelj GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kozmetika
@@ -820,7 +821,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Povezava z skrbnika2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Manager
DocType: Payment Entry,Payment From / To,Plačilo Od / Do
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nova kreditna meja je nižja od trenutne neporavnani znesek za stranko. Kreditno linijo mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nova kreditna meja je nižja od trenutne neporavnani znesek za stranko. Kreditno linijo mora biti atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Nastavite račun v Galeriji {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Na podlagi"" in ""Združi po"" ne more biti enaka"
DocType: Sales Person,Sales Person Targets,Prodaja Osebni cilji
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,serija Ime
DocType: Fee Validity,Max number of visit,Največje število obiska
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ustvaril:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,včlanite se
DocType: GST Settings,GST Settings,GST Nastavitve
DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z
@@ -958,7 +959,7 @@
DocType: Budget,Budget Against,proračun proti
DocType: Employee,Cell Number,Število celic
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Za določena merila ni nobenega zaposlenega. Preverite, da plačilne liste še niso bile ustvarjene."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto Material Zahteve Izdelano
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto Material Zahteve Izdelano
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v "Proti listu vstopa" stolpcu"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervirano za proizvodnjo
@@ -966,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energy
DocType: Opportunity,Opportunity From,Priložnost Od
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Vrstica {0}: {1} Serijske številke, potrebne za postavko {2}. Dali ste {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Vrstica {0}: {1} Serijske številke, potrebne za postavko {2}. Dali ste {3}."
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Izberite tabelo
DocType: BOM,Website Specifications,Spletna Specifikacije
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} je neveljaven e-poštni naslov v razdelku »Prejemniki«
@@ -1035,7 +1036,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Zahtevan cenik
DocType: Vital Signs,Heart Rate / Pulse,Srčni utrip / impulz
DocType: Company,Default Bank Account,Privzeti bančni račun
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Posodobi zalogo' ne more biti omogočeno, saj artikli niso dostavljeni prek {0}"
DocType: Vehicle,Acquisition Date,pridobitev Datum
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1060,7 +1061,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Naložite glavo glave (ohranite spletno prijazen kot 900 slikovnih pik za 100 pik)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: računa {2} ne more biti skupina
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Točka Row {idx} {DOCTYPE} {DOCNAME} ne obstaja v zgoraj '{DOCTYPE} "tabela
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,"Timesheet {0}, je že končana ali preklicana"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,"Timesheet {0}, je že končana ali preklicana"
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ni opravil
DocType: Item Variant Settings,Copy Fields to Variant,Kopiraj polja v Variant
DocType: Asset,Opening Accumulated Depreciation,Odpiranje nabrano amortizacijo
@@ -1172,9 +1173,10 @@
DocType: Production Order,Plan material for sub-assemblies,Plan material za sklope
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodajni partnerji in ozemelj
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} mora biti aktiven
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Zapiranje (odpiranje + skupno)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Zapiranje (odpiranje + skupno)
DocType: Journal Entry,Depreciation Entry,Amortizacija Začetek
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Prosimo, najprej izberite vrsto dokumenta"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Natisnite v valuti računa
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Preklic Material Obiski {0} pred preklicem to vzdrževanje obisk
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serijska št {0} ne pripada postavki {1}
@@ -1200,7 +1202,7 @@
DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Postavka Variante {0} posodobljen
DocType: Quality Inspection Reading,Reading 6,Branje 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1252,6 +1254,7 @@
,Company Name,ime podjetja
DocType: SMS Center,Total Message(s),Skupaj sporočil (-i)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Prosimo, nastavite imena serije za {0} prek Setup> Settings> Series Naming"
DocType: Purchase Invoice,Additional Discount Percentage,Dodatni popust Odstotek
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Oglejte si seznam vseh videoposnetkov pomočjo
DocType: Agriculture Analysis Criteria,Soil Texture,Tekstura za tla
@@ -1279,7 +1282,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Spletna stran Element
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Naslednja Amortizacija Datum je vpisana kot preteklem dnevu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Naslednja Amortizacija Datum je vpisana kot preteklem dnevu
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Bela
DocType: SMS Center,All Lead (Open),Vse ponudbe (Odprte)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Vrstica {0}: Kol ni na voljo za {4} v skladišču {1} na objavo čas začetka ({2} {3})
@@ -1296,7 +1299,7 @@
DocType: Lead,Next Contact Date,Naslednja Stik Datum
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Odpiranje Količina
DocType: Healthcare Settings,Appointment Reminder,Opomnik o imenovanju
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Prosim vnesite račun za znesek spremembe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Prosim vnesite račun za znesek spremembe
DocType: Program Enrollment Tool Student,Student Batch Name,Student Serija Ime
DocType: Consultation,Doctor,Doktor
DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
@@ -1312,6 +1315,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Pustite Orodje razdelitve emisijskih
DocType: Item,Hub Category to Publish,Kategorija vozlišča za objavo
DocType: Leave Block List,Leave Block List Dates,Pustite Block List termini
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Prosimo, nastavite številske serije za udeležbo preko Setup> Series Numbering"
DocType: Sales Invoice,Billing Address GSTIN,Naslov za izstavitev računa GSTIN
DocType: Assessment Plan,Evaluate,Ocenite
DocType: Workstation,Net Hour Rate,Neto urna postavka
@@ -1346,7 +1350,7 @@
DocType: Purchase Receipt,PREC-RET-,Prec-RET-
DocType: POS Profile,Sales Invoice Payment,Plačilo prodaja Račun
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse v Sales Order / dokončanih proizvodov Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Prodajni Znesek
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodajni Znesek
DocType: Repayment Schedule,Interest Amount,Obresti Znesek
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ste Expense odobritelj za ta zapis. Prosimo Posodobite "status" in Shrani
DocType: Serial No,Creation Document No,Za ustvarjanje dokumentov ni
@@ -1438,7 +1442,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Začetna bilanca
,GST Sales Register,DDV prodaje Registracija
DocType: Sales Invoice Advance,Sales Invoice Advance,Predplačila
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Nič zahtevati
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Nič zahtevati
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Izberite svoje domene
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Druga proračunska zapis '{0}' že obstaja proti {1} "{2}" za poslovno leto {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Polja bodo kopirana samo v času ustvarjanja.
@@ -1448,11 +1452,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je "SM", in oznaka postavka je "T-shirt", postavka koda varianto bo "T-SHIRT-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Previdno
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Previdno
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Nazaj / opominu
DocType: Price List Country,Price List Country,Cenik Država
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} veljavna serijski nos za postavko {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} veljavna serijski nos za postavko {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Oznaka se ne more spremeniti za Serial No.
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Conversion Factor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vnesite Koda priti Serija Število
@@ -1558,7 +1562,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Naročilo {0} ni veljavno
DocType: Supplier Scorecard,Warn for new Request for Quotations,Opozori na novo zahtevo za citate
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Naročilnice vam pomaga načrtovati in spremljati svoje nakupe
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Testi laboratorijskih testov
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Skupna količina Vprašanje / Transfer {0} v dogovoru Material {1} \ ne sme biti večja od zahtevane količine {2} za postavko {3}
@@ -1596,7 +1600,6 @@
DocType: Warehouse,Warehouse Contact Info,Skladišče Kontakt Info
DocType: Payment Entry,Write Off Difference Amount,Napišite Off Razlika Znesek
DocType: Volunteer,Volunteer Name,Ime prostovoljca
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Prosimo, nastavite sistem imenovanja inštruktorja v izobraževanju> Nastavitve izobraževanja"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: email zaposlenih ni mogoče najti, zato je e-poštno sporočilo ni bilo poslano"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pravilo o pošiljanju ni veljavno za državo {0}
DocType: Item,Foreign Trade Details,Zunanjo trgovino Podrobnosti
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Skupina Roll Število
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Vsota vseh uteži nalog bi moral biti 1. Prosimo, da ustrezno prilagodi uteži za vse naloge v projektu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapitalski Oprema
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cen Pravilo je najprej treba izbrati glede na "Uporabi On 'polju, ki je lahko točka, točka Group ali Brand."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,"Otrok skladišče obstaja za to skladišče. Ne, ne moreš izbrisati to skladišče."
DocType: Item,Website Item Groups,Spletna stran Element Skupine
DocType: Purchase Invoice,Total (Company Currency),Skupaj (družba Valuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serijska številka {0} je začela več kot enkrat
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serijska številka {0} je začela več kot enkrat
DocType: Journal Entry,Journal Entry,Vnos v dnevnik
DocType: Expense Claim Advance,Unclaimed amount,Nezahteven znesek
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} izdelkov v teku
@@ -1731,7 +1734,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Sporočilo dnevnik.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",Zahteva za ponudbo je onemogočen dostop iz portala za več nastavitev za preverjanje portala.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Dobavitelj Scorecard Scoring Spremenljivka
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Znesek nabave
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Znesek nabave
DocType: Sales Invoice,Shipping Address Name,Naslov dostave
DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Prišlo je do napak pri urejanju tečaja tečaja
@@ -1995,7 +1998,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ta temelji na dnevnikih glede na ta vozila. Oglejte si časovnico spodaj za podrobnosti
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
DocType: Customer,Default Price List,Privzeto Cenik
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Ne, ne moreš brisati poslovnega leta {0}. Poslovno leto {0} je privzet v globalnih nastavitvah"
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Kupec z istim imenom že obstaja
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,To bo poslalo plačne liste in ustvarilo časovni razpored poročanja. Želite nadaljevati?
@@ -2009,6 +2012,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Cenitev
DocType: Quotation,Term Details,Izraz Podrobnosti
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ne more vpisati več kot {0} študentov za to študentsko skupino.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Skupaj (brez davka)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,svinec Štetje
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,svinec Štetje
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti večje od 0
@@ -2029,7 +2033,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Prekinitev povezave med Plačilo na Izbris računa
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutni Stanje kilometrov vpisana mora biti večja od začetne števca prevožene poti vozila {0}
DocType: Restaurant Reservation,No Show,Ni predstave
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Prosimo, nastavite imena serije za {0} prek Setup> Settings> Series Naming"
DocType: Shipping Rule Country,Shipping Rule Country,Država dostavnega pravila
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Pusti in postrežbo
DocType: Maintenance Visit,Partially Completed,Delno Dopolnil
@@ -2122,7 +2125,7 @@
DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
DocType: Grant Application,Assessment Mark (Out of 10),Ocenjevalna oznaka (od 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Skrbnika2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Main
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
DocType: Employee Attendance Tool,Employees HTML,zaposleni HTML
@@ -2172,7 +2175,7 @@
DocType: Course,Course Abbreviation,Kratica za tečaj
DocType: Student Leave Application,Student Leave Application,Študent Zapusti Uporaba
DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenih {0} v pol dneva na {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Skupaj delovni čas ne sme biti večja od max delovnih ur {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
@@ -2358,9 +2361,10 @@
DocType: Task,Actual End Date (via Time Sheet),Dejanski končni datum (preko Čas lista)
DocType: Soil Texture,Soil Type,Vrsta tal
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Novo sporočilo
,Quotation Trends,Trendi ponudb
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
DocType: Shipping Rule,Shipping Amount,Znesek Dostave
DocType: Supplier Scorecard Period,Period Score,Obdobje obdobja
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Dodaj stranke
@@ -2371,7 +2375,7 @@
,Vehicle Expenses,Stroški vozil
DocType: Serial No,Invoice Details,Podrobnosti na računu
DocType: Grant Application,Show on Website,Prikaži na spletni strani
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Pričakovana vrednost po življenjski dobi, mora biti večja ali enaka {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},"Pričakovana vrednost po življenjski dobi, mora biti večja ali enaka {0}"
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Začni
DocType: Hub Category,Hub Category,Kategorija vozlišča
DocType: Purchase Invoice,SEZ,SEZ
@@ -2403,7 +2407,7 @@
DocType: Patient,B Positive,B Pozitivni
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Kol mora biti 1, kot točka je osnovno sredstvo. Prosimo, uporabite ločeno vrstico za večkratno Kol."
DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
DocType: Patient Medical Record,Patient Medical Record,Zdravniški zapis bolnika
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Skupina Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Šport
@@ -2454,6 +2458,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Prejeti RFQ ni mogoče nastaviti na nobeno ceno
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Skupaj Odbitek
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,"Izberite račun, ki ga želite natisniti v valuti računa"
,Production Analytics,proizvodne Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,To temelji na transakcijah proti temu bolniku. Podrobnosti si oglejte spodaj
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Stroškovno Posodobljeno
@@ -2509,7 +2514,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Izberite Company ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Pustite prazno, če velja za vse oddelke"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
DocType: Payroll Entry,Fortnightly,vsakih štirinajst dni
DocType: Currency Exchange,From Currency,Iz valute
DocType: Vital Signs,Weight (In Kilogram),Teža (v kilogramih)
@@ -2587,7 +2592,7 @@
DocType: Student,Guardians,skrbniki
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Cene se ne bodo pokazale, če Cenik ni nastavljen"
DocType: Stock Entry,Total Incoming Value,Skupaj Dohodni Vrednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Bremenitev je potrebno
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Bremenitev je potrebno
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomaga slediti časa, stroškov in zaračunavanje za aktivnostmi s svojo ekipo, podpisan"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nakup Cenik
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Predloge spremenljivk rezultatov dobaviteljev.
@@ -2690,7 +2695,7 @@
DocType: Company,For Reference Only.,Samo za referenco.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Zdravnik {0} ni na voljo {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Izberite Serija št
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neveljavna {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Neveljavna {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Reference Inv
@@ -2727,8 +2732,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Določite operacij, obratovalne stroške in daje edinstveno Operacija ni na vaše poslovanje."
DocType: Water Analysis,Origin,Izvor
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,"Ta dokument je nad mejo, ki jo {0} {1} za postavko {4}. Delaš drugo {3} zoper isto {2}?"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,znesek računa Izberite sprememba
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,znesek računa Izberite sprememba
DocType: Purchase Invoice,Price List Currency,Cenik Valuta
DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
DocType: Stock Settings,Allow Negative Stock,Dovoli Negative Stock
@@ -2784,7 +2789,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Opozori na nova naročila
DocType: Quality Inspection Reading,Reading 9,Branje 9
DocType: Supplier,Is Frozen,Je zamrznjena
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Skupina vozlišče skladišče ni dovoljeno izbrati za transakcije
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Skupina vozlišče skladišče ni dovoljeno izbrati za transakcije
DocType: Buying Settings,Buying Settings,Nastavitve nabave
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. za Končni Good postavki
DocType: Upload Attendance,Attendance To Date,Udeležba na tekočem
@@ -2799,6 +2804,7 @@
DocType: Grant Application,Organization,organizacija
DocType: BOM Update Tool,BOM Update Tool,Orodje za posodobitev BOM
DocType: SG Creation Tool Course,Student Group Name,Ime študent Group
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Pokaži eksplodiran pogled
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Ustvarjanje pristojbin
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prosimo, preverite, ali ste prepričani, da želite izbrisati vse posle, za te družbe. Vaši matični podatki bodo ostali kot je. Ta ukrep ni mogoče razveljaviti."
DocType: Room,Room Number,Številka sobe
@@ -2809,7 +2815,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Naredi davčno predlogo
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Uporabniški forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Surovine ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
DocType: Lab Test Sample,Lab Test Sample,Vzorec laboratorijskega testa
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Hitro Journal Entry
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
@@ -2880,7 +2886,7 @@
DocType: Membership,USD,ameriški dolar
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Izračunajte
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blizu Priložnost po 15 dneh
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Nakupna naročila niso dovoljena za {0} zaradi postavke ocene rezultatov {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Nakupna naročila niso dovoljena za {0} zaradi postavke ocene rezultatov {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Leto zaključka
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / svinec%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / svinec%
@@ -2973,7 +2979,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Nad
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nima računa {2} ali pa so že primerjali z drugo kupona
DocType: Supplier Scorecard Criteria,Criteria Weight,Teža meril
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dobavitelj> Dobavitelj tip
DocType: Buying Settings,Default Buying Price List,Privzet nabavni cenik
DocType: Payroll Entry,Salary Slip Based on Timesheet,Plača Slip Na Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Nakupna cena
@@ -3063,7 +3068,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Interesenti ga Industry Type.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Pojdite v Letterheads
DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Vsi naslovi.
DocType: Company,Stock Settings,Nastavitve Stock
@@ -3241,6 +3246,7 @@
DocType: Company,Default Inventory Account,Privzeti Popis račun
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Vrstica {0}: Zaključen Kol mora biti večji od nič.
DocType: Antibiotic,Antibiotic Name,Ime antibiotika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Koda postavke> Skupina izdelkov> Blagovna znamka
DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Izberite Vrsta ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Povezava na vse enote kopenskih površin, v katerih rastlina raste"
@@ -3436,6 +3442,7 @@
DocType: Supplier,Credit Limit,Kreditni limit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Povpr. Prodajna cenik tečaja
DocType: Production Plan Sales Order,Salse Order Date,Salse Datum naročila
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Dobavitelj> Dobavitelj tip
DocType: Salary Component,Salary Component,plača Component
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Plačilni Navedbe {0} un povezane
DocType: GL Entry,Voucher No,Voucher ni
@@ -3445,7 +3452,7 @@
DocType: Leave Allocation,Leave Allocation,Pustite Dodelitev
DocType: Payment Request,Recipient Message And Payment Details,Prejemnik sporočila in način plačila
DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Material Zahteve {0} ustvarjene
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Material Zahteve {0} ustvarjene
DocType: Restaurant Reservation,No of People,Število ljudi
DocType: Production Planning Tool,Include sub-contracted raw materials,Vključi podizvajalcev surovin
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predloga izrazov ali pogodbe.
@@ -3509,7 +3516,7 @@
DocType: Production Planning Tool,Create Material Requests,Ustvarite Material Zahteve
DocType: Employee Education,School/University,Šola / univerza
DocType: Payment Request,Reference Details,Referenčna Podrobnosti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Pričakovana vrednost Po Življenjska doba sme biti manjša od bruto zneska nakupa
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Pričakovana vrednost Po Življenjska doba sme biti manjša od bruto zneska nakupa
DocType: Sales Invoice Item,Available Qty at Warehouse,Na voljo Količina na Warehouse
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Zaračunavajo Znesek
DocType: Asset,Double Declining Balance,Double Upadanje Balance
@@ -3521,7 +3528,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dobite posodobitve
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada družbi {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Izberite vsaj eno vrednost iz vsakega od atributov.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Pustite upravljanje
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,"Skupina, ki jo račun"
DocType: Sales Order,Fully Delivered,Popolnoma Delivered
@@ -3532,14 +3539,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Plačanega zneska ne sme biti večja od zneska kredita {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Pojdite v programe
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Vrstica {0} # Razdeljena količina {1} ne sme biti večja od količine, za katero je vložena zahtevka {2}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Prosimo, nastavite številske serije za udeležbo preko Setup> Series Numbering"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Proizvodnja Sklep ni bil ustvarjen
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti za 'Do datuma '
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},"status študenta, ne more spremeniti {0} je povezana z uporabo študentskega {1}"
DocType: Asset,Fully Depreciated,celoti amortizirana
,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
DocType: Employee Attendance Tool,Marked Attendance HTML,Markirana Udeležba HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citati so predlogi, ponudbe, ki ste jih poslali svojim strankam"
DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
@@ -3624,7 +3630,7 @@
DocType: Stock Settings,Item Naming By,Postavka Poimenovanje S
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drug zaključnem obdobju Začetek {0} je bil dosežen po {1}
DocType: Production Order,Material Transferred for Manufacturing,Material Preneseno za Manufacturing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Račun {0} ne obstaja
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Račun {0} ne obstaja
DocType: Project,Project Type,Projekt Type
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Otroška naloga obstaja za to nalogo. Te naloge ne morete izbrisati.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Bodisi ciljna kol ali ciljna vrednost je obvezna.
@@ -3727,11 +3733,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Center Amortizacija Stroški
DocType: Sales Order Item,Sales Order Date,Datum Naročila Kupca
DocType: Sales Invoice Item,Delivered Qty,Delivered Kol
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Skupaj Excl. Davek
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Če je omogočeno, bodo vsi otroci vsako postavko proizvodnje je treba vključiti v materialu Prošnje."
DocType: Assessment Plan,Assessment Plan,načrt ocenjevanja
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Stranka {0} je ustvarjena.
DocType: Stock Settings,Limit Percent,omejitev Odstotek
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Prosimo, nastavite sistem imenovanja inštruktorja v izobraževanju> Nastavitve izobraževanja"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno ni na zalogi
,Payment Period Based On Invoice Date,Plačilo obdobju na podlagi računa Datum
DocType: Sample Collection,No. of print,Št. Tiskanja
@@ -3747,12 +3753,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Dolžniki ({0})
DocType: Pricing Rule,Margin,Margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nove stranke
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruto dobiček %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto dobiček %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Spremenite profil POS
DocType: Bank Reconciliation Detail,Clearance Date,Potrditev Datum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Ocenjevalno poročilo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto znesek nakupa je obvezna
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruto znesek nakupa je obvezna
DocType: Lead,Address Desc,Naslov opis izdelka
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party je obvezen
DocType: Journal Entry,JV-,JV-
@@ -3784,7 +3790,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stalno ime
DocType: Stock Entry,Customer or Supplier Details,Stranka ali dobavitelj Podrobnosti
DocType: Employee Loan Application,Required by Date,Zahtevana Datum
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Zaključna bilanca (Dr-Cr)
DocType: Lead,Lead Owner,Lastnik ponudbe
DocType: Bin,Requested Quantity,Zahtevana količina
DocType: Patient,Marital Status,Zakonski stan
@@ -3798,7 +3803,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Večkratne različice
DocType: Sales Invoice,Against Income Account,Proti dohodkov
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dostavljeno
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Prijavite se kot drugi uporabnik.
DocType: Territory,Territory Targets,Territory cilji
@@ -3899,7 +3904,7 @@
DocType: Serial No,Out of AMC,Od AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Naredite Maintenance obisk
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
DocType: Company,Default Cash Account,Privzeti gotovinski račun
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ta temelji na prisotnosti tega Študent
@@ -4051,7 +4056,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Za omenjena merila ni zaposlenih
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
DocType: Restaurant,Default Customer,Privzeta stranka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Prosimo, nastavite sistem imenovanja zaposlenih v kadri> HR Settings"
DocType: Assessment Plan,Supervisor Name,Ime nadzornik
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Ne potrdite, če je sestanek ustvarjen za isti dan"
DocType: Program Enrollment Course,Program Enrollment Course,Program Vpis tečaj
@@ -4173,7 +4177,7 @@
DocType: BOM,Website Description,Spletna stran Opis
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto sprememba v kapitalu
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Najnovejši
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-poštni naslov mora biti edinstven, že obstaja za {0}"
DocType: Serial No,AMC Expiry Date,AMC preteka Datum
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,prejem
@@ -4190,7 +4194,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izkaz denarnih tokov
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredita vrednosti ne sme preseči najvišji možen kredit znesku {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosimo, izberite Carry Forward, če želite vključiti tudi v preteklem poslovnem letu je bilanca prepušča tem fiskalnem letu"
DocType: GL Entry,Against Voucher Type,Proti bon Type
DocType: Physician,Phone (R),Telefon (R)
@@ -4202,7 +4206,7 @@
DocType: Patient,B Negative,B Negativno
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,"Stanje vzdrževanja je treba preklicati ali končati, da ga pošljete"
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Številke v vrstici {0} se ne ujema z dobavnice
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Številke v vrstici {0} se ne ujema z dobavnice
DocType: Student,Guardian Details,Guardian Podrobnosti
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Udeležba za več zaposlenih
@@ -4244,7 +4248,7 @@
DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
DocType: Training Event,Exam,Izpit
DocType: Complaint,Complaint,Pritožba
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
DocType: Patient,Alcohol Past Use,Pretekla uporaba alkohola
DocType: Fertilizer Content,Fertilizer Content,Vsebina gnojil
@@ -4373,6 +4377,7 @@
DocType: Salary Detail,Formula,Formula
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Prodajni račun
DocType: Purchase Invoice Item,Total Weight,Totalna teža
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisija za prodajo
DocType: Offer Letter Term,Value / Description,Vrednost / Opis
@@ -4530,7 +4535,7 @@
DocType: Customer,From Lead,Iz ponudbe
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Naročila sprosti za proizvodnjo.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Izberite poslovno leto ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
DocType: Program Enrollment Tool,Enroll Students,včlanite Študenti
DocType: Lab Test,Approved Date,Odobren datum
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna Prodaja
@@ -4607,7 +4612,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Proizvodnja Postavka
,Employee Information,Informacije zaposleni
DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Naredite Dobavitelj predračun
DocType: Quality Inspection,Incoming,Dohodni
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Ustvari so privzete davčne predloge za prodajo in nakup.
@@ -4624,7 +4629,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Opomba: {0}
,Delivery Note Trends,Dobavnica Trendi
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Povzetek Ta teden je
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na zalogi Količina
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Na zalogi Količina
DocType: Delivery Trip,Calculate Estimated Arrival Times,Izračunajte predvideni čas prihoda
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} se lahko posodobi samo preko delniških poslov
DocType: Student Group Creation Tool,Get Courses,Get Tečaji
@@ -4640,7 +4645,7 @@
DocType: Material Request,% Ordered,% Naročeno
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za Študentske skupine temelji igrišče, bo tečaj se potrdi za vsakega študenta od vpisanih Tečaji v programu vpis."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Akord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Odkup tečaj
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Odkup tečaj
DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
DocType: Employee,History In Company,Zgodovina V družbi
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Novo sporočilo od {pošiljatelja}
@@ -4688,7 +4693,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Vrstica {0}: Valuta BOM # {1} mora biti enaka izbrani valuti {2}
DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj
DocType: Patient,Additional information regarding the patient,Dodatne informacije o bolniku
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Naročilo {0} ni predloženo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Naročilo {0} ni predloženo
DocType: Homepage,Tag Line,tag Line
DocType: Fee Component,Fee Component,Fee Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet management
@@ -4903,7 +4908,7 @@
DocType: Employee Education,Employee Education,Izobraževanje delavec
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dvojnik postavka skupina je našla v tabeli točka skupine
DocType: Land Unit,Parent Land Unit,Matična enota
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
DocType: Fertilizer,Fertilizer Name,Ime gnojila
DocType: Salary Slip,Net Pay,Neto plača
DocType: Account,Account,Račun
@@ -4982,7 +4987,7 @@
DocType: Item Customer Detail,Ref Code,Ref Code
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Skupina strank je potrebna v profilu POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Evidence zaposlenih.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosim, nastavite Naslednja Amortizacija Datum"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Prosim, nastavite Naslednja Amortizacija Datum"
DocType: HR Settings,Payroll Settings,Nastavitve plače
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Match nepovezane računov in plačil.
DocType: POS Settings,POS Settings,POS nastavitve
@@ -5150,7 +5155,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
DocType: Asset Maintenance Task,Last Completion Date,Zadnji datum zaključka
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od zadnjega naročila
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
DocType: Buying Settings,Naming Series,Poimenovanje zaporedja
DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum zavarovanje Začetek sme biti manjša od datuma zavarovanje End
@@ -5280,6 +5285,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Dobili plačila Entries
DocType: Quotation Item,Against Docname,Proti Docname
DocType: SMS Center,All Employee (Active),Vsi zaposlenih (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Stranka> Skupina strank> Teritorija
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Oglejte si zdaj
DocType: BOM,Raw Material Cost,Raw Material Stroški
DocType: Item Reorder,Re-Order Level,Ponovno naročila ravni
@@ -5379,7 +5385,6 @@
DocType: Room,Seating Capacity,Število sedežev
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Laboratorijske skupine
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Stranka> Skupina strank> Teritorija
DocType: Project,Total Expense Claim (via Expense Claims),Total Expense zahtevek (preko Expense zahtevkov)
DocType: GST Settings,GST Summary,DDV Povzetek
DocType: Assessment Result,Total Score,Skupni rezultat
@@ -5393,7 +5398,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Ustanovljeni so bili naslednji razporedi tečaja
DocType: Journal Entry,Total Debit,Skupaj Debetna
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Privzete Končano Blago Skladišče
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Prodaja oseba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodaja oseba
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Proračun in Center Stroški
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Večkratni način plačila ni dovoljen
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,za
@@ -5568,7 +5573,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite davek ali dajatev za
DocType: Driver,Driving License Category,Kategorija vozniškega dovoljenja
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Dejanska Količina je obvezna
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ima trenutno {1} oceno za ocenjevalce dobaviteljev in naročila za naročila temu dobavitelju je treba previdno izdati.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ima trenutno {1} oceno za ocenjevalce dobaviteljev in naročila za naročila temu dobavitelju je treba previdno izdati.
DocType: Asset Maintenance Team,Asset Maintenance Team,Ekipa za vzdrževanje sredstev
DocType: Employee Loan,Loan Type,posojilo Vrsta
DocType: Scheduling Tool,Scheduling Tool,razporejanje orodje
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index c3cf13d..2129bf0 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Rendit sipas Çmimit
,Delay Days,Vonesa Ditët
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,shpenzimeve të shërbimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faturë
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Bëni regjistrimin e aksioneve të mbajtjes
DocType: Purchase Invoice Item,Item Weight Details,Pesha Detajet e artikullit
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Artikull Code: {1} dhe klientit: {2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Hapja për një punë.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM nuk është specifikuar për nënkontraktimin e sendit {0} në rreshtin {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM nuk është specifikuar për nënkontraktimin e sendit {0} në rreshtin {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Rezultati i paraqitur
DocType: Item Attribute,Increment,Rritje
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Intervalin kohor
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Nuk lejohet për {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Të marrë sendet nga
DocType: Price List,Price Not UOM Dependant,Çmimi nuk është UOM i varur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nuk ka artikuj të listuara
DocType: Asset Repair,Error Description,Përshkrimi i gabimit
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Ushqimore
DocType: Quality Inspection Reading,Reading 1,Leximi 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fondet pensionale
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Zhvlerësimi Date tjetër nuk mund të jetë më parë data e blerjes
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Zhvlerësimi Date tjetër nuk mund të jetë më parë data e blerjes
DocType: Crop,Perennial,gjithëvjetor
DocType: Consultation,Consultation Date,Data e konsultimit
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Listimi i produktit dhe zbulimi për përdoruesit ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",p.sh. "Shkolla fillore" ose "University"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Stock Raportet
DocType: Warehouse,Warehouse Detail,Magazina Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term End Date nuk mund të jetë më vonë se Data Year fund të vitit akademik në të cilin termi është i lidhur (Viti Akademik {}). Ju lutem, Korrigjo datat dhe provoni përsëri."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""A është e aseteve fikse" nuk mund të jetë e pakontrolluar, pasi ekziston rekord Pasurive ndaj artikullit"
DocType: Delivery Trip,Departure Time,Koha e Nisjes
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Get Specifikimi Details
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Modelet e renditjes së furnizuesit.
DocType: Lead,Interested,I interesuar
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Hapje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Hapje
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Nga {0} në {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Dështoi në vendosjen e taksave
DocType: Item,Copy From Item Group,Kopje nga grupi Item
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Lë në vit
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Ju lutem kontrolloni 'A Advance' kundër llogaria {1} në qoftë se kjo është një hyrje paraprakisht.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
DocType: Email Digest,Profit & Loss,Fitimi dhe Humbja
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litra
DocType: Task,Total Costing Amount (via Time Sheet),Total Kostoja Shuma (via Koha Sheet)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Kjo bazohet në transaksione kundër kësaj kompanie. Shiko detajet më poshtë për detaje
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Njoftojë me email për krijimin e kërkesës automatike materiale
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,i qëndrueshëm
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Multi Valuta
DocType: Opening Invoice Creation Tool,Invoice Type,Lloji Faturë
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Ofrimit Shënim
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Ve
DocType: Request for Quotation,Request for Quotation,Kërkesa për kuotim
DocType: Healthcare Settings,Require Lab Test Approval,Kërkoni miratimin e testit të laboratorit
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kodi i artikullit> Grupi i artikullit> Markë
DocType: Salary Slip Timesheet,Working Hours,Orari i punës
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Gjithsej Outstanding
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ndryshimi filluar / numrin e tanishëm sekuencë e një serie ekzistuese.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
DocType: Drug Prescription,Dosage,dozim
DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. Shitja Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Shitja Rate
DocType: Assessment Plan,Examiner Name,Emri Examiner
DocType: Lab Test Template,No Result,asnjë Rezultat
DocType: Purchase Invoice Item,Quantity and Rate,Sasia dhe Rate
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Zgjidhni Periudha Payroll
DocType: Purchase Invoice,Unpaid,I papaguar
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Rezervuar për shitje
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ju lutem vendosni Sistemin e Emërimit të Punonjësve në Burimet Njerëzore> Cilësimet e HR
DocType: Packing Slip,From Package No.,Nga Paketa nr
DocType: Item Attribute,To Range,Në rang
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Të letrave me vlerë dhe depozita
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,punishte
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Paralajmëroni Urdhërat e Blerjes
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Pjesë mjaftueshme për të ndërtuar
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pjesë mjaftueshme për të ndërtuar
DocType: POS Profile User,POS Profile User,Profili i POS-ut
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Të ardhurat direkte
DocType: Patient Appointment,Date TIme,Data Përmbledhje
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nuk mund të filtruar në bazë të llogarisë, në qoftë se të grupuara nga Llogaria"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Nuk mund të filtruar në bazë të llogarisë, në qoftë se të grupuara nga Llogaria"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Zyrtar Administrativ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Vendosja e kompanisë dhe taksave
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Ju lutem, përzgjidhni Course"
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Llogaria Diferenca
DocType: Purchase Invoice,Supplier GSTIN,furnizuesi GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Nuk mund detyrë afër sa detyra e saj të varur {0} nuk është e mbyllur.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
DocType: Production Order,Additional Operating Cost,Shtesë Kosto Operative
DocType: Lab Test Template,Lab Routine,Rutina e laboratorit
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kozmetikë
@@ -820,7 +821,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Raporti me Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Menaxher
DocType: Payment Entry,Payment From / To,Pagesa nga /
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Kufiri i ri i kredisë është më pak se shuma aktuale të papaguar për konsumatorin. kufiri i kreditit duhet të jetë atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Kufiri i ri i kredisë është më pak se shuma aktuale të papaguar për konsumatorin. kufiri i kreditit duhet të jetë atleast {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vendosni llogarinë në Depo {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Bazuar Në 'dhe' Grupit nga 'nuk mund të jetë e njëjtë
DocType: Sales Person,Sales Person Targets,Synimet Sales Person
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,Batch Emri
DocType: Fee Validity,Max number of visit,Numri maksimal i vizitës
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Pasqyrë e mungesave krijuar:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,regjistroj
DocType: GST Settings,GST Settings,GST Settings
DocType: Selling Settings,Customer Naming By,Emërtimi Customer Nga
@@ -957,7 +958,7 @@
DocType: Budget,Budget Against,Kundër buxheti
DocType: Employee,Cell Number,Numri Cell
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Nuk ka punonjës për kriteret e dhëna. Kontrolloni që Slipet e pagave nuk janë krijuar.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Kërkesat Auto Materiale Generated
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Kërkesat Auto Materiale Generated
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,I humbur
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në "Kundër Journal hyrjes 'kolonë
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervuar për prodhimin
@@ -965,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energji
DocType: Opportunity,Opportunity From,Opportunity Nga
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Deklarata mujore e pagave.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rreshti {0}: {1} Numrat serialë të kërkuar për artikullin {2}. Ju keni dhënë {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rreshti {0}: {1} Numrat serialë të kërkuar për artikullin {2}. Ju keni dhënë {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Zgjidh një tabelë
DocType: BOM,Website Specifications,Specifikimet Website
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} është një adresë e pavlefshme email në 'Përfituesit'
@@ -1034,7 +1035,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Cito kërkohet
DocType: Vital Signs,Heart Rate / Pulse,Shkalla e zemrës / Pulsi
DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Update Stock "nuk mund të kontrollohet, sepse sendet nuk janë dorëzuar nëpërmjet {0}"
DocType: Vehicle,Acquisition Date,Blerja Data
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1058,7 +1059,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Ngarko kokën tënde me shkronja (Mbani atë në internet si 900px me 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Llogaria {2} nuk mund të jetë një grup
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {} {DOCTYPE docname} nuk ekziston në më sipër '{DOCTYPE}' tabelë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Pasqyrë e mungesave {0} është përfunduar tashmë ose anuluar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Pasqyrë e mungesave {0} është përfunduar tashmë ose anuluar
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nuk ka detyrat
DocType: Item Variant Settings,Copy Fields to Variant,Kopjoni Fushat në Variant
DocType: Asset,Opening Accumulated Depreciation,Hapja amortizimi i akumuluar
@@ -1170,9 +1171,10 @@
DocType: Production Order,Plan material for sub-assemblies,Materiali plan për nën-kuvendet
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners dhe Territori
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} duhet të jetë aktiv
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Mbyllja (Hapja + Gjithsej)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Mbyllja (Hapja + Gjithsej)
DocType: Journal Entry,Depreciation Entry,Zhvlerësimi Hyrja
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Ju lutem zgjidhni llojin e dokumentit të parë
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Printoni në Valutën e Llogarisë
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuloje Vizitat Materiale {0} para anulimit të kësaj vizite Mirëmbajtja
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standard
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Asnjë {0} nuk i përkasin Item {1}
@@ -1198,7 +1200,7 @@
DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
DocType: Fee Structure,Components,komponentet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Item Variantet {0} përditësuar
DocType: Quality Inspection Reading,Reading 6,Leximi 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1250,6 +1252,7 @@
,Company Name,Emri i kompanisë
DocType: SMS Center,Total Message(s),Përgjithshme mesazh (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vendosni Serinë Naming për {0} nëpërmjet Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Përqindja shtesë Discount
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Shiko një listë të të gjitha ndihmë videot
DocType: Agriculture Analysis Criteria,Soil Texture,Cilësi e tokës
@@ -1278,7 +1281,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website Item
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë).
DocType: Timesheet Detail,Bill,Fature
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Zhvlerësimi Date tjetër është futur si datë të fundit
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Zhvlerësimi Date tjetër është futur si datë të fundit
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,E bardhë
DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty nuk është në dispozicion për {4} në depo {1} të postimi kohën e hyrjes ({2} {3})
@@ -1295,7 +1298,7 @@
DocType: Lead,Next Contact Date,Tjetër Kontakt Data
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Hapja Qty
DocType: Healthcare Settings,Appointment Reminder,Kujtesë për Emër
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
DocType: Program Enrollment Tool Student,Student Batch Name,Student Batch Emri
DocType: Consultation,Doctor,mjek
DocType: Holiday List,Holiday List Name,Festa Lista Emri
@@ -1311,6 +1314,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lini Alokimi Tool
DocType: Item,Hub Category to Publish,Kategoria Hub për Publikim
DocType: Leave Block List,Leave Block List Dates,Dërgo Block Lista Datat
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Ju lutem vendosni numrat e numrave për Pjesëmarrjen përmes Setup> Seritë e Numërimit
DocType: Sales Invoice,Billing Address GSTIN,Adresa e Faturimit GSTIN
DocType: Assessment Plan,Evaluate,vlerësoj
DocType: Workstation,Net Hour Rate,Shkalla neto Ore
@@ -1345,7 +1349,7 @@
DocType: Purchase Receipt,PREC-RET-,Preç-RET-
DocType: POS Profile,Sales Invoice Payment,Sales Pagesa e faturave
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervuar Magazina në Sales Order / Finished mallrave Magazina
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Shuma Shitja
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Shuma Shitja
DocType: Repayment Schedule,Interest Amount,Shuma e interesit
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ju jeni aprovuesi Shpenzimet për këtë rekord. Ju lutem Update 'Status' dhe për të shpëtuar
DocType: Serial No,Creation Document No,Krijimi Dokumenti Asnjë
@@ -1438,7 +1442,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Hapja Bilanci Kontabilitet
,GST Sales Register,GST Sales Regjistrohu
DocType: Sales Invoice Advance,Sales Invoice Advance,Shitjet Faturë Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Asgjë për të kërkuar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Asgjë për të kërkuar
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Zgjidh Domains tuaj
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Një tjetër rekord i buxhetit '{0}' ekziston kundër {1} '{2}' për vitin fiskal {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Fushat do të kopjohen vetëm në kohën e krijimit.
@@ -1448,11 +1452,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Kjo do t'i bashkëngjitet Kodit Pika e variant. Për shembull, në qoftë se shkurtim juaj është "SM", dhe kodin pika është "T-shirt", kodi pika e variantit do të jetë "T-shirt-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto Pay (me fjalë) do të jetë i dukshëm një herë ju ruani gabim pagave.
DocType: Purchase Invoice,Is Return,Është Kthimi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Kujdes
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Kujdes
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Kthimi / Debiti Note
DocType: Price List Country,Price List Country,Lista e Çmimeve Vendi
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} nos vlefshme serik për Item {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} nos vlefshme serik për Item {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kodi artikull nuk mund të ndryshohet për të Serial Nr
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Konvertimi Faktori
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Ju lutemi shkruani kodin Item për të marrë Numri i Serisë
@@ -1558,7 +1562,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
DocType: Supplier Scorecard,Warn for new Request for Quotations,Paralajmëroni për Kërkesë të re për Kuotime
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,urdhrat e blerjes t'ju ndihmuar të planit dhe të ndjekin deri në blerjet tuaja
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Recetat e testit të laboratorit
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",totale sasia Çështja / Transfer {0} në materiale Kërkesë {1} \ nuk mund të jetë më e madhe se sasia e kërkuar {2} për pikën {3}
@@ -1596,7 +1600,6 @@
DocType: Warehouse,Warehouse Contact Info,Magazina Kontaktimit
DocType: Payment Entry,Write Off Difference Amount,Shkruaj Off Diferenca Shuma
DocType: Volunteer,Volunteer Name,Emri Vullnetar
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Ju lutemi vendosni Sistemin e Emërimit të Instruktorit në Arsim> Cilësimet e Arsimit
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: email Punonjësi nuk gjendet, kështu nuk email dërguar"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Rregullimi i transportit nuk zbatohet për vendin {0}
DocType: Item,Foreign Trade Details,Jashtëm Details Tregtisë
@@ -1609,7 +1612,7 @@
DocType: Student Group Student,Group Roll Number,Grupi Roll Number
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total i të gjitha peshave duhet të jetë detyrë 1. Ju lutemi të rregulluar peshat e të gjitha detyrave të Projektit në përputhje me rrethanat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Pajisje kapitale
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rregulla e Çmimeve është zgjedhur për herë të parë në bazë të "Apliko në 'fushë, të cilat mund të jenë të artikullit, Grupi i artikullit ose markë."
@@ -1634,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,depo Child ekziston për këtë depo. Ju nuk mund të fshini këtë depo.
DocType: Item,Website Item Groups,Faqja kryesore Item Grupet
DocType: Purchase Invoice,Total (Company Currency),Total (Kompania Valuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Numri serik {0} hyrë më shumë se një herë
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Numri serik {0} hyrë më shumë se një herë
DocType: Journal Entry,Journal Entry,Journal Hyrja
DocType: Expense Claim Advance,Unclaimed amount,Shuma e pakthyeshme
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} artikuj në progres
@@ -1731,7 +1734,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikimi.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Kërkesë për Kuotim është me aftësi të kufizuara për qasje nga portali, për më shumë konfigurimet e portalit kontrollit."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Rezultati i rezultatit të furnitorit që shënon variablën
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Blerja Shuma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Blerja Shuma
DocType: Sales Invoice,Shipping Address Name,Transporti Adresa Emri
DocType: Material Request,Terms and Conditions Content,Termat dhe Kushtet Përmbajtja
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kishte gabime në krijimin e orarit të lëndëve
@@ -1995,7 +1998,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Kjo është e bazuar në shkrimet kundër këtij automjeteve. Shih afat kohor më poshtë për detaje
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
DocType: Customer,Default Price List,E albumit Lista e Çmimeve
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ju nuk mund të fshini Viti Fiskal {0}. Viti Fiskal {0} është vendosur si default në Settings Global
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Një klient me të njëjtin emër tashmë ekziston
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Kjo do të paraqesë Slipin e Pagave dhe do të krijojë regjistrimin e përhershëm të ditarit. A doni të vazhdoni?
@@ -2009,6 +2012,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,çmimi
DocType: Quotation,Term Details,Detajet Term
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Nuk mund të regjistrohen më shumë se {0} nxënësve për këtë grup të studentëve.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Totali (pa Tatimore)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Numërimi Lead
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Numërimi Lead
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} duhet të jetë më i madh se 0
@@ -2029,7 +2033,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Shkëput Pagesa mbi anulimin e Faturë
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Leximi aktuale Odometer hyrë duhet të jetë më i madh se fillestare automjeteve rrugëmatës {0}
DocType: Restaurant Reservation,No Show,Asnjë shfaqje
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vendosni Serinë Naming për {0} nëpërmjet Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Rregulla Shipping Vendi
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Lini dhe Pjesëmarrja
DocType: Maintenance Visit,Partially Completed,Kompletuar Pjesërisht
@@ -2122,7 +2125,7 @@
DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
DocType: Grant Application,Assessment Mark (Out of 10),Vlerësimi Mark (Nga 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Kryesor
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Kryesor
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
DocType: Employee Attendance Tool,Employees HTML,punonjësit HTML
@@ -2171,7 +2174,7 @@
DocType: Course,Course Abbreviation,Shkurtesa Course
DocType: Student Leave Application,Student Leave Application,Student Leave Aplikimi
DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},I punësuar {0} në gjysmë ditë në {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Orët totale të punës nuk duhet të jetë më e madhe se sa orë pune max {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Në
@@ -2358,9 +2361,10 @@
DocType: Task,Actual End Date (via Time Sheet),Aktuale End Date (via Koha Sheet)
DocType: Soil Texture,Soil Type,Lloji i dheut
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Shuma {0} {1} kundër {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Mesazh i ri
,Quotation Trends,Kuotimit Trendet
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupi pika nuk përmendet në pikën për të zotëruar pikën {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
DocType: Shipping Rule,Shipping Amount,Shuma e anijeve
DocType: Supplier Scorecard Period,Period Score,Vota e periudhës
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Shto Konsumatorët
@@ -2371,7 +2375,7 @@
,Vehicle Expenses,Shpenzimet automjeteve
DocType: Serial No,Invoice Details,detajet e faturës
DocType: Grant Application,Show on Website,Trego në Website
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe se ose e barabartë me {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe se ose e barabartë me {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Filloni
DocType: Hub Category,Hub Category,Kategoria Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2403,7 +2407,7 @@
DocType: Patient,B Positive,B Pozitiv
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty duhet të jetë 1, pasi pika është një pasuri fikse. Ju lutem përdorni rresht të veçantë për Qty shumëfishtë."
DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
DocType: Patient Medical Record,Patient Medical Record,Regjistrimi mjekësor pacient
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grup për jo-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sportiv
@@ -2453,6 +2457,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Nuk mund të caktohet një RFQ e pranuar në asnjë kuotë
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Zbritje Total
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Zgjidh një llogari për të shtypur në monedhën e llogarisë
,Production Analytics,Analytics prodhimit
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Kjo bazohet në transaksione kundër këtij Pacienti. Shiko detajet më poshtë për detaje
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kosto Përditësuar
@@ -2508,7 +2513,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Zgjidh kompanisë ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Lini bosh nëse konsiderohet për të gjitha departamentet
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Llojet e punësimit (, kontratë të përhershme, etj intern)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
DocType: Payroll Entry,Fortnightly,dyjavor
DocType: Currency Exchange,From Currency,Nga Valuta
DocType: Vital Signs,Weight (In Kilogram),Pesha (në kilogram)
@@ -2586,7 +2591,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Çmimet nuk do të shfaqet në qoftë Lista Çmimi nuk është vendosur
DocType: Stock Entry,Total Incoming Value,Vlera Totale hyrëse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debi Për të është e nevojshme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debi Për të është e nevojshme
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ndihmojë për të mbajtur gjurmët e kohës, kostos dhe faturimit për Aktivitetet e kryera nga ekipi juaj"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Blerje Lista e Çmimeve
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelet e variablave të rezultateve të rezultateve të furnizuesit.
@@ -2689,7 +2694,7 @@
DocType: Company,For Reference Only.,Vetëm për referencë.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Mjeku {0} nuk është i disponueshëm në {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Zgjidh Batch No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Invalid {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Referenca Inv
@@ -2726,8 +2731,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifikoni operacionet, koston operative dhe të japë një operacion i veçantë nuk ka për operacionet tuaja."
DocType: Water Analysis,Origin,origjinë
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ky dokument është mbi kufirin nga {0} {1} për pika {4}. A jeni duke bërë një tjetër {3} kundër të njëjtit {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Llogaria Shuma Zgjidh ndryshim
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Llogaria Shuma Zgjidh ndryshim
DocType: Purchase Invoice,Price List Currency,Lista e Çmimeve Valuta
DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
DocType: Stock Settings,Allow Negative Stock,Lejo Negativ Stock
@@ -2783,7 +2788,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Paralajmëroni për Urdhërat e reja të Blerjes
DocType: Quality Inspection Reading,Reading 9,Leximi 9
DocType: Supplier,Is Frozen,Është ngrira
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,depo nyje Group nuk është e lejuar për të zgjedhur për transaksionet
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,depo nyje Group nuk është e lejuar për të zgjedhur për transaksionet
DocType: Buying Settings,Buying Settings,Blerja Cilësimet
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Jo për një artikull përfundoi mirë
DocType: Upload Attendance,Attendance To Date,Pjesëmarrja në datën
@@ -2798,6 +2803,7 @@
DocType: Grant Application,Organization,organizatë
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Emri Group Student
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Shfaq pamje të eksploduar
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Krijimi i Tarifave
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ju lutem sigurohuni që ju me të vërtetë dëshironi të fshini të gjitha transaksionet për këtë kompani. Të dhënat tuaja mjeshtër do të mbetet ashtu siç është. Ky veprim nuk mund të zhbëhet.
DocType: Room,Room Number,Numri Room
@@ -2808,7 +2814,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Bëni modelin e taksave
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forumi User
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
DocType: Lab Test Sample,Lab Test Sample,Shembulli i testit të laboratorit
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick Journal Hyrja
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
@@ -2879,7 +2885,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Bëni Faturë
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Opportunity afër pas 15 ditësh
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Urdhërat e blerjes nuk janë të lejuara për {0} për shkak të një pozicioni të rezultateve të {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Urdhërat e blerjes nuk janë të lejuara për {0} për shkak të një pozicioni të rezultateve të {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fundi Viti
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
@@ -2972,7 +2978,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Mbi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Ditari Hyrja {1} nuk ka llogari {2} ose tashmë krahasohen kundër një kupon
DocType: Supplier Scorecard Criteria,Criteria Weight,Pesha e kritereve
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Furnizuesi> Lloji i Furnizuesit
DocType: Buying Settings,Default Buying Price List,E albumit Lista Blerja Çmimi
DocType: Payroll Entry,Salary Slip Based on Timesheet,Slip Paga Bazuar në pasqyrë e mungesave
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Shkalla e Blerjes
@@ -3062,7 +3067,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track kryeson nga Industrisë Type.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Shkoni te Letrat me Letër
DocType: Item Supplier,Item Supplier,Item Furnizuesi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Të gjitha adresat.
DocType: Company,Stock Settings,Stock Cilësimet
@@ -3240,6 +3245,7 @@
DocType: Company,Default Inventory Account,Llogaria Default Inventar
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Kompletuar Qty duhet të jetë më e madhe se zero.
DocType: Antibiotic,Antibiotic Name,Emri i Antibiotikut
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Kodi i artikullit> Grupi i artikullit> Markë
DocType: Purchase Invoice,Apply Additional Discount On,Aplikoni shtesë zbritje në
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Zgjidh Type ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Një lidhje me të gjitha Njësitë Tokësore në të cilat Pri rritet
@@ -3435,6 +3441,7 @@
DocType: Supplier,Credit Limit,Limit Credit
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Shitja e Çmimit të Çmimeve të Listës
DocType: Production Plan Sales Order,Salse Order Date,Salse Order Data
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Furnizuesi> Lloji i Furnizuesit
DocType: Salary Component,Salary Component,Paga Komponenti
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Entries pagesës {0} janë të pa-lidhur
DocType: GL Entry,Voucher No,Voucher Asnjë
@@ -3444,7 +3451,7 @@
DocType: Leave Allocation,Leave Allocation,Lini Alokimi
DocType: Payment Request,Recipient Message And Payment Details,Marrësi Message Dhe Detajet e pagesës
DocType: Training Event,Trainer Email,trajner Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Kërkesat Materiale {0} krijuar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Kërkesat Materiale {0} krijuar
DocType: Restaurant Reservation,No of People,Jo e njerëzve
DocType: Production Planning Tool,Include sub-contracted raw materials,Përfshirja e lëndëve të para nën-kontraktuar
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template i termave apo kontrate.
@@ -3509,7 +3516,7 @@
DocType: Production Planning Tool,Create Material Requests,Krijo Kërkesat materiale
DocType: Employee Education,School/University,Shkolla / Universiteti
DocType: Payment Request,Reference Details,Referenca Detajet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Vlera e pritshme Pas së dobishme duhet të jetë më pak se bruto Blerje Shuma
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Vlera e pritshme Pas së dobishme duhet të jetë më pak se bruto Blerje Shuma
DocType: Sales Invoice Item,Available Qty at Warehouse,Qty në dispozicion në magazinë
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Shuma e faturuar
DocType: Asset,Double Declining Balance,Dyfishtë rënie Balance
@@ -3521,7 +3528,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Llogaria {2} nuk i përkasin kompanisë {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Zgjidhni të paktën një vlerë nga secili prej atributeve.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Lini Menaxhimi
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupi nga Llogaria
DocType: Sales Order,Fully Delivered,Dorëzuar plotësisht
@@ -3532,14 +3539,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Shuma e disbursuar nuk mund të jetë më e madhe se: Kredia {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Shkoni te Programet
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rresht {0} # Shuma e alokuar {1} nuk mund të jetë më e madhe se shuma e pakushtuar {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Ju lutem vendosni numrat e numrave për Pjesëmarrjen përmes Setup> Seritë e Numërimit
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Rendit prodhimit jo krijuar
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Nga Data "duhet të jetë pas" deri më sot "
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Nuk mund të ndryshojë statusin si nxënës {0} është e lidhur me aplikimin e studentëve {1}
DocType: Asset,Fully Depreciated,amortizuar plotësisht
,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Pjesëmarrja e shënuar HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citate janë propozimet, ofertat keni dërguar për klientët tuaj"
DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
@@ -3624,7 +3630,7 @@
DocType: Stock Settings,Item Naming By,Item Emërtimi By
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Një tjetër Periudha Mbyllja Hyrja {0} është bërë pas {1}
DocType: Production Order,Material Transferred for Manufacturing,Materiali Transferuar për Prodhim
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Llogaria {0} nuk ekziston
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Llogaria {0} nuk ekziston
DocType: Project,Project Type,Lloji i projektit
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Detyra e fëmijës ekziston për këtë detyrë. Nuk mund ta fshish këtë detyrë.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ose Qty objektiv ose objektiv shuma është e detyrueshme.
@@ -3728,11 +3734,11 @@
DocType: Company,Asset Depreciation Cost Center,Asset Center Zhvlerësimi Kostoja
DocType: Sales Order Item,Sales Order Date,Sales Order Data
DocType: Sales Invoice Item,Delivered Qty,Dorëzuar Qty
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Totali Excl. taksë
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Nëse kontrollohen, të gjithë fëmijët e çdo zë prodhimi do të përfshihen në Kërkesave materiale."
DocType: Assessment Plan,Assessment Plan,Plani i vlerësimit
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Klienti {0} është krijuar.
DocType: Stock Settings,Limit Percent,Limit Percent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Ju lutemi vendosni Sistemin e Emërimit të Instruktorit në Arsim> Cilësimet e Arsimit
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Aktualisht nuk ka të aksioneve në dispozicion në ndonjë depo
,Payment Period Based On Invoice Date,Periudha e pagesës bazuar në datën Faturë
DocType: Sample Collection,No. of print,Numri i printimit
@@ -3748,12 +3754,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Debitorët ({0})
DocType: Pricing Rule,Margin,diferencë
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Klientët e Rinj
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruto% Fitimi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto% Fitimi
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Ndrysho Profilin e POS
DocType: Bank Reconciliation Detail,Clearance Date,Pastrimi Data
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Raporti i Vlerësimit
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Shuma Blerje është i detyrueshëm
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Gross Shuma Blerje është i detyrueshëm
DocType: Lead,Address Desc,Adresuar Përshkrimi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Partia është e detyrueshme
DocType: Journal Entry,JV-,JV-
@@ -3785,7 +3791,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Emri i Përhershëm
DocType: Stock Entry,Customer or Supplier Details,Customer ose Furnizuesi Detajet
DocType: Employee Loan Application,Required by Date,Kërkohet nga Data
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Bilanci mbyllës (Dr - Cr)
DocType: Lead,Lead Owner,Lead Owner
DocType: Bin,Requested Quantity,kërkohet Sasia
DocType: Patient,Marital Status,Statusi martesor
@@ -3799,7 +3804,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Variante të shumëfishta
DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Dorëzuar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qty Urdhërohet {1} nuk mund të jetë më pak se Qty mënyrë minimale {2} (përcaktuar në pikën).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mujor Përqindja e shpërndarjes
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Ju lutemi identifikohuni si një përdorues tjetër.
DocType: Territory,Territory Targets,Synimet Territory
@@ -3900,7 +3905,7 @@
DocType: Serial No,Out of AMC,Nga AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
DocType: Company,Default Cash Account,Gabim Llogaria Cash
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Kjo është e bazuar në pjesëmarrjen e këtij Student
@@ -4050,7 +4055,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Asnjë punonjës për kriteret e përmendura
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
DocType: Restaurant,Default Customer,Customer Default
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ju lutem vendosni Sistemin e Emërimit të Punonjësve në Burimet Njerëzore> Cilësimet e HR
DocType: Assessment Plan,Supervisor Name,Emri Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Mos konfirmoni nëse emërimi është krijuar për të njëjtën ditë
DocType: Program Enrollment Course,Program Enrollment Course,Program Regjistrimi Kursi
@@ -4168,7 +4172,7 @@
DocType: BOM,Website Description,Website Përshkrim
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Ndryshimi neto në ekuitetit
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Më të Rejat
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa Email duhet të jetë unike, tashmë ekziston për {0}"
DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Faturë
@@ -4185,7 +4189,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pasqyra Cash Flow
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Sasia huaja nuk mund të kalojë sasi maksimale huazimin e {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Liçensë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ju lutem, përzgjidhni Mbaj përpara në qoftë se ju të dëshironi që të përfshijë bilancit vitit të kaluar fiskal lë të këtij viti fiskal"
DocType: GL Entry,Against Voucher Type,Kundër Voucher Type
DocType: Physician,Phone (R),Telefoni (R)
@@ -4197,7 +4201,7 @@
DocType: Patient,B Negative,B Negative
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Statusi i mirëmbajtjes duhet të anulohet ose të përfundohet për t'u dërguar
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Numrat serial në rresht {0} nuk përputhet me shpërndarjen Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Numrat serial në rresht {0} nuk përputhet me shpërndarjen Note
DocType: Student,Guardian Details,Guardian Details
DocType: C-Form,C-Form,C-Forma
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Pjesëmarrja për të punësuarit të shumta
@@ -4239,7 +4243,7 @@
DocType: Stock Entry Detail,Basic Amount,Shuma bazë
DocType: Training Event,Exam,Provimi
DocType: Complaint,Complaint,ankim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
DocType: Patient,Alcohol Past Use,Përdorimi i mëparshëm i alkoolit
DocType: Fertilizer Content,Fertilizer Content,Përmbajtja e plehut
@@ -4364,6 +4368,7 @@
DocType: Salary Detail,Formula,formulë
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Modeli i testimit të laboratorit
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Llogaria e Shitjes
DocType: Purchase Invoice Item,Total Weight,Pesha Totale
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Komisioni për Shitje
DocType: Offer Letter Term,Value / Description,Vlera / Përshkrim
@@ -4520,7 +4525,7 @@
DocType: Customer,From Lead,Nga Lead
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Urdhërat lëshuar për prodhim.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
DocType: Program Enrollment Tool,Enroll Students,regjistrohen Studentët
DocType: Lab Test,Approved Date,Data e Aprovuar
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Shitja Standard
@@ -4596,7 +4601,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Prodhimi Item
,Employee Information,Informacione punonjës
DocType: Stock Entry Detail,Additional Cost,Kosto shtesë
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nuk mund të filtruar në bazë të Voucher Jo, qoftë të grupuara nga Bonon"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Nuk mund të filtruar në bazë të Voucher Jo, qoftë të grupuara nga Bonon"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
DocType: Quality Inspection,Incoming,Hyrje
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Modelet e taksave të parazgjedhur për shitje dhe blerje krijohen.
@@ -4613,7 +4618,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Shënim: {0}
,Delivery Note Trends,Trendet ofrimit Shënim
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Përmbledhja e kësaj jave
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Në modelet Qty
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Në modelet Qty
DocType: Delivery Trip,Calculate Estimated Arrival Times,Llogarit kohët e arritura të mbërritjes
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Llogaria: {0} mund të përditësuar vetëm përmes aksionare transaksionet
DocType: Student Group Creation Tool,Get Courses,Get Kurse
@@ -4629,7 +4634,7 @@
DocType: Material Request,% Ordered,% Urdhërohet
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Për Grupin bazuar Course Studentëve, kursi do të miratohet për çdo student nga kurset e regjistruar në programin e regjistrimit."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Punë me copë
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Blerja Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Blerja Rate
DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
DocType: Employee,History In Company,Historia Në kompanisë
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Mesazh i ri nga {sender}
@@ -4677,7 +4682,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Valuta e BOM # {1} duhet të jetë e barabartë me monedhën e zgjedhur {2}
DocType: Journal Entry Account,Exchange Rate,Exchange Rate
DocType: Patient,Additional information regarding the patient,Informacione shtesë lidhur me pacientin
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
DocType: Homepage,Tag Line,tag Line
DocType: Fee Component,Fee Component,Komponenti Fee
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Menaxhimi Fleet
@@ -4889,7 +4894,7 @@
DocType: Employee Education,Employee Education,Arsimimi punonjës
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Grupi Duplicate artikull gjenden në tabelën e grupit artikull
DocType: Land Unit,Parent Land Unit,Njësia e tokës parësore
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
DocType: Fertilizer,Fertilizer Name,Emri i plehut
DocType: Salary Slip,Net Pay,Pay Net
DocType: Account,Account,Llogari
@@ -4968,7 +4973,7 @@
DocType: Item Customer Detail,Ref Code,Kodi ref
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Grupi i Konsumatorëve kërkohet në Profilin e POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Të dhënat punonjës.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ju lutemi të vendosur Date Amortizimi tjetër
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Ju lutemi të vendosur Date Amortizimi tjetër
DocType: HR Settings,Payroll Settings,Listën e pagave Cilësimet
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Përputhje për Faturat jo-lidhura dhe pagesat.
DocType: POS Settings,POS Settings,POS Settings
@@ -5135,7 +5140,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
DocType: Asset Maintenance Task,Last Completion Date,Data e përfundimit të fundit
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ditët Që Rendit Fundit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
DocType: Buying Settings,Naming Series,Emërtimi Series
DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Fillimi duhet të jetë më pak se data Insurance Fund
@@ -5265,6 +5270,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Get Entries pagesës
DocType: Quotation Item,Against Docname,Kundër Docname
DocType: SMS Center,All Employee (Active),Të gjitha Punonjës (Aktive)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klienti> Grupi i Konsumatorëve> Territori
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Shiko Tani
DocType: BOM,Raw Material Cost,Raw Material Kosto
DocType: Item Reorder,Re-Order Level,Re-Rendit nivel
@@ -5364,7 +5370,6 @@
DocType: Room,Seating Capacity,Seating Kapaciteti
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Grupet e Testimit Lab
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Klienti> Grupi i Konsumatorëve> Territori
DocType: Project,Total Expense Claim (via Expense Claims),Gjithsej Kërkesa shpenzimeve (nëpërmjet kërkesave shpenzime)
DocType: GST Settings,GST Summary,GST Përmbledhje
DocType: Assessment Result,Total Score,Total Score
@@ -5378,7 +5383,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Pas orarit të kurseve u krijuan
DocType: Journal Entry,Total Debit,Debiti i përgjithshëm
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default përfunduara Mallra Magazina
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Buxheti dhe Qendra Kosto
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Mënyra e parazgjedhur e pagesës nuk lejohet
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,për
@@ -5553,7 +5558,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Konsideroni tatimit apo detyrimit për
DocType: Driver,Driving License Category,Kategoria e licencës së vozitjes
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Aktuale Qty është e detyrueshme
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualisht ka një {1} Scorecard të Furnizuesit, dhe Urdhërat e Blerjes për këtë furnizues duhet të lëshohen me kujdes."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} aktualisht ka një {1} Scorecard të Furnizuesit, dhe Urdhërat e Blerjes për këtë furnizues duhet të lëshohen me kujdes."
DocType: Asset Maintenance Team,Asset Maintenance Team,Ekipi i Mirëmbajtjes së Aseteve
DocType: Employee Loan,Loan Type,Lloji Loan
DocType: Scheduling Tool,Scheduling Tool,caktimin Tool
diff --git a/erpnext/translations/sr-SP.csv b/erpnext/translations/sr-SP.csv
index bb34e7d..90dac31 100644
--- a/erpnext/translations/sr-SP.csv
+++ b/erpnext/translations/sr-SP.csv
@@ -68,6 +68,7 @@
apps/erpnext/erpnext/accounts/page/pos/pos.js +2021,Please select customer,Odaberite kupca
apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
,Stock Summary,Pregled zalihe
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto cijena sa rabatom (Valuta preduzeća)
DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
,Purchase Invoice Trends,Trendovi faktura dobavljaća
DocType: Item Price,Item Price,Cijena artikla
@@ -89,12 +90,14 @@
DocType: Bank Reconciliation,Account Currency,Valuta računa
apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Otvoreni projekti
DocType: POS Profile,Price List,Cjenovnik
+DocType: Purchase Invoice Item,Rate (Company Currency),Cijena sa rabatom (Valuta preduzeća)
DocType: Activity Cost,Projects,Projekti
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Ukupno (P.S + promet u periodu)
+DocType: Purchase Invoice,Supplier Name,Naziv dobavljača
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Ukupno (P.S + promet u periodu)
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Supplier Invoice Date cannot be greater than Posting Date,Datum fakture dobavljača ne može biti veći od datuma otvaranja fakture
DocType: Production Planning Tool,Sales Orders,Prodajni nalozi
DocType: Item,Manufacturer Part Number,Proizvođačka šifra
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Prosječna vrijednost nabavke
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Prosječna vrijednost nabavke
DocType: Sales Order Item,Gross Profit,Bruto dobit
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupiši po računu.
DocType: Opening Invoice Creation Tool Item,Item Name,Naziv artikla
@@ -136,7 +139,7 @@
apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zatvorene
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},Ljekar nije dostupan u {0}
DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Skladište je potrebno unijeti za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Skladište je potrebno unijeti za artikal {0}
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Uplata već postoji
DocType: Project,Customer Details,Korisnički detalji
DocType: Item,"Example: ABCD.#####
@@ -147,6 +150,7 @@
DocType: Journal Entry Account,Sales Invoice,Faktura prodaje
DocType: Journal Entry,Accounting Entries,Računovodstveni unosi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Red # {0}: Knjiženje {1} nema kreiran nalog {2} ili je već povezan sa drugim izvodom.
+DocType: Purchase Invoice,Print Language,Jezik za štampu
DocType: Antibiotic,Healthcare Administrator,Administrator klinike
DocType: Sales Order,Track this Sales Order against any Project,Prati ovaj prodajni nalog na bilo kom projektu
DocType: Quotation Item,Stock Balance,Pregled trenutne zalihe
@@ -172,6 +176,7 @@
DocType: Bin,Ordered Quantity,Poručena količina
DocType: Lab Test Template,Standard Selling Rate,Standarna prodajna cijena
apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
+DocType: Sales Invoice Item,Rate With Margin,Cijena sa popustom
apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,Dodaj potrošeno vrijeme
DocType: Healthcare Settings,Consultations in valid days,Pregledi u važećim danima
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Korisnički portal
@@ -221,7 +226,7 @@
DocType: Customs Tariff Number,Customs Tariff Number,Carinska tarifa
DocType: Item,Default Supplier,Podrazumijevani dobavljač
apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Izaberite pacijenta
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Početno stanje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Početno stanje
DocType: POS Profile,Customer Groups,Grupe kupaca
DocType: Brand,Item Manager,Menadžer artikala
DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina preduzeća
@@ -238,7 +243,7 @@
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je obavezan podatak
DocType: Item,Customer Item Codes,Šifra kod kupca
DocType: Item,Manufacturer,Proizvođač
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Prodajni iznos
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodajni iznos
DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite isporukuili prijem robe ukoliko ne premaši ovaj procenat
DocType: Shopping Cart Settings,Orders,Porudžbine
apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Promjene na zalihama
@@ -263,7 +268,7 @@
DocType: Shopping Cart Settings,Enable Shopping Cart,Omogući korpu
DocType: Purchase Invoice Item,Is Fixed Asset,Artikal je osnovno sredstvo
,POS,POS
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Potrošeno vrijeme {0} je već potvrđeno ili otkazano
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Potrošeno vrijeme {0} je već potvrđeno ili otkazano
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +491, (Half Day),(Pola dana)
DocType: Shipping Rule,Net Weight,Neto težina
DocType: Payment Entry Reference,Outstanding,Preostalo
@@ -279,10 +284,11 @@
DocType: Quality Inspection,Report Date,Datum izvještaja
DocType: POS Profile,Item Groups,Vrste artikala
DocType: Pricing Rule,Discount Percentage,Procenat popusta
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruto dobit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruto dobit%
DocType: Payment Request,Payment Request,Upit za plaćanje
,Purchase Analytics,Analiza nabavke
DocType: Land Unit,Tree Details,Detalji stabla
+DocType: Upload Attendance,Upload Attendance,Priloži evidenciju
DocType: Grant Application,Requested Amount,Traženi iznos
apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.","Snimanje svih komunikacija tipa email, telefon, poruke, posjete, itd."
DocType: Purchase Order,Customer Contact Email,Kontakt e-mail kupca
@@ -317,6 +323,7 @@
DocType: Stock Entry,Repack,Prepakovati
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please select a warehouse,Izaberite skladište
DocType: Project,Project will be accessible on the website to these users,Projekat će biti dostupan na sajtu sledećim korisnicima
+DocType: Upload Attendance,Upload HTML,Priloži HTML
apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Usluge
apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Korpa sa artiklima
DocType: Warehouse,Warehouse Detail,Detalji o skldištu
@@ -374,7 +381,7 @@
DocType: Payment Request,Paid,Plaćeno
DocType: Pricing Rule,Buying,Nabavka
DocType: Stock Settings,Default Item Group,Podrazumijevana vrsta artikala
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Na zalihama
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Na zalihama
DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Umanjeni porezi i naknade (valuta preduzeća)
DocType: Stock Entry,Additional Costs,Dodatni troškovi
DocType: Project Task,Pending Review,Čeka provjeru
@@ -392,7 +399,6 @@
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi kupci
apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Prije prodaje
DocType: POS Customer Group,POS Customer Group,POS grupa kupaca
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Saldo (Duguje - potražuje)
DocType: Quotation,Shopping Cart,Korpa sa sajta
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervisana za proizvodnju
DocType: Pricing Rule,Pricing Rule Help,Pravilnik za cijene pomoć
@@ -411,6 +417,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +350,Make Payment,Kreiraj plaćanje
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete obrisati fiskalnu godinu {0}. Fiskalna {0} godina je označena kao trenutna u globalnim podešavanjima.
apps/erpnext/erpnext/stock/stock_ledger.py +375,{0} units of {1} needed in {2} to complete this transaction.,Željenu količinu {0} za artikal {1} je potrebno dodati na {2} da bi dovršili transakciju..
+DocType: Item Tax,Tax Rate,Poreska stopa
DocType: GL Entry,Remarks,Napomena
DocType: Opening Invoice Creation Tool,Sales,Prodaja
DocType: Pricing Rule,Pricing Rule,Pravilnik za cijene
@@ -429,12 +436,14 @@
DocType: Sales Order,Customer's Purchase Order Date,Datum porudžbenice kupca
DocType: Item,Country of Origin,Zemlja porijekla
DocType: Quotation,Order Type,Vrsta porudžbine
+DocType: BOM Item,Rate & Amount,Cijena i iznos sa rabatom
+apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Priloži evidenciju iz .csv datoteke
DocType: Pricing Rule,For Price List,Za cjenovnik
DocType: Purchase Invoice,Tax ID,Poreski broj
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Wip skladište
,Itemwise Recommended Reorder Level,Pregled preporučenih nivoa dopune
,Requested Items To Be Ordered,Tražene stavke za isporuku
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Prodajni nalog {0} nije potvrđen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Prodajni nalog {0} nije potvrđen
DocType: Item,Default Material Request Type,Podrazumijevani zahtjev za tip materijala
apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Prodajna linija
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +617,Already completed,Već završen
@@ -454,6 +463,7 @@
DocType: Buying Settings,Buying Settings,Podešavanja nabavke
DocType: Driver,Fleet Manager,Menadžer transporta
apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Nivoi zalihe
+DocType: Sales Invoice Item,Rate With Margin (Company Currency),Cijena sa popustom (Valuta preduzeća)
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +253,Closing (Cr),Saldo (Po)
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Sastavnica
apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +19,Sales and Returns,Prodaja i povraćaji
@@ -501,6 +511,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +290,Payment Entry is already created,Uplata je već kreirana
DocType: Purchase Invoice Item,Item,Artikal
DocType: Purchase Invoice,Unpaid,Neplaćen
+DocType: Purchase Invoice Item,Net Rate,Neto cijena sa rabatom
DocType: Project User,Project User,Projektni user
DocType: Item,Customer Items,Proizvodi kupca
DocType: Stock Reconciliation,SR/,SR /
@@ -609,8 +620,9 @@
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
DocType: Announcement,Student,Student
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,Prijem količine
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +56,Selling Rate,Prodajna cijena
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Uvoz uspješan!
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Zaliha se ne može promijeniti jer je vezana sa otpremnicom {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Zaliha se ne može promijeniti jer je vezana sa otpremnicom {0}
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +483,Form View,Prikaži kao formu
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,Manjak kol.
DocType: Drug Prescription,Hour,Sat
@@ -626,7 +638,7 @@
DocType: Notification Control,Quotation Message,Ponuda - poruka
DocType: Journal Entry,Stock Entry,Unos zaliha
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodajni cjenovnik
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Prosječna prodajna cijena
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Prosječna prodajna cijena
DocType: Item,End of Life,Kraj proizvodnje
DocType: Payment Entry,Payment Type,Vrsta plaćanja
DocType: Selling Settings,Default Customer Group,Podrazumijevana grupa kupaca
@@ -638,12 +650,12 @@
DocType: Bank Guarantee,Start Date,Datum početka
DocType: Notification Control,Delivery Note Message,Poruka na otpremnici
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne može se obrisati serijski broj {0}, dok god se nalazi u dijelu Promjene na zalihama"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,Kupci na čekanju
DocType: Purchase Invoice,Price List Currency,Valuta Cjenovnika
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Projektni menadzer
DocType: Journal Entry,Accounts Receivable,Potraživanja od kupaca
-DocType: Purchase Invoice Item,Rate,Cijena
+DocType: Purchase Invoice Item,Rate,Cijena sa popustom
DocType: Project Task,View Task,Pogledaj zadatak
DocType: Account,Expense,Rashod
apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter-i
@@ -664,7 +676,7 @@
apps/erpnext/erpnext/config/selling.py +179,Analytics,Analitika
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Novi {0}: # {1}
DocType: Company,Fixed Days,Fiksni dani
-DocType: Purchase Receipt Item,Rate and Amount,Cijena i vrijednost
+DocType: Purchase Receipt Item,Rate and Amount,Cijena i vrijednost sa popustom
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +71,'Total','Ukupno bez PDV-a'
DocType: Purchase Invoice,Total Taxes and Charges,Porez
DocType: Purchase Order Item,Supplier Part Number,Dobavljačeva šifra
@@ -677,6 +689,8 @@
DocType: Buying Settings,Default Buying Price List,Podrazumijevani Cjenovnik
DocType: Purchase Invoice Item,Qty,Kol
DocType: Mode of Payment,General,Opšte
+DocType: Supplier,Default Payable Accounts,Podrazumijevani nalog za plaćanje
+apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Cijena: {0}
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1463,Write Off Amount,Otpisati iznos
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,Preostalo za plaćanje
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +340,Not Paid and Not Delivered,Nije plaćeno i nije isporučeno
@@ -701,10 +715,11 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnice {0} moraju biti otkazane prije otkazivanja prodajnog naloga
DocType: Employee Loan,Total Payment,Ukupno plaćeno
DocType: POS Settings,POS Settings,POS podešavanja
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Iznos nabavke
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iznos nabavke
DocType: Purchase Invoice Item,Valuation Rate,Prosječna nab. cijena
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
DocType: Journal Entry Account,Purchase Order,Porudžbenica
+DocType: Sales Invoice Item,Rate With Margin,Cijena sa popustom
DocType: GL Entry,Voucher Type,Vrsta dokumenta
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Serijski broj {0} je već primljen
apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz i izvoz podataka
@@ -716,6 +731,7 @@
DocType: Shipping Rule Condition,Shipping Rule Condition,Uslovi pravila nabavke
apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,Početno stanje zalihe
,Customer Credit Balance,Kreditni limit kupca
+apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Adresa još nije dodata.
DocType: C-Form Invoice Detail,Net Total,Ukupno bez PDV-a
DocType: Purchase Invoice,Return,Povraćaj
DocType: Sales Order Item,Delivery Warehouse,Skladište dostave
@@ -727,7 +743,7 @@
DocType: Purchase Invoice,Apply Additional Discount On,Primijeni dodatni popust na
apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ovo je zasnovano na transkcijama ovog dobavljača. Pogledajte vremensku liniju ispod za dodatne informacije
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90 dana
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Serijski broj na poziciji {0} se ne poklapa sa otpremnicom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Serijski broj na poziciji {0} se ne poklapa sa otpremnicom
apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Novi kontakt
DocType: Production Planning Tool,Create Production Orders,Kreiraj porudžbinu za proizvodnju
DocType: Purchase Invoice,Returns,Povraćaj
@@ -792,7 +808,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +136,Due Date is mandatory,Datum dospijeća je obavezan
apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Korpa
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Promjene na zalihama prije {0} su zamrznute
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kupac {0} je prekoračio kreditni limit {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kupac {0} je prekoračio kreditni limit {1} / {2}
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Dr),Saldo (Du)
DocType: Sales Invoice,Product Bundle Help,Sastavnica Pomoć
apps/erpnext/erpnext/accounts/report/financial_statements.py +233,Total {0} ({1}),Ukupno bez PDV-a {0} ({1})
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 06fc974..720e8a0 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Сортирај по цени
,Delay Days,Дани одлагања
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,сервис Трошкови
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Фактура
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Направите задржавање залиха залиха
DocType: Purchase Invoice Item,Item Weight Details,Детаљна тежина артикла
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Референца: {0}, Код товара: {1} Цустомер: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,кг
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Отварање за посао.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},БОМ није наведен за ставку подизвођача {0} на реду {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},БОМ није наведен за ставку подизвођача {0} на реду {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Резултат је поднет
DocType: Item Attribute,Increment,Повећање
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Временски распон
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Није дозвољено за {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Гет ставке из
DocType: Price List,Price Not UOM Dependant,Цена није УОМ зависна
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Но итемс листед
DocType: Asset Repair,Error Description,Опис грешке
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,бакалница
DocType: Quality Inspection Reading,Reading 1,Читање 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Пензиони фондови
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следећа Амортизација Датум не може бити пре купуваве
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Следећа Амортизација Датум не може бити пре купуваве
DocType: Crop,Perennial,Перенниал
DocType: Consultation,Consultation Date,Датум консултације
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Списак производа и откривање за кориснике ЕРПНект
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",нпр "Основна школа" или "Универзитет"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,stock Извештаји
DocType: Warehouse,Warehouse Detail,Магацин Детаљ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Рок Датум завршетка не може бити касније од годину завршити Датум школске године у којој је термин везан (академска година {}). Молимо исправите датуме и покушајте поново.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Да ли је основних средстава" не може бити неконтролисано, као средствима запис постоји у односу на ставке"
DocType: Delivery Trip,Departure Time,Време поласка
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Гет Детаљи Спецификација
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Предлошци табеле добављача.
DocType: Lead,Interested,Заинтересован
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Отварање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Отварање
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Од {0} {1} да
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Неуспешно подешавање пореза
DocType: Item,Copy From Item Group,Копирање из ставке групе
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Леавес по години
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
DocType: Email Digest,Profit & Loss,Губитак профита
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Литар
DocType: Task,Total Costing Amount (via Time Sheet),Укупно Обрачун трошкова Износ (преко Тиме Схеет)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Ово се заснива на трансакцијама против ове компаније. За детаље погледајте временски оквир испод
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Обавестити путем емаила на стварању аутоматског материјала захтеву
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Отпорно
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Цонсултатионт
DocType: Journal Entry,Multi Currency,Тема Валута
DocType: Opening Invoice Creation Tool,Invoice Type,Фактура Тип
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Обавештење о пријему пошиљке
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Удовички
DocType: Request for Quotation,Request for Quotation,Захтев за понуду
DocType: Healthcare Settings,Require Lab Test Approval,Захтевати одобрење за тестирање лабораторија
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Шифра производа> Група производа> Бренд
DocType: Salary Slip Timesheet,Working Hours,Радно време
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Тотал Оутстандинг
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промена стартовања / струја број редни постојеће серије.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Унесите трошка
DocType: Drug Prescription,Dosage,Дозирање
DocType: Journal Entry Account,Sales Order,Продаја Наручите
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Про. Продајни
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Про. Продајни
DocType: Assessment Plan,Examiner Name,испитивач Име
DocType: Lab Test Template,No Result,Без резултата
DocType: Purchase Invoice Item,Quantity and Rate,Количина и Оцените
@@ -610,6 +610,7 @@
DocType: Payroll Entry,Select Payroll Period,Изабери периода исплате
DocType: Purchase Invoice,Unpaid,Неплаћен
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Резервисан за продају
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Молимо да подесите систем именовања запослених у људским ресурсима> ХР Сеттингс
DocType: Packing Slip,From Package No.,Од Пакет број
DocType: Item Attribute,To Range,У распону
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
@@ -634,11 +635,11 @@
DocType: Training Event,Workshop,радионица
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Упозоравај наруџбенице
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Довољно Делови за изградњу
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Довољно Делови за изградњу
DocType: POS Profile User,POS Profile User,ПОС Профил корисника
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Прямая прибыль
DocType: Patient Appointment,Date TIme,Датум време
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не можете да филтрирате на основу налога , ако груписани по налогу"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Не можете да филтрирате на основу налога , ако груписани по налогу"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Административни службеник
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Успостављање предузећа и пореза
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Молимо одаберите Цоурсе
@@ -649,7 +650,7 @@
DocType: Stock Entry Detail,Difference Account,Разлика налог
DocType: Purchase Invoice,Supplier GSTIN,добављач ГСТИН
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
DocType: Lab Test Template,Lab Routine,Лаб Роутине
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,козметика
@@ -819,7 +820,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Однос са Гуардиан2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,менаџер
DocType: Payment Entry,Payment From / To,Плаћање Фром /
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нови кредитни лимит је мање од тренутног преосталог износа за купца. Кредитни лимит мора да садржи најмање {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нови кредитни лимит је мање од тренутног преосталог износа за купца. Кредитни лимит мора да садржи најмање {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Молимо поставите налог у складишту {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основу"" и ""Групиши по"" не могу бити идентични"
DocType: Sales Person,Sales Person Targets,Продаја Персон Мете
@@ -830,7 +831,7 @@
DocType: Student Batch Name,Batch Name,батцх Име
DocType: Fee Validity,Max number of visit,Максималан број посета
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Тимесхеет цреатед:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,уписати
DocType: GST Settings,GST Settings,ПДВ подешавања
DocType: Selling Settings,Customer Naming By,Кориснички назив под
@@ -957,7 +958,7 @@
DocType: Budget,Budget Against,буџет protiv
DocType: Employee,Cell Number,Мобилни број
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,За дат критериј нема запосленог. Проверите да ли су листови плата још увек нису креирани.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Аутоматско Материјал Захтеви Генератед
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Аутоматско Материјал Захтеви Генератед
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,изгубљен
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Резервисан за производњу
@@ -965,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,енергија
DocType: Opportunity,Opportunity From,Прилика Од
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечна плата изјава.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Серијски бројеви потребни за ставку {2}. Дали сте {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Серијски бројеви потребни за ставку {2}. Дали сте {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Изаберите табелу
DocType: BOM,Website Specifications,Сајт Спецификације
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} је неважећа адреса е-поште у 'Примаоцима'
@@ -1053,7 +1054,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Цитирај молио
DocType: Vital Signs,Heart Rate / Pulse,Срце / пулса
DocType: Company,Default Bank Account,Уобичајено банковног рачуна
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Ажурирање Сток "не може се проверити, јер ствари нису достављене преко {0}"
DocType: Vehicle,Acquisition Date,Датум куповине
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Нос
@@ -1078,7 +1079,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Отпремите писмо главом (Држите га на вебу као 900пк по 100пк)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: налог {2} не може бити група
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Итем Ред {идк}: {ДОЦТИПЕ} {ДОЦНАМЕ} не постоји у горе '{ДОЦТИПЕ}' сто
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Тимесхеет {0} је већ завршен или отказан
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Тимесхеет {0} је већ завршен или отказан
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Но задаци
DocType: Item Variant Settings,Copy Fields to Variant,Копирај поља на варијанту
DocType: Asset,Opening Accumulated Depreciation,Отварање акумулирана амортизација
@@ -1190,9 +1191,10 @@
DocType: Production Order,Plan material for sub-assemblies,План материјал за подсклопови
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продајних партнера и Регија
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,БОМ {0} мора бити активна
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Затварање (отварање + укупно)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Затварање (отварање + укупно)
DocType: Journal Entry,Depreciation Entry,Амортизација Ступање
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Прво изаберите врсту документа
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Штампај у валути рачуна
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
DocType: Crop Cycle,ISO 8016 standard,ИСО 8016 стандард
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
@@ -1218,7 +1220,7 @@
DocType: Supplier,Default Payable Accounts,Уобичајено се плаћају рачуни
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
DocType: Quality Inspection Reading,Reading 6,Читање 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1270,6 +1272,7 @@
,Company Name,Име компаније
DocType: SMS Center,Total Message(s),Всего сообщений (ы)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Поставите називе серије за {0} преко Сетуп> Сеттингс> Сериес Наминг
DocType: Purchase Invoice,Additional Discount Percentage,Додатни попуст Проценат
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Погледајте листу сву помоћ видео
DocType: Agriculture Analysis Criteria,Soil Texture,Текстура тла
@@ -1298,7 +1301,7 @@
DocType: BOM Website Item,BOM Website Item,БОМ Сајт артикла
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
DocType: Timesheet Detail,Bill,рачун
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следећа Амортизација Датум је ушао као прошле дана
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Следећа Амортизација Датум је ушао као прошле дана
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Бео
DocType: SMS Center,All Lead (Open),Све Олово (Опен)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина није доступан за {4} у складишту {1} на објављивање време ступања ({2} {3})
@@ -1315,7 +1318,7 @@
DocType: Lead,Next Contact Date,Следеће Контакт Датум
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Отварање Кол
DocType: Healthcare Settings,Appointment Reminder,Опомена за именовање
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
DocType: Program Enrollment Tool Student,Student Batch Name,Студент Серија Име
DocType: Consultation,Doctor,Доцтор
DocType: Holiday List,Holiday List Name,Холидаи Листа Име
@@ -1331,6 +1334,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Оставите Тоол доделе
DocType: Item,Hub Category to Publish,Категорија Хуб објавити
DocType: Leave Block List,Leave Block List Dates,Оставите Датуми листу блокираних
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Молимо да подесите серију бројева за присуство преко Сетуп> Сериес Нумберинг
DocType: Sales Invoice,Billing Address GSTIN,Адреса за обрачун ГСТИН
DocType: Assessment Plan,Evaluate,"Проценити, оценити"
DocType: Workstation,Net Hour Rate,Нет час курс
@@ -1365,7 +1369,7 @@
DocType: Purchase Receipt,PREC-RET-,Прец-РЕТ-
DocType: POS Profile,Sales Invoice Payment,Продаја Рачун Плаћање
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Резервисано Магацин у Продаја Наручите / складиште готове робе
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Продаја Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продаја Износ
DocType: Repayment Schedule,Interest Amount,Износ камате
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
DocType: Serial No,Creation Document No,Стварање документ №
@@ -1458,7 +1462,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Отварање рачуноводства Стање
,GST Sales Register,ПДВ продаје Регистрација
DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ништа се захтевати
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ништа се захтевати
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Изаберите своје домене
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Још једна буџета запис '{0}' већ постоји против {1} {2} 'за фискалну годину {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Поља ће бити копирана само у тренутку креирања.
@@ -1468,11 +1472,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плата (у речи) ће бити видљив када сачувате Слип плату.
DocType: Purchase Invoice,Is Return,Да ли је Повратак
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Опрез
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Опрез
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Повратак / задужењу
DocType: Price List Country,Price List Country,Ценовник Земља
DocType: Item,UOMs,УОМс
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} действительные серийные NOS для Пункт {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} действительные серийные NOS для Пункт {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Шифра не може се мењати за серијским бројем
DocType: Purchase Invoice Item,UOM Conversion Factor,УОМ конверзије фактор
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Молимо Вас да унесете Код товара да се број серије
@@ -1578,7 +1582,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
DocType: Supplier Scorecard,Warn for new Request for Quotations,Упозорити на нови захтев за цитате
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Наруџбенице помоћи да планирате и праћење куповина
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Тестирање лабораторијских тестова
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Укупна количина Издање / трансфер {0} у Индустријска Захтев {1} \ не може бити већа од тражене количине {2} за тачка {3}
@@ -1616,7 +1620,6 @@
DocType: Warehouse,Warehouse Contact Info,Магацин Контакт Инфо
DocType: Payment Entry,Write Off Difference Amount,Отпис Дифференце Износ
DocType: Volunteer,Volunteer Name,Име волонтера
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Молимо вас да подесите систем именовања инструктора у образовању> Образовне поставке
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: е запослених није пронађен, стога емаил није послата"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правило о испоруци не важи за земљу {0}
DocType: Item,Foreign Trade Details,Спољнотрговинска Детаљи
@@ -1628,7 +1631,7 @@
DocType: Student Group Student,Group Roll Number,"Група Ролл, број"
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Збир свих радних тегова треба да буде 1. Подесите тежине свих задатака пројекта у складу са тим
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капитальные оборудование
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
@@ -1653,7 +1656,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Дете складиште постоји за тог складишта. Ви не можете да избришете ову складиште.
DocType: Item,Website Item Groups,Сајт Итем Групе
DocType: Purchase Invoice,Total (Company Currency),Укупно (Фирма валута)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Серийный номер {0} вошли более одного раза
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Серийный номер {0} вошли более одного раза
DocType: Journal Entry,Journal Entry,Јоурнал Ентри
DocType: Expense Claim Advance,Unclaimed amount,Непокривени износ
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ставки у току
@@ -1750,7 +1753,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација дневник.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Захтев за понуду је онемогућен да приступа из портала, за више подешавања провере портала."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Добављач Сцорецард Сцоринг Вариабле
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Куповина Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Куповина Износ
DocType: Sales Invoice,Shipping Address Name,Достава Адреса Име
DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Дошло је до грешака приликом креирања курса
@@ -2015,7 +2018,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ово је засновано на трупаца против овог возила. Погледајте рок доле за детаље
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
DocType: Customer,Default Price List,Уобичајено Ценовник
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Кретање средство запис {0} је направљена
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Кретање средство запис {0} је направљена
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете брисати Фискална година {0}. Фискална {0} Година је постављен као подразумевани у глобалним поставкама
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Клијент са истим именом већ постоји
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ово ће доставити накнаде за плате и креирати обрачунски дневник. Да ли желите да наставите?
@@ -2029,6 +2032,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Цене
DocType: Quotation,Term Details,Орочена Детаљи
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не могу уписати више од {0} студенте за ову студентској групи.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Укупно (без пореза)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,olovo Точка
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,olovo Точка
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора бити већи од 0
@@ -2049,7 +2053,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Унлинк плаћања о отказивању рачуна
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Тренутни читање Пробег ушао треба да буде већа од почетне километраже возила {0}
DocType: Restaurant Reservation,No Show,Но Схов
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Поставите називе серије за {0} преко Сетуп> Сеттингс> Сериес Наминг
DocType: Shipping Rule Country,Shipping Rule Country,Достава Правило Земља
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Остави и Присуство
DocType: Maintenance Visit,Partially Completed,Дјелимично Завршено
@@ -2141,7 +2144,7 @@
DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
DocType: Grant Application,Assessment Mark (Out of 10),Ознака оцене (од 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Гуардиан2 Мобилни број
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,основной
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,основной
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Варијанта
DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
DocType: Employee Attendance Tool,Employees HTML,zaposleni ХТМЛ
@@ -2191,7 +2194,7 @@
DocType: Course,Course Abbreviation,Наравно држава
DocType: Student Leave Application,Student Leave Application,Студент одсуство примене
DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Запослени {0} на пола дана на {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Укупно радно време не би требало да буде већи од мак радних сати {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
@@ -2378,9 +2381,10 @@
DocType: Task,Actual End Date (via Time Sheet),Стварна Датум завршетка (преко Тиме Схеет)
DocType: Soil Texture,Soil Type,Врста земљишта
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Нова порука
,Quotation Trends,Котировочные тенденции
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
DocType: Shipping Rule,Shipping Amount,Достава Износ
DocType: Supplier Scorecard Period,Period Score,Оцена периода
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Додај Купци
@@ -2391,7 +2395,7 @@
,Vehicle Expenses,Трошкови возила
DocType: Serial No,Invoice Details,Детаљи рачуна
DocType: Grant Application,Show on Website,Схов он Вебсите
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Почиње
DocType: Hub Category,Hub Category,Главна категорија
DocType: Purchase Invoice,SEZ,СЕЗ
@@ -2423,7 +2427,7 @@
DocType: Patient,B Positive,Б Позитивно
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Аббр не може бити празно или простор
DocType: Patient Medical Record,Patient Medical Record,Пацијент медицински запис
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Група не-Гроуп
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,спортски
@@ -2474,6 +2478,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Не можете поставити примљени РФК на Но Куоте
DocType: Quotation,QTN-,КТН-
DocType: Salary Slip,Total Deduction,Укупно Одбитак
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Изаберите налог за штампање у валути рачуна
,Production Analytics,Продуцтион analitika
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Ово се заснива на трансакцијама против овог пацијента. Погледајте детаље испод
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Трошкови ажурирано
@@ -2529,7 +2534,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изаберите фирму ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Оставите празно ако се сматра за сва одељења
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
DocType: Payroll Entry,Fortnightly,четрнаестодневни
DocType: Currency Exchange,From Currency,Од валутног
DocType: Vital Signs,Weight (In Kilogram),Тежина (у килограму)
@@ -2607,7 +2612,7 @@
DocType: Student,Guardians,старатељи
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Цене неће бити приказан ако Ценовник није подешен
DocType: Stock Entry,Total Incoming Value,Укупна вредност Долазни
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Дебитна Да је потребно
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Дебитна Да је потребно
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Тимесхеетс лакше пратили времена, трошкова и рачуна за АКТИВНОСТИ урадио ваш тим"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Куповина Ценовник
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони варијабли индекса добављача.
@@ -2710,7 +2715,7 @@
DocType: Company,For Reference Only.,За справки.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Лекар {0} није доступан на {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Избор серијски бр
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неважећи {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Неважећи {0}: {1}
,GSTR-1,ГСТР-1
DocType: Purchase Invoice,PINV-RET-,ПИНВ-РЕТ-
DocType: Fee Validity,Reference Inv,Референце Инв
@@ -2747,8 +2752,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
DocType: Water Analysis,Origin,Порекло
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овај документ је преко границе од {0} {1} за ставку {4}. Правиш други {3} против исте {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Молимо поставите понављају након снимања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Избор промена износ рачуна
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Молимо поставите понављају након снимања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Избор промена износ рачуна
DocType: Purchase Invoice,Price List Currency,Ценовник валута
DocType: Naming Series,User must always select,Корисник мора увек изабрати
DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
@@ -2804,7 +2809,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Упозорити на нова наруџбина
DocType: Quality Inspection Reading,Reading 9,Читање 9
DocType: Supplier,Is Frozen,Је замрзнут
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,складиште група чвор није дозвољено да изаберете за трансакције
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,складиште група чвор није дозвољено да изаберете за трансакције
DocType: Buying Settings,Buying Settings,Куповина Сеттингс
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,БОМ Но за готових добре тачке
DocType: Upload Attendance,Attendance To Date,Присуство Дате
@@ -2818,6 +2823,7 @@
DocType: Grant Application,Organization,организација
DocType: BOM Update Tool,BOM Update Tool,Алат за ажурирање БОМ-а
DocType: SG Creation Tool Course,Student Group Name,Студент Име групе
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Покажите експлодиран поглед
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Креирање накнада
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
DocType: Room,Room Number,Број собе
@@ -2828,7 +2834,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Направите порезну шему
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Корисник форум
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Сировине не може бити празан.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
DocType: Lab Test Sample,Lab Test Sample,Узорак за лабораторијско испитивање
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Брзо Јоурнал Ентри
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
@@ -2899,7 +2905,7 @@
DocType: Membership,USD,Амерички долар
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Маке фактуру
DocType: Selling Settings,Auto close Opportunity after 15 days,Ауто затварање Могућност након 15 дана
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Наруџбе за куповину нису дозвољене за {0} због стања картице која се налази на {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Наруџбе за куповину нису дозвољене за {0} због стања картице која се налази на {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,До краја године
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Куот / Олово%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Куот / Олово%
@@ -3012,7 +3018,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Изнад
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: Јоурнал Ентри {1} нема налог {2} или већ упарен против другог ваучера
DocType: Supplier Scorecard Criteria,Criteria Weight,Критериј Тежина
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Супплиер> Тип добављача
DocType: Buying Settings,Default Buying Price List,Уобичајено Куповина Ценовник
DocType: Payroll Entry,Salary Slip Based on Timesheet,Плата Слип основу ТимеСхеет
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Стопа куповине
@@ -3102,7 +3107,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Стаза води од индустрије Типе .
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Идите у Леттерхеадс
DocType: Item Supplier,Item Supplier,Ставка Снабдевач
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Све адресе.
DocType: Company,Stock Settings,Стоцк Подешавања
@@ -3292,6 +3297,7 @@
DocType: Company,Default Inventory Account,Уобичајено Инвентар налог
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршен количина мора бити већа од нуле.
DocType: Antibiotic,Antibiotic Name,Антибиотички назив
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Шифра производа> Група производа> Бренд
DocType: Purchase Invoice,Apply Additional Discount On,Нанесите додатни попуст Он
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Изаберите Тип ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Веза са свим земљишним јединицама у којима расту усеви
@@ -3487,6 +3493,7 @@
DocType: Supplier,Credit Limit,Кредитни лимит
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Авг. Продајна ценовна листа
DocType: Production Plan Sales Order,Salse Order Date,Салсе Датум наруџбе
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Супплиер> Тип добављача
DocType: Salary Component,Salary Component,плата Компонента
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Плаћања прилога {0} аре ун-линкед
DocType: GL Entry,Voucher No,Ваучер Бр.
@@ -3496,7 +3503,7 @@
DocType: Leave Allocation,Leave Allocation,Оставите Алокација
DocType: Payment Request,Recipient Message And Payment Details,Прималац поруке и плаћања Детаљи
DocType: Training Event,Trainer Email,тренер-маил
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Запросы Материал {0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Запросы Материал {0} создан
DocType: Restaurant Reservation,No of People,Број људи
DocType: Production Planning Tool,Include sub-contracted raw materials,Укључују подуговорене сировина
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Предложак термина или уговору.
@@ -3562,7 +3569,7 @@
DocType: Production Planning Tool,Create Material Requests,Креирате захтеве Материјал
DocType: Employee Education,School/University,Школа / Универзитет
DocType: Payment Request,Reference Details,Референтна Детаљи
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очекује Вредност Након користан живот мора бити мања од бруто набавне Износ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Очекује Вредност Након користан живот мора бити мања од бруто набавне Износ
DocType: Sales Invoice Item,Available Qty at Warehouse,Доступно Кол у складишту
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Изграђена Износ
DocType: Asset,Double Declining Balance,Доубле дегресивне
@@ -3574,7 +3581,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Гет Упдатес
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: налог {2} не припада компанији {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Изаберите најмање једну вредност из сваког атрибута.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Оставите Манагемент
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Группа по Счет
DocType: Sales Order,Fully Delivered,Потпуно Испоручено
@@ -3585,14 +3592,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Исплаћено износ не може бити већи од кредита Износ {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Иди на програме
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Ред {0} # Расподијељена количина {1} не може бити већа од незадовољне количине {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Молимо да подесите серију бројева за присуство преко Сетуп> Сериес Нумберинг
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Производња Поруџбина није направљена
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Не могу да променим статус студента {0} је повезан са применом студентског {1}
DocType: Asset,Fully Depreciated,потпуно отписаних
,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Приметан Присуство ХТМЛ
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Цитати су предлози, понуде које сте послали да својим клијентима"
DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
@@ -3677,7 +3683,7 @@
DocType: Stock Settings,Item Naming By,Шифра назив под
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
DocType: Production Order,Material Transferred for Manufacturing,Материјал пребачени на Мануфацтуринг
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Рачун {0} не постоји
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Рачун {0} не постоји
DocType: Project,Project Type,Тип пројекта
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Цхилд Таск постоји за овај задатак. Не можете да избришете овај задатак.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Либо целевой Количество или целевое количество является обязательным.
@@ -3780,11 +3786,11 @@
DocType: Company,Asset Depreciation Cost Center,Средство Амортизација Трошкови центар
DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
DocType: Sales Invoice Item,Delivered Qty,Испоручено Кол
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Тотал Екцл. Порез
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ако је означено, сва деца сваке производне јединице треба да буде укључен у материјалу захтевима."
DocType: Assessment Plan,Assessment Plan,Процена план
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Клијент {0} је креиран.
DocType: Stock Settings,Limit Percent,лимит Проценат
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Молимо вас да подесите систем именовања инструктора у образовању> Образовне поставке
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Тренутно нема доступних трговина на залихама
,Payment Period Based On Invoice Date,Период отплате Басед Он Фактура Дате
DocType: Sample Collection,No. of print,Број отиска
@@ -3800,12 +3806,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Дужници ({0})
DocType: Pricing Rule,Margin,Маржа
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нове Купци
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Бруто добит%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Бруто добит%
DocType: Appraisal Goal,Weightage (%),Веигхтаге (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Промените ПОС профил
DocType: Bank Reconciliation Detail,Clearance Date,Чишћење Датум
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Извештај процене
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Бруто Куповина Износ је обавезан
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Бруто Куповина Износ је обавезан
DocType: Lead,Address Desc,Адреса Десц
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Парти је обавезно
DocType: Journal Entry,JV-,ЈВ-
@@ -3837,7 +3843,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Стално име
DocType: Stock Entry,Customer or Supplier Details,Купца или добављача Детаљи
DocType: Employee Loan Application,Required by Date,Рекуиред би Дате
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Затварање биланса (Др - Цр)
DocType: Lead,Lead Owner,Олово Власник
DocType: Bin,Requested Quantity,Тражени Количина
DocType: Patient,Marital Status,Брачни статус
@@ -3851,7 +3856,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Вишеструке варијанте
DocType: Sales Invoice,Against Income Account,Против приход
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Испоручено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Ставка {0}: Ж ком {1} не може бити мањи од Минимална количина за поручивање {2} (дефинисан у тачки).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Молимо пријавите се као други корисник.
DocType: Territory,Territory Targets,Територија Мете
@@ -3952,7 +3957,7 @@
DocType: Serial No,Out of AMC,Од АМЦ
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Маке одржавање Посетите
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
DocType: Company,Default Cash Account,Уобичајено готовински рачун
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ово је засновано на похађања овог Студент
@@ -4104,7 +4109,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Нема запослених по наведеним критеријумима
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
DocType: Restaurant,Default Customer,Дефаулт Цустомер
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Молимо да подесите систем именовања запослених у људским ресурсима> ХР Сеттингс
DocType: Assessment Plan,Supervisor Name,Супервизор Име
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Не потврдите да ли је заказан термин за исти дан
DocType: Program Enrollment Course,Program Enrollment Course,Програм Упис предмета
@@ -4227,7 +4231,7 @@
DocType: BOM,Website Description,Вебсајт Опис
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нето промена у капиталу
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Најновије
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Е-маил адреса мора бити јединствена, већ постоји за {0}"
DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Признаница
@@ -4244,7 +4248,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај о токовима готовине
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ кредита не може бити већи од максимални износ кредита {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Молимо изаберите пренети ако такође желите да укључите претходну фискалну годину је биланс оставља на ову фискалну годину
DocType: GL Entry,Against Voucher Type,Против Вауцер Типе
DocType: Physician,Phone (R),Телефон (Р)
@@ -4256,7 +4260,7 @@
DocType: Patient,B Negative,Б Негативе
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Статус одржавања мора бити поништен или завршен за достављање
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Серијски бројеви у низу {0} не поклапа са Деливери Ноте
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Серијски бројеви у низу {0} не поклапа са Деливери Ноте
DocType: Student,Guardian Details,гуардиан Детаљи
DocType: C-Form,C-Form,Ц-Форм
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк Присуство за више радника
@@ -4298,7 +4302,7 @@
DocType: Stock Entry Detail,Basic Amount,Основни Износ
DocType: Training Event,Exam,испит
DocType: Complaint,Complaint,Жалба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
DocType: Leave Allocation,Unused leaves,Неискоришћени листови
DocType: Patient,Alcohol Past Use,Употреба алкохола у прошлости
DocType: Fertilizer Content,Fertilizer Content,Садржај ђубрива
@@ -4427,6 +4431,7 @@
DocType: Salary Detail,Formula,формула
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Сериал #
DocType: Lab Test Template,Lab Test Template,Лаб тест шаблон
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Рачун продаје
DocType: Purchase Invoice Item,Total Weight,Укупна маса
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комиссия по продажам
DocType: Offer Letter Term,Value / Description,Вредност / Опис
@@ -4585,7 +4590,7 @@
DocType: Customer,From Lead,Од Леад
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поруџбине пуштен за производњу.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изаберите Фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
DocType: Program Enrollment Tool,Enroll Students,упис студената
DocType: Lab Test,Approved Date,Одобрени датум
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продаја
@@ -4662,7 +4667,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Производња артикла
,Employee Information,Запослени Информације
DocType: Stock Entry Detail,Additional Cost,Додатни трошак
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Направи понуду добављача
DocType: Quality Inspection,Incoming,Долазни
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Основани порезни предлошци за продају и куповину су створени.
@@ -4679,7 +4684,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Примечание: {0}
,Delivery Note Trends,Достава Напомена трендови
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Овонедељном Преглед
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,На залихама Количина
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,На залихама Количина
DocType: Delivery Trip,Calculate Estimated Arrival Times,Израчунајте процењене временске прилике
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Рачун: {0} може да се ажурира само преко Стоцк промету
DocType: Student Group Creation Tool,Get Courses,Гет Курсеви
@@ -4695,7 +4700,7 @@
DocType: Material Request,% Ordered,% Од А до Ж
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За Студент Гроуп курс заснован, Курс ће бити потврђена за сваког студента из уписаних курсева у програм Упис."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,рад плаћен на акорд
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Про. Куповни
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Про. Куповни
DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
DocType: Employee,History In Company,Историја У друштву
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Нова порука од {пошиљаоца}
@@ -4743,7 +4748,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута у БОМ # {1} треба да буде једнака изабране валуте {2}
DocType: Journal Entry Account,Exchange Rate,Курс
DocType: Patient,Additional information regarding the patient,Додатне информације о пацијенту
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
DocType: Homepage,Tag Line,таг линија
DocType: Fee Component,Fee Component,naknada Компонента
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Управљање возним парком
@@ -4956,7 +4961,7 @@
DocType: Employee Education,Employee Education,Запослени Образовање
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Дупликат ставка група наћи у табели тачка групе
DocType: Land Unit,Parent Land Unit,Родитељска јединица
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
DocType: Fertilizer,Fertilizer Name,Име ђубрива
DocType: Salary Slip,Net Pay,Нето плата
DocType: Account,Account,рачун
@@ -5035,7 +5040,7 @@
DocType: Item Customer Detail,Ref Code,Реф Код
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Корисничка група је потребна у ПОС профилу
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Запослених евиденција.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Молимо поставите Нект амортизације од
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Молимо поставите Нект амортизације од
DocType: HR Settings,Payroll Settings,Платне Подешавања
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Матцх нису повезане фактурама и уплатама.
DocType: POS Settings,POS Settings,ПОС Сеттингс
@@ -5203,7 +5208,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Подсетник за рођендан за {0}
DocType: Asset Maintenance Task,Last Completion Date,Последњи датум завршетка
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дана Од Последња Наручи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
DocType: Buying Settings,Naming Series,Именовање Сериес
DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Осигурање Датум почетка треба да буде мања од осигурања Енд дате
@@ -5333,6 +5338,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Гет плаћања уносе
DocType: Quotation Item,Against Docname,Против Доцнаме
DocType: SMS Center,All Employee (Active),Све Запослени (активна)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Корисник> Корисничка група> Територија
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Погледај Сада
DocType: BOM,Raw Material Cost,Сировина Трошак
DocType: Item Reorder,Re-Order Level,Поново би Левел
@@ -5432,7 +5438,6 @@
DocType: Room,Seating Capacity,Број седишта
DocType: Issue,ISS-,ИСС-
DocType: Lab Test Groups,Lab Test Groups,Лабораторијске групе
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Корисник> Корисничка група> Територија
DocType: Project,Total Expense Claim (via Expense Claims),Укупни расходи Цлаим (преко Расходи потраживања)
DocType: GST Settings,GST Summary,ПДВ Преглед
DocType: Assessment Result,Total Score,Крајњи резултат
@@ -5446,7 +5451,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Следећи планови курса су створени
DocType: Journal Entry,Total Debit,Укупно задуживање
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Уобичајено готове робе Складиште
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Продаја Особа
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продаја Особа
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Буџет и трошкова центар
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Вишеструки начин плаћања није дозвољен
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,за
@@ -5621,7 +5626,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Размислите пореза или оптужба за
DocType: Driver,Driving License Category,Категорија возачке дозволе
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Стварна ком је обавезна
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} тренутно има {1} Сцорецард става, а наруџбине за овај добављач треба издати опрезно."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} тренутно има {1} Сцорецард става, а наруџбине за овај добављач треба издати опрезно."
DocType: Asset Maintenance Team,Asset Maintenance Team,Тим за одржавање имовине
DocType: Employee Loan,Loan Type,Тип кредита
DocType: Scheduling Tool,Scheduling Tool,Заказивање Алат
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index 0b5ae06..02706d1 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sortera efter pris
,Delay Days,Fördröjningsdagar
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjänsten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Faktura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Gör lagringslagret
DocType: Purchase Invoice Item,Item Weight Details,Produkt Vikt detaljer
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referens: {0}, Artikelnummer: {1} och Kund: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Öppning för ett jobb.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM är inte specificerat för underleverantörsobjekt {0} i rad {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM är inte specificerat för underleverantörsobjekt {0} i rad {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultat skickat
DocType: Item Attribute,Increment,Inkrement
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Tidsrymd
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Ej tillåtet för {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Få objekt från
DocType: Price List,Price Not UOM Dependant,Pris inte UOM beroende
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkten {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Inga föremål listade
DocType: Asset Repair,Error Description,Felbeskrivning
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Matvaror
DocType: Quality Inspection Reading,Reading 1,Avläsning 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pensionsfonder
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nästa avskrivning Datum kan inte vara före Inköpsdatum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Nästa avskrivning Datum kan inte vara före Inköpsdatum
DocType: Crop,Perennial,Perenn
DocType: Consultation,Consultation Date,Samrådsdagen
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Produktlista och upptäckt för ERPNext-användare
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",t.ex. "Primary School" eller "universitet"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,lagerrapporter
DocType: Warehouse,Warehouse Detail,Lagerdetalj
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termen Slutdatum kan inte vara senare än slutet av året Datum för läsåret som termen är kopplad (läsåret {}). Rätta datum och försök igen.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Är Fast Asset" kan inte vara okontrollerat, som Asset rekord existerar mot objektet"
DocType: Delivery Trip,Departure Time,Avgångstid
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Hämta Specifikation Detaljer
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Mallar av leverantörsställningar.
DocType: Lead,Interested,Intresserad
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Öppning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Öppning
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Från {0} till {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Misslyckades med att konfigurera skatter
DocType: Item,Copy From Item Group,Kopiera från artikelgrupp
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Avgångar per år
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rad {0}: Kontrollera ""Är i förskott"" mot konto {1} om det är ett förskotts post."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
DocType: Email Digest,Profit & Loss,Vinst förlust
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Liter
DocType: Task,Total Costing Amount (via Time Sheet),Totalt Costing Belopp (via Tidrapportering)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Detta baseras på transaktioner mot detta företag. Se tidslinjen nedan för detaljer
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Meddela via e-post om skapandet av automatisk Material Begäran
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistent
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Flera valutor
DocType: Opening Invoice Creation Tool,Invoice Type,Faktura Typ
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Följesedel
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Änka
DocType: Request for Quotation,Request for Quotation,Offertförfrågan
DocType: Healthcare Settings,Require Lab Test Approval,Kräv laboratorietest godkännande
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Artikelnummer> Varugrupp> Varumärke
DocType: Salary Slip Timesheet,Working Hours,Arbetstimmar
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Totalt Utestående
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ändra start / aktuella sekvensnumret av en befintlig serie.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ange kostnadsställe
DocType: Drug Prescription,Dosage,Dosering
DocType: Journal Entry Account,Sales Order,Kundorder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Avg. Säljkurs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Säljkurs
DocType: Assessment Plan,Examiner Name,examiner Namn
DocType: Lab Test Template,No Result,Inget resultat
DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet och betyg
@@ -610,6 +610,7 @@
DocType: Payroll Entry,Select Payroll Period,Välj Payroll Period
DocType: Purchase Invoice,Unpaid,Obetald
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reserverade till salu
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vänligen uppsättning Anställningsnamnssystem i mänsklig resurs> HR-inställningar
DocType: Packing Slip,From Package No.,Från Paket No.
DocType: Item Attribute,To Range,Range
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Värdepapper och inlåning
@@ -634,11 +635,11 @@
DocType: Training Event,Workshop,Verkstad
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varna inköpsorder
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Tillräckligt med delar för att bygga
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Tillräckligt med delar för att bygga
DocType: POS Profile User,POS Profile User,POS Profil Användare
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Direkt inkomst
DocType: Patient Appointment,Date TIme,Datum Tid
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan inte filtrera baserat på konto, om grupperad efter konto"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Kan inte filtrera baserat på konto, om grupperad efter konto"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Handläggare
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Inrätta företag och skatter
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Var god välj Kurs
@@ -649,7 +650,7 @@
DocType: Stock Entry Detail,Difference Account,Differenskonto
DocType: Purchase Invoice,Supplier GSTIN,Leverantör GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Det går inte att stänga uppgiften då dess huvuduppgift {0} inte är stängd.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
DocType: Production Order,Additional Operating Cost,Ytterligare driftkostnader
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetika
@@ -819,7 +820,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relation med Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Chef
DocType: Payment Entry,Payment From / To,Betalning från / till
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nya kreditgränsen är mindre än nuvarande utestående beloppet för kunden. Kreditgräns måste vara minst {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nya kreditgränsen är mindre än nuvarande utestående beloppet för kunden. Kreditgräns måste vara minst {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vänligen ange konto i lager {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Baserad på"" och ""Gruppera efter"" kan inte vara samma"
DocType: Sales Person,Sales Person Targets,Försäljnings Person Mål
@@ -830,7 +831,7 @@
DocType: Student Batch Name,Batch Name,batch Namn
DocType: Fee Validity,Max number of visit,Max antal besök
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Tidrapport skapat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Skriva in
DocType: GST Settings,GST Settings,GST-inställningar
DocType: Selling Settings,Customer Naming By,Kundnamn på
@@ -957,7 +958,7 @@
DocType: Budget,Budget Against,budget mot
DocType: Employee,Cell Number,Mobilnummer
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Det finns ingen anställd för de angivna kriterierna. Kontrollera att löneavgifter inte redan har skapats.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Automaterial Framställningar Generated
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Automaterial Framställningar Generated
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Förlorade
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reserverat för tillverkning
@@ -965,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energi
DocType: Opportunity,Opportunity From,Möjlighet Från
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månadslön uttalande.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rad {0}: {1} Serienummer krävs för punkt {2}. Du har angett {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rad {0}: {1} Serienummer krävs för punkt {2}. Du har angett {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Välj en tabell
DocType: BOM,Website Specifications,Webbplats Specifikationer
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} är en ogiltig e-postadress i "Mottagare"
@@ -1034,7 +1035,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Begärt citat
DocType: Vital Signs,Heart Rate / Pulse,Hjärtfrekvens / puls
DocType: Company,Default Bank Account,Standard bankkonto
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","För att filtrera baserat på partiet, väljer Party Typ först"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","För att filtrera baserat på partiet, väljer Party Typ först"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Uppdatera Stock"" kan inte kontrolleras eftersom produkter som inte levereras via {0}"
DocType: Vehicle,Acquisition Date,förvärvs~~POS=TRUNC
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1058,7 +1059,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Ladda upp ditt brevhuvud (Håll det webbvänligt som 900px med 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: konto {2} inte kan vara en grupp
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {doknamn} existerar inte i ovanstående "{doctype} tabellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Tidrapport {0} är redan slutförts eller avbrutits
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Tidrapport {0} är redan slutförts eller avbrutits
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Inga uppgifter
DocType: Item Variant Settings,Copy Fields to Variant,Kopiera fält till variant
DocType: Asset,Opening Accumulated Depreciation,Ingående ackumulerade avskrivningar
@@ -1170,9 +1171,10 @@
DocType: Production Order,Plan material for sub-assemblies,Planera material för underenheter
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Säljpartners och Territory
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} måste vara aktiv
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Stängning (Öppning + Totalt)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Stängning (Öppning + Totalt)
DocType: Journal Entry,Depreciation Entry,avskrivningar Entry
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Välj dokumenttyp först
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Skriv ut i kontovaluta
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material {0} innan du avbryter detta Underhållsbesök
DocType: Crop Cycle,ISO 8016 standard,ISO 8016-standarden
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Löpnummer {0} inte tillhör punkt {1}
@@ -1198,7 +1200,7 @@
DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
DocType: Fee Structure,Components,Komponenter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
DocType: Quality Inspection Reading,Reading 6,Avläsning 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1250,6 +1252,7 @@
,Company Name,Företagsnamn
DocType: SMS Center,Total Message(s),Totalt Meddelande (er)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ange Naming Series för {0} via Setup> Settings> Naming Series
DocType: Purchase Invoice,Additional Discount Percentage,Ytterligare rabatt Procent
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visa en lista över alla hjälp videos
DocType: Agriculture Analysis Criteria,Soil Texture,Marktextur
@@ -1278,7 +1281,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Website Post
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
DocType: Timesheet Detail,Bill,Räkningen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Nästa Avskrivningar Datum anges som tidigare datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Nästa Avskrivningar Datum anges som tidigare datum
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Vit
DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antal inte tillgängligt för {4} i lager {1} vid utstationering tidpunkt för angivelsen ({2} {3})
@@ -1295,7 +1298,7 @@
DocType: Lead,Next Contact Date,Nästa Kontakt Datum
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Öppning Antal
DocType: Healthcare Settings,Appointment Reminder,Avtal påminnelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Ange konto för förändring Belopp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Ange konto för förändring Belopp
DocType: Program Enrollment Tool Student,Student Batch Name,Elev batchnamn
DocType: Consultation,Doctor,Läkare
DocType: Holiday List,Holiday List Name,Semester Listnamn
@@ -1311,6 +1314,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ledighet Tilldelningsverktyget
DocType: Item,Hub Category to Publish,Hub kategori att publicera
DocType: Leave Block List,Leave Block List Dates,Lämna Block Lista Datum
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Vänligen uppsätt nummerserien för deltagande via Inställningar> Numreringsserie
DocType: Sales Invoice,Billing Address GSTIN,Faktureringsadress GSTIN
DocType: Assessment Plan,Evaluate,Utvärdera
DocType: Workstation,Net Hour Rate,Netto timmekostnad
@@ -1345,7 +1349,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-retro
DocType: POS Profile,Sales Invoice Payment,Fakturan Betalning
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserverat lager i kundorder / färdigvarulagret
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Försäljningsbelopp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Försäljningsbelopp
DocType: Repayment Schedule,Interest Amount,räntebelopp
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du har ansvar för utgifterna för denna post. Vänligen Uppdatera ""Status"" och spara"
DocType: Serial No,Creation Document No,Skapande Dokument nr
@@ -1438,7 +1442,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Ingående redovisning Balans
,GST Sales Register,GST Försäljningsregister
DocType: Sales Invoice Advance,Sales Invoice Advance,Försäljning Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Ingenting att begära
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Ingenting att begära
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Välj domäner
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annan budget record '{0}' finns redan mot {1} {2} för räkenskapsåret {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Fält kopieras endast över tiden vid skapandet.
@@ -1448,11 +1452,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Detta kommer att läggas till den punkt koden varianten. Till exempel, om din förkortning är "SM", och försändelsekoden är "T-TRÖJA", posten kod varianten kommer att vara "T-Shirt-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolön (i ord) kommer att vara synliga när du sparar lönebeskedet.
DocType: Purchase Invoice,Is Return,Är Returnerad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Varning
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Varning
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Retur / debetnota
DocType: Price List Country,Price List Country,Prislista Land
DocType: Item,UOMs,UOM
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} giltigt serienummer för punkt {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} giltigt serienummer för punkt {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Produkt kod kan inte ändras för serienummer
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM Omvandlingsfaktor
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Ange Post kod för att få Batch nummer
@@ -1558,7 +1562,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Kundorder {0} är inte giltig
DocType: Supplier Scorecard,Warn for new Request for Quotations,Varna för ny Offertförfrågan
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Inköpsorder hjälpa dig att planera och följa upp dina inköp
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Den totala emissions / Transfer mängd {0} i Material Begäran {1} \ inte kan vara större än efterfrågat antal {2} till punkt {3}
@@ -1596,7 +1600,6 @@
DocType: Warehouse,Warehouse Contact Info,Lagrets kontaktinfo
DocType: Payment Entry,Write Off Difference Amount,Skriv differensen Belopp
DocType: Volunteer,Volunteer Name,Frivilligt namn
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vänligen installera Instruktör Naming System i Utbildning> Utbildningsinställningar
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Anställd e-post hittades inte, därför e-post skickas inte"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Fraktregeln gäller inte för land {0}
DocType: Item,Foreign Trade Details,Foreign Trade Detaljer
@@ -1608,7 +1611,7 @@
DocType: Student Group Student,Group Roll Number,Grupprullnummer
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summan av alla uppgift vikter bör vara 1. Justera vikter av alla projektuppgifter i enlighet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Produkt {0} måste vara ett underleverantörs produkt
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapital Utrustning
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prissättning regel baseras först på ""Lägg till på' fälten, som kan vara artikel, artikelgrupp eller Märke."
@@ -1633,7 +1636,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barnlager existerar för det här lagret. Du kan inte ta bort det här lagret.
DocType: Item,Website Item Groups,Webbplats artikelgrupper
DocType: Purchase Invoice,Total (Company Currency),Totalt (Company valuta)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Serienummer {0} in mer än en gång
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Serienummer {0} in mer än en gång
DocType: Journal Entry,Journal Entry,Journalanteckning
DocType: Expense Claim Advance,Unclaimed amount,Oavkrävat belopp
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} objekt pågår
@@ -1730,7 +1733,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationslog.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Offertförfrågan är inaktiverad att komma åt från portalen, för mer kontroll portalens inställningar."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Leverantör Scorecard Scorevariabel
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Köpa mängd
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Köpa mängd
DocType: Sales Invoice,Shipping Address Name,Leveransadress Namn
DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Det fanns fel som skapade kursschema
@@ -1994,7 +1997,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Detta grundar sig på stockar mot detta fordon. Se tidslinje nedan för mer information
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
DocType: Customer,Default Price List,Standard Prislista
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan inte ta bort Räkenskapsårets {0}. Räkenskapsårets {0} är satt som standard i Globala inställningar
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,En kund med samma namn finns redan
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Detta kommer att skicka löneglister och skapa periodiseringsjournalen. Vill du fortsätta?
@@ -2008,6 +2011,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Prissättning
DocType: Quotation,Term Details,Term Detaljer
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Det går inte att registrera mer än {0} studenter för denna elevgrupp.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Totalt (utan skatt)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lödräkning
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Lödräkning
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} måste vara större än 0
@@ -2028,7 +2032,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Bort länken Betalning på Indragning av faktura
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nuvarande vägmätare läsning deltagare bör vara större än initial Vägmätarvärde {0}
DocType: Restaurant Reservation,No Show,Icke infinnande
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ange Naming Series för {0} via Setup> Settings> Naming Series
DocType: Shipping Rule Country,Shipping Rule Country,Frakt Regel Land
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Lämna och närvaro
DocType: Maintenance Visit,Partially Completed,Delvis Färdig
@@ -2121,7 +2124,7 @@
DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
DocType: Grant Application,Assessment Mark (Out of 10),Bedömningsmärke (av 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Huvud
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Huvud
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
DocType: Employee Attendance Tool,Employees HTML,Anställda HTML
@@ -2171,7 +2174,7 @@
DocType: Course,Course Abbreviation,Naturligtvis Förkortning
DocType: Student Leave Application,Student Leave Application,Student Lämna Application
DocType: Item,Will also apply for variants,Kommer också att ansöka om varianter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Anställd {0} på Halvdag på {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Totalt arbetstid bör inte vara större än max arbetstid {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
@@ -2357,9 +2360,10 @@
DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdatum (via Tidrapportering)
DocType: Soil Texture,Soil Type,Marktyp
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Belopp {0} {1} mot {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Nytt meddelande
,Quotation Trends,Offert Trender
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Produktgruppen nämns inte i huvudprodukten för objektet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
DocType: Shipping Rule,Shipping Amount,Fraktbelopp
DocType: Supplier Scorecard Period,Period Score,Periodpoäng
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Lägg till kunder
@@ -2370,7 +2374,7 @@
,Vehicle Expenses,fordons Kostnader
DocType: Serial No,Invoice Details,Faktura detaljer
DocType: Grant Application,Show on Website,Visa på hemsidan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Förväntat värde efter livslängd måste vara större än eller lika med {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Förväntat värde efter livslängd måste vara större än eller lika med {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Börja på
DocType: Hub Category,Hub Category,Navkategori
DocType: Purchase Invoice,SEZ,SEZ
@@ -2402,7 +2406,7 @@
DocType: Patient,B Positive,B Positiv
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rad # {0}: Antal måste vara en, som objektet är en anläggningstillgång. Använd separat rad för flera st."
DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Förkortning kan inte vara tomt
DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grupp till icke-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2453,6 +2457,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Kan inte ställa in en mottagen RFQ till No Quote
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Totalt Avdrag
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Välj ett konto för att skriva ut i kontovaluta
,Production Analytics,produktions~~POS=TRUNC Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Detta baseras på transaktioner mot denna patient. Se tidslinjen nedan för detaljer
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Kostnad Uppdaterad
@@ -2508,7 +2513,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Välj Företaget ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Lämna tomt om det anses vara för alla avdelningar
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Typer av anställning (permanent, kontrakts, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
DocType: Payroll Entry,Fortnightly,Var fjortonde dag
DocType: Currency Exchange,From Currency,Från Valuta
DocType: Vital Signs,Weight (In Kilogram),Vikt (i kilogram)
@@ -2586,7 +2591,7 @@
DocType: Student,Guardians,Guardians
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Priserna kommer inte att visas om prislista inte är inställd
DocType: Stock Entry,Total Incoming Value,Totalt Inkommande Värde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debitering krävs
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debitering krävs
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidrapporter hjälpa till att hålla reda på tid, kostnad och fakturering för aktiviteter som utförts av ditt team"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Inköps Prislista
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Mallar med leverantörsspecifika variabler.
@@ -2689,7 +2694,7 @@
DocType: Company,For Reference Only.,För referens.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Läkare {0} är inte tillgänglig på {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Välj batchnummer
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ogiltigt {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Ogiltigt {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-retro
DocType: Fee Validity,Reference Inv,Referens Inv
@@ -2726,8 +2731,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Ange verksamhet, driftskostnad och ger en unik drift nej till din verksamhet."
DocType: Water Analysis,Origin,Ursprung
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Detta dokument är över gränsen med {0} {1} för posten {4}. Är du göra en annan {3} mot samma {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Ställ återkommande efter att ha sparat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Välj förändringsbelopp konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Ställ återkommande efter att ha sparat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Välj förändringsbelopp konto
DocType: Purchase Invoice,Price List Currency,Prislista Valuta
DocType: Naming Series,User must always select,Användaren måste alltid välja
DocType: Stock Settings,Allow Negative Stock,Tillåt Negativ lager
@@ -2783,7 +2788,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Varning för nya inköpsorder
DocType: Quality Inspection Reading,Reading 9,Avläsning 9
DocType: Supplier,Is Frozen,Är Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Grupp nod lager är inte tillåtet att välja för transaktioner
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Grupp nod lager är inte tillåtet att välja för transaktioner
DocType: Buying Settings,Buying Settings,Köpinställningar
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nr för ett Färdigt objekt
DocType: Upload Attendance,Attendance To Date,Närvaro Till Datum
@@ -2798,6 +2803,7 @@
DocType: Grant Application,Organization,Organisation
DocType: BOM Update Tool,BOM Update Tool,BOM Update Tool
DocType: SG Creation Tool Course,Student Group Name,Student gruppnamn
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Visa exploderad vy
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Skapa avgifter
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Se till att du verkligen vill ta bort alla transaktioner för företag. Dina basdata kommer att förbli som det är. Denna åtgärd kan inte ångras.
DocType: Room,Room Number,Rumsnummer
@@ -2808,7 +2814,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Gör Skattemall
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Användarforum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
DocType: Lab Test Sample,Lab Test Sample,Lab Test Prov
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick Journal Entry
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
@@ -2879,7 +2885,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Skapa Faktura
DocType: Selling Settings,Auto close Opportunity after 15 days,Stäng automatiskt Affärsmöjlighet efter 15 dagar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Inköpsorder är inte tillåtna för {0} på grund av ett scorecard med {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Inköpsorder är inte tillåtna för {0} på grund av ett scorecard med {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,slut År
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
@@ -2972,7 +2978,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Ovan
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rad # {0}: Journal Entry {1} har inte hänsyn {2} eller redan matchas mot en annan kupong
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterier Vikt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Leverantör> Leverantörstyp
DocType: Buying Settings,Default Buying Price List,Standard Inköpslista
DocType: Payroll Entry,Salary Slip Based on Timesheet,Lön Slip Baserat på Tidrapport
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Köpkurs
@@ -3062,7 +3067,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spår leder med Industry Type.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Gå till Letterheads
DocType: Item Supplier,Item Supplier,Produkt Leverantör
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alla adresser.
DocType: Company,Stock Settings,Stock Inställningar
@@ -3240,6 +3245,7 @@
DocType: Company,Default Inventory Account,Standard Inventory Account
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,V {0}: Genomförd Antal måste vara större än noll.
DocType: Antibiotic,Antibiotic Name,Antibiotikumnamn
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Artikelnummer> Varugrupp> Varumärke
DocType: Purchase Invoice,Apply Additional Discount On,Applicera ytterligare rabatt på
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Välj typ ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,En länk till alla markenheter där grödan växer
@@ -3435,6 +3441,7 @@
DocType: Supplier,Credit Limit,Kreditgräns
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Säljes prislista pris
DocType: Production Plan Sales Order,Salse Order Date,Salse Orderdatum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Leverantör> Leverantörstyp
DocType: Salary Component,Salary Component,lönedel
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Betalnings Inlägg {0} är un bundna
DocType: GL Entry,Voucher No,Rabatt nr
@@ -3444,7 +3451,7 @@
DocType: Leave Allocation,Leave Allocation,Ledighet tilldelad
DocType: Payment Request,Recipient Message And Payment Details,Mottagare Meddelande och betalningsuppgifter
DocType: Training Event,Trainer Email,Trainer E
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Material Begäran {0} skapades
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Material Begäran {0} skapades
DocType: Restaurant Reservation,No of People,Antal människor
DocType: Production Planning Tool,Include sub-contracted raw materials,Inkludera underleverantörer råvaror
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mall av termer eller kontrakt.
@@ -3510,7 +3517,7 @@
DocType: Production Planning Tool,Create Material Requests,Skapa Materialförfrågan
DocType: Employee Education,School/University,Skola / Universitet
DocType: Payment Request,Reference Details,Referens Detaljer
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Förväntat värde eller återanvändas måste vara mindre än Gross köpesumman
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Förväntat värde eller återanvändas måste vara mindre än Gross köpesumman
DocType: Sales Invoice Item,Available Qty at Warehouse,Tillgång Antal vid Lager
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturerat antal
DocType: Asset,Double Declining Balance,Dubbel degressiv
@@ -3522,7 +3529,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hämta uppdateringar
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} inte tillhör bolaget {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Välj minst ett värde från var och en av attributen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Lämna ledning
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Grupp per konto
DocType: Sales Order,Fully Delivered,Fullt Levererad
@@ -3533,14 +3540,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Betalats Beloppet får inte vara större än Loan Mängd {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Gå till Program
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Rad {0} # Tilldelad mängd {1} kan inte vara större än oavkrävat belopp {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Vänligen uppsätt nummerserien för deltagande via Inställningar> Numreringsserie
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Produktionsorder inte skapat
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Från datum" måste vara efter "Till datum"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Det går inte att ändra status som studerande {0} är kopplad med student ansökan {1}
DocType: Asset,Fully Depreciated,helt avskriven
,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Markerad Närvaro HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Citat är förslag, bud som du har skickat till dina kunder"
DocType: Sales Order,Customer's Purchase Order,Kundens beställning
@@ -3625,7 +3631,7 @@
DocType: Stock Settings,Item Naming By,Produktnamn Genom
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annan period Utgående anteckning {0} har gjorts efter {1}
DocType: Production Order,Material Transferred for Manufacturing,Material Överfört för tillverkning
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} existerar inte
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Konto {0} existerar inte
DocType: Project,Project Type,Projekt Typ
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Barnuppgift finns för denna uppgift. Du kan inte ta bort denna uppgift.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Antingen mål antal eller målbeloppet är obligatorisk.
@@ -3729,11 +3735,11 @@
DocType: Company,Asset Depreciation Cost Center,Avskrivning kostnadsställe
DocType: Sales Order Item,Sales Order Date,Kundorder Datum
DocType: Sales Invoice Item,Delivered Qty,Levererat Antal
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Totalt exkl. Beskatta
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Om markerad, kommer alla barn i varje produktionspost ingå i materialet begäran."
DocType: Assessment Plan,Assessment Plan,Bedömningsplan
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Kund {0} är skapad.
DocType: Stock Settings,Limit Percent,gräns Procent
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vänligen installera Instruktör Naming System i Utbildning> Utbildningsinställningar
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,För närvarande finns ingen lager i lager
,Payment Period Based On Invoice Date,Betalningstiden Baserad på Fakturadatum
DocType: Sample Collection,No. of print,Antal utskrivningar
@@ -3749,12 +3755,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Gäldenär ({0})
DocType: Pricing Rule,Margin,Marginal
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nya kunder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Bruttovinst%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bruttovinst%
DocType: Appraisal Goal,Weightage (%),Vikt (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Ändra POS-profil
DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Utvärderingsrapport
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttoköpesumma är obligatorisk
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Bruttoköpesumma är obligatorisk
DocType: Lead,Address Desc,Adress fallande
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Party är obligatoriskt
DocType: Journal Entry,JV-,JV-
@@ -3786,7 +3792,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Stående namn
DocType: Stock Entry,Customer or Supplier Details,Kund eller leverantör Detaljer
DocType: Employee Loan Application,Required by Date,Krävs Datum
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Slutsaldo (Dr - Cr)
DocType: Lead,Lead Owner,Prospekt ägaren
DocType: Bin,Requested Quantity,begärda Kvantitet
DocType: Patient,Marital Status,Civilstånd
@@ -3800,7 +3805,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Flera varianter
DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Levererad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Produkt {0}: Beställd st {1} kan inte vara mindre än minimiorder st {2} (definierat i punkt).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månadsdistributions Procent
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Vänligen logga in som en annan användare.
DocType: Territory,Territory Targets,Territorium Mål
@@ -3901,7 +3906,7 @@
DocType: Serial No,Out of AMC,Slut på AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Skapa Servicebesök
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0}
DocType: Company,Default Cash Account,Standard Konto
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Detta grundar sig på närvaron av denna Student
@@ -4053,7 +4058,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Inga anställda för nämnda kriterier
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
DocType: Restaurant,Default Customer,Standardkund
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vänligen uppsättning Anställningsnamnssystem i mänsklig resurs> HR-inställningar
DocType: Assessment Plan,Supervisor Name,Supervisor Namn
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Bekräfta inte om mötet är skapat för samma dag
DocType: Program Enrollment Course,Program Enrollment Course,Program Inskrivningskurs
@@ -4175,7 +4179,7 @@
DocType: BOM,Website Description,Webbplats Beskrivning
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoförändringen i eget kapital
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Nyaste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-postadress måste vara unikt, redan för {0}"
DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Mottagande
@@ -4192,7 +4196,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kassaflödesanalys
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeloppet kan inte överstiga Maximal låne Mängd {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Välj Överföring om du även vill inkludera föregående räkenskapsårs balans till detta räkenskapsår
DocType: GL Entry,Against Voucher Type,Mot Kupongtyp
DocType: Physician,Phone (R),Telefon (R)
@@ -4204,7 +4208,7 @@
DocType: Patient,B Negative,B Negativ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Underhållsstatus måste avbrytas eller slutförts för att skicka in
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Serienumren i rad {0} matchar inte med leveransnotering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Serienumren i rad {0} matchar inte med leveransnotering
DocType: Student,Guardian Details,Guardian Detaljer
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Närvaro för flera anställda
@@ -4246,7 +4250,7 @@
DocType: Stock Entry Detail,Basic Amount,BASBELOPP
DocType: Training Event,Exam,Examen
DocType: Complaint,Complaint,Klagomål
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
DocType: Leave Allocation,Unused leaves,Oanvända blad
DocType: Patient,Alcohol Past Use,Alkohol tidigare användning
DocType: Fertilizer Content,Fertilizer Content,Gödselinnehåll
@@ -4375,6 +4379,7 @@
DocType: Salary Detail,Formula,Formel
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Seriell #
DocType: Lab Test Template,Lab Test Template,Lab Test Template
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Försäljningskonto
DocType: Purchase Invoice Item,Total Weight,Totalvikt
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Försäljningsprovision
DocType: Offer Letter Term,Value / Description,Värde / Beskrivning
@@ -4532,7 +4537,7 @@
DocType: Customer,From Lead,Från Prospekt
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order släppts för produktion.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Välj räkenskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
DocType: Program Enrollment Tool,Enroll Students,registrera studenter
DocType: Lab Test,Approved Date,Godkänd datum
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardförsäljnings
@@ -4609,7 +4614,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produktions artikel
,Employee Information,Anställd Information
DocType: Stock Entry Detail,Additional Cost,Extra kostnad
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",Kan inte filtrera baserat på kupong nr om grupperad efter kupong
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",Kan inte filtrera baserat på kupong nr om grupperad efter kupong
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Skapa Leverantörsoffert
DocType: Quality Inspection,Incoming,Inkommande
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Standardskattmallar för försäljning och inköp skapas.
@@ -4626,7 +4631,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Obs: {0}
,Delivery Note Trends,Följesedel Trender
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Veckans Sammanfattning
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,I lager Antal
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,I lager Antal
DocType: Delivery Trip,Calculate Estimated Arrival Times,Beräkna uppskattade ankomsttider
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan endast uppdateras via aktietransaktioner
DocType: Student Group Creation Tool,Get Courses,få Banor
@@ -4642,7 +4647,7 @@
DocType: Material Request,% Ordered,% Beordrade
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",För kursbaserad studentgrupp kommer kursen att valideras för varje student från de inskrivna kurser i programinsökan.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Ackord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. Köpkurs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Köpkurs
DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
DocType: Employee,History In Company,Historia Företaget
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Nytt meddelande från {avsändare}
@@ -4690,7 +4695,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: Valuta för BOM # {1} bör vara lika med den valda valutan {2}
DocType: Journal Entry Account,Exchange Rate,Växelkurs
DocType: Patient,Additional information regarding the patient,Ytterligare information om patienten
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
DocType: Homepage,Tag Line,Tag Linje
DocType: Fee Component,Fee Component,avgift Komponent
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Fleet Management
@@ -4903,7 +4908,7 @@
DocType: Employee Education,Employee Education,Anställd Utbildning
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Dubblett grupp finns i posten grupptabellen
DocType: Land Unit,Parent Land Unit,Föräldrajordsenhet
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
DocType: Fertilizer,Fertilizer Name,Namn på gödselmedel
DocType: Salary Slip,Net Pay,Nettolön
DocType: Account,Account,Konto
@@ -4982,7 +4987,7 @@
DocType: Item Customer Detail,Ref Code,Referenskod
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Kundgrupp krävs i POS-profil
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Personaldokument.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ställ Nästa Avskrivningar Datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Ställ Nästa Avskrivningar Datum
DocType: HR Settings,Payroll Settings,Sociala Inställningar
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Matcha ej bundna fakturor och betalningar.
DocType: POS Settings,POS Settings,POS-inställningar
@@ -5149,7 +5154,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Påminnelse födelsedag för {0}
DocType: Asset Maintenance Task,Last Completion Date,Sista slutdatum
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar sedan senast Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
DocType: Buying Settings,Naming Series,Namge Serien
DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum bör vara mindre än försäkring Slutdatum
@@ -5279,6 +5284,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Få Betalnings Inlägg
DocType: Quotation Item,Against Docname,Mot doknamn
DocType: SMS Center,All Employee (Active),Personal (aktiv)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kund> Kundgrupp> Territorium
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Visa nu
DocType: BOM,Raw Material Cost,Råvarukostnad
DocType: Item Reorder,Re-Order Level,Återuppta nivå
@@ -5379,7 +5385,6 @@
DocType: Room,Seating Capacity,sittplatser
DocType: Issue,ISS-,ISS
DocType: Lab Test Groups,Lab Test Groups,Lab Test Grupper
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Kund> Kundgrupp> Territorium
DocType: Project,Total Expense Claim (via Expense Claims),Totalkostnadskrav (via räkningar)
DocType: GST Settings,GST Summary,GST Sammanfattning
DocType: Assessment Result,Total Score,Totalpoäng
@@ -5393,7 +5398,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Följande kursplaner skapades
DocType: Journal Entry,Total Debit,Totalt bankkort
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard färdigvarulagret
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Försäljnings person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Försäljnings person
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Budget och kostnadsställe
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Multipla standard betalningssätt är inte tillåtet
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,för
@@ -5569,7 +5574,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Värdera skatt eller avgift för
DocType: Driver,Driving License Category,Körkortskategori
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiska Antal är obligatorisk
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har för närvarande ett {1} leverantörssortkort, och inköpsorder till denna leverantör bör utfärdas med försiktighet."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} har för närvarande ett {1} leverantörssortkort, och inköpsorder till denna leverantör bör utfärdas med försiktighet."
DocType: Asset Maintenance Team,Asset Maintenance Team,Asset Maintenance Team
DocType: Employee Loan,Loan Type,lånetyp
DocType: Scheduling Tool,Scheduling Tool,schemaläggning Tool
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index 26cc1b6..f6c219c 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Panga kwa Bei
,Delay Days,Siku za kuchelewa
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gharama za Huduma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Nambari ya Serial: {0} tayari imeelezea katika Invoice ya Mauzo: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Nambari ya Serial: {0} tayari imeelezea katika Invoice ya Mauzo: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Invoice
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Fanya Uhifadhi Uingiaji wa hisa
DocType: Purchase Invoice Item,Item Weight Details,Kipengee Maelezo ya Uzito
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Rejea: {0}, Msimbo wa Item: {1} na Wateja: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kilo
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Kufungua kwa Kazi.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM haijainishwa kwa kipengee cha kutenganisha {0} katika mfululizo {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM haijainishwa kwa kipengee cha kutenganisha {0} katika mfululizo {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,Matokeo ya {0} yaliyotolewa
DocType: Item Attribute,Increment,Uingizaji
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Hairuhusiwi kwa {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Pata vitu kutoka
DocType: Price List,Price Not UOM Dependant,Bei Si UOM Inategemea
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Hifadhi haiwezi kurekebishwa dhidi ya Kumbuka Utoaji {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Hifadhi haiwezi kurekebishwa dhidi ya Kumbuka Utoaji {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Bidhaa {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Hakuna vitu vilivyoorodheshwa
DocType: Asset Repair,Error Description,Maelezo ya Hitilafu
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Kula
DocType: Quality Inspection Reading,Reading 1,Kusoma 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Mfuko wa Pensheni
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Tarehe ya Uzito ya pili haiwezi kuwa kabla ya Tarehe ya Ununuzi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Tarehe ya Uzito ya pili haiwezi kuwa kabla ya Tarehe ya Ununuzi
DocType: Crop,Perennial,Kudumu
DocType: Consultation,Consultation Date,Tarehe ya Ushauri
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Orodha ya bidhaa na ugunduzi kwa watumiaji wa ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",mfano "Shule ya Msingi" au "Chuo Kikuu"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Ripoti za hisa
DocType: Warehouse,Warehouse Detail,Maelezo ya Ghala
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kizuizi cha mkopo kimevuka kwa wateja {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kizuizi cha mkopo kimevuka kwa wateja {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Tarehe ya Mwisho wa Mwisho haiwezi kuwa baadaye kuliko Tarehe ya Mwisho wa Mwaka wa Mwaka wa Chuo ambazo neno hilo limeunganishwa (Mwaka wa Chuo {}). Tafadhali tengeneza tarehe na jaribu tena.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Je, Mali isiyohamishika" hawezi kufunguliwa, kama rekodi ya Malipo ipo dhidi ya kipengee"
DocType: Delivery Trip,Departure Time,Wakati wa Kuondoka
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Pata Maelezo ya Ufafanuzi
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Matukio ya kusimama kwa wasambazaji.
DocType: Lead,Interested,Inastahili
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Ufunguzi
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Ufunguzi
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Kutoka {0} hadi {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Imeshindwa kuanzisha kodi
DocType: Item,Copy From Item Group,Nakala Kutoka Kundi la Bidhaa
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Tarehe ya Kuondoa lazima iwe kubwa kuliko Tarehe ya kujiunga
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Majani kwa mwaka
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Tafadhali angalia 'Je, Advance' dhidi ya Akaunti {1} ikiwa hii ni kuingia mapema."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Ghala {0} sio wa kampuni {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Ghala {0} sio wa kampuni {1}
DocType: Email Digest,Profit & Loss,Faida & Kupoteza
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Vitabu
DocType: Task,Total Costing Amount (via Time Sheet),Kiwango cha jumla cha gharama (kupitia Karatasi ya Muda)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Hii inategemea shughuli za Kampuni hii. Tazama kalenda ya chini kwa maelezo zaidi
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Arifa kwa barua pepe juu ya uumbaji wa Nyenzo ya Nyenzo ya Moja kwa moja
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Wanakabiliwa
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Ushauri
DocType: Journal Entry,Multi Currency,Fedha nyingi
DocType: Opening Invoice Creation Tool,Invoice Type,Aina ya ankara
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Kumbuka Utoaji
@@ -528,7 +529,6 @@
DocType: Employee,Widowed,Mjane
DocType: Request for Quotation,Request for Quotation,Ombi la Nukuu
DocType: Healthcare Settings,Require Lab Test Approval,Inahitaji idhini ya Mtihani wa Lab
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Msimbo wa Item> Kikundi cha Bidhaa> Brand
DocType: Salary Slip Timesheet,Working Hours,Saa za kazi
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Jumla ya Kipaumbele
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Badilisha idadi ya mwanzo / ya sasa ya mlolongo wa mfululizo uliopo.
@@ -557,7 +557,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Tafadhali ingiza Kituo cha Gharama
DocType: Drug Prescription,Dosage,Kipimo
DocType: Journal Entry Account,Sales Order,Uagizaji wa Mauzo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Mg. Kiwango cha Mauzo
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Mg. Kiwango cha Mauzo
DocType: Assessment Plan,Examiner Name,Jina la Mchunguzi
DocType: Lab Test Template,No Result,Hakuna Matokeo
DocType: Purchase Invoice Item,Quantity and Rate,Wingi na Kiwango
@@ -605,6 +605,7 @@
DocType: Payroll Entry,Select Payroll Period,Chagua Kipindi cha Mishahara
DocType: Purchase Invoice,Unpaid,Hailipwa
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Imehifadhiwa kwa ajili ya kuuza
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Tafadhali kuanzisha Mfumo wa Jina la Waajiriwa katika Rasilimali za Binadamu> Mipangilio ya HR
DocType: Packing Slip,From Package No.,Kutoka kwa pakiti No.
DocType: Item Attribute,To Range,Kupanga
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Usalama na Deposits
@@ -629,11 +630,11 @@
DocType: Training Event,Workshop,Warsha
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Angalia Amri za Ununuzi
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Andika orodha ya wateja wako wachache. Wanaweza kuwa mashirika au watu binafsi.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Vipande vyenye Kujenga
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Vipande vyenye Kujenga
DocType: POS Profile User,POS Profile User,Mtumiaji wa Programu ya POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Mapato ya moja kwa moja
DocType: Patient Appointment,Date TIme,Tarehe TIme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Haiwezi kuchuja kulingana na Akaunti, ikiwa imewekwa na Akaunti"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Haiwezi kuchuja kulingana na Akaunti, ikiwa imewekwa na Akaunti"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Afisa wa Usimamizi
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Kuanzisha kampuni na kodi
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Tafadhali chagua kozi
@@ -643,7 +644,7 @@
DocType: Stock Entry Detail,Difference Account,Akaunti ya Tofauti
DocType: Purchase Invoice,Supplier GSTIN,GSTIN wa Wasambazaji
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Haiwezi kufunga kazi kama kazi yake ya kutegemea {0} haijafungwa.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Tafadhali ingiza Ghala la Maombi ya Nyenzo ambayo itafufuliwa
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Tafadhali ingiza Ghala la Maombi ya Nyenzo ambayo itafufuliwa
DocType: Production Order,Additional Operating Cost,Gharama za ziada za uendeshaji
DocType: Lab Test Template,Lab Routine,Daima Lab
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Vipodozi
@@ -811,7 +812,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Uhusiano na Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Meneja
DocType: Payment Entry,Payment From / To,Malipo Kutoka / Kwa
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Mpaka mpya wa mkopo ni chini ya kiasi cha sasa cha sasa kwa wateja. Kizuizi cha mkopo kinapaswa kuwa kikubwa {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Mpaka mpya wa mkopo ni chini ya kiasi cha sasa cha sasa kwa wateja. Kizuizi cha mkopo kinapaswa kuwa kikubwa {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Tafadhali weka akaunti katika Warehouse {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Kutoka' na 'Kundi Kwa' haiwezi kuwa sawa
DocType: Sales Person,Sales Person Targets,Malengo ya Mtu wa Mauzo
@@ -822,7 +823,7 @@
DocType: Student Batch Name,Batch Name,Jina la Kundi
DocType: Fee Validity,Max number of visit,Idadi kubwa ya ziara
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet iliunda:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Tafadhali weka Akaunti ya Fedha au Benki ya Mkopo katika Mfumo wa Malipo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Tafadhali weka Akaunti ya Fedha au Benki ya Mkopo katika Mfumo wa Malipo {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Ingia
DocType: GST Settings,GST Settings,Mipangilio ya GST
DocType: Selling Settings,Customer Naming By,Mteja anayeitwa na
@@ -946,7 +947,7 @@
DocType: Budget,Budget Against,Bajeti ya Dhidi
DocType: Employee,Cell Number,Nambari ya Kiini
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Hakuna mfanyakazi kwa vigezo vinavyopewa. Angalia kwamba Slips za Mshahara bado haijaundwa.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Maombi ya Nyenzo za Auto yanayotokana
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Maombi ya Nyenzo za Auto yanayotokana
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Potea
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Huwezi kuingia hati ya sasa katika safu ya 'Against Journal Entry'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Imehifadhiwa kwa ajili ya utengenezaji
@@ -954,7 +955,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Nishati
DocType: Opportunity,Opportunity From,Fursa Kutoka
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Taarifa ya mshahara kila mwezi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Nambari za nambari zinahitajika kwa Bidhaa {2}. Umetoa {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Nambari za nambari zinahitajika kwa Bidhaa {2}. Umetoa {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Tafadhali chagua meza
DocType: BOM,Website Specifications,Ufafanuzi wa tovuti
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} ni anwani ya barua pepe batili katika 'Wapokeaji'
@@ -1023,7 +1024,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Quote Iliombwa
DocType: Vital Signs,Heart Rate / Pulse,Kiwango cha Moyo / Pulse
DocType: Company,Default Bank Account,Akaunti ya Akaunti ya Default
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Kuchuja kulingana na Chama, chagua Aina ya Chama kwanza"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Kuchuja kulingana na Chama, chagua Aina ya Chama kwanza"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Mwisho Stock' hauwezi kuzingatiwa kwa sababu vitu havijatumwa kupitia {0}
DocType: Vehicle,Acquisition Date,Tarehe ya Ununuzi
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nasi
@@ -1047,7 +1048,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Pakia kichwa chako cha barua (Weka mtandao kuwa wavuti kama 900px kwa 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akaunti {2} haiwezi kuwa Kikundi
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Jambo Row {idx}: {doctype} {docname} haipo katika meza ya '{doctype}' hapo juu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} tayari imekamilika au kufutwa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} tayari imekamilika au kufutwa
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Hakuna kazi
DocType: Item Variant Settings,Copy Fields to Variant,Weka Mashamba kwa Tofauti
DocType: Asset,Opening Accumulated Depreciation,Kufungua kushuka kwa thamani
@@ -1159,9 +1160,10 @@
DocType: Production Order,Plan material for sub-assemblies,Panga nyenzo kwa makusanyiko ndogo
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Washirika wa Mauzo na Wilaya
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} lazima iwe hai
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Kufungwa (Kufungua + Jumla)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Kufungwa (Kufungua + Jumla)
DocType: Journal Entry,Depreciation Entry,Kuingia kwa kushuka kwa thamani
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Tafadhali chagua aina ya hati kwanza
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Chapisha katika Fedha za Akaunti
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Futa Ziara Nyenzo {0} kabla ya kufuta Kutembelea Utunzaji huu
DocType: Crop Cycle,ISO 8016 standard,Kiwango cha ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Serial Hakuna {0} si ya Bidhaa {1}
@@ -1187,7 +1189,7 @@
DocType: Supplier,Default Payable Accounts,Akaunti ya malipo yenye malipo
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Mfanyakazi {0} haifanyi kazi au haipo
DocType: Fee Structure,Components,Vipengele
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Tafadhali ingiza Kundi la Mali katika Item {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Tafadhali ingiza Kundi la Mali katika Item {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Vipengee vya Toleo {0} vinavyosasishwa
DocType: Quality Inspection Reading,Reading 6,Kusoma 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1239,6 +1241,7 @@
,Company Name,jina la kampuni
DocType: SMS Center,Total Message(s),Ujumbe Jumla (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Chagua Kitu cha Kuhamisha
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Tafadhali weka Mfululizo wa Naming kwa {0} kupitia Setup> Mipangilio> Mfululizo wa Naming
DocType: Purchase Invoice,Additional Discount Percentage,Asilimia ya Punguzo la ziada
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Tazama orodha ya video zote za usaidizi
DocType: Agriculture Analysis Criteria,Soil Texture,Texture ya Udongo
@@ -1266,7 +1269,7 @@
DocType: BOM Website Item,BOM Website Item,BOM ya Bidhaa ya Tovuti
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Pakia kichwa chako na alama. (unaweza kuwahariri baadaye).
DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Tarehe ya Uzito ya pili imeingia kama tarehe iliyopita
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Tarehe ya Uzito ya pili imeingia kama tarehe iliyopita
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Nyeupe
DocType: SMS Center,All Lead (Open),Viongozi wote (Ufunguzi)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Uliopatikana kwa {4} katika ghala {1} wakati wa kutuma muda wa kuingia ({2} {3})
@@ -1282,7 +1285,7 @@
DocType: Lead,Next Contact Date,Tarehe ya Kuwasiliana ijayo
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Ufunguzi wa Uchina
DocType: Healthcare Settings,Appointment Reminder,Kumbukumbu ya Uteuzi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Tafadhali ingiza Akaunti ya Kiasi cha Mabadiliko
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Tafadhali ingiza Akaunti ya Kiasi cha Mabadiliko
DocType: Program Enrollment Tool Student,Student Batch Name,Jina la Kundi la Mwanafunzi
DocType: Consultation,Doctor,Daktari
DocType: Holiday List,Holiday List Name,Jina la Orodha ya likizo
@@ -1298,6 +1301,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Acha Chombo cha Ugawaji
DocType: Item,Hub Category to Publish,Jamii ya Hifadhi ya Kuchapisha
DocType: Leave Block List,Leave Block List Dates,Acha Tarehe ya Kuzuia Orodha
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Tafadhali kuanzisha mfululizo wa kuhesabu kwa Mahudhurio kupitia Upangilio> Orodha ya Kuhesabu
DocType: Sales Invoice,Billing Address GSTIN,Anwani ya kulipia GSTIN
DocType: Assessment Plan,Evaluate,Tathmini
DocType: Workstation,Net Hour Rate,Kiwango cha Saa ya Nambari
@@ -1331,7 +1335,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Malipo ya ankara ya mauzo
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Ghala iliyohifadhiwa katika Mauzo ya Hifadhi / Bidhaa Zilizohitimishwa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Kuuza Kiasi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Kuuza Kiasi
DocType: Repayment Schedule,Interest Amount,Kiwango cha riba
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Wewe ni Mpatanishi wa gharama kwa rekodi hii. Tafadhali sasisha 'Hali' na Hifadhi
DocType: Serial No,Creation Document No,Hati ya Uumbaji No
@@ -1422,7 +1426,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Kufungua Mizani ya Uhasibu
,GST Sales Register,Jumuiya ya Daftari ya Mauzo
DocType: Sales Invoice Advance,Sales Invoice Advance,Advance ya Mauzo ya Mauzo
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Hakuna chochote cha kuomba
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Hakuna chochote cha kuomba
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Chagua Domains yako
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Rekodi nyingine ya Bajeti '{0}' tayari imesimama dhidi ya {1} '{2}' kwa mwaka wa fedha {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Mashamba yatakopwa zaidi wakati wa uumbaji.
@@ -1432,11 +1436,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Hii itaongezwa kwenye Kanuni ya Nambari ya Mchapishaji. Kwa mfano, ikiwa kichwa chako ni "SM", na msimbo wa kipengee ni "T-SHIRT", msimbo wa kipengee wa kipengee utakuwa "T-SHIRT-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (kwa maneno) itaonekana baada ya kuokoa Slip ya Mshahara.
DocType: Purchase Invoice,Is Return,Inarudi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Tahadhari
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Tahadhari
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Kurudi / Kumbuka Debit
DocType: Price List Country,Price List Country,Orodha ya Bei ya Nchi
DocType: Item,UOMs,UOM
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} salama ya serial kwa Bidhaa {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} salama ya serial kwa Bidhaa {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Msimbo wa kipengee hauwezi kubadilishwa kwa Nambari ya Serial.
DocType: Purchase Invoice Item,UOM Conversion Factor,Kipengele cha Kubadili UOM
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Tafadhali ingiza Msimbo wa Nambari ili kupata Nambari ya Batch
@@ -1540,7 +1544,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Uagizaji wa Mauzo {0} halali
DocType: Supplier Scorecard,Warn for new Request for Quotations,Tahadhari kwa ombi mpya ya Nukuu
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Amri za ununuzi husaidia kupanga na kufuatilia ununuzi wako
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Samahani, makampuni hawezi kuunganishwa"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Samahani, makampuni hawezi kuunganishwa"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Maagizo ya Majaribio ya Lab
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Jalada la jumla / Vipimo vya uhamisho {0} katika Maombi ya Vifaa {1} \ hawezi kuwa kubwa zaidi kuliko kiasi kilichoombwa {2} kwa Bidhaa {3}
@@ -1578,7 +1582,6 @@
DocType: Warehouse,Warehouse Contact Info,Info ya Kuwasiliana na Ghala
DocType: Payment Entry,Write Off Difference Amount,Andika Tofauti Tofauti
DocType: Volunteer,Volunteer Name,Jina la kujitolea
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Tafadhali kuanzisha Msaidizi wa Kuita Mfumo katika Elimu> Mipangilio ya Elimu
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: barua pepe ya mfanyakazi haipatikani, hivyo barua pepe haitumwa"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Sheria ya usafirishaji haifai kwa nchi {0}
DocType: Item,Foreign Trade Details,Maelezo ya Biashara ya Nje
@@ -1590,7 +1593,7 @@
DocType: Student Group Student,Group Roll Number,Nambari ya Roll ya Kikundi
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Kwa {0}, akaunti za mikopo tu zinaweza kuunganishwa dhidi ya kuingia mwingine kwa debit"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumla ya yote uzito wa kazi lazima 1. Tafadhali weka uzito wa kazi zote za Mradi ipasavyo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Kumbuka Utoaji {0} haujawasilishwa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Kumbuka Utoaji {0} haujawasilishwa
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Kipengee {0} kinafaa kuwa kitu cha Chini
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Vifaa vya Capital
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule ya bei ni ya kwanza kuchaguliwa kulingana na shamba la 'Weka On', ambayo inaweza kuwa Item, Kikundi cha Bidhaa au Brand."
@@ -1615,7 +1618,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Ghala la watoto lipo kwa ghala hili. Huwezi kufuta ghala hii.
DocType: Item,Website Item Groups,Vikundi vya Bidhaa vya tovuti
DocType: Purchase Invoice,Total (Company Currency),Jumla (Kampuni ya Fedha)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Nambari ya serial {0} imeingia zaidi ya mara moja
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Nambari ya serial {0} imeingia zaidi ya mara moja
DocType: Journal Entry,Journal Entry,Kuingia kwa Jarida
DocType: Expense Claim Advance,Unclaimed amount,Kiasi kisichojulikana
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} vitu vinaendelea
@@ -1711,7 +1714,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Ingia ya mawasiliano.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Ombi la Nukuu imezimwa ili kufikia kutoka kwenye bandari, kwa mipangilio zaidi ya kuzingatia porta."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Scorecard ya Wafanyabiashara Mboresho
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Kununua Kiasi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kununua Kiasi
DocType: Sales Invoice,Shipping Address Name,Jina la Jina la Mafikisho
DocType: Material Request,Terms and Conditions Content,Masharti na Masharti Maudhui
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kulikuwa na hitilafu za kuunda ratiba ya kozi
@@ -1973,7 +1976,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Hii inategemea magogo dhidi ya Gari hii. Tazama kalenda ya chini kwa maelezo zaidi
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Dhidi ya Invoice ya Wasambazaji {0} dated {1}
DocType: Customer,Default Price List,Orodha ya Bei ya Hitilafu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Rekodi ya Movement ya Malipo {0} imeundwa
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Rekodi ya Movement ya Malipo {0} imeundwa
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Huwezi kufuta Mwaka wa Fedha {0}. Mwaka wa Fedha {0} umewekwa kama default katika Mipangilio ya Global
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Mteja mwenye jina sawa tayari yupo
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Hii itawasilisha Slips za Mshahara na kuunda Usajili wa Majarida. Je! Unataka kuendelea?
@@ -1987,6 +1990,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Bei
DocType: Quotation,Term Details,Maelezo ya muda
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Haiwezi kujiandikisha zaidi ya {0} wanafunzi kwa kikundi hiki cha wanafunzi.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Jumla (bila ya Kodi)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Hesabu ya Kiongozi
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} lazima iwe kubwa kuliko 0
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Stock Inapatikana
@@ -2005,7 +2009,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Malipo ya Kuondoa Invoice
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Orodha ya Odometer ya sasa imewekwa inapaswa kuwa kubwa kuliko Odometer ya awali ya Gari {0}
DocType: Restaurant Reservation,No Show,Hakuna Onyesha
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Tafadhali weka Mfululizo wa Naming kwa {0} kupitia Setup> Mipangilio> Mfululizo wa Naming
DocType: Shipping Rule Country,Shipping Rule Country,Nchi ya Maagizo ya Utoaji
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Acha na Uhudhuriaji
DocType: Maintenance Visit,Partially Completed,Ilikamilishwa kikamilifu
@@ -2094,7 +2097,7 @@
DocType: Student Group Instructor,Student Group Instructor,Mwalimu wa Kikundi cha Wanafunzi
DocType: Grant Application,Assessment Mark (Out of 10),Marko ya Tathmini (nje ya 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Simu ya Mkono Hakuna
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Kuu
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Kuu
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Tofauti
DocType: Naming Series,Set prefix for numbering series on your transactions,Weka kiambishi kwa mfululizo wa nambari kwenye shughuli zako
DocType: Employee Attendance Tool,Employees HTML,Waajiri HTML
@@ -2141,7 +2144,7 @@
DocType: Course,Course Abbreviation,Hali ya Mafunzo
DocType: Student Leave Application,Student Leave Application,Maombi ya Kuondoka kwa Wanafunzi
DocType: Item,Will also apply for variants,Pia itatumika kwa vipengee
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Mali haziwezi kufutwa, kama tayari {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Mali haziwezi kufutwa, kama tayari {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Mfanyakazi {0} kwenye siku ya nusu kwenye {1}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,On
apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Vifungu vya vitu wakati wa kuuza.
@@ -2323,9 +2326,10 @@
DocType: Task,Actual End Date (via Time Sheet),Tarehe ya mwisho ya mwisho (kupitia Karatasi ya Muda)
DocType: Soil Texture,Soil Type,Aina ya Udongo
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Kiasi {0} {1} dhidi ya {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Ujumbe mpya
,Quotation Trends,Mwelekeo wa Nukuu
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Kikundi cha kipengee ambacho hakijajwa katika kipengee cha bidhaa kwa kipengee {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debit Kwa akaunti lazima iwe akaunti inayoidhinishwa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debit Kwa akaunti lazima iwe akaunti inayoidhinishwa
DocType: Shipping Rule,Shipping Amount,Kiasi cha usafirishaji
DocType: Supplier Scorecard Period,Period Score,Kipindi cha Kipindi
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Ongeza Wateja
@@ -2336,7 +2340,7 @@
,Vehicle Expenses,Gharama za Gari
DocType: Serial No,Invoice Details,Maelezo ya ankara
DocType: Grant Application,Show on Website,Onyesha kwenye tovuti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Thamani inayotarajiwa baada ya maisha muhimu lazima iwe kubwa kuliko au sawa na {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Thamani inayotarajiwa baada ya maisha muhimu lazima iwe kubwa kuliko au sawa na {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Anza
DocType: Hub Category,Hub Category,Jamii ya Hub
DocType: Purchase Invoice,SEZ,SEZ
@@ -2367,7 +2371,7 @@
DocType: Patient,B Positive,B Chanya
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Uchina lazima uwe 1, kama kipengee ni mali iliyobaki. Tafadhali tumia mstari wa tofauti kwa qty nyingi."
DocType: Leave Block List Allow,Leave Block List Allow,Acha orodha ya kuzuia Kuruhusu
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr haiwezi kuwa tupu au nafasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr haiwezi kuwa tupu au nafasi
DocType: Patient Medical Record,Patient Medical Record,Kumbukumbu ya Matibabu Mgonjwa
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Gundi kwa Wasio Kikundi
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Michezo
@@ -2417,6 +2421,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Haiwezi kuweka RFQ iliyopokea kwa No Quote
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Utoaji Jumla
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Chagua akaunti ili uchapishe katika sarafu ya akaunti
,Production Analytics,Uchambuzi wa Uzalishaji
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Hii inategemea shughuli za Mgonjwa. Tazama kalenda ya chini kwa maelezo zaidi
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Gharama ya Kusasishwa
@@ -2471,7 +2476,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Chagua Kampuni ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Acha tupu ikiwa inachukuliwa kwa idara zote
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Aina ya ajira (kudumu, mkataba, intern nk)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} ni lazima kwa Bidhaa {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} ni lazima kwa Bidhaa {1}
DocType: Payroll Entry,Fortnightly,Usiku wa jioni
DocType: Currency Exchange,From Currency,Kutoka kwa Fedha
DocType: Vital Signs,Weight (In Kilogram),Uzito (Kilogramu)
@@ -2547,7 +2552,7 @@
DocType: Student,Guardians,Walinzi
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Bei haitaonyeshwa kama Orodha ya Bei haijawekwa
DocType: Stock Entry,Total Incoming Value,Thamani ya Ingizo Yote
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debit To inahitajika
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debit To inahitajika
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets kusaidia kuweka wimbo wa muda, gharama na bili kwa activites kufanyika kwa timu yako"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Orodha ya Bei ya Ununuzi
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Matukio ya vigezo vya scorecard za wasambazaji.
@@ -2648,7 +2653,7 @@
DocType: Company,For Reference Only.,Kwa Kumbukumbu Tu.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Daktari {0} haipatikani kwenye {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Chagua Batch No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Halafu {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Halafu {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Mwaliko wa Kumbukumbu
@@ -2685,8 +2690,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Taja shughuli, gharama za uendeshaji na kutoa Operesheni ya kipekee bila shughuli zako."
DocType: Water Analysis,Origin,Mwanzo
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Hati hii imepungua kwa {0} {1} kwa kipengee {4}. Je! Unafanya mwingine {3} dhidi ya sawa {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Tafadhali kuweka mara kwa mara baada ya kuokoa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Chagua akaunti ya kubadilisha kiasi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Tafadhali kuweka mara kwa mara baada ya kuokoa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Chagua akaunti ya kubadilisha kiasi
DocType: Purchase Invoice,Price List Currency,Orodha ya Bei ya Fedha
DocType: Naming Series,User must always select,Mtumiaji lazima ague daima
DocType: Stock Settings,Allow Negative Stock,Ruhusu Stock mbaya
@@ -2742,7 +2747,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Tahadhari kwa Amri mpya ya Ununuzi
DocType: Quality Inspection Reading,Reading 9,Kusoma 9
DocType: Supplier,Is Frozen,Ni Frozen
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Ghala la node ya kikundi hairuhusiwi kuchagua kwa shughuli
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Ghala la node ya kikundi hairuhusiwi kuchagua kwa shughuli
DocType: Buying Settings,Buying Settings,Mipangilio ya kununua
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No kwa Nakala Iliyopangwa Nzuri
DocType: Upload Attendance,Attendance To Date,Kuhudhuria Tarehe
@@ -2756,6 +2761,7 @@
DocType: Grant Application,Organization,Shirika
DocType: BOM Update Tool,BOM Update Tool,Chombo cha Mwisho cha BOM
DocType: SG Creation Tool Course,Student Group Name,Jina la Kikundi cha Wanafunzi
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Onyesha maoni yaliyopuka
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Kujenga ada
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Tafadhali hakikisha unataka kufuta shughuli zote za kampuni hii. Data yako bwana itabaki kama ilivyo. Hatua hii haiwezi kufutwa.
DocType: Room,Room Number,Idadi ya Chumba
@@ -2766,7 +2772,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Fanya Kigezo cha Kodi
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum Forum
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Malighafi haziwezi kuwa tupu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Haikuweza kusasisha hisa, ankara ina bidhaa ya kusafirisha kushuka."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Haikuweza kusasisha hisa, ankara ina bidhaa ya kusafirisha kushuka."
DocType: Lab Test Sample,Lab Test Sample,Mfano wa Mtihani wa Lab
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Quick Journal Entry
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Huwezi kubadili kiwango kama BOM imetajwa agianst kitu chochote
@@ -2837,7 +2843,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fanya ankara
DocType: Selling Settings,Auto close Opportunity after 15 days,Funga karibu na fursa baada ya siku 15
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Amri za Ununuzi hayaruhusiwi kwa {0} kutokana na msimamo wa alama ya {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Amri za Ununuzi hayaruhusiwi kwa {0} kutokana na msimamo wa alama ya {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Mwisho wa Mwaka
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Kiongozi%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Tarehe ya Mwisho wa Mkataba lazima iwe kubwa kuliko Tarehe ya Kujiunga
@@ -2929,7 +2935,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-juu
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Kuingia kwa Machapishaji {1} hawana akaunti {2} au tayari kuendana na chaguo jingine
DocType: Supplier Scorecard Criteria,Criteria Weight,Vigezo vya uzito
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Wasambazaji> Aina ya Wasambazaji
DocType: Buying Settings,Default Buying Price List,Orodha ya Bei ya Kichuuzi
DocType: Payroll Entry,Salary Slip Based on Timesheet,Kulipwa kwa Mshahara Kulingana na Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Kiwango cha kununua
@@ -3017,7 +3022,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Orodha inayoongozwa na Aina ya Viwanda.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Nenda kwenye Barua
DocType: Item Supplier,Item Supplier,Muuzaji wa Bidhaa
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Tafadhali ingiza Msimbo wa Nambari ili kupata bat
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Tafadhali ingiza Msimbo wa Nambari ili kupata bat
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Tafadhali chagua thamani ya {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Anwani zote.
DocType: Company,Stock Settings,Mipangilio ya hisa
@@ -3194,6 +3199,7 @@
DocType: Company,Default Inventory Account,Akaunti ya Akaunti ya Default
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Uchina uliokamilika lazima uwe mkubwa kuliko sifuri.
DocType: Antibiotic,Antibiotic Name,Jina la Antibiotic
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Msimbo wa Item> Kikundi cha Bidhaa> Brand
DocType: Purchase Invoice,Apply Additional Discount On,Weka Kutoa Discount On
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Chagua Aina ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Kiungo kwa Units zote za Ardhi ambazo Mazao huongezeka
@@ -3387,6 +3393,7 @@
DocType: Supplier,Credit Limit,Kizuizi cha Mikopo
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Mg. Orodha ya Bei ya Kuuza
DocType: Production Plan Sales Order,Salse Order Date,Tarehe ya Utaratibu wa Salse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Wasambazaji> Aina ya Wasambazaji
DocType: Salary Component,Salary Component,Kipengele cha Mshahara
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Maingizo ya Malipo {0} hayajaunganishwa
DocType: GL Entry,Voucher No,Voucher No
@@ -3395,7 +3402,7 @@
DocType: Leave Allocation,Leave Allocation,Acha Ugawaji
DocType: Payment Request,Recipient Message And Payment Details,Ujumbe wa mpokeaji na maelezo ya malipo
DocType: Training Event,Trainer Email,Barua ya Mkufunzi
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Maombi ya Nyenzo {0} yaliyoundwa
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Maombi ya Nyenzo {0} yaliyoundwa
DocType: Restaurant Reservation,No of People,Hakuna Watu
DocType: Production Planning Tool,Include sub-contracted raw materials,Jumuisha vifaa vyenye vyenye mkataba
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Kigezo cha maneno au mkataba.
@@ -3458,7 +3465,7 @@
DocType: Production Planning Tool,Create Material Requests,Unda Maombi ya Nyenzo
DocType: Employee Education,School/University,Shule / Chuo Kikuu
DocType: Payment Request,Reference Details,Maelezo ya Kumbukumbu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Thamani inayotarajiwa Baada ya Maisha muhimu lazima iwe chini ya Kiasi cha Ununuzi wa Gross
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Thamani inayotarajiwa Baada ya Maisha muhimu lazima iwe chini ya Kiasi cha Ununuzi wa Gross
DocType: Sales Invoice Item,Available Qty at Warehouse,Uchina Inapatikana katika Ghala
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Ulipa kiasi
DocType: Asset,Double Declining Balance,Mizani miwili ya kupungua
@@ -3470,7 +3477,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Pata Marekebisho
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akaunti {2} sio ya Kampuni {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Chagua angalau thamani moja kutoka kwa kila sifa.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Ombi la Vifaa {0} limefutwa au kusimamishwa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Ombi la Vifaa {0} limefutwa au kusimamishwa
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Acha Usimamizi
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Kundi na Akaunti
DocType: Sales Order,Fully Delivered,Kutolewa kikamilifu
@@ -3481,14 +3488,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Kiasi kilichopotea hawezi kuwa kikubwa kuliko Kiasi cha Mikopo {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Nenda kwenye Programu
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Kiasi kilichowekwa {1} haiwezi kuwa kikubwa kuliko kiasi kisichojulikana {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Tafadhali kuanzisha mfululizo wa kuhesabu kwa Mahudhurio kupitia Upangilio> Orodha ya Kuhesabu
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Nambari ya Order ya Ununuzi inahitajika kwa Bidhaa {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Utaratibu wa Uzalishaji haukuundwa
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarehe Tarehe' lazima iwe baada ya 'Tarehe'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Haiwezi kubadilisha hali kama mwanafunzi {0} imeunganishwa na programu ya mwanafunzi {1}
DocType: Asset,Fully Depreciated,Kikamilifu imepungua
,Stock Projected Qty,Uchina Uliopangwa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Wateja {0} sio mradi {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Wateja {0} sio mradi {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Kuhudhuria alama HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Nukuu ni mapendekezo, zabuni ambazo umetuma kwa wateja wako"
DocType: Sales Order,Customer's Purchase Order,Amri ya Ununuzi wa Wateja
@@ -3572,7 +3578,7 @@
DocType: Stock Settings,Item Naming By,Kipengele kinachojulikana
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Muda mwingine wa Kuingia Ufungashaji {0} umefanywa baada ya {1}
DocType: Production Order,Material Transferred for Manufacturing,Nyenzo Iliyohamishwa kwa Uzalishaji
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Akaunti {0} haipo
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Akaunti {0} haipo
DocType: Project,Project Type,Aina ya Mradi
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Kazi ya Watoto ipo kwa Kazi hii. Huwezi kufuta Kazi hii.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Vipi lengo la qty au kiasi lengo ni lazima.
@@ -3674,11 +3680,11 @@
DocType: Company,Asset Depreciation Cost Center,Kituo cha gharama ya kushuka kwa thamani ya mali
DocType: Sales Order Item,Sales Order Date,Tarehe ya Utaratibu wa Mauzo
DocType: Sales Invoice Item,Delivered Qty,Utoaji Uchina
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Jumla ya Excl. Kodi
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ikiwa hunakiliwa, watoto wote wa kila kipengee cha uzalishaji wataingizwa katika Maombi ya Nyenzo."
DocType: Assessment Plan,Assessment Plan,Mpango wa Tathmini
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Mteja {0} ameundwa.
DocType: Stock Settings,Limit Percent,Percent Limit
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Tafadhali kuanzisha Msaidizi wa Kuita Mfumo katika Elimu> Mipangilio ya Elimu
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hivi sasa hakuna hisa zinazopatikana katika ghala lolote
,Payment Period Based On Invoice Date,Kipindi cha Malipo Kulingana na tarehe ya ankara
DocType: Sample Collection,No. of print,Hapana ya kuchapishwa
@@ -3694,12 +3700,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Wadaiwa ({0})
DocType: Pricing Rule,Margin,Margin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Wateja wapya
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Faida Pato%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Faida Pato%
DocType: Appraisal Goal,Weightage (%),Uzito (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Badilisha Profaili ya POS
DocType: Bank Reconciliation Detail,Clearance Date,Tarehe ya kufuta
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Ripoti ya Tathmini
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Thamani ya Ununuzi wa Pato ni lazima
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Thamani ya Ununuzi wa Pato ni lazima
DocType: Lead,Address Desc,Anwani Desc
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Chama ni lazima
DocType: Journal Entry,JV-,JV-
@@ -3731,7 +3737,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Jina lililosimama
DocType: Stock Entry,Customer or Supplier Details,Maelezo ya Wateja au Wafanyabiashara
DocType: Employee Loan Application,Required by Date,Inahitajika kwa Tarehe
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Kufungia Mizani (Dr - Cr)
DocType: Lead,Lead Owner,Mmiliki wa Kiongozi
DocType: Bin,Requested Quantity,Waliombwa Wingi
DocType: Patient,Marital Status,Hali ya ndoa
@@ -3745,7 +3750,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Vipengele vingi
DocType: Sales Invoice,Against Income Account,Dhidi ya Akaunti ya Mapato
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Ametolewa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Kipengee {0}: Iliyoagizwa qty {1} haiwezi kuwa chini ya amri ya chini qty {2} (iliyoelezwa katika Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Kipengee {0}: Iliyoagizwa qty {1} haiwezi kuwa chini ya amri ya chini qty {2} (iliyoelezwa katika Item).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Asilimia ya Usambazaji wa Kila mwezi
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Tafadhali ingia kama mtumiaji mwingine.
DocType: Territory,Territory Targets,Malengo ya Wilaya
@@ -3843,7 +3848,7 @@
DocType: Serial No,Out of AMC,Nje ya AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Idadi ya kushuka kwa thamani iliyotengenezwa haiwezi kuwa kubwa zaidi kuliko Jumla ya Idadi ya Dhamana
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Fanya Ziara ya Utunzaji
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Tafadhali wasiliana na mtumiaji aliye na jukumu la Meneja Mauzo {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Tafadhali wasiliana na mtumiaji aliye na jukumu la Meneja Mauzo {0}
DocType: Company,Default Cash Account,Akaunti ya Fedha ya Default
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Kampuni (si Wateja au Wafanyabiashara) Mwalimu.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Hii inategemea mahudhurio ya Mwanafunzi
@@ -3993,7 +3998,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Hakuna wafanyakazi kwa vigezo vilivyotajwa
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Hakuna Vipengee Vipengee vya Vifaa vya Kutengeneza
DocType: Restaurant,Default Customer,Wateja wa Mteja
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Tafadhali kuanzisha Mfumo wa Jina la Waajiriwa katika Rasilimali za Binadamu> Mipangilio ya HR
DocType: Assessment Plan,Supervisor Name,Jina la Msimamizi
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Usihakikishe ikiwa uteuzi umeundwa kwa siku ile ile
DocType: Program Enrollment Course,Program Enrollment Course,Kozi ya Usajili wa Programu
@@ -4111,7 +4115,7 @@
DocType: BOM,Website Description,Website Description
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Mabadiliko ya Net katika Equity
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Karibuni zaidi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Tafadhali cancel ankara ya Ununuzi {0} kwanza
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Tafadhali cancel ankara ya Ununuzi {0} kwanza
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Anwani ya barua pepe inapaswa kuwa ya kipekee, tayari ipo kwa {0}"
DocType: Serial No,AMC Expiry Date,Tarehe ya Kumalizika ya AMC
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Receipt
@@ -4128,7 +4132,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Taarifa ya Flow Flow
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kiasi cha Mkopo hawezi kuzidi Kiwango cha Mikopo ya Upeo wa {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Leseni
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Tafadhali ondoa hii ankara {0} kutoka C-Fomu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Tafadhali ondoa hii ankara {0} kutoka C-Fomu {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Tafadhali chagua Kuendeleza ikiwa unataka pia kuweka usawa wa mwaka uliopita wa fedha hadi mwaka huu wa fedha
DocType: GL Entry,Against Voucher Type,Dhidi ya Aina ya Voucher
DocType: Physician,Phone (R),Simu (R)
@@ -4140,7 +4144,7 @@
DocType: Patient,B Negative,B mbaya
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Hali ya Matengenezo inapaswa kufutwa au Imekamilika Kuwasilisha
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akaunti {0} sio ya kampuni {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Nambari za Serial katika mstari {0} haifani na Kumbuka Utoaji
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Nambari za Serial katika mstari {0} haifani na Kumbuka Utoaji
DocType: Student,Guardian Details,Maelezo ya Guardian
DocType: C-Form,C-Form,Fomu ya C
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Attendance kwa wafanyakazi wengi
@@ -4182,7 +4186,7 @@
DocType: Stock Entry Detail,Basic Amount,Kiasi cha Msingi
DocType: Training Event,Exam,Mtihani
DocType: Complaint,Complaint,Malalamiko
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Ghala inayotakiwa kwa kipengee cha hisa {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Ghala inayotakiwa kwa kipengee cha hisa {0}
DocType: Leave Allocation,Unused leaves,Majani yasiyotumika
DocType: Patient,Alcohol Past Use,Pombe Matumizi ya Kale
DocType: Fertilizer Content,Fertilizer Content,Maudhui ya Mbolea
@@ -4306,6 +4310,7 @@
DocType: Salary Detail,Formula,Mfumo
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Kigezo cha Mtihani wa Lab
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Akaunti ya Mauzo
DocType: Purchase Invoice Item,Total Weight,Uzito wote
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Tume ya Mauzo
DocType: Offer Letter Term,Value / Description,Thamani / Maelezo
@@ -4461,7 +4466,7 @@
DocType: Customer,From Lead,Kutoka Kiongozi
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Amri iliyotolewa kwa ajili ya uzalishaji.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Chagua Mwaka wa Fedha ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,Profaili ya POS inahitajika ili ufanye POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,Profaili ya POS inahitajika ili ufanye POS Entry
DocType: Program Enrollment Tool,Enroll Students,Jiandikisha Wanafunzi
DocType: Lab Test,Approved Date,Tarehe iliyoidhinishwa
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Uuzaji wa kawaida
@@ -4537,7 +4542,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Bidhaa ya Uzalishaji
,Employee Information,Taarifa ya Waajiriwa
DocType: Stock Entry Detail,Additional Cost,Gharama za ziada
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Haiwezi kuchuja kulingana na Voucher No, ikiwa imewekwa na Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Haiwezi kuchuja kulingana na Voucher No, ikiwa imewekwa na Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Fanya Nukuu ya Wasambazaji
DocType: Quality Inspection,Incoming,Inakuja
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Vidokezo vya kodi za kutosha kwa mauzo na ununuzi vinaloundwa.
@@ -4554,7 +4559,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Kumbuka: {0}
,Delivery Note Trends,Mwelekeo wa Kumbuka Utoaji
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Muhtasari wa wiki hii
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Katika Stock
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Katika Stock
DocType: Delivery Trip,Calculate Estimated Arrival Times,Tumia Hesabu ya Kufika Iliyohesabiwa
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Akaunti: {0} inaweza kurekebishwa tu kupitia Ushirikiano wa Hifadhi
DocType: Student Group Creation Tool,Get Courses,Pata Mafunzo
@@ -4570,7 +4575,7 @@
DocType: Material Request,% Ordered,Aliamriwa
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kwa Kundi la Wanafunzi la msingi, Kozi itastahikiwa kwa kila Mwanafunzi kutoka Kozi zilizosajiliwa katika Uandikishaji wa Programu."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Mg. Kiwango cha kununua
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Mg. Kiwango cha kununua
DocType: Task,Actual Time (in Hours),Muda halisi (katika Masaa)
DocType: Employee,History In Company,Historia Katika Kampuni
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Ujumbe mpya kutoka {mtumaji}
@@ -4617,7 +4622,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Fedha ya BOM # {1} inapaswa kuwa sawa na sarafu iliyochaguliwa {2}
DocType: Journal Entry Account,Exchange Rate,Kiwango cha Exchange
DocType: Patient,Additional information regarding the patient,Maelezo ya ziada kuhusu mgonjwa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Sheria ya Mauzo {0} haijawasilishwa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Sheria ya Mauzo {0} haijawasilishwa
DocType: Homepage,Tag Line,Mstari wa Tag
DocType: Fee Component,Fee Component,Fomu ya Malipo
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Usimamizi wa Fleet
@@ -4829,7 +4834,7 @@
DocType: Employee Education,Employee Education,Elimu ya Waajiriwa
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Kundi la kipengee cha kipengee kilichopatikana kwenye meza ya kikundi cha bidhaa
DocType: Land Unit,Parent Land Unit,Kitengo cha Ardhi cha Mzazi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Inahitajika Kuchukua Maelezo ya Bidhaa.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Inahitajika Kuchukua Maelezo ya Bidhaa.
DocType: Fertilizer,Fertilizer Name,Jina la Mbolea
DocType: Salary Slip,Net Pay,Net Pay
DocType: Account,Account,Akaunti
@@ -4908,7 +4913,7 @@
DocType: Item Customer Detail,Ref Code,Kanuni ya Ref
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Kundi la Wateja Inahitajika katika POS Profile
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekodi za waajiriwa.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Tafadhali weka Tarehe ya Utoaji wa Dhamana
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Tafadhali weka Tarehe ya Utoaji wa Dhamana
DocType: HR Settings,Payroll Settings,Mipangilio ya Mishahara
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Mechi zisizohusishwa ankara na malipo.
DocType: POS Settings,POS Settings,Mipangilio ya POS
@@ -5074,7 +5079,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Kikumbusho cha Kuzaliwa kwa {0}
DocType: Asset Maintenance Task,Last Completion Date,Tarehe ya mwisho ya kukamilika
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Siku Tangu Toleo la Mwisho
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debit Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debit Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
DocType: Buying Settings,Naming Series,Mfululizo wa majina
DocType: Leave Block List,Leave Block List Name,Acha jina la orodha ya kuzuia
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tarehe ya kuanza kwa bima inapaswa kuwa chini ya tarehe ya mwisho ya Bima
@@ -5200,6 +5205,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Pata Maingizo ya Malipo
DocType: Quotation Item,Against Docname,Dhidi ya Nyaraka
DocType: SMS Center,All Employee (Active),Wafanyakazi wote (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Wateja> Kikundi cha Wateja> Eneo
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Tazama Sasa
DocType: BOM,Raw Material Cost,Gharama za Nyenzo za Raw
DocType: Item Reorder,Re-Order Level,Kiwango cha Udhibiti wa Rejea
@@ -5298,7 +5304,6 @@
DocType: Room,Seating Capacity,Kuweka uwezo
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Makundi ya Majaribio ya Lab
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Wateja> Kikundi cha Wateja> Eneo
DocType: Project,Total Expense Claim (via Expense Claims),Madai ya jumla ya gharama (kupitia madai ya gharama)
DocType: GST Settings,GST Summary,Muhtasari wa GST
DocType: Assessment Result,Total Score,Jumla ya alama
@@ -5311,7 +5316,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Kufuatia ratiba ya kozi iliundwa
DocType: Journal Entry,Total Debit,Debit Jumla
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Ghala la Wafanyabiashara wa Malifadi
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Mtu wa Mauzo
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Mtu wa Mauzo
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Kituo cha Bajeti na Gharama
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Njia ya malipo ya malipo ya kuruhusiwa haiwezi kuruhusiwa
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,kwa
@@ -5484,7 +5489,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Fikiria kodi au malipo kwa
DocType: Driver,Driving License Category,Jamii ya Leseni ya Kuendesha
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Uhakika halisi ni lazima
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} kwa sasa ina {1} Wafanyabiashara Scorecard amesimama, na Amri ya Ununuzi kwa mtoa huduma hii inapaswa kutolewa."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} kwa sasa ina {1} Wafanyabiashara Scorecard amesimama, na Amri ya Ununuzi kwa mtoa huduma hii inapaswa kutolewa."
DocType: Asset Maintenance Team,Asset Maintenance Team,Timu ya Matengenezo ya Mali
DocType: Employee Loan,Loan Type,Aina ya Mikopo
DocType: Scheduling Tool,Scheduling Tool,Kitabu cha Mpangilio
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 6798a2d..176de58 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -89,7 +89,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,விலை மூலம் வரிசைப்படுத்தவும்
,Delay Days,தாமதம் நாட்கள்
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,சேவை செலவு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,விலைப்பட்டியல்
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,வைத்திருத்தல் பங்கு நுழைவு செய்யுங்கள்
DocType: Purchase Invoice Item,Item Weight Details,பொருள் எடை விவரங்கள்
@@ -140,7 +140,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",குறிப்பு: {0} பொருள் குறியீடு: {1} மற்றும் வாடிக்கையாளர்: {2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,கிலோ
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ஒரு வேலை திறப்பு.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},{0} வரிசையில் {0} துணை உருப்படிக்கு BOM குறிப்பிடப்படவில்லை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},{0} வரிசையில் {0} துணை உருப்படிக்கு BOM குறிப்பிடப்படவில்லை
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} முடிவு சமர்ப்பிக்கப்பட்டது
DocType: Item Attribute,Increment,சம்பள உயர்வு
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,கால இடைவெளி
@@ -151,7 +151,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},அனுமதி இல்லை {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,இருந்து பொருட்களை பெற
DocType: Price List,Price Not UOM Dependant,விலை இல்லை UOM சார்ந்த
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},தயாரிப்பு {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,உருப்படிகள் எதுவும் பட்டியலிடப்படவில்லை
DocType: Asset Repair,Error Description,பிழை விளக்கம்
@@ -159,7 +159,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,மளிகை
DocType: Quality Inspection Reading,Reading 1,1 படித்தல்
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,அடுத்து தேய்மானம் தேதி கொள்முதல் தேதி முன்பாக இருக்கக் கூடாது
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,அடுத்து தேய்மானம் தேதி கொள்முதல் தேதி முன்பாக இருக்கக் கூடாது
DocType: Crop,Perennial,வற்றாத
DocType: Consultation,Consultation Date,ஆலோசனை தேதி
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext பயனர்களுக்கான தயாரிப்பு பட்டியல் மற்றும் கண்டுபிடிப்பு
@@ -174,7 +174,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",எ.கா. "முதன்மை பள்ளி" அல்லது "பல்கலைக்கழகம்"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,பங்கு அறிக்கைகள்
DocType: Warehouse,Warehouse Detail,சேமிப்பு கிடங்கு விரிவாக
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,கால முடிவு தேதி பின்னர் கால இணைக்கப்பட்ட செய்ய கல்வியாண்டின் ஆண்டு முடிவு தேதி விட முடியாது (கல்வி ஆண்டு {}). தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""நிலையான சொத்து உள்ளது" சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
DocType: Delivery Trip,Departure Time,புறப்படும் நேரம்
@@ -194,7 +194,7 @@
DocType: Quality Inspection,Get Specification Details,குறிப்பு விவரம் கிடைக்கும்
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,சப்ளையர் தரவரிசை வார்ப்புகள்.
DocType: Lead,Interested,அக்கறை உள்ள
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,திறப்பு
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,திறப்பு
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},இருந்து {0} {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,வரிகளை அமைப்பதில் தோல்வி
DocType: Item,Copy From Item Group,பொருள் குழு நகல்
@@ -366,7 +366,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,வருடத்திற்கு விடுப்பு
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ரோ {0}: சரிபார்க்கவும் கணக்கு எதிராக 'அட்வான்ஸ்' என்ற {1} இந்த ஒரு முன்கூட்டியே நுழைவு என்றால்.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},கிடங்கு {0} அல்ல நிறுவனம் {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},கிடங்கு {0} அல்ல நிறுவனம் {1}
DocType: Email Digest,Profit & Loss,லாபம் மற்றும் நஷ்டம்
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,லிட்டர்
DocType: Task,Total Costing Amount (via Time Sheet),மொத்த செலவுவகை தொகை (நேரம் தாள் வழியாக)
@@ -459,6 +459,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,இந்த நிறுவனத்திற்கு எதிரான பரிவர்த்தனைகளை அடிப்படையாகக் கொண்டது. விபரங்களுக்கு கீழே காலவரிசைப் பார்க்கவும்
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,தானியங்கி பொருள் கோரிக்கை உருவாக்கம் மின்னஞ்சல் மூலம் தெரிவிக்க
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,எதிர்ப்பு
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,பல நாணய
DocType: Opening Invoice Creation Tool,Invoice Type,விலைப்பட்டியல் வகை
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,டெலிவரி குறிப்பு
@@ -534,7 +535,6 @@
DocType: Employee,Widowed,விதவை
DocType: Request for Quotation,Request for Quotation,விலைப்பட்டியலுக்கான கோரிக்கை
DocType: Healthcare Settings,Require Lab Test Approval,லேப் சோதனை ஒப்புதல் தேவை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,பொருள் குறியீடு> பொருள் குழு> பிராண்ட்
DocType: Salary Slip Timesheet,Working Hours,வேலை நேரங்கள்
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,மொத்த நிலுவை
DocType: Naming Series,Change the starting / current sequence number of an existing series.,ஏற்கனவே தொடரில் தற்போதைய / தொடக்க வரிசை எண் மாற்ற.
@@ -563,7 +563,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
DocType: Drug Prescription,Dosage,மருந்தளவு
DocType: Journal Entry Account,Sales Order,விற்பனை ஆணை
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,சராசரி. விற்பனை விகிதம்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,சராசரி. விற்பனை விகிதம்
DocType: Assessment Plan,Examiner Name,பரிசோதகர் பெயர்
DocType: Lab Test Template,No Result,முடிவு இல்லை
DocType: Purchase Invoice Item,Quantity and Rate,அளவு மற்றும் விகிதம்
@@ -613,6 +613,7 @@
DocType: Payroll Entry,Select Payroll Period,சம்பளப்பட்டியல் காலம் தேர்ந்தெடுக்கவும்
DocType: Purchase Invoice,Unpaid,செலுத்தப்படாத
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,விற்பனை முன்பதிவு
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,மனித வளத்தில் பணியாளர் பெயரிடும் அமைப்பை அமைத்தல்> HR அமைப்புகள்
DocType: Packing Slip,From Package No.,தொகுப்பு எண் இருந்து
DocType: Item Attribute,To Range,வரையறைக்கு
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,பத்திரங்கள் மற்றும் வைப்பு
@@ -637,11 +638,11 @@
DocType: Training Event,Workshop,பட்டறை
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,கொள்முதல் கட்டளைகளை எச்சரிக்கவும்
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,போதும் பாகங்கள் கட்டுவது எப்படி
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,போதும் பாகங்கள் கட்டுவது எப்படி
DocType: POS Profile User,POS Profile User,POS பயனர் பயனர்
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,நேரடி வருமானம்
DocType: Patient Appointment,Date TIme,தேதி நேரம்
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","கணக்கு மூலம் தொகுக்கப்பட்டுள்ளது என்றால் , கணக்கு அடிப்படையில் வடிகட்ட முடியாது"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","கணக்கு மூலம் தொகுக்கப்பட்டுள்ளது என்றால் , கணக்கு அடிப்படையில் வடிகட்ட முடியாது"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,நிர்வாக அதிகாரி
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,நிறுவனம் மற்றும் வரிகளை அமைத்தல்
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
@@ -652,7 +653,7 @@
DocType: Stock Entry Detail,Difference Account,வித்தியாசம் கணக்கு
DocType: Purchase Invoice,Supplier GSTIN,சப்ளையர் GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,அதன் சார்ந்து பணி {0} மூடவில்லை நெருக்கமாக பணி அல்ல முடியும்.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
DocType: Production Order,Additional Operating Cost,கூடுதல் இயக்க செலவு
DocType: Lab Test Template,Lab Routine,லேப் ரோட்டின்
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,ஒப்பனை
@@ -823,7 +824,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 அரசுடன் உறவு
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,மேலாளர்
DocType: Payment Entry,Payment From / To,/ இருந்து பணம்
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},புதிய கடன் வரம்பை வாடிக்கையாளர் தற்போதைய கடன் தொகையை விட குறைவாக உள்ளது. கடன் வரம்பு குறைந்தது இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},புதிய கடன் வரம்பை வாடிக்கையாளர் தற்போதைய கடன் தொகையை விட குறைவாக உள்ளது. கடன் வரம்பு குறைந்தது இருக்க வேண்டும் {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'அடிப்படையாக கொண்டு ' மற்றும் ' குழு மூலம் ' அதே இருக்க முடியாது
DocType: Sales Person,Sales Person Targets,விற்பனை நபர் இலக்குகள்
DocType: Installation Note,IN-,வய தான
@@ -833,7 +834,7 @@
DocType: Student Batch Name,Batch Name,தொகுதி பெயர்
DocType: Fee Validity,Max number of visit,விஜயத்தின் அதிகபட்ச எண்ணிக்கை
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,பதிவுசெய்யவும்
DocType: GST Settings,GST Settings,ஜிஎஸ்டி அமைப்புகள்
DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
@@ -960,7 +961,7 @@
DocType: Budget,Budget Against,வரவு செலவுத் திட்டத்திற்கு எதிராக
DocType: Employee,Cell Number,செல் எண்
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,கொடுக்கப்பட்ட நிபந்தனைகளுக்கு ஊழியர் இல்லை. சம்பள சரிவுகள் ஏற்கனவே உருவாக்கப்படவில்லை என்பதைச் சரிபார்க்கவும்.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,ஆட்டோ பொருள் கோரிக்கைகள் உருவாக்கிய
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ஆட்டோ பொருள் கோரிக்கைகள் உருவாக்கிய
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,லாஸ்ட்
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,உற்பத்தி ஒதுக்கப்பட்டது
@@ -968,7 +969,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,சக்தி
DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,வரிசை {0}: {1} பொருள் {2} க்கான தொடர் எண்கள் தேவைப்படும். நீங்கள் {3} வழங்கியுள்ளீர்கள்.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,வரிசை {0}: {1} பொருள் {2} க்கான தொடர் எண்கள் தேவைப்படும். நீங்கள் {3} வழங்கியுள்ளீர்கள்.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ஒரு அட்டவணையைத் தேர்ந்தெடுக்கவும்
DocType: BOM,Website Specifications,இணையத்தளம் விருப்பம்
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} என்பது 'பெறுநர்கள்' இன் தவறான மின்னஞ்சல் முகவரி.
@@ -1055,7 +1056,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,கோரிக்கை கோரப்பட்டது
DocType: Vital Signs,Heart Rate / Pulse,ஹார்ட் ரேட் / பல்ஸ்
DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"பொருட்களை வழியாக இல்லை, ஏனெனில் 'மேம்படுத்தல் பங்கு' சோதிக்க முடியாது, {0}"
DocType: Vehicle,Acquisition Date,வாங்கிய தேதி
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,இலக்கங்கள்
@@ -1079,7 +1080,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),உங்கள் கடிதத் தலைப்பைப் பதிவேற்றுக (100px மூலம் 900px என இணைய நட்பு கொள்ளுங்கள்)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: கணக்கு {2} ஒரு குழுவாக இருக்க முடியாது
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,பொருள் வரிசையில் {அச்சுக்கோப்புகளை வாசிக்க}: {டாக்டைப்பானது} {docName} மேலே இல்லை '{டாக்டைப்பானது}' அட்டவணை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,பணிகள் எதுவும் இல்லை
DocType: Item Variant Settings,Copy Fields to Variant,மாறுபாடுகளுக்கு புலங்களை நகலெடுக்கவும்
DocType: Asset,Opening Accumulated Depreciation,குவிக்கப்பட்ட தேய்மானம் திறந்து
@@ -1191,9 +1192,10 @@
DocType: Production Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,விற்பனை பங்குதாரர்கள் மற்றும் பிரதேச
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),நிறைவு (திறக்கும் + மொத்தம்)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),நிறைவு (திறக்கும் + மொத்தம்)
DocType: Journal Entry,Depreciation Entry,தேய்மானம் நுழைவு
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,முதல் ஆவணம் வகையை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,கணக்கு நாணயத்தில் அச்சிடு
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,இந்த பராமரிப்பு பணிகள் முன் பொருள் வருகைகள் {0} ரத்து
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 தரநிலை
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},தொடர் இல {0} பொருள் அல்ல {1}
@@ -1220,7 +1222,7 @@
DocType: Supplier,Default Payable Accounts,இயல்புநிலை செலுத்தத்தக்க கணக்குகள்
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
DocType: Fee Structure,Components,கூறுகள்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1272,6 +1274,7 @@
,Company Name,நிறுவனத்தின் பெயர்
DocType: SMS Center,Total Message(s),மொத்த செய்தி (கள்)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,அமைவு> அமைப்புகள்> பெயரிடும் தொடர்கள் வழியாக {0} பெயரிடும் தொடர்களை அமைக்கவும்
DocType: Purchase Invoice,Additional Discount Percentage,கூடுதல் தள்ளுபடி சதவீதம்
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,அனைத்து உதவி வீடியோக்களை பட்டியலை காண்க
DocType: Agriculture Analysis Criteria,Soil Texture,மண் தோற்றம்
@@ -1300,7 +1303,7 @@
DocType: BOM Website Item,BOM Website Item,BOM இணையத்தளம் பொருள்
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
DocType: Timesheet Detail,Bill,ரசீது
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,அடுத்த தேய்மானம் தேதி கடந்த தேதி உள்ளிட்ட வருகிறது
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,அடுத்த தேய்மானம் தேதி கடந்த தேதி உள்ளிட்ட வருகிறது
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,வெள்ளை
DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ரோ {0}: அளவு கிடைக்கவில்லை {4} கிடங்கில் {1} நுழைவு நேரம் வெளியிடும் ({2} {3})
@@ -1317,7 +1320,7 @@
DocType: Lead,Next Contact Date,அடுத்த தொடர்பு தேதி
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,திறந்து அளவு
DocType: Healthcare Settings,Appointment Reminder,நியமனம் நினைவூட்டல்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
DocType: Program Enrollment Tool Student,Student Batch Name,மாணவர் தொகுதி பெயர்
DocType: Consultation,Doctor,டாக்டர்
DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
@@ -1333,6 +1336,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ஒதுக்கீடு கருவி விட்டு
DocType: Item,Hub Category to Publish,வெளியிட வகை
DocType: Leave Block List,Leave Block List Dates,பிளாக் பட்டியல் தினங்கள் விட்டு
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,அமைவு> எண் வரிசை தொடர் மூலம் கலந்துரையாடலுக்கான வரிசை எண்ணை அமைக்கவும்
DocType: Sales Invoice,Billing Address GSTIN,பில்லிங் முகவரி GSTIN
DocType: Assessment Plan,Evaluate,மதிப்பிடுங்கள்
DocType: Workstation,Net Hour Rate,நிகர மணி விகிதம்
@@ -1367,7 +1371,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,விற்பனை விலைப்பட்டியல் கொடுப்பனவு
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,விற்பனை ஆணை / இறுதிப்பொருட்களாக்கும் கிடங்கில் ஒதுக்கப்பட்ட கிடங்கு
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,விற்பனை தொகை
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,விற்பனை தொகை
DocType: Repayment Schedule,Interest Amount,வட்டி தொகை
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,இந்த பதிவு செலவு அப்ரூவரான இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்
DocType: Serial No,Creation Document No,உருவாக்கம் ஆவண இல்லை
@@ -1460,7 +1464,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,திறந்து கணக்கு இருப்பு
,GST Sales Register,ஜிஎஸ்டி விற்பனை பதிவு
DocType: Sales Invoice Advance,Sales Invoice Advance,விற்பனை விலைப்பட்டியல் முன்பணம்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,எதுவும் கோர
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,எதுவும் கோர
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,உங்கள் களங்களைத் தேர்ந்தெடுக்கவும்
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},மற்றொரு பட்ஜெட் சாதனை '{0}' ஏற்கனவே எதிராக உள்ளது {1} '{2}' நிதி ஆண்டிற்கான {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,உருவாக்கம் நேரத்தில் மட்டுமே புலங்கள் நகலெடுக்கப்படும்.
@@ -1470,11 +1474,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","இந்த மாற்று பொருள் குறியீடு இணைக்கப்படும். உங்கள் சுருக்கம் ""எஸ்.எம்"", மற்றும் என்றால் உதாரணமாக, இந்த உருப்படியை குறியீடு ""சட்டை"", ""டி-சட்டை-எஸ்.எம்"" இருக்கும் மாறுபாடு உருப்படியை குறியீடு ஆகிறது"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,நீங்கள் சம்பள விபரம் சேமிக்க முறை நிகர வருவாய் (வார்த்தைகளில்) காண முடியும்.
DocType: Purchase Invoice,Is Return,திரும்ப
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,எச்சரிக்கை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,எச்சரிக்கை
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,திரும்ப / டெபிட் குறிப்பு
DocType: Price List Country,Price List Country,விலை பட்டியல் நாடு
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},பொருட்களை {0} செல்லுபடியாகும் தொடர் இலக்கங்கள் {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},பொருட்களை {0} செல்லுபடியாகும் தொடர் இலக்கங்கள் {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,பொருள் குறியீடு வரிசை எண் மாற்றப்பட கூடாது
DocType: Purchase Invoice Item,UOM Conversion Factor,மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,தொகுதி எண் பெற கொள்ளவும் பொருள் குறியீடு நுழைய
@@ -1580,7 +1584,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
DocType: Supplier Scorecard,Warn for new Request for Quotations,மேற்கோள்களுக்கான புதிய கோரிக்கைக்கு எச்சரிக்கவும்
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,கொள்முதல் ஆணைகள் நீ திட்டமிட உதவும் உங்கள் கொள்முதல் சரி வர
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,லேப் சோதனை பரிந்துரைப்புகள்
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",மொத்த வெளியீடு மாற்றம் / அளவு {0} பொருள் கோரிக்கை {1} \ பொருள் {2} கோரிய அளவு அதிகமாக இருக்கக் கூடாது முடியும் {3}
@@ -1618,7 +1622,6 @@
DocType: Warehouse,Warehouse Contact Info,சேமிப்பு கிடங்கு தொடர்பு தகவல்
DocType: Payment Entry,Write Off Difference Amount,வேறுபாடு தொகை ஆஃப் எழுத
DocType: Volunteer,Volunteer Name,தொண்டர் பெயர்
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,தயவுசெய்து கல்வி> கல்வி அமைப்புகளில் கல்வி பயிற்றுவிப்பாளரை அமைத்தல்
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: ஊழியர் மின்னஞ்சல் கிடைக்கவில்லை, எனவே மின்னஞ்சல் அனுப்பப்படவில்லை."
DocType: Item,Foreign Trade Details,வெளிநாட்டு வர்த்தக விவரங்கள்
,Assessment Plan Status,மதிப்பீட்டு திட்டம் நிலை
@@ -1630,7 +1633,7 @@
DocType: Student Group Student,Group Roll Number,குழு ரோல் எண்
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,அனைத்து பணி எடைகள் மொத்த இருக்க வேண்டும் 1. அதன்படி அனைத்து திட்ட பணிகளை எடைகள் சரிசெய்யவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,விநியோக குறிப்பு {0} சமர்ப்பிக்கவில்லை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,விநியோக குறிப்பு {0} சமர்ப்பிக்கவில்லை
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,மூலதன கருவிகள்
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
@@ -1655,7 +1658,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,குழந்தை கிடங்கில் இந்த களஞ்சியசாலை உள்ளது. நீங்கள் இந்த களஞ்சியசாலை நீக்க முடியாது.
DocType: Item,Website Item Groups,இணைய தகவல்கள் குழுக்கள்
DocType: Purchase Invoice,Total (Company Currency),மொத்த (நிறுவனத்தின் நாணயம்)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,சீரியல் எண்ணை {0} க்கும் மேற்பட்ட முறை உள்ளிட்ட
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,சீரியல் எண்ணை {0} க்கும் மேற்பட்ட முறை உள்ளிட்ட
DocType: Journal Entry,Journal Entry,பத்திரிகை நுழைவு
DocType: Expense Claim Advance,Unclaimed amount,உரிமை கோரப்படாத தொகை
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} முன்னேற்றம் பொருட்களை
@@ -1753,7 +1756,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,தொடர்பாடல் பதிவு.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","விலைப்பட்டியலுக்கான கோரிக்கை மேலும் காசோலை போர்டல் அமைப்புகளை, போர்டல் இருந்து அணுக முடக்கப்பட்டுள்ளது."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,சப்ளையர் ஸ்கோர் கார்ட் மாறி
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,தொகை வாங்கும்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,தொகை வாங்கும்
DocType: Sales Invoice,Shipping Address Name,ஷிப்பிங் முகவரி பெயர்
DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,பாடநெறி அட்டவணையை உருவாக்கும் பிழைகள் இருந்தன
@@ -2019,7 +2022,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,இந்த வாகன எதிராக பதிவுகள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,நீங்கள் நீக்க முடியாது நிதியாண்டு {0}. நிதியாண்டு {0} உலகளாவிய அமைப்புகள் முன்னிருப்பாக அமைக்க உள்ளது
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,அதே பெயருடன் ஒரு வாடிக்கையாளர் ஏற்கனவே உள்ளார்
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,இது சம்பள சரிவுகளைச் சமர்ப்பிக்கும் மற்றும் ஊடுருவல் ஜர்னல் நுழைவு உருவாக்குதல். நீங்கள் தொடர விரும்புகிறீர்களா?
@@ -2033,6 +2036,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,விலை
DocType: Quotation,Term Details,கால விவரம்
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} இந்த மாணவர் குழு மாணவர்கள் விட சேர முடியாது.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),மொத்தம் (வரி இல்லாமல்)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,முன்னணி கவுண்ட்
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,முன்னணி கவுண்ட்
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 விட அதிகமாக இருக்க வேண்டும்
@@ -2053,7 +2057,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,விலைப்பட்டியல் ரத்து கட்டணங்களை செலுத்தும் இணைப்பகற்றம்
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},தற்போதைய ஓடோமீட்டர் வாசிப்பு உள்ளிட்ட ஆரம்ப வாகன ஓடோமீட்டர் விட அதிகமாக இருக்க வேண்டும் {0}
DocType: Restaurant Reservation,No Show,காட்சி இல்லை
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,அமைவு> அமைப்புகள்> பெயரிடும் தொடர்கள் வழியாக {0} பெயரிடும் தொடர்களை அமைக்கவும்
DocType: Shipping Rule Country,Shipping Rule Country,கப்பல் விதி நாடு
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,விட்டு மற்றும் வருகை
DocType: Maintenance Visit,Partially Completed,ஓரளவிற்கு பூர்த்தி
@@ -2146,7 +2149,7 @@
DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
DocType: Grant Application,Assessment Mark (Out of 10),மதிப்பீட்டு மார்க் (10 இலிருந்து)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 கைப்பேசி
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,முதன்மை
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,முதன்மை
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,மாற்று
DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
DocType: Employee Attendance Tool,Employees HTML,"ஊழியர், HTML"
@@ -2195,7 +2198,7 @@
DocType: Course,Course Abbreviation,பாடநெறி சுருக்கமான
DocType: Student Leave Application,Student Leave Application,மாணவர் விடுப்பு விண்ணப்பம்
DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},பணியாளர் {0} அன்று அரை நாளில் {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},மொத்த வேலை மணி நேரம் அதிகபட்சம் வேலை நேரம் விட அதிகமாக இருக்க கூடாது {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,மீது
@@ -2382,10 +2385,11 @@
DocType: Task,Actual End Date (via Time Sheet),உண்மையான முடிவு தேதி (நேரம் தாள் வழியாக)
DocType: Soil Texture,Soil Type,மண் வகை
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},அளவு {0} {1} எதிராக {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,புதிய தகவல்
,Quotation Trends,மேற்கோள் போக்குகள்
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},"பொருள் குழு குறிப்பிடப்படவில்லை
உருப்படியை {0} ல் உருப்படியை மாஸ்டர்"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
DocType: Shipping Rule,Shipping Amount,கப்பல் தொகை
DocType: Supplier Scorecard Period,Period Score,காலம் ஸ்கோர்
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,வாடிக்கையாளர்கள் சேர்
@@ -2396,7 +2400,7 @@
,Vehicle Expenses,வாகன செலவுகள்
DocType: Serial No,Invoice Details,விவரப்பட்டியல் விவரங்கள்
DocType: Grant Application,Show on Website,இணையத்தளத்தில் காட்டு
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,தொடங்குங்கள்
DocType: Hub Category,Hub Category,ஹப் பகுப்பு
DocType: Purchase Invoice,SEZ,சிறப்புப் பொருளாதார மண்டலம்
@@ -2428,7 +2432,7 @@
DocType: Patient,B Positive,பி நேர்மறை
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி இருக்க முடியாது
DocType: Patient Medical Record,Patient Medical Record,நோயாளி மருத்துவ பதிவு
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,அல்லாத குழு குழு
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,விளையாட்டு
@@ -2479,6 +2483,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,எந்தவொரு மேற்கோளிடமும் பெறப்பட்ட RFQ ஐ அமைக்க முடியவில்லை
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,கணக்கு நாணயத்தில் அச்சிட ஒரு கணக்கைத் தேர்ந்தெடுக்கவும்
,Production Analytics,உற்பத்தி அனலிட்டிக்ஸ்
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,இந்த நோயாளிக்கு எதிரான பரிவர்த்தனைகளை அடிப்படையாகக் கொண்டது. விபரங்களுக்கு கீழே காலவரிசைப் பார்க்கவும்
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
@@ -2534,7 +2539,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
DocType: Leave Control Panel,Leave blank if considered for all departments,அனைத்து துறைகளில் கருதப்படுகிறது என்றால் வெறுமையாக
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
DocType: Payroll Entry,Fortnightly,இரண்டு வாரங்களுக்கு ஒரு முறை
DocType: Currency Exchange,From Currency,நாணய இருந்து
DocType: Vital Signs,Weight (In Kilogram),எடை (கிலோகிராம்)
@@ -2611,7 +2616,7 @@
DocType: Student,Guardians,பாதுகாவலர்கள்
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,விலை பட்டியல் அமைக்கப்படவில்லை எனில் காண்பிக்கப்படும் விலைகளில் முடியாது
DocType: Stock Entry,Total Incoming Value,மொத்த உள்வரும் மதிப்பு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,பற்று தேவைப்படுகிறது
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,பற்று தேவைப்படுகிறது
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets உங்கள் அணி செய்யப்படுகிறது செயல்பாடுகளுக்கு நேரம், செலவு மற்றும் பில்லிங் கண்காணிக்க உதவும்"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,கொள்முதல் விலை பட்டியல்
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,சப்ளையர் ஸ்கோர் கார்டு மாறிகளின் டெம்ப்ளேட்கள்.
@@ -2715,7 +2720,7 @@
DocType: Company,For Reference Only.,குறிப்பு மட்டும்.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},{1} இல் மருத்துவர் {0} கிடைக்கவில்லை
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,தொகுதி தேர்வு இல்லை
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},தவறான {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},தவறான {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,குறிப்பு அழை
@@ -2752,8 +2757,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
DocType: Water Analysis,Origin,தோற்றம்
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,இந்த ஆவணம் மூலம் எல்லை மீறிவிட்டது {0} {1} உருப்படியை {4}. நீங்கள் கவனிக்கிறீர்களா மற்றொரு {3} அதே எதிராக {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
@@ -2809,7 +2814,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,புதிய கொள்முதல் ஆணைகளுக்கு எச்சரிக்கை
DocType: Quality Inspection Reading,Reading 9,9 படித்தல்
DocType: Supplier,Is Frozen,உறைந்திருக்கும்
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,குழு முனை கிடங்கில் பரிமாற்றங்கள் தேர்ந்தெடுக்க அனுமதி இல்லை
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,குழு முனை கிடங்கில் பரிமாற்றங்கள் தேர்ந்தெடுக்க அனுமதி இல்லை
DocType: Buying Settings,Buying Settings,அமைப்புகள் வாங்கும்
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,"ஒரு முடிக்கப்பட்ட நல்ல பொருளை BOM, எண்"
DocType: Upload Attendance,Attendance To Date,தேதி வருகை
@@ -2824,6 +2829,7 @@
DocType: Grant Application,Organization,அமைப்பு
DocType: BOM Update Tool,BOM Update Tool,BOM புதுப்பித்தல் கருவி
DocType: SG Creation Tool Course,Student Group Name,மாணவர் குழு பெயர்
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,வெடித்த பார்வை காட்டு
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,கட்டணம் உருவாக்குதல்
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
DocType: Room,Room Number,அறை எண்
@@ -2834,7 +2840,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,வரி வார்ப்புருவை உருவாக்குங்கள்
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,பயனர் கருத்துக்களம்
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
DocType: Lab Test Sample,Lab Test Sample,லேப் டெஸ்ட் மாதிரி
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
@@ -2905,7 +2911,7 @@
DocType: Membership,USD,அமெரிக்க டாலர்
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,விலைப்பட்டியல் செய்ய
DocType: Selling Settings,Auto close Opportunity after 15 days,15 நாட்களுக்கு பிறகு ஆட்டோ நெருங்கிய வாய்ப்பு
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ஸ்கோர் கார்டு தரநிலை காரணமாக {0} வாங்குவதற்கு ஆர்டர் அனுமதிக்கப்படவில்லை.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} ஸ்கோர் கார்டு தரநிலை காரணமாக {0} வாங்குவதற்கு ஆர்டர் அனுமதிக்கப்படவில்லை.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,இறுதி ஆண்டு
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / முன்னணி%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / முன்னணி%
@@ -3018,7 +3024,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 மேலே
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ரோ # {0}: மற்றொரு ரசீது எதிராக பத்திரிகை நுழைவு {1} கணக்கு இல்லை {2} அல்லது ஏற்கனவே பொருந்தியது
DocType: Supplier Scorecard Criteria,Criteria Weight,நிபந்தனை எடை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,சப்ளையர்> சப்ளையர் வகை
DocType: Buying Settings,Default Buying Price List,இயல்புநிலை கொள்முதல் விலை பட்டியல்
DocType: Payroll Entry,Salary Slip Based on Timesheet,சம்பளம் ஸ்லிப் டைம் ஷீட் அடிப்படையில்
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,வாங்குதல் விகிதம்
@@ -3108,7 +3113,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ட்ராக் தொழில் வகை செல்கிறது.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,லெட்டர்ஹெட்ஸ் செல்க
DocType: Item Supplier,Item Supplier,பொருள் சப்ளையர்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,அனைத்து முகவரிகள்.
DocType: Company,Stock Settings,பங்கு அமைப்புகள்
@@ -3297,6 +3302,7 @@
DocType: Company,Default Inventory Account,இயல்புநிலை சரக்கு கணக்கு
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,ரோ {0}: பூர்த்தி அளவு சுழியை விட பெரியதாக இருக்க வேண்டும்.
DocType: Antibiotic,Antibiotic Name,ஆண்டிபயாடிக் பெயர்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,பொருள் குறியீடு> பொருள் குழு> பிராண்ட்
DocType: Purchase Invoice,Apply Additional Discount On,கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும்
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,வகை தேர்வு ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,பயிர் வளரும் அனைத்து நில அலகுகளுக்கும் ஒரு இணைப்பு
@@ -3491,6 +3497,7 @@
DocType: Supplier,Credit Limit,கடன் எல்லை
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,சரா. விலை பட்டியல் விகிதம் விற்பனை
DocType: Production Plan Sales Order,Salse Order Date,Salse ஆர்டர் தேதி
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,சப்ளையர்> சப்ளையர் வகை
DocType: Salary Component,Salary Component,சம்பளம் உபகரண
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,கொடுப்பனவு பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
DocType: GL Entry,Voucher No,ரசீது இல்லை
@@ -3500,7 +3507,7 @@
DocType: Leave Allocation,Leave Allocation,ஒதுக்கீடு விட்டு
DocType: Payment Request,Recipient Message And Payment Details,பெறுநரின் செய்தி மற்றும் கொடுப்பனவு விபரங்கள்
DocType: Training Event,Trainer Email,பயிற்சி மின்னஞ்சல்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,பொருள் கோரிக்கைகள் {0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,பொருள் கோரிக்கைகள் {0} உருவாக்கப்பட்டது
DocType: Restaurant Reservation,No of People,மக்கள் இல்லை
DocType: Production Planning Tool,Include sub-contracted raw materials,துணை ஒப்பந்த மூலப்பொருட்கள் சேர்க்கவும்
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,சொற்கள் அல்லது ஒப்பந்த வார்ப்புரு.
@@ -3566,7 +3573,7 @@
DocType: Production Planning Tool,Create Material Requests,பொருள் கோரிக்கைகள் உருவாக்க
DocType: Employee Education,School/University,பள்ளி / பல்கலைக்கழகம்
DocType: Payment Request,Reference Details,குறிப்பு விவரம்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்த்த மதிப்பு மொத்த கொள்முதல் தொகையை விடக் குறைவாக இருக்க வேண்டும்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்த்த மதிப்பு மொத்த கொள்முதல் தொகையை விடக் குறைவாக இருக்க வேண்டும்
DocType: Sales Invoice Item,Available Qty at Warehouse,சேமிப்பு கிடங்கு கிடைக்கும் அளவு
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,பில் செய்த தொகை
DocType: Asset,Double Declining Balance,இரட்டை குறைவு சமநிலை
@@ -3578,7 +3585,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,மேம்படுத்தல்கள் கிடைக்கும்
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: கணக்கு {2} நிறுவனத்தின் சொந்தம் இல்லை {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,ஒவ்வொரு பண்புகளிலிருந்தும் குறைந்தது ஒரு மதிப்பைத் தேர்ந்தெடுக்கவும்.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
apps/erpnext/erpnext/config/hr.py +310,Leave Management,மேலாண்மை விடவும்
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,கணக்கு குழு
DocType: Sales Order,Fully Delivered,முழுமையாக வழங்கப்படுகிறது
@@ -3589,14 +3596,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},செலவிட்டு தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது கொள்ளலாம் {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,நிகழ்ச்சிகளுக்கு செல்க
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},வரிசை {0} # ஒதுக்கப்படாத தொகையை {2} விட அதிகமானதாக இருக்க முடியாது {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,அமைவு> எண் வரிசை தொடர் மூலம் கலந்துரையாடலுக்கான வரிசை எண்ணை அமைக்கவும்
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,உற்பத்தி ஆர்டர் உருவாக்கப்பட்டது இல்லை
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},மாணவர் என நிலையை மாற்ற முடியாது {0} மாணவர் பயன்பாடு இணைந்தவர் {1}
DocType: Asset,Fully Depreciated,முழுமையாக தணியாக
,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,"அடையாளமிட்ட வருகை, HTML"
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",மேற்கோள்கள் முன்மொழிவுகள் நீங்கள் உங்கள் வாடிக்கையாளர்களுக்கு அனுப்பியுள்ளோம் ஏலம் உள்ளன
DocType: Sales Order,Customer's Purchase Order,வாடிக்கையாளர் கொள்முதல் ஆணை
@@ -3681,7 +3687,7 @@
DocType: Stock Settings,Item Naming By,பொருள் மூலம் பெயரிடுதல்
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},மற்றொரு காலம் நிறைவு நுழைவு {0} பின்னர் செய்யப்பட்ட {1}
DocType: Production Order,Material Transferred for Manufacturing,பொருள் தயாரிப்பு இடமாற்றம்
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,கணக்கு {0} இல்லை உள்ளது
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,கணக்கு {0} இல்லை உள்ளது
DocType: Project,Project Type,திட்ட வகை
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,இந்த பணிக்கான குழந்தை பணி உள்ளது. இந்த பணி நீக்க முடியாது.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,இலக்கு அளவு அல்லது இலக்கு அளவு கட்டாயமாகும்.
@@ -3785,11 +3791,11 @@
DocType: Company,Asset Depreciation Cost Center,சொத்து தேய்மானம் செலவு மையம்
DocType: Sales Order Item,Sales Order Date,விற்பனை ஆர்டர் தேதி
DocType: Sales Invoice Item,Delivered Qty,வழங்கப்படும் அளவு
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,மொத்த முன்னாள். வரி
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","தேர்ந்தெடுக்கப்பட்டால், ஒவ்வொரு தயாரிப்பு உருப்படியை அனைத்து குழந்தைகள் பொருள் கோரிக்கைகள் சேர்க்கப்படும்."
DocType: Assessment Plan,Assessment Plan,மதிப்பீடு திட்டம்
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,வாடிக்கையாளர் {0} உருவாக்கப்பட்டது.
DocType: Stock Settings,Limit Percent,எல்லை சதவீதம்
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,தயவுசெய்து கல்வி> கல்வி அமைப்புகளில் கல்வி பயிற்றுவிப்பாளரை அமைத்தல்
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,தற்போது எந்த கிடங்கிலும் பங்கு இல்லை
,Payment Period Based On Invoice Date,விலைப்பட்டியல் தேதியின் அடிப்படையில் கொடுப்பனவு காலம்
DocType: Sample Collection,No. of print,அச்சு எண்
@@ -3805,12 +3811,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),"இருப்பினும், கடனாளிகள் ({0})"
DocType: Pricing Rule,Margin,விளிம்பு
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,புதிய வாடிக்கையாளர்கள்
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,மொத்த லாபம்%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,மொத்த லாபம்%
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS சுயவிவரத்தை மாற்றுக
DocType: Bank Reconciliation Detail,Clearance Date,அனுமதி தேதி
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,மதிப்பீட்டு அறிக்கை
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,மொத்த கொள்முதல் அளவு அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,மொத்த கொள்முதல் அளவு அத்தியாவசியமானதாகும்
DocType: Lead,Address Desc,இறங்குமுக முகவரி
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,கட்சி அத்தியாவசியமானதாகும்
DocType: Journal Entry,JV-,JV-
@@ -3842,7 +3848,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,நின்று பெயர்
DocType: Stock Entry,Customer or Supplier Details,வாடிக்கையாளருக்கு அல்லது விபரங்கள்
DocType: Employee Loan Application,Required by Date,டேட் தேவையான
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),நிறைவுநிலை இருப்பு (டாக்டர் - சிஆர்)
DocType: Lead,Lead Owner,முன்னணி உரிமையாளர்
DocType: Bin,Requested Quantity,கோரப்பட்ட அளவு
DocType: Patient,Marital Status,திருமண தகுதி
@@ -3856,7 +3861,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,பல மாறுபாடுகள்
DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% வழங்கப்படுகிறது
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,பொருள் {0}: உத்தரவிட்டார் அளவு {1} குறைந்தபட்ச வரிசை அளவு {2} (உருப்படியை வரையறுக்கப்பட்ட) விட குறைவாக இருக்க முடியாது.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,பொருள் {0}: உத்தரவிட்டார் அளவு {1} குறைந்தபட்ச வரிசை அளவு {2} (உருப்படியை வரையறுக்கப்பட்ட) விட குறைவாக இருக்க முடியாது.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,மாதாந்திர விநியோகம் சதவீதம்
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,தயவுசெய்து மற்றொரு பயனராக உள்நுழைக.
DocType: Territory,Territory Targets,மண்டலம் இலக்குகள்
@@ -3957,7 +3962,7 @@
DocType: Serial No,Out of AMC,AMC வெளியே
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம் எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
DocType: Company,Default Cash Account,இயல்புநிலை பண கணக்கு
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,இந்த மாணவர் வருகை அடிப்படையாக கொண்டது
@@ -4109,7 +4114,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,குறிப்பிடப்பட்ட அளவுகோல்களுக்கு ஊழியர்கள் இல்லை
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
DocType: Restaurant,Default Customer,இயல்புநிலை வாடிக்கையாளர்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,மனித வளத்தில் பணியாளர் பெயரிடும் அமைப்பை அமைத்தல்> HR அமைப்புகள்
DocType: Assessment Plan,Supervisor Name,மேற்பார்வையாளர் பெயர்
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,ஒரே நாளில் சந்திப்பு உருவாக்கப்பட்டது என்றால் உறுதிப்படுத்தாதீர்கள்
DocType: Program Enrollment Course,Program Enrollment Course,திட்டம் பதிவு கோர்ஸ்
@@ -4231,7 +4235,7 @@
DocType: BOM,Website Description,இணையதளத்தில் விளக்கம்
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ஈக்விட்டி நிகர மாற்றம்
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,புதியது
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","மின்னஞ்சல் முகவரி, தனித்துவமானதாக இருக்க வேண்டும் ஏற்கனவே உள்ளது {0}"
DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,ரசீது
@@ -4248,7 +4252,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,பணப்பாய்வு அறிக்கை
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},கடன் தொகை அதிகபட்ச கடன் தொகை தாண்ட முடியாது {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,உரிமம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,நீங்கள் முந்தைய நிதி ஆண்டின் இருப்புநிலை இந்த நிதி ஆண்டு விட்டு சேர்க்க விரும்பினால் முன் எடுத்து கொள்ளவும்
DocType: GL Entry,Against Voucher Type,வவுச்சர் வகை எதிராக
DocType: Physician,Phone (R),தொலைபேசி (R)
@@ -4260,7 +4264,7 @@
DocType: Patient,B Negative,பி நெகட்டிவ்
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,பராமரிப்பு நிலைமை ரத்து செய்யப்பட வேண்டும் அல்லது சமர்ப்பிக்க வேண்டும்
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,வரிசையில் {0} இல் சீரியல் எண்கள் டெலிவரி குறிப்பு உடன் பொருந்தவில்லை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,வரிசையில் {0} இல் சீரியல் எண்கள் டெலிவரி குறிப்பு உடன் பொருந்தவில்லை
DocType: Student,Guardian Details,பாதுகாவலர் விபரங்கள்
DocType: C-Form,C-Form,சி படிவம்
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,பல ஊழியர்கள் மார்க் வருகை
@@ -4302,7 +4306,7 @@
DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
DocType: Training Event,Exam,தேர்வு
DocType: Complaint,Complaint,புகார்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
DocType: Patient,Alcohol Past Use,மது போஸ்ட் பயன்படுத்து
DocType: Fertilizer Content,Fertilizer Content,உரம் உள்ளடக்கம்
@@ -4429,6 +4433,7 @@
DocType: Salary Detail,Formula,சூத்திரம்
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,தொடர் #
DocType: Lab Test Template,Lab Test Template,லேப் டெஸ்ட் வார்ப்புரு
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,விற்பனை கணக்கு
DocType: Purchase Invoice Item,Total Weight,மொத்த எடை
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,விற்பனையில் கமிஷன்
DocType: Offer Letter Term,Value / Description,மதிப்பு / விளக்கம்
@@ -4585,7 +4590,7 @@
DocType: Customer,From Lead,முன்னணி இருந்து
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ஆணைகள் உற்பத்தி வெளியிடப்பட்டது.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
DocType: Program Enrollment Tool,Enroll Students,மாணவர்கள் பதிவுசெய்யவும்
DocType: Lab Test,Approved Date,அங்கீகரிக்கப்பட்ட தேதி
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
@@ -4661,7 +4666,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,உற்பத்தி பொருள்
,Employee Information,பணியாளர் தகவல்
DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
DocType: Quality Inspection,Incoming,உள்வரும்
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,விற்பனை மற்றும் வாங்குதலுக்கான இயல்புநிலை வரி வார்ப்புருக்கள் உருவாக்கப்படுகின்றன.
@@ -4678,7 +4683,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},குறிப்பு: {0}
,Delivery Note Trends,பந்து குறிப்பு போக்குகள்
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,இந்த வார சுருக்கம்
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,பங்கு அளவு உள்ள
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,பங்கு அளவு உள்ள
DocType: Delivery Trip,Calculate Estimated Arrival Times,கணக்கிடப்பட்ட வருகை டைம்ஸ் கணக்கிடுங்கள்
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,கணக்கு: {0} மட்டுமே பங்கு பரிவர்த்தனைகள் வழியாக புதுப்பிக்க முடியும்
DocType: Student Group Creation Tool,Get Courses,மைதானங்கள் பெற
@@ -4694,7 +4699,7 @@
DocType: Material Request,% Ordered,% உத்தரவிட்டார்
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","கோர்ஸ் சார்ந்த மாணவர் குழுக்களுக்கான, கோர்ஸ் திட்டம் பதிவு சேர்ந்தார் பாடப்பிரிவுகள் இருந்து ஒவ்வொரு மாணவர் மதிப்பாய்வு செய்யப்படும்."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,சிறுதுண்டு வேலைக்கு
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
DocType: Employee,History In Company,நிறுவனத்தின் ஆண்டு வரலாறு
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{அனுப்புநர்} இலிருந்து புதிய செய்தி
@@ -4742,7 +4747,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ரோ {0}: டெலி # கரன்சி {1} தேர்வு நாணய சமமாக இருக்க வேண்டும் {2}
DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
DocType: Patient,Additional information regarding the patient,நோயாளியைப் பற்றிய கூடுதல் தகவல்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
DocType: Homepage,Tag Line,டேக் லைன்
DocType: Fee Component,Fee Component,கட்டண பகுதியிலேயே
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,கடற்படை மேலாண்மை
@@ -4958,7 +4963,7 @@
DocType: Employee Education,Employee Education,பணியாளர் கல்வி
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,உருப்படியை குழு அட்டவணையில் பிரதி உருப்படியை குழு
DocType: Land Unit,Parent Land Unit,பெற்றோர் மனை பிரிவு
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
DocType: Fertilizer,Fertilizer Name,உரம் பெயர்
DocType: Salary Slip,Net Pay,நிகர சம்பளம்
DocType: Account,Account,கணக்கு
@@ -5036,7 +5041,7 @@
DocType: Item Customer Detail,Ref Code,Ref கோட்
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS சுயவிவரத்தில் வாடிக்கையாளர் குழு தேவை
apps/erpnext/erpnext/config/hr.py +12,Employee records.,ஊழியர் பதிவுகள்.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,அடுத்த தேய்மானம் தேதி அமைக்கவும்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,அடுத்த தேய்மானம் தேதி அமைக்கவும்
DocType: HR Settings,Payroll Settings,சம்பளப்பட்டியல் அமைப்புகள்
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,அல்லாத தொடர்புடைய பற்றுச்சீட்டுகள் மற்றும் கட்டணங்கள் போட்டி.
DocType: POS Settings,POS Settings,POS அமைப்புகள்
@@ -5204,7 +5209,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
DocType: Asset Maintenance Task,Last Completion Date,கடைசி நிறைவு தேதி
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
DocType: Buying Settings,Naming Series,தொடர் பெயரிடும்
DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,காப்புறுதி தொடக்க தேதி காப்புறுதி முடிவு தேதி விட குறைவாக இருக்க வேண்டும்
@@ -5334,6 +5339,7 @@
DocType: Bank Reconciliation,Get Payment Entries,கொடுப்பனவு பதிவுகள் பெற
DocType: Quotation Item,Against Docname,ஆவணம் பெயர் எதிராக
DocType: SMS Center,All Employee (Active),அனைத்து பணியாளர் (செயலில்)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,வாடிக்கையாளர்> வாடிக்கையாளர் குழு> மண்டலம்
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,இப்போது காண்க
DocType: BOM,Raw Material Cost,மூலப்பொருட்களின் செலவு
DocType: Item Reorder,Re-Order Level,மீண்டும் ஒழுங்கு நிலை
@@ -5434,7 +5440,6 @@
DocType: Room,Seating Capacity,அமரும்
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,லேப் டெஸ்ட் குழுக்கள்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,வாடிக்கையாளர்> வாடிக்கையாளர் குழு> மண்டலம்
DocType: Project,Total Expense Claim (via Expense Claims),மொத்த செலவு கூறுகின்றனர் (செலவு பற்றிய கூற்றுக்கள் வழியாக)
DocType: GST Settings,GST Summary,ஜிஎஸ்டி சுருக்கம்
DocType: Assessment Result,Total Score,மொத்த மதிப்பெண்
@@ -5447,7 +5452,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,பின்வரும் பாடத்திட்டங்கள் உருவாக்கப்பட்டுள்ளன
DocType: Journal Entry,Total Debit,மொத்த பற்று
DocType: Manufacturing Settings,Default Finished Goods Warehouse,இயல்புநிலை முடிக்கப்பட்ட பொருட்கள் கிடங்கு
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,விற்பனை நபர்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,விற்பனை நபர்
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,பட்ஜெட் மற்றும் செலவு மையம்
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,கட்டணம் செலுத்திய பல இயல்புநிலை முறை அனுமதிக்கப்படவில்லை
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,அதற்காக
@@ -5623,7 +5628,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,வரி அல்லது பொறுப்பு கருத்தில்
DocType: Driver,Driving License Category,உரிமம் வகை ஓட்டுநர்
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,உண்மையான அளவு கட்டாய ஆகிறது
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} தற்போது {1} சப்ளையர் ஸ்கோர்கார்டு நின்று உள்ளது, இந்த சப்ளையருக்கான கொள்முதல் ஆணை எச்சரிக்கையுடன் வெளியிடப்பட வேண்டும்."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} தற்போது {1} சப்ளையர் ஸ்கோர்கார்டு நின்று உள்ளது, இந்த சப்ளையருக்கான கொள்முதல் ஆணை எச்சரிக்கையுடன் வெளியிடப்பட வேண்டும்."
DocType: Asset Maintenance Team,Asset Maintenance Team,சொத்து பராமரிப்பு குழு
DocType: Employee Loan,Loan Type,கடன் வகை
DocType: Scheduling Tool,Scheduling Tool,திட்டமிடல் கருவி
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index 316afcd..29dab1c 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,ధర ద్వారా క్రమబద్ధీకరించు
,Delay Days,ఆలస్యం డేస్
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,సర్వీస్ ఖర్చుల
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,వాయిస్
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,నిలుపుదల స్టాక్ ఎంట్రీ చేయండి
DocType: Purchase Invoice Item,Item Weight Details,అంశం బరువు వివరాలు
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","సూచన: {0}, Item కోడ్: {1} మరియు కస్టమర్: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,కిలొగ్రామ్
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ఒక Job కొరకు తెరవడం.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},{0} వరుసలో {0} సబ్ కన్స్ట్రక్టింగ్ అంశం కోసం BOM పేర్కొనబడలేదు.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},{0} వరుసలో {0} సబ్ కన్స్ట్రక్టింగ్ అంశం కోసం BOM పేర్కొనబడలేదు.
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ఫలితం సమర్పించబడింది
DocType: Item Attribute,Increment,పెంపు
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,కాల వ్యవధి
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},కోసం అనుమతి లేదు {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,నుండి అంశాలను పొందండి
DocType: Price List,Price Not UOM Dependant,ధర UOM ఆధారపడదు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ఉత్పత్తి {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,జాబితా అంశాలను తోబుట్టువుల
DocType: Asset Repair,Error Description,లోపం వివరణ
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,కిరాణా
DocType: Quality Inspection Reading,Reading 1,1 పఠనం
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,పెన్షన్ ఫండ్స్
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,తదుపరి అరుగుదల తేదీ కొనుగోలు తేదీ ముందు ఉండకూడదు
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,తదుపరి అరుగుదల తేదీ కొనుగోలు తేదీ ముందు ఉండకూడదు
DocType: Crop,Perennial,నిత్యం
DocType: Consultation,Consultation Date,సంప్రదింపు తేదీ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ఉత్పత్తి జాబితా మరియు ERPNext వినియోగదారుల కోసం ఆవిష్కరణ
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",ఉదా "ప్రాథమిక స్కూల్" లేదా "విశ్వవిద్యాలయం"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,స్టాక్ నివేదికలు
DocType: Warehouse,Warehouse Detail,వేర్హౌస్ వివరాలు
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,టర్మ్ ముగింపు తేదీ తర్వాత అకడమిక్ ఇయర్ ఇయర్ ఎండ్ తేదీ పదం సంబంధమున్న కంటే ఉండకూడదు (అకాడమిక్ ఇయర్ {}). దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""స్థిర ఆస్తిగా", అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
DocType: Delivery Trip,Departure Time,బయలుదేరు సమయము
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,స్పెసిఫికేషన్ వివరాలు పొందండి
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,సరఫరాదారు స్టాండింగ్ల యొక్క టెంప్లేట్లు.
DocType: Lead,Interested,ఆసక్తి
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,ప్రారంభోత్సవం
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,ప్రారంభోత్సవం
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},నుండి {0} కు {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,పన్నులను సెటప్ చేయడం విఫలమైంది
DocType: Item,Copy From Item Group,అంశం గ్రూప్ నుండి కాపీ
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,తేదీ ఉపశమనం చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,సంవత్సరానికి ఆకులు
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,రో {0}: తనిఖీ చేయండి ఖాతా వ్యతిరేకంగా 'అడ్వాన్స్ ఈజ్' {1} ఈ అడ్వాన్సుగా ఎంట్రీ ఉంటే.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},{0} వేర్హౌస్ కంపెనీకి చెందినది కాదు {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},{0} వేర్హౌస్ కంపెనీకి చెందినది కాదు {1}
DocType: Email Digest,Profit & Loss,లాభం & నష్టం
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,లీటరు
DocType: Task,Total Costing Amount (via Time Sheet),మొత్తం ఖర్చు మొత్తం (సమయం షీట్ ద్వారా)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,ఇది ఈ కంపెనీకి వ్యతిరేకంగా లావాదేవీల ఆధారంగా ఉంది. వివరాలు కోసం కాలక్రమం క్రింద చూడండి
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ఆటోమేటిక్ మెటీరియల్ అభ్యర్థన సృష్టి పై ఇమెయిల్ ద్వారా తెలియజేయి
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,రెసిస్టెంట్
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,మల్టీ కరెన్సీ
DocType: Opening Invoice Creation Tool,Invoice Type,వాయిస్ పద్ధతి
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,డెలివరీ గమనిక
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,వైధవ్యం
DocType: Request for Quotation,Request for Quotation,కొటేషన్ కోసం అభ్యర్థన
DocType: Healthcare Settings,Require Lab Test Approval,ల్యాబ్ పరీక్ష ఆమోదం అవసరం
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,అంశం కోడ్> అంశం సమూహం> బ్రాండ్
DocType: Salary Slip Timesheet,Working Hours,పని గంటలు
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,మొత్తం అత్యుత్తమమైనది
DocType: Naming Series,Change the starting / current sequence number of an existing series.,అప్పటికే ఉన్న సిరీస్ ప్రారంభం / ప్రస్తుత క్రమ సంఖ్య మార్చండి.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ఖర్చు సెంటర్ నమోదు చేయండి
DocType: Drug Prescription,Dosage,మోతాదు
DocType: Journal Entry Account,Sales Order,అమ్మకాల ఆర్డర్
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,కనీస. సెల్లింగ్ రేటు
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,కనీస. సెల్లింగ్ రేటు
DocType: Assessment Plan,Examiner Name,ఎగ్జామినర్ పేరు
DocType: Lab Test Template,No Result,తోబుట్టువుల ఫలితం
DocType: Purchase Invoice Item,Quantity and Rate,పరిమాణ మరియు రేటు
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,పేరోల్ కాలం ఎంచుకోండి
DocType: Purchase Invoice,Unpaid,చెల్లించని
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,అమ్మకానికి రిసర్వ్డ్
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,దయచేసి మానవ వనరులో HR ఉద్యోగ నామకరణ వ్యవస్థ సెటప్ చేయండి> హెచ్ఆర్ సెట్టింగులు
DocType: Packing Slip,From Package No.,ప్యాకేజీ నం నుండి
DocType: Item Attribute,To Range,రేంజ్ కు
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,సెక్యూరిటీస్ అండ్ డిపాజిట్లు
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,వర్క్షాప్
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,కొనుగోలు ఆర్డర్లను హెచ్చరించండి
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,మీ వినియోగదారులు కొన్ని జాబితా. వారు సంస్థలు లేదా వ్యక్తులతో కావచ్చు.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,తగినంత భాగాలు బిల్డ్
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,తగినంత భాగాలు బిల్డ్
DocType: POS Profile User,POS Profile User,POS ప్రొఫైల్ వాడుకరి
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,ప్రత్యక్ష ఆదాయం
DocType: Patient Appointment,Date TIme,తేదీ TIme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","ఖాతా ద్వారా సమూహం ఉంటే, ఖాతా ఆధారంగా వేరు చేయలేని"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","ఖాతా ద్వారా సమూహం ఉంటే, ఖాతా ఆధారంగా వేరు చేయలేని"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,అడ్మినిస్ట్రేటివ్ ఆఫీసర్
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,సంస్థ మరియు పన్నులు ఏర్పాటు
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,తేడా ఖాతా
DocType: Purchase Invoice,Supplier GSTIN,సరఫరాదారు GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,దాని ఆధారపడి పని {0} సంవృతం కాదు దగ్గరగా పని కాదు.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
DocType: Production Order,Additional Operating Cost,అదనపు నిర్వహణ ఖర్చు
DocType: Lab Test Template,Lab Routine,ల్యాబ్ రొటీన్
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,కాస్మటిక్స్
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 తో రిలేషన్
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,మేనేజర్
DocType: Payment Entry,Payment From / To,చెల్లింపు / నుండి
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},క్రొత్త క్రెడిట్ పరిమితి కస్టమర్ ప్రస్తుత అసాధారణ మొత్తం కంటే తక్కువగా ఉంటుంది. క్రెడిట్ పరిమితి కనీసం ఉండాలి {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},క్రొత్త క్రెడిట్ పరిమితి కస్టమర్ ప్రస్తుత అసాధారణ మొత్తం కంటే తక్కువగా ఉంటుంది. క్రెడిట్ పరిమితి కనీసం ఉండాలి {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,మరియు 'గ్రూప్ ద్వారా' 'ఆధారంగా' అదే ఉండకూడదు
DocType: Sales Person,Sales Person Targets,సేల్స్ పర్సన్ టార్గెట్స్
DocType: Installation Note,IN-,ఇన్
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,బ్యాచ్ పేరు
DocType: Fee Validity,Max number of visit,సందర్శన యొక్క అత్యధిక సంఖ్య
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet రూపొందించినవారు:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,నమోదు
DocType: GST Settings,GST Settings,జిఎస్టి సెట్టింగులు
DocType: Selling Settings,Customer Naming By,ద్వారా కస్టమర్ నేమింగ్
@@ -958,7 +959,7 @@
DocType: Budget,Budget Against,బడ్జెట్ వ్యతిరేకంగా
DocType: Employee,Cell Number,సెల్ సంఖ్య
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ఇవ్వబడిన ప్రమాణాలకు ఉద్యోగి లేదు. జీతం స్లిప్స్ ఇప్పటికే సృష్టించబడలేదు అని తనిఖీ చేయండి.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,ఆటో మెటీరియల్ అభ్యర్థనలు రూపొందించినవి
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,ఆటో మెటీరియల్ అభ్యర్థనలు రూపొందించినవి
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,లాస్ట్
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,మీరు కాలమ్ 'జర్నల్ ఎంట్రీ వ్యతిరేకంగా' ప్రస్తుత రసీదును ఎంటర్ కాదు
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,తయారీ కోసం రిసర్వ్డ్
@@ -966,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,శక్తి
DocType: Opportunity,Opportunity From,నుండి అవకాశం
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,మంత్లీ జీతం ప్రకటన.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,వరుస {0}: {1} అంశం కోసం {2} క్రమ సంఖ్య అవసరం. మీరు {3} ను అందించారు.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,వరుస {0}: {1} అంశం కోసం {2} క్రమ సంఖ్య అవసరం. మీరు {3} ను అందించారు.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,దయచేసి ఒక పట్టికను ఎంచుకోండి
DocType: BOM,Website Specifications,వెబ్సైట్ లక్షణాలు
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} 'గ్రహీతలు' లో చెల్లని ఇమెయిల్ చిరునామా
@@ -1035,7 +1036,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,కోట్ అభ్యర్థించబడింది
DocType: Vital Signs,Heart Rate / Pulse,హార్ట్ రేట్ / పల్స్
DocType: Company,Default Bank Account,డిఫాల్ట్ బ్యాంక్ ఖాతా
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",పార్టీ ఆధారంగా ఫిల్టర్ ఎన్నుకోండి పార్టీ మొదటి రకం
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",పార్టీ ఆధారంగా ఫిల్టర్ ఎన్నుకోండి పార్టీ మొదటి రకం
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},అంశాలను ద్వారా పంపిణీ లేదు ఎందుకంటే 'సరిచేయబడిన స్టాక్' తనిఖీ చెయ్యబడదు {0}
DocType: Vehicle,Acquisition Date,సంపాదన తేది
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1060,7 +1061,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),మీ లెటర్ హెడ్ ను అప్ లోడ్ చెయ్యండి (ఇది 100px ద్వారా 900px గా వెబ్ను స్నేహపూర్వకంగా ఉంచండి)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ఖాతా {2} ఒక గ్రూప్ ఉండకూడదు
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,అంశం రో {IDX}: {doctype} {DOCNAME} లేదు పైన ఉనికిలో లేదు '{doctype}' పట్టిక
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} ఇప్పటికే పూర్తి లేదా రద్దు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} ఇప్పటికే పూర్తి లేదా రద్దు
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,విధులు లేవు
DocType: Item Variant Settings,Copy Fields to Variant,కాపీ ఫీల్డ్స్ వేరియంట్
DocType: Asset,Opening Accumulated Depreciation,పోగుచేసిన తరుగుదల తెరవడం
@@ -1172,9 +1173,10 @@
DocType: Production Order,Plan material for sub-assemblies,ఉప శాసనసభలకు ప్రణాళిక పదార్థం
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,సేల్స్ భాగస్వాములు అండ్ టెరిటరీ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),మూసివేయడం (మొత్తం + తెరవడం)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),మూసివేయడం (మొత్తం + తెరవడం)
DocType: Journal Entry,Depreciation Entry,అరుగుదల ఎంట్రీ
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,మొదటి డాక్యుమెంట్ రకాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,ఖాతా కరెన్సీలో ముద్రించండి
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ఈ నిర్వహణ సందర్శించండి రద్దు ముందు రద్దు మెటీరియల్ సందర్శనల {0}
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 స్టాండర్డ్
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},సీరియల్ లేవు {0} అంశం చెందినది కాదు {1}
@@ -1200,7 +1202,7 @@
DocType: Supplier,Default Payable Accounts,డిఫాల్ట్ చెల్లించవలసిన అకౌంట్స్
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ఉద్యోగి చురుకుగా కాదు లేదా ఉనికిలో లేదు
DocType: Fee Structure,Components,భాగాలు
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
DocType: Quality Inspection Reading,Reading 6,6 పఠనం
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1252,6 +1254,7 @@
,Company Name,కంపెనీ పేరు
DocType: SMS Center,Total Message(s),మొత్తం సందేశం (లు)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,దయచేసి సెటప్> సెట్టింగులు> నామకరణ సిరీస్ ద్వారా {0} నామకరణ సిరీస్ను సెట్ చేయండి
DocType: Purchase Invoice,Additional Discount Percentage,అదనపు డిస్కౌంట్ శాతం
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,అన్ని సహాయ వీడియోలను జాబితాను వీక్షించండి
DocType: Agriculture Analysis Criteria,Soil Texture,నేల ఆకృతి
@@ -1280,7 +1283,7 @@
DocType: BOM Website Item,BOM Website Item,బిఒఎం వెబ్సైట్ అంశం
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,మీ లేఖ తల మరియు లోగో అప్లోడ్. (మీరు తర్వాత వాటిని సవరించవచ్చు).
DocType: Timesheet Detail,Bill,బిల్
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,తదుపరి అరుగుదల తేదీ గత తేదీగా ఎంటర్ ఉంది
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,తదుపరి అరుగుదల తేదీ గత తేదీగా ఎంటర్ ఉంది
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,వైట్
DocType: SMS Center,All Lead (Open),అన్ని లీడ్ (ఓపెన్)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),రో {0}: కోసం ప్యాక్ చేసిన అంశాల అందుబాటులో లేదు {4} గిడ్డంగిలో {1} ప్రవేశం సమయం పోస్ట్ చేయడంలో ({2} {3})
@@ -1297,7 +1300,7 @@
DocType: Lead,Next Contact Date,తదుపరి సంప్రదించండి తేదీ
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,ప్యాక్ చేసిన అంశాల తెరవడం
DocType: Healthcare Settings,Appointment Reminder,అపాయింట్మెంట్ రిమైండర్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
DocType: Program Enrollment Tool Student,Student Batch Name,స్టూడెంట్ బ్యాచ్ పేరు
DocType: Consultation,Doctor,డాక్టర్
DocType: Holiday List,Holiday List Name,హాలిడే జాబితా పేరు
@@ -1313,6 +1316,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,కేటాయింపు టూల్ వదిలి
DocType: Item,Hub Category to Publish,హబ్ వర్గం ప్రచురించడానికి
DocType: Leave Block List,Leave Block List Dates,బ్లాక్ జాబితా తేదీలు వదిలి
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,సెటప్> నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబర్ సిరీస్ను సెటప్ చేయండి
DocType: Sales Invoice,Billing Address GSTIN,బిల్లింగ్ అడ్రస్ GSTIN
DocType: Assessment Plan,Evaluate,పరీక్షించు
DocType: Workstation,Net Hour Rate,నికర గంట రేట్
@@ -1347,7 +1351,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,సేల్స్ వాయిస్ చెల్లింపు
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,సేల్స్ ఆర్డర్ / తయారైన వస్తువులు గిడ్డంగిలో రిసర్వ్డ్ వేర్హౌస్
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,సెల్లింగ్ మొత్తం
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,సెల్లింగ్ మొత్తం
DocType: Repayment Schedule,Interest Amount,వడ్డీ మొత్తం
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,మీరు ఈ రికార్డ్ కోసం ఖర్చుల అప్రూవర్గా ఉన్నాయి. 'హోదా' మరియు సేవ్ అప్డేట్ దయచేసి
DocType: Serial No,Creation Document No,సృష్టి డాక్యుమెంట్ లేవు
@@ -1440,7 +1444,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,తెరవడం అకౌంటింగ్ సంతులనం
,GST Sales Register,జిఎస్టి సేల్స్ నమోదు
DocType: Sales Invoice Advance,Sales Invoice Advance,సేల్స్ వాయిస్ అడ్వాన్స్
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,నథింగ్ అభ్యర్థించవచ్చు
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,నథింగ్ అభ్యర్థించవచ్చు
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,మీ డొమైన్లను ఎంచుకోండి
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},మరో బడ్జెట్ రికార్డు '{0}' ఇప్పటికే వ్యతిరేకంగా ఉంది {1} '{2}' ఆర్థిక సంవత్సరానికి {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,క్షేత్రాలు సృష్టి సమయంలో మాత్రమే కాపీ చేయబడతాయి.
@@ -1450,11 +1454,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ఈ శ్రేణి Item కోడ్ చేర్చవలసి ఉంటుంది. మీ సంక్షిప్త "SM" మరియు ఉదాహరణకు, అంశం కోడ్ "T- షర్టు", "T- షర్టు-SM" ఉంటుంది వేరియంట్ అంశం కోడ్"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,మీరు వేతనం స్లిప్ సేవ్ ఒకసారి (మాటలలో) నికర పే కనిపిస్తుంది.
DocType: Purchase Invoice,Is Return,రాబడి
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,హెచ్చరిక
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,హెచ్చరిక
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,రిటర్న్ / డెబిట్ గమనిక
DocType: Price List Country,Price List Country,ధర జాబితా దేశం
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} అంశం చెల్లుబాటు సీరియల్ nos {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} అంశం చెల్లుబాటు సీరియల్ nos {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item కోడ్ సీరియల్ నం కోసం మారలేదు
DocType: Purchase Invoice Item,UOM Conversion Factor,UoM మార్పిడి ఫాక్టర్
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,బ్యాచ్ సంఖ్య పొందడానికి అంశం కోడ్ను నమోదు చేయండి
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
DocType: Supplier Scorecard,Warn for new Request for Quotations,ఉల్లేఖనాల కోసం క్రొత్త అభ్యర్థన కోసం హెచ్చరించండి
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,కొనుగోలు ఆర్డర్లు మీరు ప్లాన్ సహాయం మరియు మీ కొనుగోళ్లపై అనుసరించాల్సి
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ల్యాబ్ టెస్ట్ ప్రిస్క్రిప్షన్స్
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",మొత్తం ఇష్యూ / ట్రాన్స్ఫర్ పరిమాణం {0} మెటీరియల్ అభ్యర్థన {1} \ అంశం కోసం అభ్యర్థించిన పరిమాణం {2} కంటే ఎక్కువ ఉండకూడదు {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,వేర్హౌస్ సంప్రదింపు సమాచారం
DocType: Payment Entry,Write Off Difference Amount,తేడా మొత్తం ఆఫ్ వ్రాయండి
DocType: Volunteer,Volunteer Name,వాలంటీర్ పేరు
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,దయచేసి ఎడ్యుకేషన్> ఎడ్యుకేషన్ సెట్టింగులలో ఇన్స్ట్రక్టర్ నేమింగ్ సిస్టం సెటప్ చేయండి
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: ఉద్యోగి ఇమెయిల్ దొరకలేదు, అందుకే పంపలేదు ఇమెయిల్"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},షిప్పింగ్ నియమం దేశం కోసం వర్తించదు {0}
DocType: Item,Foreign Trade Details,ఫారిన్ ట్రేడ్ వివరాలు
@@ -1610,7 +1613,7 @@
DocType: Student Group Student,Group Roll Number,గ్రూప్ రోల్ సంఖ్య
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, కేవలం క్రెడిట్ ఖాతాల మరొక డెబిట్ ప్రవేశం వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,అన్ని పని బరువులు మొత్తం 1 ఉండాలి తదనుగుణంగా ప్రణాళిక పనులు బరువులు సర్దుబాటు చేయండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,అంశం {0} ఒక ఉప-ఒప్పంద అంశం ఉండాలి
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,రాజధాని పరికరాలు
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ధర రూల్ మొదటి ఆధారంగా ఎంపిక ఉంటుంది అంశం, అంశం గ్రూప్ లేదా బ్రాండ్ కావచ్చు, ఫీల్డ్ 'న వర్తించు'."
@@ -1635,7 +1638,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,చైల్డ్ గిడ్డంగిలో ఈ గిడ్డంగిలో అవసరమయ్యారు. మీరు ఈ గిడ్డంగిలో తొలగించలేరు.
DocType: Item,Website Item Groups,వెబ్సైట్ అంశం గుంపులు
DocType: Purchase Invoice,Total (Company Currency),మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,{0} క్రమ సంఖ్య ఒకసారి కంటే ఎక్కువ ప్రవేశించింది
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,{0} క్రమ సంఖ్య ఒకసారి కంటే ఎక్కువ ప్రవేశించింది
DocType: Journal Entry,Journal Entry,జర్నల్ ఎంట్రీ
DocType: Expense Claim Advance,Unclaimed amount,దావా వేయబడిన మొత్తం
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} పురోగతి అంశాలను
@@ -1732,7 +1735,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,కమ్యూనికేషన్ లాగ్.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","కొటేషన్ కోసం అభ్యర్థన చెక్ పోర్టల్ అమర్పులను కోసం, పోర్టల్ నుండి యాక్సెస్ నిలిపివేయబడింది."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,సరఫరాదారు స్కోర్కార్డ్ స్కోరింగ్ వేరియబుల్
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,కొనుగోలు సొమ్ము
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,కొనుగోలు సొమ్ము
DocType: Sales Invoice,Shipping Address Name,షిప్పింగ్ చిరునామా పేరు
DocType: Material Request,Terms and Conditions Content,నియమాలు మరియు నిబంధనలు కంటెంట్
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,కోర్సు షెడ్యూల్ను సృష్టించే లోపాలు ఉన్నాయి
@@ -1996,7 +1999,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ఈ ఈ వాహనం వ్యతిరేకంగా లాగ్లను ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},సరఫరాదారు వ్యతిరేకంగా వాయిస్ {0} నాటి {1}
DocType: Customer,Default Price List,డిఫాల్ట్ ధర జాబితా
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,మీరు తొలగించలేరు ఫిస్కల్ ఇయర్ {0}. ఫిస్కల్ ఇయర్ {0} గ్లోబల్ సెట్టింగ్స్ లో డిఫాల్ట్ గా సెట్
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,అదే పేరుతో ఉన్న కస్టమర్ ఇప్పటికే ఉంది
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,"ఇది జీతం స్లిప్ లను సమర్పించి, హక్కు జర్నల్ ఎంట్రీని సృష్టిస్తుంది. మీరు కొనసాగాలనుకుంటున్నారా?"
@@ -2010,6 +2013,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,ధర
DocType: Quotation,Term Details,టర్మ్ వివరాలు
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} ఈ విద్యార్థి సమూహం కోసం విద్యార్థులు కంటే మరింత నమోదు చేయలేరు.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),మొత్తం (పన్ను లేకుండా)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,లీడ్ కౌంట్
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 కంటే ఎక్కువ ఉండాలి
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,స్టాక్ అందుబాటులో ఉంది
@@ -2029,7 +2033,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,వాయిస్ రద్దు చెల్లింపు లింక్ను రద్దు
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ఎంటర్ ప్రస్తుత ఓడోమీటార్ పఠనం ప్రారంభ వాహనం ఓడోమీటార్ కన్నా ఎక్కువ ఉండాలి {0}
DocType: Restaurant Reservation,No Show,ప్రదర్శన లేదు
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,దయచేసి సెటప్> సెట్టింగులు> నామకరణ సిరీస్ ద్వారా {0} నామకరణ సిరీస్ను సెట్ చేయండి
DocType: Shipping Rule Country,Shipping Rule Country,షిప్పింగ్ రూల్ దేశం
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,వదిలివేయండి మరియు హాజరు
DocType: Maintenance Visit,Partially Completed,పాక్షికంగా పూర్తి
@@ -2122,7 +2125,7 @@
DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
DocType: Grant Application,Assessment Mark (Out of 10),అసెస్మెంట్ మార్క్ (10 నుండి)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 మొబైల్ లేవు
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,ప్రధాన
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,ప్రధాన
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,వేరియంట్
DocType: Naming Series,Set prefix for numbering series on your transactions,మీ లావాదేవీలపై సిరీస్ నంబరింగ్ కోసం సెట్ ఉపసర్గ
DocType: Employee Attendance Tool,Employees HTML,ఉద్యోగులు HTML
@@ -2172,7 +2175,7 @@
DocType: Course,Course Abbreviation,కోర్సు సంక్షిప్తీకరణ
DocType: Student Leave Application,Student Leave Application,స్టూడెంట్ లీవ్ అప్లికేషన్
DocType: Item,Will also apply for variants,కూడా రూపాంతరాలు వర్తిస్తాయని
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ఉద్యోగి {0} లో హాఫ్ రోజున {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},మొత్తం పని గంటల గరిష్టంగా పని గంటల కంటే ఎక్కువ ఉండకూడదు {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,పై
@@ -2359,9 +2362,10 @@
DocType: Task,Actual End Date (via Time Sheet),ముగింపు తేదీ (సమయం షీట్ ద్వారా)
DocType: Soil Texture,Soil Type,నేల రకం
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,కొత్త సందేశం
,Quotation Trends,కొటేషన్ ట్రెండ్లులో
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},అంశం గ్రూప్ అంశం కోసం అంశాన్ని మాస్టర్ ప్రస్తావించలేదు {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
DocType: Shipping Rule,Shipping Amount,షిప్పింగ్ మొత్తం
DocType: Supplier Scorecard Period,Period Score,కాలం స్కోరు
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,వినియోగదారుడు జోడించండి
@@ -2372,7 +2376,7 @@
,Vehicle Expenses,వాహనం ఖర్చులు
DocType: Serial No,Invoice Details,ఇన్వాయిస్ వివరాలు
DocType: Grant Application,Show on Website,వెబ్సైట్లో చూపించు
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ప్రారంభించండి
DocType: Hub Category,Hub Category,హబ్ వర్గం
DocType: Purchase Invoice,SEZ,సెజ్
@@ -2404,7 +2408,7 @@
DocType: Patient,B Positive,B అనుకూలమైన
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
DocType: Leave Block List Allow,Leave Block List Allow,బ్లాక్ జాబితా అనుమతించు వదిలి
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
DocType: Patient Medical Record,Patient Medical Record,పేషెంట్ మెడికల్ రికార్డ్
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,కాని గ్రూప్ గ్రూప్
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,క్రీడలు
@@ -2454,6 +2458,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,ఏ కోట్కు అందుకున్న RFQ ను సెట్ చేయలేరు
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,మొత్తం తీసివేత
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,ఖాతా కరెన్సీలో ముద్రించడానికి ఒక ఖాతాను ఎంచుకోండి
,Production Analytics,ఉత్పత్తి Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,ఇది ఈ రోగికి సంబంధించిన లావాదేవీల ఆధారంగా ఉంది. వివరాలు కోసం కాలక్రమం క్రింద చూడండి
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ధర నవీకరించబడింది
@@ -2509,7 +2514,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,కంపెనీ ఎంచుకోండి ...
DocType: Leave Control Panel,Leave blank if considered for all departments,అన్ని శాఖల కోసం భావిస్తారు ఉంటే ఖాళీ వదిలి
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
DocType: Payroll Entry,Fortnightly,పక్ష
DocType: Currency Exchange,From Currency,కరెన్సీ నుండి
DocType: Vital Signs,Weight (In Kilogram),బరువు (కిలోగ్రాంలో)
@@ -2586,7 +2591,7 @@
DocType: Student,Guardians,గార్దియన్స్
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ధర జాబితా సెట్ చెయ్యకపోతే ధరలు చూపబడవు
DocType: Stock Entry,Total Incoming Value,మొత్తం ఇన్కమింగ్ విలువ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,డెబిట్ అవసరం ఉంది
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,డెబిట్ అవసరం ఉంది
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets మీ జట్టు చేసిన కృత్యాలు కోసం సమయం, ఖర్చు మరియు బిల్లింగ్ ట్రాక్ సహాయం"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,కొనుగోలు ధర జాబితా
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,సరఫరాదారు స్కోర్కార్డ్ వేరియబుల్స్ యొక్క టెంప్లేట్లు.
@@ -2688,7 +2693,7 @@
DocType: Company,For Reference Only.,సూచన ఓన్లి.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},వైద్యుడు {0} {1} లో అందుబాటులో లేదు
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,బ్యాచ్ ఎంచుకోండి లేవు
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},చెల్లని {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},చెల్లని {0}: {1}
,GSTR-1,GSTR -1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,సూచన ఆహ్వానం
@@ -2725,8 +2730,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","కార్యకలాపాలు, నిర్వహణ ఖర్చు పేర్కొనండి మరియు మీ కార్యకలాపాలను ఎలాంటి ఒక ఏకైక ఆపరేషన్ ఇస్తాయి."
DocType: Water Analysis,Origin,మూలం
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ఈ పత్రం పరిమితి {0} {1} అంశం {4}. మీరు తయారు మరొక {3} అదే వ్యతిరేకంగా {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
DocType: Purchase Invoice,Price List Currency,ధర జాబితా కరెన్సీ
DocType: Naming Series,User must always select,వినియోగదారు ఎల్లప్పుడూ ఎంచుకోవాలి
DocType: Stock Settings,Allow Negative Stock,ప్రతికూల స్టాక్ అనుమతించు
@@ -2782,7 +2787,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,కొత్త కొనుగోలు ఆర్డర్లు కోసం హెచ్చరించండి
DocType: Quality Inspection Reading,Reading 9,9 పఠనం
DocType: Supplier,Is Frozen,ఘనీభవించిన
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,గ్రూప్ నోడ్ గిడ్డంగిలో లావాదేవీలకు ఎంచుకోండి అనుమతి లేదు
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,గ్రూప్ నోడ్ గిడ్డంగిలో లావాదేవీలకు ఎంచుకోండి అనుమతి లేదు
DocType: Buying Settings,Buying Settings,కొనుగోలు సెట్టింగ్స్
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,ఒక ఫినిష్డ్ మంచి అంశం BOM నం
DocType: Upload Attendance,Attendance To Date,తేదీ హాజరు
@@ -2797,6 +2802,7 @@
DocType: Grant Application,Organization,సంస్థ
DocType: BOM Update Tool,BOM Update Tool,BOM అప్డేట్ టూల్
DocType: SG Creation Tool Course,Student Group Name,స్టూడెంట్ గ్రూప్ పేరు
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,పేలింది వీక్షణ చూపించు
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,రుసుము సృష్టిస్తోంది
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,మీరు నిజంగా ఈ సంస్థ కోసం అన్ని లావాదేవీలు తొలగించాలనుకుంటున్నారా నిర్ధారించుకోండి. ఇది వంటి మీ మాస్టర్ డేటా అలాగే ఉంటుంది. ఈ చర్య రద్దు సాధ్యం కాదు.
DocType: Room,Room Number,గది సంఖ్య
@@ -2807,7 +2813,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,పన్ను మూసను చేయండి
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,వాడుకరి ఫోరం
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
DocType: Lab Test Sample,Lab Test Sample,ల్యాబ్ పరీక్ష నమూనా
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,బిఒఎం ఏ అంశం agianst పేర్కొన్నారు ఉంటే మీరు రేటు మార్చలేరు
@@ -2878,7 +2884,7 @@
DocType: Membership,USD,డాలర్లు
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,వాయిస్ చేయండి
DocType: Selling Settings,Auto close Opportunity after 15 days,15 రోజుల తర్వాత ఆటో దగ్గరగా అవకాశం
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} యొక్క స్కోర్కార్డ్ స్టాండింగ్ వల్ల {0} కొనుగోలు ఆర్డర్లు అనుమతించబడవు.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} యొక్క స్కోర్కార్డ్ స్టాండింగ్ వల్ల {0} కొనుగోలు ఆర్డర్లు అనుమతించబడవు.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ముగింపు సంవత్సరం
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,QUOT / లీడ్%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,కాంట్రాక్ట్ ముగింపు తేదీ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
@@ -2969,7 +2975,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ఉపరితలం
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,రో # {0}: జర్నల్ ఎంట్రీ {1} లేదు ఖాతా లేదు {2} లేదా ఇప్పటికే మరొక రసీదును జతచేసేందుకు
DocType: Supplier Scorecard Criteria,Criteria Weight,ప్రమాణం బరువు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,సరఫరాదారు> సరఫరాదారు రకం
DocType: Buying Settings,Default Buying Price List,డిఫాల్ట్ కొనుగోలు ధర జాబితా
DocType: Payroll Entry,Salary Slip Based on Timesheet,జీతం స్లిప్ TIMESHEET ఆధారంగా
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,కొనుగోలు కొనుగోలు
@@ -3058,7 +3063,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ట్రాక్ పరిశ్రమ రకం ద్వారా నడిపించును.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,లెటర్ హెడ్స్ వెళ్ళండి
DocType: Item Supplier,Item Supplier,అంశం సరఫరాదారు
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,అన్ని చిరునామాలు.
DocType: Company,Stock Settings,స్టాక్ సెట్టింగ్స్
@@ -3234,6 +3239,7 @@
DocType: Company,Default Inventory Account,డిఫాల్ట్ ఇన్వెంటరీ ఖాతా
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల సున్నా కంటే ఎక్కువ ఉండాలి.
DocType: Antibiotic,Antibiotic Name,యాంటిబయోటిక్ పేరు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,అంశం కోడ్> అంశం సమూహం> బ్రాండ్
DocType: Purchase Invoice,Apply Additional Discount On,అదనపు డిస్కౌంట్ న వర్తించు
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,రకాన్ని ఎంచుకోండి ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,పంట పెరుగుతున్న అన్ని ల్యాండ్ యూనిట్లు ఒక లింక్
@@ -3426,6 +3432,7 @@
DocType: Supplier,Credit Limit,క్రెడిట్ పరిమితి
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,కనీస. ధర జాబితా రేట్ సెల్లింగ్
DocType: Production Plan Sales Order,Salse Order Date,Salse ఆర్డర్ తేదీ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,సరఫరాదారు> సరఫరాదారు రకం
DocType: Salary Component,Salary Component,జీతం భాగం
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,చెల్లింపు ఎంట్రీలు {0} అన్ చేయబడినాయి
DocType: GL Entry,Voucher No,ఓచర్ లేవు
@@ -3434,7 +3441,7 @@
DocType: Leave Allocation,Leave Allocation,కేటాయింపు వదిలి
DocType: Payment Request,Recipient Message And Payment Details,గ్రహీత సందేశం మరియు చెల్లింపు వివరాలు
DocType: Training Event,Trainer Email,శిక్షణ ఇమెయిల్
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,రూపొందించినవారు మెటీరియల్ అభ్యర్థనలు {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,రూపొందించినవారు మెటీరియల్ అభ్యర్థనలు {0}
DocType: Restaurant Reservation,No of People,ప్రజల సంఖ్య
DocType: Production Planning Tool,Include sub-contracted raw materials,ఉప-ఒప్పంద ముడి పదార్థాలు చేర్చండి
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,నిబంధనలు ఒప్పందం మూస.
@@ -3498,7 +3505,7 @@
DocType: Production Planning Tool,Create Material Requests,మెటీరియల్ అభ్యర్థనలు సృష్టించు
DocType: Employee Education,School/University,స్కూల్ / విశ్వవిద్యాలయం
DocType: Payment Request,Reference Details,రిఫరెన్స్ వివరాలు
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ఆశిస్తున్న విలువ ఉపయోగకరమైన లైఫ్ తరువాత స్థూల కొనుగోలు మొత్తం కంటే తక్కువ ఉండాలి
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ఆశిస్తున్న విలువ ఉపయోగకరమైన లైఫ్ తరువాత స్థూల కొనుగోలు మొత్తం కంటే తక్కువ ఉండాలి
DocType: Sales Invoice Item,Available Qty at Warehouse,Warehouse వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,బిల్ మొత్తం
DocType: Asset,Double Declining Balance,డబుల్ తగ్గుతున్న సంతులనం
@@ -3510,7 +3517,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,నవీకరణలు పొందండి
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ఖాతా {2} కంపెనీ చెందదు {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,ప్రతి లక్షణాల నుండి కనీసం ఒక విలువను ఎంచుకోండి.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,మెటీరియల్ అభ్యర్థన {0} రద్దు లేదా ఆగిపోయిన
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,మెటీరియల్ అభ్యర్థన {0} రద్దు లేదా ఆగిపోయిన
apps/erpnext/erpnext/config/hr.py +310,Leave Management,మేనేజ్మెంట్ వదిలి
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,ఖాతా గ్రూప్
DocType: Sales Order,Fully Delivered,పూర్తిగా పంపిణీ
@@ -3521,14 +3528,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},పంపించబడతాయి మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,ప్రోగ్రామ్లకు వెళ్లండి
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},వరుస {0} # కేటాయించబడిన మొత్తాన్ని {2} కంటే ఎక్కువగా కేటాయించబడదు {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,సెటప్> నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబర్ సిరీస్ను సెటప్ చేయండి
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},అంశం అవసరం ఆర్డర్ సంఖ్య కొనుగోలు {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,ఉత్పత్తి ఆర్డర్ సృష్టించలేదు
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','తేదీ నుండి' తర్వాత 'తేదీ' ఉండాలి
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},విద్యార్థిగా స్థితిని మార్చలేరు {0} విద్యార్ధి అప్లికేషన్ ముడిపడి ఉంటుంది {1}
DocType: Asset,Fully Depreciated,పూర్తిగా విలువ తగ్గుతున్న
,Stock Projected Qty,స్టాక్ ప్యాక్ చేసిన అంశాల ప్రొజెక్టెడ్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,గుర్తించ హాజరు HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","సుభాషితాలు, ప్రతిపాదనలు ఉన్నాయి మీరు మీ వినియోగదారులకు పంపారు వేలం"
DocType: Sales Order,Customer's Purchase Order,కస్టమర్ యొక్క కొనుగోలు ఆర్డర్
@@ -3612,7 +3618,7 @@
DocType: Stock Settings,Item Naming By,అంశం ద్వారా నామకరణ
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},మరో కాలం ముగింపు ఎంట్రీ {0} తర్వాత జరిగింది {1}
DocType: Production Order,Material Transferred for Manufacturing,పదార్థం తయారీ కోసం బదిలీ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,ఖాతా {0} చేస్తుంది ఉందో
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,ఖాతా {0} చేస్తుంది ఉందో
DocType: Project,Project Type,ప్రాజెక్ట్ పద్ధతి
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,ఈ టాస్క్ కోసం చైల్డ్ టాస్క్ ఉనికిలో ఉంది. మీరు ఈ విధిని తొలగించలేరు.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,గాని లక్ష్యాన్ని అంశాల లేదా లక్ష్యం మొత్తం తప్పనిసరి.
@@ -3714,11 +3720,11 @@
DocType: Company,Asset Depreciation Cost Center,ఆస్తి అరుగుదల వ్యయ కేంద్రం
DocType: Sales Order Item,Sales Order Date,సేల్స్ ఆర్డర్ తేదీ
DocType: Sales Invoice Item,Delivered Qty,పంపిణీ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,మొత్తం Excl. పన్ను
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","తనిఖీ చేస్తే, ప్రతి ఉత్పత్తి అంశాన్ని లందరును మెటీరియల్ రిక్వెస్ట్ చేర్చబడుతుంది."
DocType: Assessment Plan,Assessment Plan,అసెస్మెంట్ ప్రణాళిక
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,కస్టమర్ {0} సృష్టించబడింది.
DocType: Stock Settings,Limit Percent,పరిమితి శాతం
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,దయచేసి ఎడ్యుకేషన్> ఎడ్యుకేషన్ సెట్టింగులలో ఇన్స్ట్రక్టర్ నేమింగ్ సిస్టం సెటప్ చేయండి
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ఏ గిడ్డంగిలో ప్రస్తుతం స్టాక్ లేదు
,Payment Period Based On Invoice Date,వాయిస్ తేదీ ఆధారంగా చెల్లింపు కాలం
DocType: Sample Collection,No. of print,ప్రింట్ సంఖ్య
@@ -3734,12 +3740,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),రుణగ్రస్తులు ({0})
DocType: Pricing Rule,Margin,మార్జిన్
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,కొత్త వినియోగదారులు
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,స్థూల లాభం%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,స్థూల లాభం%
DocType: Appraisal Goal,Weightage (%),వెయిటేజీ (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS ప్రొఫైల్ని మార్చండి
DocType: Bank Reconciliation Detail,Clearance Date,క్లియరెన్స్ తేదీ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,అసెస్మెంట్ రిపోర్ట్
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,స్థూల కొనుగోలు మొత్తాన్ని తప్పనిసరి
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,స్థూల కొనుగోలు మొత్తాన్ని తప్పనిసరి
DocType: Lead,Address Desc,Desc పరిష్కరించేందుకు
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,పార్టీ తప్పనిసరి
DocType: Journal Entry,JV-,JV-
@@ -3771,7 +3777,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,స్టాండింగ్ పేరు
DocType: Stock Entry,Customer or Supplier Details,కస్టమర్ లేదా సరఫరాదారు వివరాలు
DocType: Employee Loan Application,Required by Date,తేదీ ద్వారా అవసరం
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),ముగింపు సంతులనం (డాక్టర్ - CR)
DocType: Lead,Lead Owner,జట్టు యజమాని
DocType: Bin,Requested Quantity,అభ్యర్థించిన పరిమాణం
DocType: Patient,Marital Status,వైవాహిక స్థితి
@@ -3785,7 +3790,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,బహుళ వైవిధ్యాలు
DocType: Sales Invoice,Against Income Account,ఆదాయపు ఖాతా వ్యతిరేకంగా
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% పంపిణీ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,అంశం {0}: క్రమ చేసిన అంశాల {1} కనీస క్రమంలో అంశాల {2} (అంశం లో నిర్వచించిన) కంటే తక్కువ ఉండకూడదు.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,అంశం {0}: క్రమ చేసిన అంశాల {1} కనీస క్రమంలో అంశాల {2} (అంశం లో నిర్వచించిన) కంటే తక్కువ ఉండకూడదు.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,మంత్లీ పంపిణీ శాతం
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,దయచేసి మరొక యూజర్గా లాగిన్ అవ్వండి.
DocType: Territory,Territory Targets,భూభాగం టార్గెట్స్
@@ -3884,7 +3889,7 @@
DocType: Serial No,Out of AMC,AMC యొక్క అవుట్
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,నిర్వహణ సందర్శించండి చేయండి
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
DocType: Company,Default Cash Account,డిఫాల్ట్ నగదు ఖాతా
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,కంపెనీ (కాదు కస్టమర్ లేదా సరఫరాదారు) మాస్టర్.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ఈ ఈ విద్యార్థి హాజరు ఆధారంగా
@@ -4036,7 +4041,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,పేర్కొన్న ప్రమాణం కోసం ఉద్యోగులు లేరు
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
DocType: Restaurant,Default Customer,డిఫాల్ట్ కస్టమర్
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,దయచేసి మానవ వనరులో HR ఉద్యోగ నామకరణ వ్యవస్థ సెటప్ చేయండి> హెచ్ఆర్ సెట్టింగులు
DocType: Assessment Plan,Supervisor Name,సూపర్వైజర్ పేరు
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,అదే రోజున నియామకం సృష్టించబడితే నిర్ధారించవద్దు
DocType: Program Enrollment Course,Program Enrollment Course,ప్రోగ్రామ్ ఎన్రోల్మెంట్ కోర్సు
@@ -4159,7 +4163,7 @@
DocType: BOM,Website Description,వెబ్సైట్ వివరణ
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ఈక్విటీ నికర మార్పు
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,సరికొత్త
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ఇమెయిల్ అడ్రస్ కోసం ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,స్వీకరణపై
@@ -4176,7 +4180,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,లావాదేవి నివేదిక
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},రుణ మొత్తం గరిష్ట రుణ మొత్తం మించకూడదు {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,లైసెన్సు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,మీరు కూడా గత ఆర్థిక సంవత్సరం సంతులనం ఈ ఆర్థిక సంవత్సరం ఆకులు ఉన్నాయి అనుకుంటే కుంటున్న దయచేసి ఎంచుకోండి
DocType: GL Entry,Against Voucher Type,ఓచర్ పద్ధతి వ్యతిరేకంగా
DocType: Physician,Phone (R),ఫోన్ (R)
@@ -4188,7 +4192,7 @@
DocType: Patient,B Negative,బి నెగటివ్
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,నిర్వహణ స్థితి రద్దు చేయబడాలి లేదా సమర్పించవలసి ఉంటుంది
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,వరుసగా {0} లో సీరియల్ సంఖ్యలు డెలివరీ గమనిక సరిపోలడం లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,వరుసగా {0} లో సీరియల్ సంఖ్యలు డెలివరీ గమనిక సరిపోలడం లేదు
DocType: Student,Guardian Details,గార్డియన్ వివరాలు
DocType: C-Form,C-Form,సి ఫారం
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,బహుళ ఉద్యోగులకు మార్క్ హాజరు
@@ -4230,7 +4234,7 @@
DocType: Stock Entry Detail,Basic Amount,ప్రాథమిక సొమ్ము
DocType: Training Event,Exam,పరీక్షా
DocType: Complaint,Complaint,ఫిర్యాదు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
DocType: Leave Allocation,Unused leaves,ఉపయోగించని ఆకులు
DocType: Patient,Alcohol Past Use,ఆల్కహాల్ పాస్ట్ యూజ్
DocType: Fertilizer Content,Fertilizer Content,ఎరువులు కంటెంట్
@@ -4358,6 +4362,7 @@
DocType: Salary Detail,Formula,ఫార్ములా
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,సీరియల్ #
DocType: Lab Test Template,Lab Test Template,ల్యాబ్ టెస్ట్ మూస
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,సేల్స్ ఖాతా
DocType: Purchase Invoice Item,Total Weight,మొత్తం బరువు
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,సేల్స్ కమిషన్
DocType: Offer Letter Term,Value / Description,విలువ / వివరణ
@@ -4514,7 +4519,7 @@
DocType: Customer,From Lead,లీడ్ నుండి
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ఆర్డర్స్ ఉత్పత్తి కోసం విడుదల చేసింది.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ఫిస్కల్ ఇయర్ ఎంచుకోండి ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
DocType: Program Enrollment Tool,Enroll Students,విద్యార్ధులను నమోదు
DocType: Lab Test,Approved Date,ఆమోదించబడిన తేదీ
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ప్రామాణిక సెల్లింగ్
@@ -4591,7 +4596,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,ఉత్పత్తి అంశం
,Employee Information,Employee ఇన్ఫర్మేషన్
DocType: Stock Entry Detail,Additional Cost,అదనపు ఖర్చు
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ఓచర్ లేవు ఆధారంగా వడపోత కాదు, ఓచర్ ద్వారా సమూహం ఉంటే"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","ఓచర్ లేవు ఆధారంగా వడపోత కాదు, ఓచర్ ద్వారా సమూహం ఉంటే"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
DocType: Quality Inspection,Incoming,ఇన్కమింగ్
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,అమ్మకాలు మరియు కొనుగోలు కోసం డిఫాల్ట్ పన్ను టెంప్లేట్లు సృష్టించబడతాయి.
@@ -4608,7 +4613,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},గమనిక: {0}
,Delivery Note Trends,డెలివరీ గమనిక ట్రెండ్లులో
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ఈ వారపు సారాంశం
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,స్టాక్ ప్యాక్ చేసిన అంశాల లో
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,స్టాక్ ప్యాక్ చేసిన అంశాల లో
DocType: Delivery Trip,Calculate Estimated Arrival Times,అంచనావేయబడిన రాకపోకల టైములను లెక్కించండి
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ఖాతా: {0} మాత్రమే స్టాక్ లావాదేవీలు ద్వారా నవీకరించబడింది చేయవచ్చు
DocType: Student Group Creation Tool,Get Courses,కోర్సులు పొందండి
@@ -4624,7 +4629,7 @@
DocType: Material Request,% Ordered,% క్రమ
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","కోర్సు ఆధారంగా విద్యార్థి సమూహం కోసం, కోర్సు ప్రోగ్రామ్ ఎన్రోల్మెంట్ చేరాడు కోర్సులు నుండి ప్రతి విద్యార్థి కోసం చెల్లుబాటు అవుతుంది."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,కనీస. బైయింగ్ రేట్
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,కనీస. బైయింగ్ రేట్
DocType: Task,Actual Time (in Hours),(గంటల్లో) వాస్తవ సమయం
DocType: Employee,History In Company,కంపెనీ చరిత్ర
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{పంపినవారు} నుండి క్రొత్త సందేశం
@@ -4672,7 +4677,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},రో {0}: పాఠశాల బిఒఎం # కరెన్సీ {1} ఎంపిక కరెన్సీ సమానంగా ఉండాలి {2}
DocType: Journal Entry Account,Exchange Rate,ఎక్స్చేంజ్ రేట్
DocType: Patient,Additional information regarding the patient,రోగి గురించి అదనపు సమాచారం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
DocType: Homepage,Tag Line,ట్యాగ్ లైన్
DocType: Fee Component,Fee Component,ఫీజు భాగం
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,ఫ్లీట్ మేనేజ్మెంట్
@@ -4887,7 +4892,7 @@
DocType: Employee Education,Employee Education,Employee ఎడ్యుకేషన్
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,అంశం సమూహం పట్టిక కనిపించే నకిలీ అంశం సమూహం
DocType: Land Unit,Parent Land Unit,పేరెంట్ ల్యాండ్ యూనిట్
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
DocType: Fertilizer,Fertilizer Name,ఎరువులు పేరు
DocType: Salary Slip,Net Pay,నికర పే
DocType: Account,Account,ఖాతా
@@ -4966,7 +4971,7 @@
DocType: Item Customer Detail,Ref Code,Ref కోడ్
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS ప్రొఫైల్ లో కస్టమర్ గ్రూప్ అవసరం
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Employee రికార్డులు.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,తదుపరి అరుగుదల తేదీ సెట్ చెయ్యండి
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,తదుపరి అరుగుదల తేదీ సెట్ చెయ్యండి
DocType: HR Settings,Payroll Settings,పేరోల్ సెట్టింగ్స్
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,కాని లింక్డ్ రసీదులు మరియు చెల్లింపులు ఫలితం.
DocType: POS Settings,POS Settings,POS సెట్టింగులు
@@ -5134,7 +5139,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},పుట్టినరోజు రిమైండర్ {0}
DocType: Asset Maintenance Task,Last Completion Date,చివరి పూర్తి తేదీ
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,చివరి ఆర్డర్ నుండి రోజుల్లో
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
DocType: Buying Settings,Naming Series,నామకరణ సిరీస్
DocType: Leave Block List,Leave Block List Name,బ్లాక్ జాబితా వదిలి పేరు
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,భీమా తేదీ ప్రారంభించండి భీమా ముగింపు తేదీ కంటే తక్కువ ఉండాలి
@@ -5264,6 +5269,7 @@
DocType: Bank Reconciliation,Get Payment Entries,చెల్లింపు ఎంట్రీలు పొందండి
DocType: Quotation Item,Against Docname,Docname వ్యతిరేకంగా
DocType: SMS Center,All Employee (Active),అన్ని ఉద్యోగి (యాక్టివ్)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,కస్టమర్> కస్టమర్ గ్రూప్> భూభాగం
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ఇప్పుడు వీక్షణ
DocType: BOM,Raw Material Cost,రా మెటీరియల్ ఖర్చు
DocType: Item Reorder,Re-Order Level,రీ-ఆర్డర్ స్థాయి
@@ -5364,7 +5370,6 @@
DocType: Room,Seating Capacity,సీటింగ్ కెపాసిటీ
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,ల్యాబ్ టెస్ట్ గుంపులు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,కస్టమర్> కస్టమర్ గ్రూప్> భూభాగం
DocType: Project,Total Expense Claim (via Expense Claims),మొత్తం ఖర్చుల దావా (ఖర్చు వాదనలు ద్వారా)
DocType: GST Settings,GST Summary,జిఎస్టి సారాంశం
DocType: Assessment Result,Total Score,మొత్తం స్కోరు
@@ -5378,7 +5383,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,తరువాత కోర్సు షెడ్యూల్ సృష్టించబడింది
DocType: Journal Entry,Total Debit,మొత్తం డెబిట్
DocType: Manufacturing Settings,Default Finished Goods Warehouse,డిఫాల్ట్ తయారైన వస్తువులు వేర్హౌస్
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,సేల్స్ పర్సన్
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,సేల్స్ పర్సన్
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,బడ్జెట్ మరియు వ్యయ కేంద్రం
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,చెల్లింపు యొక్క బహుళ డిఫాల్ట్ మోడ్ అనుమతించబడదు
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,కొరకు
@@ -5553,7 +5558,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,పన్ను లేదా ఛార్జ్ పరిగణించండి
DocType: Driver,Driving License Category,డ్రైవింగ్ లైసెన్సు వర్గం
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,వాస్తవ ప్యాక్ చేసిన అంశాల తప్పనిసరి
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ప్రస్తుతం {1} సరఫరాదారు స్కోర్కార్డ్ నిలబడి ఉంది మరియు ఈ సరఫరాదారుకి కొనుగోలు ఆర్డర్లు హెచ్చరికతో జారీ చేయాలి.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ప్రస్తుతం {1} సరఫరాదారు స్కోర్కార్డ్ నిలబడి ఉంది మరియు ఈ సరఫరాదారుకి కొనుగోలు ఆర్డర్లు హెచ్చరికతో జారీ చేయాలి.
DocType: Asset Maintenance Team,Asset Maintenance Team,ఆస్తి నిర్వహణ బృందం
DocType: Employee Loan,Loan Type,లోన్ టైప్
DocType: Scheduling Tool,Scheduling Tool,షెడ్యూలింగ్ టూల్
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 5b12cac..95d79ff 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,เรียงตามราคา
,Delay Days,Delay Days
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ค่าใช้จ่ายในการให้บริการ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,ใบกำกับสินค้า
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Make Entry Stock Entry
DocType: Purchase Invoice Item,Item Weight Details,รายละเอียดน้ำหนักรายการ
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ข้อมูลอ้างอิง: {0} รหัสรายการ: {1} และลูกค้า: {2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,กิโลกรัม
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,เปิดงาน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},ไม่ได้ระบุ BOM สำหรับรายการรับเหมาช่วง {0} ที่แถว {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},ไม่ได้ระบุ BOM สำหรับรายการรับเหมาช่วง {0} ที่แถว {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} ผลลัพธ์ที่ส่งมา
DocType: Item Attribute,Increment,การเพิ่มขึ้น
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,ช่วงเวลา
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,รับรายการจาก
DocType: Price List,Price Not UOM Dependant,ราคาไม่ขึ้นอยู่ UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},สินค้า {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ไม่มีรายการที่ระบุไว้
DocType: Asset Repair,Error Description,คำอธิบายข้อผิดพลาด
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,ร้านขายของชำ
DocType: Quality Inspection Reading,Reading 1,Reading 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ถัดไปวันที่ค่าเสื่อมราคาที่ไม่สามารถจะซื้อก่อนวันที่
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,ถัดไปวันที่ค่าเสื่อมราคาที่ไม่สามารถจะซื้อก่อนวันที่
DocType: Crop,Perennial,ตลอดกาล
DocType: Consultation,Consultation Date,วันที่ปรึกษา
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,รายชื่อผลิตภัณฑ์และการค้นพบสำหรับผู้ใช้ ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",เช่น "โรงเรียนประถม" หรือ "มหาวิทยาลัย"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,รายงานสต็อกสินค้า
DocType: Warehouse,Warehouse Detail,รายละเอียดคลังสินค้า
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,วันที่สิ้นสุดระยะเวลาที่ไม่สามารถจะช้ากว่าปีวันที่สิ้นสุดปีการศึกษาที่คำว่ามีการเชื่อมโยง (ปีการศึกษา {}) โปรดแก้ไขวันและลองอีกครั้ง
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ไม่สามารถเพิกถอน ""คือสินทรัพย์ถาวร"" ได้เพราะมีบันทึกสินทรัพย์ที่อยู่กับรายการ"
DocType: Delivery Trip,Departure Time,เวลาออกเดินทาง
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,ดูรายละเอียดสเปค
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,แม่แบบของ standings ผู้จัดจำหน่าย
DocType: Lead,Interested,สนใจ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,การเปิด
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,การเปิด
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},จาก {0} เป็น {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,ไม่สามารถตั้งค่าภาษีได้
DocType: Item,Copy From Item Group,คัดลอกจากกลุ่มสินค้า
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,การลาต่อปี
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,แถว {0}: โปรดตรวจสอบ 'เป็นล่วงหน้า' กับบัญชี {1} ถ้านี้เป็นรายการล่วงหน้า
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},คลังสินค้า {0} ไม่ได้เป็นของ บริษัท {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},คลังสินค้า {0} ไม่ได้เป็นของ บริษัท {1}
DocType: Email Digest,Profit & Loss,กำไรขาดทุน
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,ลิตร
DocType: Task,Total Costing Amount (via Time Sheet),รวมคำนวณต้นทุนจำนวนเงิน (ผ่านใบบันทึกเวลา)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับ บริษัท นี้ ดูรายละเอียดเพิ่มเติมเกี่ยวกับเส้นเวลาด้านล่าง
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,แจ้งทางอีเมล์เมื่อการสร้างการร้องขอวัสดุโดยอัตโนมัติ
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,ต้านทาน
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
DocType: Opening Invoice Creation Tool,Invoice Type,ประเภทใบแจ้งหนี้
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,หมายเหตุจัดส่งสินค้า
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,เป็นม่าย
DocType: Request for Quotation,Request for Quotation,ขอใบเสนอราคา
DocType: Healthcare Settings,Require Lab Test Approval,ต้องได้รับอนุมัติจาก Lab Test
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,รหัสรายการ> กลุ่มสินค้า> แบรนด์
DocType: Salary Slip Timesheet,Working Hours,เวลาทำการ
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,รวมดีเด่น
DocType: Naming Series,Change the starting / current sequence number of an existing series.,เปลี่ยนหมายเลขลำดับเริ่มต้น / ปัจจุบันของชุดที่มีอยู่
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
DocType: Drug Prescription,Dosage,ปริมาณ
DocType: Journal Entry Account,Sales Order,สั่งซื้อขาย
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,เฉลี่ย อัตราการขาย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,เฉลี่ย อัตราการขาย
DocType: Assessment Plan,Examiner Name,ชื่อผู้ตรวจสอบ
DocType: Lab Test Template,No Result,ไม่มีผล
DocType: Purchase Invoice Item,Quantity and Rate,จำนวนและอัตรา
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,เลือกระยะเวลาการจ่ายเงินเดือน
DocType: Purchase Invoice,Unpaid,ไม่ได้ค่าจ้าง
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,สงวนไว้สำหรับขาย
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,กรุณาติดตั้ง System Employee Naming System ใน Human Resource> HR Settings
DocType: Packing Slip,From Package No.,จากเลขที่แพคเกจ
DocType: Item Attribute,To Range,ช่วง
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,หลักทรัพย์และ เงินฝาก
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,โรงงาน
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,เตือนคำสั่งซื้อ
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,อะไหล่พอที่จะสร้าง
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,อะไหล่พอที่จะสร้าง
DocType: POS Profile User,POS Profile User,ผู้ใช้โปรไฟล์ POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,รายได้ โดยตรง
DocType: Patient Appointment,Date TIme,วันเวลา
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",ไม่สามารถกรอง ตาม บัญชี ถ้า จัดกลุ่มตาม บัญชี
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",ไม่สามารถกรอง ตาม บัญชี ถ้า จัดกลุ่มตาม บัญชี
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,พนักงานธุรการ
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,การตั้ง บริษัท และภาษี
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,กรุณาเลือกหลักสูตร
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,บัญชี ที่แตกต่างกัน
DocType: Purchase Invoice,Supplier GSTIN,ผู้จัดจำหน่าย GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,ไม่สามารถปิดงานเป็นงานขึ้นอยู่กับ {0} ไม่ได้ปิด
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
DocType: Production Order,Additional Operating Cost,เพิ่มเติมต้นทุนการดำเนินงาน
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,เครื่องสำอาง
@@ -821,7 +822,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,ความสัมพันธ์กับ Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,ผู้จัดการ
DocType: Payment Entry,Payment From / To,การชำระเงินจาก / ถึง
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},วงเงินสินเชื่อใหม่น้อยกว่าจำนวนเงินที่ค้างในปัจจุบันสำหรับลูกค้า วงเงินสินเชื่อจะต้องมีอย่างน้อย {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},วงเงินสินเชื่อใหม่น้อยกว่าจำนวนเงินที่ค้างในปัจจุบันสำหรับลูกค้า วงเงินสินเชื่อจะต้องมีอย่างน้อย {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},โปรดตั้งค่าบัญชีในคลังสินค้า {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ขึ้นอยู่กับ' และ 'จัดกลุ่มโดย' ต้องไม่เหมือนกัน
DocType: Sales Person,Sales Person Targets,ขายเป้าหมายคน
@@ -832,7 +833,7 @@
DocType: Student Batch Name,Batch Name,ชื่อแบทช์
DocType: Fee Validity,Max number of visit,จำนวนการเข้าชมสูงสุด
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet สร้าง:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ลงทะเบียน
DocType: GST Settings,GST Settings,การตั้งค่า GST
DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
@@ -959,7 +960,7 @@
DocType: Budget,Budget Against,งบประมาณป้องกันและปราบปราม
DocType: Employee,Cell Number,จำนวนเซลล์
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,ไม่มีพนักงานสำหรับเกณฑ์ที่ระบุ ตรวจสอบว่าไม่มีการสร้างสลากเงินเดือนแล้ว
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Auto วัสดุการขอสร้าง
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Auto วัสดุการขอสร้าง
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,สูญหาย
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,สงวนไว้สำหรับการผลิต
@@ -967,7 +968,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,พลังงาน
DocType: Opportunity,Opportunity From,โอกาสจาก
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,งบเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,แถว {0}: {1} ต้องระบุหมายเลขผลิตภัณฑ์สำหรับรายการ {2} คุณได้ให้ {3} แล้ว
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,แถว {0}: {1} ต้องระบุหมายเลขผลิตภัณฑ์สำหรับรายการ {2} คุณได้ให้ {3} แล้ว
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,โปรดเลือกตาราง
DocType: BOM,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} คือที่อยู่อีเมลที่ไม่ถูกต้องใน "ผู้รับ"
@@ -1055,7 +1056,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,อ้างสิทธิ์ที่ร้องขอ
DocType: Vital Signs,Heart Rate / Pulse,อัตราหัวใจ / ชีพจร
DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'การปรับสต็อก' ไม่สามารถตรวจสอบได้เพราะรายการไม่ได้จัดส่งผ่านทาง {0}
DocType: Vehicle,Acquisition Date,การได้มาซึ่งวัน
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1080,7 +1081,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),อัปโหลดหัวจดหมายของคุณ (เก็บไว้ในรูปแบบเว็บที่ใช้งานได้ง่ายราว 900px โดย 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: บัญชี {2} ไม่สามารถเป็นกลุ่ม
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,รายการแถว {IDX}: {DOCTYPE} {} DOCNAME ไม่อยู่ในข้างต้น '{} DOCTYPE' ตาราง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} เสร็จสมบูรณ์แล้วหรือยกเลิก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} เสร็จสมบูรณ์แล้วหรือยกเลิก
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ไม่มีงาน
DocType: Item Variant Settings,Copy Fields to Variant,คัดลอกช่องข้อมูลเป็น Variant
DocType: Asset,Opening Accumulated Depreciation,เปิดค่าเสื่อมราคาสะสม
@@ -1192,9 +1193,10 @@
DocType: Production Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,พันธมิตรการขายและดินแดน
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} จะต้องใช้งาน
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),การปิดบัญชี (การเปิด + ยอดรวม)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),การปิดบัญชี (การเปิด + ยอดรวม)
DocType: Journal Entry,Depreciation Entry,รายการค่าเสื่อมราคา
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,เลือกประเภทของเอกสารที่แรก
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,พิมพ์ในสกุลเงินของบัญชี
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ยกเลิก การเข้าชม วัสดุ {0} ก่อนที่จะ ยกเลิก การบำรุงรักษา นี้ เยี่ยมชม
DocType: Crop Cycle,ISO 8016 standard,มาตรฐาน ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน รายการ {1}
@@ -1220,7 +1222,7 @@
DocType: Supplier,Default Payable Accounts,บัญชีเจ้าหนี้เริ่มต้น
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
DocType: Fee Structure,Components,ส่วนประกอบ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
DocType: Quality Inspection Reading,Reading 6,Reading 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1272,6 +1274,7 @@
,Company Name,ชื่อ บริษัท
DocType: SMS Center,Total Message(s),ข้อความ รวม (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า> การตั้งค่า> การตั้งชื่อซีรี่ส์
DocType: Purchase Invoice,Additional Discount Percentage,เพิ่มเติมร้อยละส่วนลด
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ดูรายการทั้งหมดวิดีโอความช่วยเหลือที่
DocType: Agriculture Analysis Criteria,Soil Texture,พื้นผิวดิน
@@ -1300,7 +1303,7 @@
DocType: BOM Website Item,BOM Website Item,BOM รายการเว็บไซต์
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
DocType: Timesheet Detail,Bill,บิล
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ถัดไปวันที่มีการป้อนค่าเสื่อมราคาเป็นวันที่ผ่านมา
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,ถัดไปวันที่มีการป้อนค่าเสื่อมราคาเป็นวันที่ผ่านมา
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,ขาว
DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),แถว {0}: จำนวนไม่สามารถใช้ได้สำหรับ {4} ในคลังสินค้า {1} ที่โพสต์เวลาของรายการ ({2} {3})
@@ -1316,7 +1319,7 @@
DocType: Lead,Next Contact Date,วันที่ถัดไปติดต่อ
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,เปิด จำนวน
DocType: Healthcare Settings,Appointment Reminder,นัดหมายเตือน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
DocType: Program Enrollment Tool Student,Student Batch Name,นักศึกษาชื่อชุด
DocType: Consultation,Doctor,คุณหมอ
DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
@@ -1332,6 +1335,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,เครื่องมือการจัดสรรการลา
DocType: Item,Hub Category to Publish,ฮับประเภทที่จะเผยแพร่
DocType: Leave Block List,Leave Block List Dates,ไม่ระบุวันที่รายการบล็อก
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup> Numbering Series
DocType: Sales Invoice,Billing Address GSTIN,ที่อยู่การเรียกเก็บเงิน GSTIN
DocType: Assessment Plan,Evaluate,ประเมินผล
DocType: Workstation,Net Hour Rate,อัตราชั่วโมงสุทธิ
@@ -1366,7 +1370,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,การชำระเงินการขายใบแจ้งหนี้
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,คลังสินค้าสำรองในการขายการสั่งซื้อ / โกดังสินค้าสำเร็จรูป
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,ปริมาณการขาย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ปริมาณการขาย
DocType: Repayment Schedule,Interest Amount,จำนวนเงินที่น่าสนใจ
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ บันทึก
DocType: Serial No,Creation Document No,การสร้าง เอกสาร ไม่มี
@@ -1459,7 +1463,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,เปิดยอดคงเหลือบัญชี
,GST Sales Register,ลงทะเบียนการขาย GST
DocType: Sales Invoice Advance,Sales Invoice Advance,ขายใบแจ้งหนี้ล่วงหน้า
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,ไม่มีอะไรที่จะ ขอ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,ไม่มีอะไรที่จะ ขอ
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,เลือกโดเมนของคุณ
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},บันทึกงบประมาณอีก '{0}' อยู่แล้วกับ {1} "{2} 'สำหรับปีงบการเงิน {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ฟิลด์จะถูกคัดลอกเฉพาะช่วงเวลาของการสร้างเท่านั้น
@@ -1469,11 +1473,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","นี้จะถูกผนวกเข้ากับรหัสสินค้าของตัวแปร ตัวอย่างเช่นถ้าย่อของคุณคือ ""เอสเอ็ม"" และรหัสรายการคือ ""เสื้อยืด"" รหัสรายการของตัวแปรจะเป็น ""เสื้อ-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,จ่ายสุทธิ (คำ) จะสามารถมองเห็นได้เมื่อคุณบันทึกสลิปเงินเดือน
DocType: Purchase Invoice,Is Return,คือการกลับมา
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,ความระมัดระวัง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,ความระมัดระวัง
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,ย้อนกลับ / เดบิตหมายเหตุ
DocType: Price List Country,Price List Country,ราคาประเทศ
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} หมายเลขประจำเครื่องที่ถูกต้องสำหรับรายการ {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} หมายเลขประจำเครื่องที่ถูกต้องสำหรับรายการ {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,รหัสสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
DocType: Purchase Invoice Item,UOM Conversion Factor,ปัจจัยการแปลง UOM
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,กรุณากรอกรหัสสินค้าที่จะได้รับหมายเลข Batch
@@ -1579,7 +1583,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
DocType: Supplier Scorecard,Warn for new Request for Quotations,แจ้งเตือนคำขอใหม่สำหรับใบเสนอราคา
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,คำสั่งซื้อที่ช่วยให้คุณวางแผนและติดตามในการซื้อสินค้าของคุณ
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,ข้อกำหนดการทดสอบในแล็บ
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",ปริมาณการเบิก / โอนทั้งหมด {0} วัสดุในการจอง {1} \ ไม่สามารถจะสูงกว่าปริมาณการร้องขอ {2} สำหรับรายการ {3}
@@ -1617,7 +1621,6 @@
DocType: Warehouse,Warehouse Contact Info,ข้อมูลติดต่อคลังสินค้า
DocType: Payment Entry,Write Off Difference Amount,จำนวนหนี้สูญความแตกต่าง
DocType: Volunteer,Volunteer Name,อาสาสมัครชื่อ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในการศึกษา> การตั้งค่าการศึกษา
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: ไม่พบอีเมลของพนักงาน อีเมล์นี้จึงไม่ได้ถูกส่ง
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},กฎการจัดส่งไม่สามารถใช้ได้กับประเทศ {0}
DocType: Item,Foreign Trade Details,รายละเอียดการค้าต่างประเทศ
@@ -1630,7 +1633,7 @@
DocType: Student Group Student,Group Roll Number,หมายเลขกลุ่ม
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,รวมทุกน้ำหนักงานควรจะ 1. โปรดปรับน้ำหนักของงานโครงการทั้งหมดตาม
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,อุปกรณ์ ทุน
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
@@ -1655,7 +1658,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,คลังสินค้าที่มีอยู่สำหรับเด็กคลังสินค้านี้ คุณไม่สามารถลบคลังสินค้านี้
DocType: Item,Website Item Groups,กลุ่มรายการเว็บไซต์
DocType: Purchase Invoice,Total (Company Currency),รวม (บริษัท สกุลเงิน)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,หมายเลข {0} เข้ามา มากกว่าหนึ่งครั้ง
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,หมายเลข {0} เข้ามา มากกว่าหนึ่งครั้ง
DocType: Journal Entry,Journal Entry,รายการบันทึก
DocType: Expense Claim Advance,Unclaimed amount,จำนวนที่ไม่มีการอ้างสิทธิ์
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} รายการ อยู่ระหว่างดำเนินการ
@@ -1752,7 +1755,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,บันทึกการสื่อสาร
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",ขอให้เสนอราคาถูกปิดใช้งานในการเข้าถึงจากพอร์ทัลสำหรับการตั้งค่าพอร์ทัลการตรวจสอบมากขึ้น
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,ตัวชี้วัดการให้คะแนน Scorecard ของซัพพลายเออร์
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,จำนวนซื้อ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,จำนวนซื้อ
DocType: Sales Invoice,Shipping Address Name,การจัดส่งสินค้าที่อยู่ชื่อ
DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,มีข้อผิดพลาดในการสร้างตารางเรียน
@@ -2017,7 +2020,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,แห่งนี้ตั้งอยู่บนพื้นฐานของบันทึกกับรถคันนี้ ดูระยะเวลารายละเอียดด้านล่าง
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
DocType: Customer,Default Price List,รายการราคาเริ่มต้น
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,คุณไม่สามารถลบปีงบประมาณ {0} ปีงบประมาณ {0} ตั้งเป็นค่าเริ่มต้นในการตั้งค่าส่วนกลาง
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,มีลูกค้าที่มีชื่อเดียวกันอยู่แล้ว
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,การดำเนินการนี้จะส่งสลากเงินเดือนและสร้างสมุดบันทึกรายวันคงค้าง คุณต้องการดำเนินการต่อหรือไม่?
@@ -2031,6 +2034,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,การตั้งราคา
DocType: Quotation,Term Details,รายละเอียดคำ
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,ไม่สามารถลงทะเบียนมากกว่า {0} นักเรียนสำหรับนักเรียนกลุ่มนี้
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),รวม (ไม่มีภาษี)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,นับตะกั่ว
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,นับตะกั่ว
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ต้องมากกว่า 0
@@ -2051,7 +2055,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ยกเลิกการเชื่อมโยงการชำระเงินในการยกเลิกใบแจ้งหนี้
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},อ่านวัดระยะทางที่ปัจจุบันเข้ามาควรจะมากกว่าครั้งแรกยานพาหนะ Odometer {0}
DocType: Restaurant Reservation,No Show,ไม่แสดง
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า> การตั้งค่า> การตั้งชื่อซีรี่ส์
DocType: Shipping Rule Country,Shipping Rule Country,กฎการจัดส่งสินค้าประเทศ
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,การลา และการเข้าร่วม
DocType: Maintenance Visit,Partially Completed,เสร็จบางส่วน
@@ -2144,7 +2147,7 @@
DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
DocType: Grant Application,Assessment Mark (Out of 10),เครื่องหมายประเมิน (จาก 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 มือถือไม่มี
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,หลัก
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,หลัก
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ตัวแปร
DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
DocType: Employee Attendance Tool,Employees HTML,พนักงาน HTML
@@ -2194,7 +2197,7 @@
DocType: Course,Course Abbreviation,ชื่อย่อแน่นอน
DocType: Student Leave Application,Student Leave Application,แอพลิเคชันออกจากนักศึกษา
DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},พนักงาน {0} ในครึ่งวันในวันที่ {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},ชั่วโมงการทำงานรวมไม่ควรมากกว่าชั่วโมงการทำงานสูงสุด {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,บน
@@ -2382,9 +2385,10 @@
DocType: Task,Actual End Date (via Time Sheet),ที่เกิดขึ้นจริงวันที่สิ้นสุด (ผ่านใบบันทึกเวลา)
DocType: Soil Texture,Soil Type,ชนิดของดิน
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,ข้อความใหม่
,Quotation Trends,ใบเสนอราคา แนวโน้ม
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
DocType: Shipping Rule,Shipping Amount,จำนวนการจัดส่งสินค้า
DocType: Supplier Scorecard Period,Period Score,ระยะเวลาคะแนน
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,เพิ่มลูกค้า
@@ -2395,7 +2399,7 @@
,Vehicle Expenses,ค่าใช้จ่ายในยานพาหนะ
DocType: Serial No,Invoice Details,รายละเอียดใบแจ้งหนี้
DocType: Grant Application,Show on Website,แสดงบนเว็บไซต์
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,เริ่มต้นเมื่อ
DocType: Hub Category,Hub Category,หมวดหมู่ฮับ
DocType: Purchase Invoice,SEZ,SEZ
@@ -2426,7 +2430,7 @@
DocType: Patient,B Positive,B บวก
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
DocType: Patient Medical Record,Patient Medical Record,บันทึกการแพทย์ของผู้ป่วย
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,กลุ่มที่ไม่ใช่กลุ่ม
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,กีฬา
@@ -2477,6 +2481,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,ไม่สามารถตั้งค่า RFQ ที่ได้รับเป็น No Quote
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,หักรวม
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,เลือกบัญชีที่จะพิมพ์ในสกุลเงินของบัญชี
,Production Analytics,Analytics ผลิต
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับผู้ป่วยรายนี้ ดูรายละเอียดจากเส้นเวลาด้านล่าง
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
@@ -2532,7 +2537,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,เลือก บริษัท ...
DocType: Leave Control Panel,Leave blank if considered for all departments,เว้นไว้หากพิจารณาให้หน่วยงานทั้งหมด
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
DocType: Payroll Entry,Fortnightly,รายปักษ์
DocType: Currency Exchange,From Currency,จากสกุลเงิน
DocType: Vital Signs,Weight (In Kilogram),น้ำหนัก (เป็นกิโลกรัม)
@@ -2610,7 +2615,7 @@
DocType: Student,Guardians,ผู้ปกครอง
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ราคาจะไม่แสดงถ้าราคาไม่ได้ตั้งค่า
DocType: Stock Entry,Total Incoming Value,ค่าเข้ามาทั้งหมด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,เดบิตในการที่จะต้อง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,เดบิตในการที่จะต้อง
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ช่วยให้การติดตามของเวลาค่าใช้จ่ายและการเรียกเก็บเงินสำหรับกิจกรรมที่ทำโดยทีมงานของคุณ
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ซื้อราคา
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,เทมเพลตของตัวแปรชี้วัดของซัพพลายเออร์
@@ -2713,7 +2718,7 @@
DocType: Company,For Reference Only.,สำหรับการอ้างอิงเท่านั้น
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},แพทย์ {0} ไม่มีให้บริการใน {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,เลือกแบทช์
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ไม่ถูกต้อง {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},ไม่ถูกต้อง {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Inv อ้างอิง
@@ -2750,8 +2755,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
DocType: Water Analysis,Origin,ที่มา
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,เอกสารนี้เป็นเกินขีด จำกัด โดย {0} {1} สำหรับรายการ {4} คุณกำลังทำอีก {3} กับเดียวกัน {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
@@ -2807,7 +2812,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,เตือนคำสั่งซื้อใหม่
DocType: Quality Inspection Reading,Reading 9,อ่าน 9
DocType: Supplier,Is Frozen,ถูกแช่แข็ง
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,คลังสินค้าโหนดกลุ่มไม่ได้รับอนุญาตให้เลือกสำหรับการทำธุรกรรม
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,คลังสินค้าโหนดกลุ่มไม่ได้รับอนุญาตให้เลือกสำหรับการทำธุรกรรม
DocType: Buying Settings,Buying Settings,ตั้งค่าการซื้อ
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,หมายเลข BOM สำหรับรายการที่ดีสำเร็จรูป
DocType: Upload Attendance,Attendance To Date,วันที่เข้าร่วมประชุมเพื่อ
@@ -2822,6 +2827,7 @@
DocType: Grant Application,Organization,องค์กร
DocType: BOM Update Tool,BOM Update Tool,เครื่องมืออัปเดต BOM
DocType: SG Creation Tool Course,Student Group Name,ชื่อกลุ่มนักศึกษา
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,แสดงมุมมองแบบหล่นลง
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,การสร้างค่าธรรมเนียม
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
DocType: Room,Room Number,หมายเลขห้อง
@@ -2832,7 +2838,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,ทำแม่แบบภาษี
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ผู้ใช้งานฟอรั่ม
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,วารสารรายการด่วน
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
@@ -2903,7 +2909,7 @@
DocType: Membership,USD,ดอลล่าร์
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,ทำให้ ใบแจ้งหนี้
DocType: Selling Settings,Auto close Opportunity after 15 days,รถยนต์ใกล้โอกาสหลังจาก 15 วัน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,คำสั่งซื้อซื้อไม่ได้รับอนุญาตสำหรับ {0} เนื่องจากมีการจดแต้มที่ {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,คำสั่งซื้อซื้อไม่ได้รับอนุญาตสำหรับ {0} เนื่องจากมีการจดแต้มที่ {1}
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ปีที่จบ
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -3015,7 +3021,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ขึ้นไป
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,แถว # {0}: วารสารรายการ {1} ไม่มีบัญชี {2} หรือมีอยู่แล้วจับคู่กับบัตรกำนัลอื่น
DocType: Supplier Scorecard Criteria,Criteria Weight,เกณฑ์น้ำหนัก
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,ผู้จัดจำหน่าย> ประเภทผู้จัดจำหน่าย
DocType: Buying Settings,Default Buying Price List,รายการราคาซื้อเริ่มต้น
DocType: Payroll Entry,Salary Slip Based on Timesheet,สลิปเงินเดือนจาก Timesheet
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,อัตราการซื้อ
@@ -3105,7 +3110,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ติดตาม ช่องทาง ตามประเภทอุตสาหกรรม
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,ไปที่หัวจดหมาย
DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ที่อยู่ทั้งหมด
DocType: Company,Stock Settings,การตั้งค่าหุ้น
@@ -3295,6 +3300,7 @@
DocType: Company,Default Inventory Account,บัญชีพื้นที่โฆษณาเริ่มต้น
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,แถว {0}: เสร็จสมบูรณ์จำนวนจะต้องมากกว่าศูนย์
DocType: Antibiotic,Antibiotic Name,ชื่อยาปฏิชีวนะ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,รหัสรายการ> กลุ่มสินค้า> แบรนด์
DocType: Purchase Invoice,Apply Additional Discount On,สมัครสมาชิกเพิ่มเติมส่วนลด
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,เลือกประเภท ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,ลิงก์ไปยังหน่วยที่ดินทั้งหมดที่พืชมีการเจริญเติบโต
@@ -3490,6 +3496,7 @@
DocType: Supplier,Credit Limit,วงเงินสินเชื่อ
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,เฉลี่ย ราคารายการขายราคา
DocType: Production Plan Sales Order,Salse Order Date,Salse วันที่สั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,ผู้จัดจำหน่าย> ประเภทผู้จัดจำหน่าย
DocType: Salary Component,Salary Component,เงินเดือนที่ต้องการตัวแทน
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,รายการชำระเงิน {0} ยกเลิกการเชื่อมโยง
DocType: GL Entry,Voucher No,บัตรกำนัลไม่มี
@@ -3499,7 +3506,7 @@
DocType: Leave Allocation,Leave Allocation,การจัดสรรการลา
DocType: Payment Request,Recipient Message And Payment Details,ผู้รับข้อความและรายละเอียดการชำระเงิน
DocType: Training Event,Trainer Email,เทรนเนอร์อีเมล์
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,ขอ วัสดุ {0} สร้าง
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,ขอ วัสดุ {0} สร้าง
DocType: Restaurant Reservation,No of People,ไม่มีผู้คน
DocType: Production Planning Tool,Include sub-contracted raw materials,รวมถึงวัตถุดิบย่อยหด
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,แม่ของข้อตกลงหรือสัญญา
@@ -3565,7 +3572,7 @@
DocType: Production Planning Tool,Create Material Requests,ขอสร้างวัสดุ
DocType: Employee Education,School/University,โรงเรียน / มหาวิทยาลัย
DocType: Payment Request,Reference Details,รายละเอียดอ้างอิง
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์จะต้องน้อยกว่ามวลรวมสั่งซื้อ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์จะต้องน้อยกว่ามวลรวมสั่งซื้อ
DocType: Sales Invoice Item,Available Qty at Warehouse,จำนวนที่คลังสินค้า
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,จำนวนเงินที่ เรียกเก็บเงิน
DocType: Asset,Double Declining Balance,ยอดลดลงสองครั้ง
@@ -3577,7 +3584,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ได้รับการปรับปรุง
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: บัญชี {2} ไม่ได้เป็นของ บริษัท {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,เลือกค่าอย่างน้อยหนึ่งค่าจากแต่ละแอตทริบิวต์
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,คำขอใช้วัสดุ {0} ถูกยกเลิก หรือ ระงับแล้ว
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,คำขอใช้วัสดุ {0} ถูกยกเลิก หรือ ระงับแล้ว
apps/erpnext/erpnext/config/hr.py +310,Leave Management,ออกจากการบริหารจัดการ
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,จัดกลุ่มตามบัญชี
DocType: Sales Order,Fully Delivered,จัดส่งอย่างเต็มที่
@@ -3588,14 +3595,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},การเบิกจ่ายจำนวนเงินที่ไม่สามารถจะสูงกว่าจำนวนเงินกู้ {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,ไปที่ Programs
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},แถว {0} # จำนวนที่จัดสรรไว้ {1} จะต้องไม่เกินจำนวนที่ไม่มีการอ้างสิทธิ์ {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup> Numbering Series
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,ใบสั่งผลิตไม่ได้สร้าง
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},ไม่สามารถเปลี่ยนสถานะเป็นนักเรียน {0} มีการเชื่อมโยงกับโปรแกรมนักเรียน {1}
DocType: Asset,Fully Depreciated,ค่าเสื่อมราคาหมด
,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,ผู้เข้าร่วมการทำเครื่องหมาย HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",ใบเสนอราคาข้อเสนอการเสนอราคาที่คุณส่งให้กับลูกค้าของคุณ
DocType: Sales Order,Customer's Purchase Order,การสั่งซื้อของลูกค้า
@@ -3680,7 +3686,7 @@
DocType: Stock Settings,Item Naming By,รายการการตั้งชื่อตาม
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},อีก รายการ ระยะเวลา ปิด {0} ได้รับการทำ หลังจาก {1}
DocType: Production Order,Material Transferred for Manufacturing,โอนวัสดุเพื่อไปผลิต
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,บัญชี {0} ไม่อยู่
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,บัญชี {0} ไม่อยู่
DocType: Project,Project Type,ประเภทโครงการ
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,งานลูกมีอยู่สำหรับงานนี้ คุณไม่สามารถลบงานนี้ได้
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
@@ -3784,11 +3790,11 @@
DocType: Company,Asset Depreciation Cost Center,สินทรัพย์ศูนย์ต้นทุนค่าเสื่อมราคา
DocType: Sales Order Item,Sales Order Date,วันที่สั่งซื้อขาย
DocType: Sales Invoice Item,Delivered Qty,จำนวนส่ง
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,รวมทั้งหมด ภาษี
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",หากตรวจสอบเด็กทุกคนของรายการการผลิตแต่ละคนจะถูกรวมอยู่ในการร้องขอวัสดุ
DocType: Assessment Plan,Assessment Plan,แผนการประเมิน
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,สร้างลูกค้า {0} แล้ว
DocType: Stock Settings,Limit Percent,ร้อยละขีด จำกัด
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในการศึกษา> การตั้งค่าการศึกษา
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ไม่มีคลังสินค้าในคลังสินค้าใด ๆ
,Payment Period Based On Invoice Date,ระยะเวลา ในการชำระเงิน ตาม ใบแจ้งหนี้ ใน วันที่
DocType: Sample Collection,No. of print,จำนวนการพิมพ์
@@ -3804,12 +3810,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),ลูกหนี้ ({0})
DocType: Pricing Rule,Margin,ขอบ
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ลูกค้าใหม่
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,% กำไรขั้นต้น
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,% กำไรขั้นต้น
DocType: Appraisal Goal,Weightage (%),weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,เปลี่ยนโพรไฟล์ POS
DocType: Bank Reconciliation Detail,Clearance Date,วันที่กวาดล้าง
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,รายงานการประเมินผล
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,จำนวนการสั่งซื้อขั้นต้นมีผลบังคับใช้
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,จำนวนการสั่งซื้อขั้นต้นมีผลบังคับใช้
DocType: Lead,Address Desc,ลักษณะ ของ ที่อยู่
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,พรรคมีผลบังคับใช้
DocType: Journal Entry,JV-,JV-
@@ -3841,7 +3847,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,ชื่อยืน
DocType: Stock Entry,Customer or Supplier Details,ลูกค้าหรือผู้ผลิตรายละเอียด
DocType: Employee Loan Application,Required by Date,จำเป็นโดยวันที่
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),ยอดคงเหลือปลายงวด (Dr - Cr)
DocType: Lead,Lead Owner,เจ้าของช่องทาง
DocType: Bin,Requested Quantity,จำนวนการขอใช้บริการ
DocType: Patient,Marital Status,สถานภาพการสมรส
@@ -3855,7 +3860,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,หลายรูปแบบ
DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% ส่งแล้ว
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,รายการ {0}: จำนวนสั่ง {1} ไม่สามารถจะน้อยกว่าจำนวนสั่งซื้อขั้นต่ำ {2} (ที่กำหนดไว้ในรายการ)
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,การกระจายรายเดือนร้อยละ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,โปรดเข้าสู่ระบบในฐานะผู้ใช้รายอื่น
DocType: Territory,Territory Targets,เป้าหมายดินแดน
@@ -3956,7 +3961,7 @@
DocType: Serial No,Out of AMC,ออกของ AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
DocType: Company,Default Cash Account,บัญชีเงินสดเริ่มต้น
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,นี้ขึ้นอยู่กับการเข้าร่วมประชุมของนักศึกษานี้
@@ -4108,7 +4113,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ไม่มีพนักงานสำหรับเกณฑ์ดังกล่าว
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
DocType: Restaurant,Default Customer,ลูกค้าเริ่มต้น
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,กรุณาติดตั้ง System Employee Naming System ใน Human Resource> HR Settings
DocType: Assessment Plan,Supervisor Name,ชื่อผู้บังคับบัญชา
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,อย่ายืนยันว่ามีการสร้างการนัดหมายสำหรับวันเดียวกันหรือไม่
DocType: Program Enrollment Course,Program Enrollment Course,หลักสูตรการลงทะเบียนเรียน
@@ -4230,7 +4234,7 @@
DocType: BOM,Website Description,คำอธิบายเว็บไซต์
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,เปลี่ยนแปลงสุทธิในส่วนของเจ้าของ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,ใหม่ล่าสุด
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",อีเมล์ต้องไม่ซ้ำกันอยู่แล้วสำหรับ {0}
DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,ใบเสร็จรับเงิน
@@ -4247,7 +4251,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,งบกระแสเงินสด
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},วงเงินกู้ไม่เกินจำนวนเงินกู้สูงสุดของ {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,การอนุญาต
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,เลือกดำเนินการต่อถ้าคุณยังต้องการที่จะรวมถึงความสมดุลในปีงบประมาณก่อนหน้านี้ออกไปในปีงบการเงิน
DocType: GL Entry,Against Voucher Type,กับประเภทบัตร
DocType: Physician,Phone (R),โทรศัพท์ (R)
@@ -4259,7 +4263,7 @@
DocType: Patient,B Negative,B เชิงลบ
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,สถานะการบำรุงรักษาต้องถูกยกเลิกหรือเสร็จสมบูรณ์เพื่อส่ง
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,หมายเลขซีเรียลในแถว {0} ไม่ตรงกับหมายเหตุการจัดส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,หมายเลขซีเรียลในแถว {0} ไม่ตรงกับหมายเหตุการจัดส่ง
DocType: Student,Guardian Details,รายละเอียดผู้ปกครอง
DocType: C-Form,C-Form,C-Form
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,มาร์คเข้าร่วมสำหรับพนักงานหลาย
@@ -4301,7 +4305,7 @@
DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
DocType: Training Event,Exam,การสอบ
DocType: Complaint,Complaint,การร้องเรียน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
DocType: Patient,Alcohol Past Use,การใช้แอลกอฮอล์ในอดีต
DocType: Fertilizer Content,Fertilizer Content,เนื้อหาปุ๋ย
@@ -4430,6 +4434,7 @@
DocType: Salary Detail,Formula,สูตร
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,เทมเพลตการทดสอบ Lab
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,บัญชีขาย
DocType: Purchase Invoice Item,Total Weight,น้ำหนักรวม
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,สำนักงานคณะกรรมการกำกับ การขาย
DocType: Offer Letter Term,Value / Description,ค่า / รายละเอียด
@@ -4587,7 +4592,7 @@
DocType: Customer,From Lead,จากช่องทาง
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,คำสั่งปล่อยให้การผลิต
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,เลือกปีงบประมาณ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,รายละเอียด จุดขาย จำเป็นต้องทำให้ จุดขาย บันทึกได้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,รายละเอียด จุดขาย จำเป็นต้องทำให้ จุดขาย บันทึกได้
DocType: Program Enrollment Tool,Enroll Students,รับสมัครนักเรียน
DocType: Lab Test,Approved Date,วันที่อนุมัติ
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ขาย มาตรฐาน
@@ -4664,7 +4669,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,การผลิตสินค้า
,Employee Information,ข้อมูลของพนักงาน
DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
DocType: Quality Inspection,Incoming,ขาเข้า
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,เทมเพลตภาษีที่เป็นค่าเริ่มต้นสำหรับการขายและซื้อจะสร้างขึ้น
@@ -4681,7 +4686,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},หมายเหตุ : {0}
,Delivery Note Trends,แนวโน้มหมายเหตุการจัดส่งสินค้า
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,ข้อมูลอย่างนี้สัปดาห์
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,ในสต็อกจำนวน
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,ในสต็อกจำนวน
DocType: Delivery Trip,Calculate Estimated Arrival Times,คำนวณเวลาเข้าพักโดยประมาณ
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,บัญชี: {0} เท่านั้นที่สามารถได้รับการปรับปรุงผ่านการทำธุรกรรมสต็อก
DocType: Student Group Creation Tool,Get Courses,รับหลักสูตร
@@ -4697,7 +4702,7 @@
DocType: Material Request,% Ordered,% สั่งแล้ว
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",สำหรับกลุ่มนักศึกษาหลักสูตรจะมีการตรวจสอบหลักสูตรสำหรับนักเรียนทุกคนจากหลักสูตรที่ลงทะเบียนเรียนในการลงทะเบียนหลักสูตร
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,งานเหมา
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,ราคาซื้อเฉลี่ย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,ราคาซื้อเฉลี่ย
DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
DocType: Employee,History In Company,ประวัติใน บริษัท
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},ข้อความใหม่จาก {sender}
@@ -4745,7 +4750,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},แถว {0}: สกุลเงินของ BOM # {1} ควรจะเท่ากับสกุลเงินที่เลือก {2}
DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
DocType: Patient,Additional information regarding the patient,ข้อมูลเพิ่มเติมเกี่ยวกับผู้ป่วย
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
DocType: Homepage,Tag Line,สายแท็ก
DocType: Fee Component,Fee Component,ค่าบริการตัวแทน
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,การจัดการ Fleet
@@ -4960,7 +4965,7 @@
DocType: Employee Education,Employee Education,การศึกษาการทำงานของพนักงาน
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,กลุ่มรายการที่ซ้ำกันที่พบในตารางกลุ่มรายการ
DocType: Land Unit,Parent Land Unit,หน่วยที่ดินปกครอง
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
DocType: Fertilizer,Fertilizer Name,ชื่อปุ๋ย
DocType: Salary Slip,Net Pay,จ่ายสุทธิ
DocType: Account,Account,บัญชี
@@ -5039,7 +5044,7 @@
DocType: Item Customer Detail,Ref Code,รหัส Ref
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,ลูกค้าจำเป็นต้องมีในโปรไฟล์ POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,ระเบียนพนักงาน
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,กรุณาตั้งค่าถัดไปวันที่ค่าเสื่อมราคา
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,กรุณาตั้งค่าถัดไปวันที่ค่าเสื่อมราคา
DocType: HR Settings,Payroll Settings,การตั้งค่า บัญชีเงินเดือน
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,ตรงกับใบแจ้งหนี้ไม่ได้เชื่อมโยงและการชำระเงิน
DocType: POS Settings,POS Settings,การตั้งค่า POS
@@ -5207,7 +5212,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
DocType: Asset Maintenance Task,Last Completion Date,วันที่เสร็จสมบูรณ์ล่าสุด
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
DocType: Buying Settings,Naming Series,การตั้งชื่อซีรีส์
DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,วันประกันเริ่มต้นควรจะน้อยกว่าวันประกันสิ้นสุด
@@ -5338,6 +5343,7 @@
DocType: Bank Reconciliation,Get Payment Entries,ได้รับรายการการชำระเงิน
DocType: Quotation Item,Against Docname,กับ ชื่อเอกสาร
DocType: SMS Center,All Employee (Active),พนักงาน (อยู่ในระบบ) ทั้งหมด
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ลูกค้า> กลุ่มลูกค้า> เขตแดน
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ดู ตอนนี้
DocType: BOM,Raw Material Cost,วัตถุดิบต้นทุน
DocType: Item Reorder,Re-Order Level,ระดับ Re-Order
@@ -5438,7 +5444,6 @@
DocType: Room,Seating Capacity,ความจุของที่นั่ง
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,กลุ่มการทดสอบในห้องปฏิบัติการ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,ลูกค้า> กลุ่มลูกค้า> เขตแดน
DocType: Project,Total Expense Claim (via Expense Claims),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
DocType: GST Settings,GST Summary,สรุป GST
DocType: Assessment Result,Total Score,คะแนนรวม
@@ -5452,7 +5457,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,สร้างตารางเวลาหลักสูตรขึ้นแล้ว
DocType: Journal Entry,Total Debit,เดบิตรวม
DocType: Manufacturing Settings,Default Finished Goods Warehouse,เริ่มต้นโกดังสินค้าสำเร็จรูป
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,พนักงานขาย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,พนักงานขาย
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,งบประมาณและศูนย์ต้นทุน
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,โหมดการชำระเงินเริ่มต้นหลายรูปแบบไม่ได้รับอนุญาต
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,สำหรับ
@@ -5628,7 +5633,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,พิจารณาภาษีหรือคิดค่าบริการสำหรับ
DocType: Driver,Driving License Category,ประเภทใบอนุญาตขับรถ
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,จำนวนที่เกิดขึ้นจริงมีผลบังคับใช้
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ปัจจุบันมีสถานะ {1} Scorecard ของผู้จัดหาและใบสั่งซื้อของผู้จัดจำหน่ายรายนี้ควรได้รับการเตือนด้วยความระมัดระวัง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} ปัจจุบันมีสถานะ {1} Scorecard ของผู้จัดหาและใบสั่งซื้อของผู้จัดจำหน่ายรายนี้ควรได้รับการเตือนด้วยความระมัดระวัง
DocType: Asset Maintenance Team,Asset Maintenance Team,ทีมงานบำรุงรักษาสินทรัพย์
DocType: Employee Loan,Loan Type,ประเภทเงินกู้
DocType: Scheduling Tool,Scheduling Tool,เครื่องมือการตั้งเวลา
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 023d56e..e9658f8 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -101,7 +101,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Fiyata göre sırala
,Delay Days,Gecikme günleri
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,hizmet Gideri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Fatura
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Stok Saklama Stok Yap
DocType: Purchase Invoice Item,Item Weight Details,Öğe Ağırlık Ayrıntılar
@@ -161,7 +161,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kilogram
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kilogram
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,İş Açılışı.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},"BOM, {1} satırında taşeron {0} öğesinde belirtilmedi"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},"BOM, {1} satırında taşeron {0} öğesinde belirtilmedi"
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Sonuç gönderildi
DocType: Item Attribute,Increment,Artım
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Zaman aralığı
@@ -174,7 +174,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Izin verilmez {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Öğeleri alın
DocType: Price List,Price Not UOM Dependant,Fiyat UOM Bağımlı Değil
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Ürün {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Listelenen öğe yok
DocType: Asset Repair,Error Description,Hata tanımlaması
@@ -185,7 +185,7 @@
DocType: Quality Inspection Reading,Reading 1,1 Okuma
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Emeklilik Fonları
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Emeklilik Fonları
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sonraki Amortisman Tarihi Satın Alma Tarihinden önce olamaz
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Sonraki Amortisman Tarihi Satın Alma Tarihinden önce olamaz
DocType: Crop,Perennial,uzun ömürlü
DocType: Consultation,Consultation Date,Danışma Tarihi
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext kullanıcıları için ürün listeleme ve keşif
@@ -200,7 +200,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","örneğin, "İlköğretim Okulu" ya da "Üniversite""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Stok Raporları
DocType: Warehouse,Warehouse Detail,Depo Detayı
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Dönem Bitiş Tarihi sonradan terim bağlantılı olduğu için Akademik Yılı Yıl Sonu tarihi daha olamaz (Akademik Yılı {}). tarihleri düzeltmek ve tekrar deneyin.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","'Sabit Varlıktır' seçimi kaldırılamaz, çünkü Varlık kayıtları bulunuyor"
DocType: Delivery Trip,Departure Time,Hareket saati
@@ -220,7 +220,7 @@
DocType: Quality Inspection,Get Specification Details,Şartname Detaylarını alın
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Tedarikçi sıralamaları şablonları.
DocType: Lead,Interested,İlgili
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Açılış
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Açılış
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Gönderen {0} için {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Vergiler ayarlanamadı.
DocType: Item,Copy From Item Group,Ürün Grubundan kopyalayın
@@ -413,7 +413,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Yıl başına bırakır
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans giriş ise.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Depo {0} Şirket {1}e ait değildir
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Depo {0} Şirket {1}e ait değildir
DocType: Email Digest,Profit & Loss,Kar kaybı
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),(Zaman Formu aracılığıyla) Toplam Maliyet Tutarı
@@ -516,6 +516,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,"Bu, bu Şirkete karşı işlemlere dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesine bakın"
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Otomatik Malzeme Talebi oluşturulması durumunda e-posta ile bildir
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,dayanıklı
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
DocType: Opening Invoice Creation Tool,Invoice Type,Fatura Türü
DocType: Opening Invoice Creation Tool,Invoice Type,Fatura Türü
@@ -601,7 +602,6 @@
DocType: Employee,Widowed,Dul
DocType: Request for Quotation,Request for Quotation,Fiyat Teklif Talebi
DocType: Healthcare Settings,Require Lab Test Approval,Laboratuvar Testi Onayı Gerektirir
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Ürün Kodu> Ürün Grubu> Marka
DocType: Salary Slip Timesheet,Working Hours,Iş saatleri
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Toplam Üstün
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıç / geçerli sıra numarasını değiştirin.
@@ -637,7 +637,7 @@
DocType: Drug Prescription,Dosage,Dozaj
DocType: Journal Entry Account,Sales Order,Satış Siparişi
DocType: Journal Entry Account,Sales Order,Satış Siparişi
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Ort. Satış Oranı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Ort. Satış Oranı
DocType: Assessment Plan,Examiner Name,sınav Adı
DocType: Lab Test Template,No Result,Sonuç yok
DocType: Purchase Invoice Item,Quantity and Rate,Miktarı ve Oranı
@@ -693,6 +693,7 @@
DocType: Purchase Invoice,Unpaid,Ödenmemiş
DocType: Purchase Invoice,Unpaid,Ödenmemiş
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,İkinci saklıdır
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun> HR Ayarları
DocType: Packing Slip,From Package No.,Ambalaj Numarasından.
DocType: Item Attribute,To Range,Range
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Teminatlar ve Mevduatlar
@@ -718,12 +719,12 @@
DocType: Training Event,Workshop,Atölye
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Satınalma Siparişlerini Uyarın
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Yeter Parçaları Build
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Yeter Parçaları Build
DocType: POS Profile User,POS Profile User,POS Profil Kullanıcıları
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Doğrudan Gelir
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Doğrudan Gelir
DocType: Patient Appointment,Date TIme,Tarih Tarihi
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Hesap, olarak gruplandırıldı ise Hesaba dayalı filtreleme yapamaz"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Hesap, olarak gruplandırıldı ise Hesaba dayalı filtreleme yapamaz"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,İdari Memur
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,İdari Memur
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Şirket ve vergileri ayarlama
@@ -736,7 +737,7 @@
DocType: Stock Entry Detail,Difference Account,Fark Hesabı
DocType: Purchase Invoice,Supplier GSTIN,Tedarikçi GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Bağımlı görevi {0} kapalı değil yakın bir iş değildir Can.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
DocType: Lab Test Template,Lab Routine,Laboratuar rutini
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Bakım ürünleri
@@ -932,7 +933,7 @@
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Yönetici
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Yönetici
DocType: Payment Entry,Payment From / To,From / To Ödeme
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yeni kredi limiti müşteri için geçerli kalan miktar daha azdır. Kredi limiti en az olmak zorundadır {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yeni kredi limiti müşteri için geçerli kalan miktar daha azdır. Kredi limiti en az olmak zorundadır {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Lütfen deposunu {0} 'da hesaba koy
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Dayalıdır' ve 'Grubundadır' aynı olamaz
DocType: Sales Person,Sales Person Targets,Satış Personeli Hedefleri
@@ -944,7 +945,7 @@
DocType: Student Batch Name,Batch Name,Parti Adı
DocType: Fee Validity,Max number of visit,Maks Ziyaret Sayısı
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Mesai Kartı oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,kaydetmek
DocType: GST Settings,GST Settings,GST Ayarları
DocType: Selling Settings,Customer Naming By,Müşterinin Bilinen Adı
@@ -1088,7 +1089,7 @@
DocType: Budget,Budget Against,bütçe Karşı
DocType: Employee,Cell Number,Hücre sayısı
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Verilen ölçütler için çalışan yok. Maaş Fişlerinin henüz oluşturulmadığını kontrol edin.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Otomatik Malzeme İstekler Oluşturulmuş
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Otomatik Malzeme İstekler Oluşturulmuş
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
@@ -1099,7 +1100,7 @@
DocType: Opportunity,Opportunity From,Fırsattan itibaren
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Aylık maaş beyanı.
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Aylık maaş beyanı.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} Satırı: {1} {2} Numarası için seri numarası gerekli. {3} adresini verdiniz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} Satırı: {1} {2} Numarası için seri numarası gerekli. {3} adresini verdiniz.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Lütfen bir tablo seçin
DocType: BOM,Website Specifications,Web Sitesi Özellikleri
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',"{0}, 'Alıcılar' bölümünde geçersiz bir e-posta adresidir"
@@ -1193,7 +1194,7 @@
DocType: Vital Signs,Heart Rate / Pulse,Nabız / Darbe
DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Partiye dayalı seçim için önce Parti Tipi seçiniz
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",Partiye dayalı seçim için önce Parti Tipi seçiniz
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Stok Güncelle' seçilemez çünkü ürünler {0} ile teslim edilmemiş.
DocType: Vehicle,Acquisition Date,Edinme tarihi
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,adet
@@ -1220,7 +1221,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Mektup başınızı yükleyin (900px x 100px gibi web dostu tutun)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Hesap {2} Grup olamaz
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ürün Satır {idx}: {doctype} {docname} Yukarıdaki mevcut değildir '{doctype}' tablosu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Mesai Kartı {0} tamamlanmış veya iptal edilmiş
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Mesai Kartı {0} tamamlanmış veya iptal edilmiş
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,görev yok
DocType: Item Variant Settings,Copy Fields to Variant,Alanları Varyanta Kopyala
DocType: Asset,Opening Accumulated Depreciation,Birikmiş Amortisman Açılış
@@ -1344,9 +1345,10 @@
DocType: Production Order,Plan material for sub-assemblies,Alt-montajlar Plan malzeme
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Satış Ortakları ve Bölge
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,Ürün Ağacı {0} aktif olmalıdır
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Kapanış (Açılış + Toplam)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Kapanış (Açılış + Toplam)
DocType: Journal Entry,Depreciation Entry,Amortisman kayıt
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Önce belge türünü seçiniz
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Hesap Para Birimi İçinde Yazdır
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Bu Bakım Ziyaretini iptal etmeden önce Malzeme Ziyareti {0} iptal edin
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standardı
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Seri No {0} Ürün {1} e ait değil
@@ -1375,7 +1377,7 @@
DocType: Supplier,Default Payable Accounts,Standart Borç Hesapları
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
DocType: Fee Structure,Components,Bileşenler
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
DocType: Quality Inspection Reading,Reading 6,6 Okuma
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1432,6 +1434,7 @@
DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Lütfen Kurulum> Ayarlar> Adlandırma Serisi aracılığıyla {0} için Adlandırma Serisini ayarlayın.
DocType: Purchase Invoice,Additional Discount Percentage,Ek iskonto yüzdesi
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Tüm yardım videoların bir listesini görüntüleyin
DocType: Agriculture Analysis Criteria,Soil Texture,Toprak dokusu
@@ -1462,7 +1465,7 @@
DocType: BOM Website Item,BOM Website Item,Ürün Ağacı Web Sitesi kalemi
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
DocType: Timesheet Detail,Bill,Fatura
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sonraki Amortisman Tarihi geçmiş tarih olarak girilir
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Sonraki Amortisman Tarihi geçmiş tarih olarak girilir
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Beyaz
DocType: SMS Center,All Lead (Open),Bütün Müşteri Adayları (Açık)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Satır {0}: için Adet mevcut değil {4} depoda {1} giriş saati gönderme de ({2} {3})
@@ -1479,7 +1482,7 @@
DocType: Lead,Next Contact Date,Sonraki İrtibat Tarihi
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Açılış Miktarı
DocType: Healthcare Settings,Appointment Reminder,Randevu Hatırlatıcısı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
DocType: Program Enrollment Tool Student,Student Batch Name,Öğrenci Toplu Adı
DocType: Consultation,Doctor,doktor
DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
@@ -1497,6 +1500,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,İzin Tahsis Aracı
DocType: Item,Hub Category to Publish,Yayınlanacak Hub Kategorisi
DocType: Leave Block List,Leave Block List Dates,İzin engel listesi tarihleri
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Kurulum ile Seyirci için numaralandırma serisini ayarlayın> Serileri Numaralandırma
DocType: Sales Invoice,Billing Address GSTIN,Fatura adresi GSTIN
DocType: Assessment Plan,Evaluate,Değerlendirmek
DocType: Workstation,Net Hour Rate,Net Saat Hızı
@@ -1534,7 +1538,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-ret
DocType: POS Profile,Sales Invoice Payment,Satış Fatura Ödeme
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Satış Sipariş / Satış Emrinde ayrılan Depo/ Mamül Deposu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Satış Tutarı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Satış Tutarı
DocType: Repayment Schedule,Interest Amount,Faiz Tutarı
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bu Kayıt için Gider Onaylayıcısınız. Lütfen 'durumu' güncelleyip kaydedin.
DocType: Serial No,Creation Document No,Oluşturulan Belge Tarihi
@@ -1638,7 +1642,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Açılış Muhasebe Dengesi
,GST Sales Register,GST Satış Kaydı
DocType: Sales Invoice Advance,Sales Invoice Advance,Satış Fatura Avansı
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Talep edecek bir şey yok
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Talep edecek bir şey yok
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Alan adlarınızı seçin
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Başka bir bütçe rekoru '{0}' zaten karşı var {1} '{2}' mali yıl için {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Alanlar yalnızca oluşturulma anında kopyalanır.
@@ -1650,11 +1654,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bu varyant Ürün Kodu eklenecektir. Senin kısaltması ""SM"", ve eğer, örneğin, ürün kodu ""T-Shirt"", ""T-Shirt-SM"" olacak varyantın madde kodu"
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Ödeme (sözlü) Maaş Makbuzunu kaydettiğinizde görünecektir
DocType: Purchase Invoice,Is Return,İade mi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Dikkat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Dikkat
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,İade / Borç Dekontu
DocType: Price List Country,Price List Country,Fiyat Listesi Ülke
DocType: Item,UOMs,Ölçü Birimleri
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},Ürün {1} için {0} geçerli bir seri numarası
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},Ürün {1} için {0} geçerli bir seri numarası
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
DocType: Purchase Invoice Item,UOM Conversion Factor,Ölçü Birimi Dönüşüm Katsayısı
@@ -1772,7 +1776,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
DocType: Supplier Scorecard,Warn for new Request for Quotations,Teklifler için yeni İstek uyarısı yapın
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Satın alma siparişleri planı ve alışverişlerinizi takip
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Testi Reçeteleri
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Malzeme Talebi toplam Sayı / Aktarım miktarı {0} {1} \ Ürün için istenen miktar {2} daha büyük olamaz {3}
@@ -1816,7 +1820,6 @@
DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
DocType: Payment Entry,Write Off Difference Amount,Şüpheli Alacak Fark Hesabı
DocType: Volunteer,Volunteer Name,Gönüllülük Adı
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Lütfen Eğiticide Eğitim Sistemine Adlandırma Sistemini Ayarlayın> Eğitim Ayarları
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: Çalışanın e-posta adresi bulunamadığı için e-posta gönderilemedi
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Nakliye kuralı {0} ülkesi için geçerli değil
DocType: Item,Foreign Trade Details,Dış Ticaret Detayları
@@ -1830,7 +1833,7 @@
DocType: Student Group Student,Group Roll Number,Grup Rulosu Numarası
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,tüm görev ağırlıkları toplamı 1. buna göre tüm proje görevleri ağırlıkları ayarlayın olmalıdır
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Sermaye Ekipmanları
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Sermaye Ekipmanları
@@ -1859,7 +1862,7 @@
DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
DocType: Purchase Invoice,Total (Company Currency),Toplam (Şirket Para)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Seri numarası {0} birden çok girilmiş
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Seri numarası {0} birden çok girilmiş
DocType: Journal Entry,Journal Entry,Kayıt Girdisi
DocType: Expense Claim Advance,Unclaimed amount,Talep edilmeyen tutar
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} ürün işlemde
@@ -1974,7 +1977,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Iletişim günlüğü.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Teklif Talebi daha fazla onay portalı ayarları için, portaldan erişim devre dışı bırakılır."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Tedarikçi Puan Kartı Değişken Skorlama
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Alım Miktarı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Alım Miktarı
DocType: Sales Invoice,Shipping Address Name,Teslimat Adresi İsmi
DocType: Material Request,Terms and Conditions Content,Şartlar ve Koşullar İçeriği
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Ders Programı Oluşturma Hataları Oluştu
@@ -2271,7 +2274,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},{1} tarihli {0} Tedarikçi Faturası karşılığı
DocType: Customer,Default Price List,Standart Fiyat Listesi
DocType: Customer,Default Price List,Standart Fiyat Listesi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Silemezsiniz Mali Yılı {0}. Mali yıl {0} Genel ayarlar varsayılan olarak ayarlanır
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Aynı ada sahip bir müşteri zaten var
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,"Bu, Maaş Fişleri gönderecek ve Tahakkuk Dergisi Girişi oluşturacaktır. Devam etmek istiyor musunuz?"
@@ -2286,6 +2289,7 @@
DocType: Quotation,Term Details,Dönem Ayrıntıları
DocType: Quotation,Term Details,Dönem Ayrıntıları
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Bu öğrenci grubu için {0} öğrencilere göre daha kayıt olamaz.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Toplam (Vergisiz)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Müşteri Adayı Sayısı
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Müşteri Adayı Sayısı
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} değeri 0 dan büyük olmalı
@@ -2306,7 +2310,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fatura İptaline İlişkin Ödeme bağlantısını kaldır
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Girilen Güncel Yolölçer okuma başlangıç Araç Odometrenin daha fazla olmalıdır {0}
DocType: Restaurant Reservation,No Show,Gösterim Yok
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Lütfen Kurulum> Ayarlar> Adlandırma Serisi aracılığıyla {0} için Adlandırma Serisini ayarlayın.
DocType: Shipping Rule Country,Shipping Rule Country,Nakliye Kural Ülke
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Bırakın ve Seyirci
DocType: Maintenance Visit,Partially Completed,Kısmen Tamamlandı
@@ -2410,8 +2413,8 @@
DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
DocType: Grant Application,Assessment Mark (Out of 10),Değerlendirme Markası (10 üzerinden)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil yok
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Ana
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Varyant
DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
DocType: Employee Attendance Tool,Employees HTML,"Çalışanlar, HTML"
@@ -2465,7 +2468,7 @@
DocType: Course,Course Abbreviation,Ders Kısaltma
DocType: Student Leave Application,Student Leave Application,Öğrenci bırak Uygulaması
DocType: Item,Will also apply for variants,Ayrıca varyantları için geçerli olacaktır
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},"Yarım günde Çalışan {0}, {1}"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Toplam çalışma süresi maksimum çalışma saatleri fazla olmamalıdır {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Üzerinde
@@ -2672,9 +2675,10 @@
DocType: Task,Actual End Date (via Time Sheet),Gerçek tamamlanma tarihi (Zaman Tablosu'ndan)
DocType: Soil Texture,Soil Type,Toprak tipi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Miktar {0} {2} karşılığı {1} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Yeni Mesaj
,Quotation Trends,Teklif Trendleri
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Ürün {0} içim Ürün alanında Ürün grubu belirtilmemiş
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
DocType: Shipping Rule,Shipping Amount,Kargo Tutarı
DocType: Shipping Rule,Shipping Amount,Kargo Tutarı
DocType: Supplier Scorecard Period,Period Score,Dönem Notu
@@ -2687,7 +2691,7 @@
,Vehicle Expenses,araç Giderleri
DocType: Serial No,Invoice Details,Fatura detayları
DocType: Grant Application,Show on Website,Web sitesinde göster
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},kullanım ömrünün sonunda beklenen değer daha büyük ya da eşit olmalıdır {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},kullanım ömrünün sonunda beklenen değer daha büyük ya da eşit olmalıdır {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Başla
DocType: Hub Category,Hub Category,Hub Kategorisi
DocType: Purchase Invoice,SEZ,SEZ
@@ -2721,7 +2725,7 @@
DocType: Patient,B Positive,B Olumlu
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Satır # {0}: öğe sabit kıymet olarak Adet, 1 olmalıdır. Birden fazla qty için ayrı bir satır kullanın."
DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
DocType: Patient Medical Record,Patient Medical Record,Hasta Tıbbi Kayıt
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Sigara Grup Grup
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Spor
@@ -2780,6 +2784,7 @@
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Toplam Kesinti
DocType: Salary Slip,Total Deduction,Toplam Kesinti
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Hesap para birimi cinsinden yazdırılacak bir hesap seçin
,Production Analytics,Üretim Analytics
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,"Bu, bu Hastaya karşı işlemlere dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesine bakın"
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Maliyet Güncelleme
@@ -2843,7 +2848,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Firma Seçin ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Tüm bölümler için kabul ise boş bırakın
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","İstihdam (daimi, sözleşmeli, stajyer vb) Türleri."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
DocType: Payroll Entry,Fortnightly,iki haftada bir
DocType: Currency Exchange,From Currency,Para biriminden
DocType: Vital Signs,Weight (In Kilogram),Ağırlık (Kilogram cinsinden)
@@ -2926,7 +2931,7 @@
DocType: Student,Guardians,Veliler
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Fiyat Listesi ayarlı değilse fiyatları gösterilmeyecektir
DocType: Stock Entry,Total Incoming Value,Toplam Gelen Değeri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Bankamatik To gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Bankamatik To gereklidir
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Zaman çizelgeleri ekip tarafından yapılan aktiviteler için zaman, maliyet ve fatura izlemenize yardımcı"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Satınalma Fiyat Listesi
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Tedarikçi puan kartı değişkenlerinin şablonları.
@@ -3038,7 +3043,7 @@
DocType: Company,For Reference Only.,Başvuru için sadece.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Hekim {0} {1} üzerinde mevcut değil
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Toplu İş Numarayı Seç
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Geçersiz {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Geçersiz {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-ret
DocType: Fee Validity,Reference Inv,Referans Inv
@@ -3082,8 +3087,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","İşlemleri, işlem maliyetlerini belirtiniz ve işlemlerinize kendilerine özgü işlem numaraları veriniz."
DocType: Water Analysis,Origin,Menşei
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Bu belge ile sınırı üzerinde {0} {1} öğe için {4}. yapıyoruz aynı karşı başka {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Seç değişim miktarı hesabı
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Seç değişim miktarı hesabı
DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
DocType: Naming Series,User must always select,Kullanıcı her zaman seçmelidir
@@ -3146,7 +3151,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Yeni Satın Alma Siparişi için Uyarı
DocType: Quality Inspection Reading,Reading 9,9 Okuma
DocType: Supplier,Is Frozen,Donmuş
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Grup düğüm depo işlemleri için seçmek için izin verilmez
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Grup düğüm depo işlemleri için seçmek için izin verilmez
DocType: Buying Settings,Buying Settings,Satınalma Ayarları
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Biten İyi Ürün için BOM numarası
DocType: Upload Attendance,Attendance To Date,Tarihine kadar katılım
@@ -3162,6 +3167,7 @@
DocType: Grant Application,Organization,organizasyon
DocType: BOM Update Tool,BOM Update Tool,BOM Güncelleme Aracı
DocType: SG Creation Tool Course,Student Group Name,Öğrenci Grubu Adı
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Genişletilmiş görünümü göster
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Ücret Yaratmak
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Bu şirkete ait bütün işlemleri silmek istediğinizden emin olun. Ana veriler olduğu gibi kalacaktır. Bu işlem geri alınamaz.
DocType: Room,Room Number,Oda numarası
@@ -3172,7 +3178,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Vergi Şablonu Yap
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,kullanıcı Forumu
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
DocType: Lab Test Sample,Lab Test Sample,Laboratuvar Testi Örneği
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Hızlı Kayıt Girdisi
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
@@ -3252,7 +3258,7 @@
DocType: Membership,USD,Amerikan Doları
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fatura Oluştur
DocType: Selling Settings,Auto close Opportunity after 15 days,15 gün sonra otomatik yakın Fırsat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} hesap kartının puan durumu nedeniyle {0} için Satın Alma Siparişlerine izin verilmiyor.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} hesap kartının puan durumu nedeniyle {0} için Satın Alma Siparişlerine izin verilmiyor.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,bitiş yılı
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Teklif/Müşteri Adayı yüzdesi
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Teklif/Müşteri Adayı yüzdesi
@@ -3373,7 +3379,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 üzerinde
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Satır # {0}: günlük girdisi {1} hesabı yok {2} ya da zaten başka bir çeki karşı eşleşti
DocType: Supplier Scorecard Criteria,Criteria Weight,Ölçütler Ağırlık
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Tedarikçi> Tedarikçi Türü
DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
DocType: Payroll Entry,Salary Slip Based on Timesheet,Çizelgesi dayanarak maaş Kayma
@@ -3475,7 +3480,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Antetli Kâğıtlara Git
DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
@@ -3681,6 +3686,7 @@
DocType: Company,Default Inventory Account,Varsayılan Envanter Hesabı
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Satır {0}: Tamamlandı Adet sıfırdan büyük olmalıdır.
DocType: Antibiotic,Antibiotic Name,Antibiyotik adı
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Ürün Kodu> Ürün Grubu> Marka
DocType: Purchase Invoice,Apply Additional Discount On,Ek İndirim On Uygula
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Türü seçin ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Tarimda büyüyen tüm Kara Birimlerine bir baglanti
@@ -3905,6 +3911,7 @@
DocType: Supplier,Credit Limit,Kredi Limiti
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Ort. Satış Fiyatı Liste Oranı
DocType: Production Plan Sales Order,Salse Order Date,Salse Sipariş Tarihi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Tedarikçi> Tedarikçi Türü
DocType: Salary Component,Salary Component,Maaş Bileşeni
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Ödeme Girişler {0}-un bağlantılıdır
DocType: GL Entry,Voucher No,Föy No
@@ -3913,7 +3920,7 @@
DocType: Leave Allocation,Leave Allocation,İzin Tahsisi
DocType: Payment Request,Recipient Message And Payment Details,Alıcı Mesaj Ve Ödeme Ayrıntıları
DocType: Training Event,Trainer Email,eğitmen E-posta
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Malzeme Talepleri {0} oluşturuldu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Malzeme Talepleri {0} oluşturuldu
DocType: Restaurant Reservation,No of People,İnsanlar Sayısı
DocType: Production Planning Tool,Include sub-contracted raw materials,taşeronluk hammadde Dahil
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Şart veya sözleşmeler şablonu.
@@ -3984,7 +3991,7 @@
DocType: Production Planning Tool,Create Material Requests,Malzeme İstekleri Oluştur
DocType: Employee Education,School/University,Okul / Üniversite
DocType: Payment Request,Reference Details,Referans Detayları
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Kullanım süresi sonunda beklenen değer, brüt alım maliyetinden düşük olmalıdır"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,"Kullanım süresi sonunda beklenen değer, brüt alım maliyetinden düşük olmalıdır"
DocType: Sales Invoice Item,Available Qty at Warehouse,Depoda mevcut miktar
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Faturalı Tutar
DocType: Asset,Double Declining Balance,Çift Azalan Bakiye
@@ -3997,7 +4004,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Güncellemeler Alın
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Hesap {2} Şirket'e ait olmayan {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Her bir özellikten en az bir değer seçin.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Yönetim bırakın
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Hesap Grubu
DocType: Sales Order,Fully Delivered,Tamamen Teslim Edilmiş
@@ -4009,14 +4016,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Bir Kullanım Tutarı Kredi Miktarı daha büyük olamaz {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Programlara Git
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Satır {0} # Tahsis edilen tutar {1}, talep edilmeyen tutardan {2} daha büyük olamaz"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Kurulum ile Seyirci için numaralandırma serisini ayarlayın> Serileri Numaralandırma
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Üretim Sipariş oluşturulmadı
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},öğrenci olarak durumunu değiştirmek olamaz {0} öğrenci uygulaması ile bağlantılı {1}
DocType: Asset,Fully Depreciated,Değer kaybı tamamlanmış
,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,İşaretlenmiş Devamlılık HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Alıntılar, müşterilerinize gönderilen adres teklifler önerileri şunlardır"
DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
@@ -4108,7 +4114,7 @@
DocType: Stock Settings,Item Naming By,Ürün adlandırma
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{1} den sonra başka bir dönem kapatma girdisi {0} yapılmıştır
DocType: Production Order,Material Transferred for Manufacturing,Üretim için Transfer edilen Materyal
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Hesap {0} yok
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Hesap {0} yok
DocType: Project,Project Type,Proje Tipi
DocType: Project,Project Type,Proje Tipi
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Bu Görev için Çocuk Görevi var. Bu görevi silemezsiniz.
@@ -4221,11 +4227,11 @@
DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
DocType: Sales Invoice Item,Delivered Qty,Teslim Edilen Miktar
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Toplam Excl. Vergi
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Eğer işaretli ise, her üretim öğesinin tüm çocukların Malzeme İstekler dahil edilecektir."
DocType: Assessment Plan,Assessment Plan,Değerlendirme Planı
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Müşteri {0} oluşturuldu.
DocType: Stock Settings,Limit Percent,Sınır Yüzde
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Lütfen Eğiticide Eğitim Sistemine Adlandırma Sistemini Ayarlayın> Eğitim Ayarları
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Şu an herhangi bir depoda stok yok
,Payment Period Based On Invoice Date,Fatura Tarihine Dayalı Ödeme Süresi
DocType: Sample Collection,No. of print,Baskı sayısı
@@ -4241,12 +4247,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Borçlular ({0})
DocType: Pricing Rule,Margin,Kar Marjı
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Yeni Müşteriler
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Brüt Kazanç%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Brüt Kazanç%
DocType: Appraisal Goal,Weightage (%),Ağırlık (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS Profilini Değiştir
DocType: Bank Reconciliation Detail,Clearance Date,Gümrükleme Tarih
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Değerlendirme raporu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Brüt sipariş tutarı zorunludur
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Brüt sipariş tutarı zorunludur
DocType: Lead,Address Desc,Azalan Adres
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Parti zorunludur
DocType: Journal Entry,JV-,JV-
@@ -4281,7 +4287,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Daimi Adı
DocType: Stock Entry,Customer or Supplier Details,Müşteri ya da Tedarikçi Detayları
DocType: Employee Loan Application,Required by Date,Tarihe Göre Gerekli
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Kapanış Bakiyesi (Dr - Cr)
DocType: Lead,Lead Owner,Talep Yaratma Sahibi
DocType: Bin,Requested Quantity,istenen Miktar
DocType: Patient,Marital Status,Medeni durum
@@ -4297,7 +4302,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Çoklu Varyantlar
DocType: Sales Invoice,Against Income Account,Karşılık Gelir Hesabı
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Teslim Edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Öğe {0}: Sıralı qty {1} minimum sipariş qty {2} (Öğe tanımlanan) daha az olamaz.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Aylık Dağılımı Yüzde
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Lütfen başka bir kullanıcı olarak giriş yapınız.
DocType: Territory,Territory Targets,Bölge Hedefleri
@@ -4402,7 +4407,7 @@
DocType: Serial No,Out of AMC,Çıkış AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bakım Ziyareti Yapın
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
DocType: Company,Default Cash Account,Standart Kasa Hesabı
DocType: Company,Default Cash Account,Standart Kasa Hesabı
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Şirket (değil Müşteri veya alanı) usta.
@@ -4573,7 +4578,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Sözü edilen ölçütler için çalışan yok
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
DocType: Restaurant,Default Customer,Varsayılan Müşteri
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun> HR Ayarları
DocType: Assessment Plan,Supervisor Name,Süpervizör Adı
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Aynı gün için randevu oluşturulup oluşturulmadığını teyit etmeyin
DocType: Program Enrollment Course,Program Enrollment Course,Program Kayıt Kursu
@@ -4712,7 +4716,7 @@
DocType: BOM,Website Description,Web Sitesi Açıklaması
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Özkaynak Net Değişim
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,en yeni
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posta adresi zaten var, benzersiz olmalıdır {0}"
DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Makbuz
@@ -4731,7 +4735,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Nakit Akım Tablosu
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredi Miktarı Maksimum Kredi Tutarı geçemez {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Geçen mali yılın bakiyelerini bu mali yıla dahil etmek isterseniz Lütfen İleri Taşıyı seçin
DocType: GL Entry,Against Voucher Type,Dekont Tipi karşılığı
DocType: Physician,Phone (R),Telefon (R)
@@ -4743,7 +4747,7 @@
DocType: Patient,B Negative,B Negatif
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Bakım Durumu İptal Edildi veya Gönderilmesi Tamamlandı
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,{0} satırındaki Seri Numaraları Teslimat Notu ile eşleşmiyor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,{0} satırındaki Seri Numaraları Teslimat Notu ile eşleşmiyor
DocType: Student,Guardian Details,Guardian Detayları
DocType: C-Form,C-Form,C-Formu
DocType: C-Form,C-Form,C-Formu
@@ -4791,7 +4795,7 @@
DocType: Stock Entry Detail,Basic Amount,Temel Tutar
DocType: Training Event,Exam,sınav
DocType: Complaint,Complaint,şikâyet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
DocType: Patient,Alcohol Past Use,Alkol Geçmiş Kullanım
DocType: Fertilizer Content,Fertilizer Content,Gübre İçerik
@@ -4928,6 +4932,7 @@
DocType: Salary Detail,Formula,formül
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Seri #
DocType: Lab Test Template,Lab Test Template,Lab Test Şablonu
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Satış hesabı
DocType: Purchase Invoice Item,Total Weight,Toplam ağırlık
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Satış Komisyonu
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Satış Komisyonu
@@ -5108,7 +5113,7 @@
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Üretim için verilen emirler.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Mali Yıl Seçin ...
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
DocType: Program Enrollment Tool,Enroll Students,Öğrenciler kayıt
DocType: Lab Test,Approved Date,Onaylanmış Tarih
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart Satış
@@ -5198,7 +5203,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Üretim Öğe
,Employee Information,Çalışan Bilgileri
DocType: Stock Entry Detail,Additional Cost,Ek maliyet
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Dekont, olarak gruplandırıldı ise Makbuz numarasına dayalı filtreleme yapamaz"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Dekont, olarak gruplandırıldı ise Makbuz numarasına dayalı filtreleme yapamaz"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
DocType: Quality Inspection,Incoming,Alınan
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Satışlar ve satın alımlar için varsayılan vergi şablonları oluşturulmuştur.
@@ -5216,7 +5221,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Not: {0}
,Delivery Note Trends,Teslimat Analizi
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Bu Haftanın Özeti
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Stok Adet
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Stok Adet
DocType: Delivery Trip,Calculate Estimated Arrival Times,Tahmini Varış Sürelerini Hesaplayın
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Hesap: {0} sadece Stok İşlemleri üzerinden güncellenebilir
DocType: Student Group Creation Tool,Get Courses,Kursları alın
@@ -5233,7 +5238,7 @@
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Kurs Tabanlı Öğrenci Grubu için, Kurs, Kayıt Edilen Program Kayıt Kurslarından her öğrenci için geçerli olacak."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Parça başı iş
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Parça başı iş
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Ort. Alış Oranı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ort. Alış Oranı
DocType: Task,Actual Time (in Hours),Gerçek Zaman (Saat olarak)
DocType: Employee,History In Company,Şirketteki Geçmişi
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{Gönderen} 'den gelen yeni mesaj
@@ -5281,7 +5286,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Satır {0}: BOM # Döviz {1} seçilen para birimi eşit olmalıdır {2}
DocType: Journal Entry Account,Exchange Rate,Döviz Kuru
DocType: Patient,Additional information regarding the patient,Hastaya ilişkin ek bilgiler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
DocType: Homepage,Tag Line,Etiket Hattı
DocType: Fee Component,Fee Component,ücret Bileşeni
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Filo yönetimi
@@ -5524,7 +5529,7 @@
DocType: Employee Education,Employee Education,Çalışan Eğitimi
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,öğe grubu tablosunda bulunan yinelenen öğe grubu
DocType: Land Unit,Parent Land Unit,Ana Kara Birimi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
DocType: Fertilizer,Fertilizer Name,Gübre Adı
DocType: Salary Slip,Net Pay,Net Ödeme
DocType: Account,Account,Hesap
@@ -5617,7 +5622,7 @@
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS Profilinde Müşteri Grubu Gerekiyor
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Çalışan kayıtları.
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Çalışan kayıtları.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Sonraki Amortisman tarihi ayarlayın
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Sonraki Amortisman tarihi ayarlayın
DocType: HR Settings,Payroll Settings,Bordro Ayarları
DocType: HR Settings,Payroll Settings,Bordro Ayarları
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Bağlantısız Faturaları ve Ödemeleri eşleştirin.
@@ -5809,7 +5814,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
DocType: Asset Maintenance Task,Last Completion Date,Son Bitiş Tarihi
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Son siparişten bu yana geçen günler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
DocType: Buying Settings,Naming Series,Seri Adlandırma
DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sigorta Başlangıç tarihi Bitiş tarihi Sigortası daha az olmalıdır
@@ -5957,6 +5962,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Ödeme Girişleri alın
DocType: Quotation Item,Against Docname,Belge adı karşılığı
DocType: SMS Center,All Employee (Active),Tüm Çalışanlar (Aktif)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Müşteri> Müşteri Grubu> Bölge
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Şimdi görüntüle
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Şimdi görüntüle
DocType: BOM,Raw Material Cost,Hammadde Maliyeti
@@ -6070,7 +6076,6 @@
DocType: Room,Seating Capacity,Oturma kapasitesi
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Laboratuar Test Grupları
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Müşteri> Müşteri Grubu> Bölge
DocType: Project,Total Expense Claim (via Expense Claims),Toplam Gider İddiası (Gider Talepleri yoluyla)
DocType: GST Settings,GST Summary,GST Özeti
DocType: Assessment Result,Total Score,Toplam puan
@@ -6084,7 +6089,7 @@
DocType: Journal Entry,Total Debit,Toplam Borç
DocType: Journal Entry,Total Debit,Toplam Borç
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standart bitirdi Eşya Depo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Satış Personeli
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Satış Personeli
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Bütçe ve Maliyet Merkezi
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Birden fazla varsayılan ödeme moduna izin verilmiyor
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,için
@@ -6281,7 +6286,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Vergi veya Ücret
DocType: Driver,Driving License Category,Sürücü Belgesi Kategorisi
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Gerçek Adet zorunludur
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} şu anda bir {1} Tedarikçi Puan Kartı'na sahip ve bu tedarikçiye Satın Alma Siparişleri dikkatle verilmelidir.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} şu anda bir {1} Tedarikçi Puan Kartı'na sahip ve bu tedarikçiye Satın Alma Siparişleri dikkatle verilmelidir.
DocType: Asset Maintenance Team,Asset Maintenance Team,Varlık Bakım Ekibi
DocType: Employee Loan,Loan Type,kredi Türü
DocType: Scheduling Tool,Scheduling Tool,zamanlama Aracı
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 16eadbe..dcb262d 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Сортувати за ціною
,Delay Days,Затримки днів
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,послуги Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Рахунок-фактура
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Зробіть утримання запасу запасів
DocType: Purchase Invoice Item,Item Weight Details,Деталі ваги Деталі
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Посилання: {0}, Код товару: {1} і клієнта: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Кг
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Вакансія
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM не вказано для субпідрядного пункту {0} у рядку {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM не вказано для субпідрядного пункту {0} у рядку {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Результат представлений
DocType: Item Attribute,Increment,Приріст
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Проміжок часу
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Не допускається для {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Отримати елементи з
DocType: Price List,Price Not UOM Dependant,Ціна не залежить від УОМ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,немає Перелічене
DocType: Asset Repair,Error Description,Опис помилки
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Продукти
DocType: Quality Inspection Reading,Reading 1,Читання 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Пенсійні фонди
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Наступна амортизація Дата не може бути перед покупкою Дати
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Наступна амортизація Дата не може бути перед покупкою Дати
DocType: Crop,Perennial,Багаторічна
DocType: Consultation,Consultation Date,Дата консультації
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Список продуктів і відкриття для користувачів ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","наприклад, "Початкова школа" або "Університет""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Складські звіти
DocType: Warehouse,Warehouse Detail,Детальна інформація по складу
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Термін Дата закінчення не може бути пізніше, ніж за рік Дата закінчення навчального року, до якого цей термін пов'язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Є основним засобом"" не може бути знято, оскільки існує запис засобу відносно об’єкту"
DocType: Delivery Trip,Departure Time,Час відправлення
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Отримати специфікація подробиці
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Шаблони таблиці постачальників.
DocType: Lead,Interested,Зацікавлений
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Відкриття/На початок
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Відкриття/На початок
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},З {0} до {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Не вдалося встановити податки
DocType: Item,Copy From Item Group,Копіювати з групи товарів
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,"Дата звільнення повинна бути більше, ніж дата влаштування"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Листя на рік
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Будь ласка, поставте відмітку 'Аванс"" у рахунку {1}, якщо це авансовий запис."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Склад {0} не належить компанії {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Склад {0} не належить компанії {1}
DocType: Email Digest,Profit & Loss,Прибуток та збиток
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,літр
DocType: Task,Total Costing Amount (via Time Sheet),Загальна калькуляція Сума (за допомогою Time Sheet)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Це базується на операціях проти цієї компанії. Детальніше див. Наведену нижче шкалу часу
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Повідомляти електронною поштою про створення автоматичних Замовлень матеріалів
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Стійкий
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Консультація
DocType: Journal Entry,Multi Currency,Мультивалютна
DocType: Opening Invoice Creation Tool,Invoice Type,Тип рахунку-фактури
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Накладна
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,Овдовілий
DocType: Request for Quotation,Request for Quotation,Запит пропозиції
DocType: Healthcare Settings,Require Lab Test Approval,Потрібне підтвердження випробування на випробування
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Код товару> Група предметів> Бренд
DocType: Salary Slip Timesheet,Working Hours,Робочі години
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Усього видатних
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Змінити стартову / поточний порядковий номер існуючого ряду.
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Будь ласка, введіть центр витрат"
DocType: Drug Prescription,Dosage,Дозування
DocType: Journal Entry Account,Sales Order,Замовлення клієнта
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Сер. ціна прод.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Сер. ціна прод.
DocType: Assessment Plan,Examiner Name,ім'я Examiner
DocType: Lab Test Template,No Result,немає результату
DocType: Purchase Invoice Item,Quantity and Rate,Кількість та ціна
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,Виберіть Період нарахування заробітної плати
DocType: Purchase Invoice,Unpaid,Неоплачений
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Зарезервовано для продажу
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Будь ласка, встановіть систему найменування працівників у людських ресурсах> Параметри персоналу"
DocType: Packing Slip,From Package No.,З пакета №
DocType: Item Attribute,To Range,Для Діапазон
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Цінні папери та депозити
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,семінар
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Попереджати замовлення на купівлю
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Досить частини для зборки
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Досить частини для зборки
DocType: POS Profile User,POS Profile User,Користувач POS Профіль
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Пряма прибуток
DocType: Patient Appointment,Date TIme,"Дата, час"
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не можете фільтрувати на основі рахунку, якщо рахунок згруповані по"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Не можете фільтрувати на основі рахунку, якщо рахунок згруповані по"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Адміністративний співробітник
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Налагодження компанії та податків
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Будь ласка, виберіть курс"
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,Рахунок різниці
DocType: Purchase Invoice,Supplier GSTIN,Постачальник GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Неможливо закрити завдання, як її залежить завдання {0} не закрите."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для якого буде створено Замовлення матеріалів"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для якого буде створено Замовлення матеріалів"
DocType: Production Order,Additional Operating Cost,Додаткова Експлуатаційні витрати
DocType: Lab Test Template,Lab Routine,Лабораторна програма
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Косметика
@@ -820,7 +821,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Зв'язок з Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Менеджер
DocType: Payment Entry,Payment From / To,Оплата с / з
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новий кредитний ліміт менше поточної суми заборгованості для клієнта. Кредитний ліміт повинен бути зареєстровано не менше {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новий кредитний ліміт менше поточної суми заборгованості для клієнта. Кредитний ліміт повинен бути зареєстровано не менше {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Будь ласка, встановіть обліковий запис у складі {0}"
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Базується на"" і ""Згруповано за"" не можуть бути однаковими"
DocType: Sales Person,Sales Person Targets,Цілі відповідального з продажу
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,пакетна Ім'я
DocType: Fee Validity,Max number of visit,Максимальна кількість відвідувань
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Табель робочого часу створено:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,зараховувати
DocType: GST Settings,GST Settings,налаштування GST
DocType: Selling Settings,Customer Naming By,Називати клієнтів по
@@ -957,7 +958,7 @@
DocType: Budget,Budget Against,Бюджет по
DocType: Employee,Cell Number,Номер мобільного
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,"Для даного критерію немає працівника. Перевірте, що плати за зарплату ще не створені."
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Автоматичне Замовлення матеріалів згенероване
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Автоматичне Замовлення матеріалів згенероване
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Втрачений
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести даний документ у колонку «Згідно проводки'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Зарезервовано для виготовлення
@@ -965,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Енергія
DocType: Opportunity,Opportunity From,Нагода від
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Щомісячна виписка зарплата.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Рядок {0}: {1} Серійні номери, необхідні для пункту {2}. Ви надали {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Рядок {0}: {1} Серійні номери, необхідні для пункту {2}. Ви надали {3}."
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Будь ласка, виберіть таблицю"
DocType: BOM,Website Specifications,Характеристики веб-сайту
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - це недійсна електронна адреса в "Одержувачі"
@@ -1034,7 +1035,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Писати пишуть запит
DocType: Vital Signs,Heart Rate / Pulse,Серцевий ритм / імпульс
DocType: Company,Default Bank Account,Банківський рахунок за замовчуванням
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Оновити Інвентар"" не може бути позначено, тому що об’єкти не доставляються через {0}"
DocType: Vehicle,Acquisition Date,придбання Дата
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Пп
@@ -1059,7 +1060,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Завантажте свою листа головою (тримайте її в Інтернеті як 900 пікс. По 100 пікс.)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Рахунок {2} не може бути групою
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Рядок {IDX}: {доктайпів} {DOCNAME} не існує в вище '{доктайпів}' таблиця
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Табель {0} вже завершено або скасовано
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Табель {0} вже завершено або скасовано
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,немає завдання
DocType: Item Variant Settings,Copy Fields to Variant,Копіювати поля до варіанта
DocType: Asset,Opening Accumulated Depreciation,Накопичений знос на момент відкриття
@@ -1171,9 +1172,10 @@
DocType: Production Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Торгові партнери та території
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,Документ Норми витрат {0} повинен бути активним
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Закриття (Відкриття + Усього)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Закриття (Відкриття + Усього)
DocType: Journal Entry,Depreciation Entry,Операція амортизації
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Будь ласка, виберіть тип документа в першу чергу"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Друк у валюті рахунку
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Скасування матеріалів переглядів {0} до скасування цього обслуговування візит
DocType: Crop Cycle,ISO 8016 standard,Стандарт ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Серійний номер {0} не належить до номенклатурної позиції {1}
@@ -1199,7 +1201,7 @@
DocType: Supplier,Default Payable Accounts,За замовчуванням заборгованість Кредиторська
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Працівник {0} не є активним або не існує
DocType: Fee Structure,Components,компоненти
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Варіанти позиції {0} оновлено
DocType: Quality Inspection Reading,Reading 6,Читання 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1251,6 +1253,7 @@
,Company Name,Назва компанії
DocType: SMS Center,Total Message(s),Загалом повідомлень
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Будь-ласка, встановіть серію імен для {0} через Налаштування> Налаштування> Серія імен"
DocType: Purchase Invoice,Additional Discount Percentage,Додаткова знижка у відсотках
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Переглянути перелік усіх довідкових відео
DocType: Agriculture Analysis Criteria,Soil Texture,Текстура грунтів
@@ -1279,7 +1282,7 @@
DocType: BOM Website Item,BOM Website Item,BOM Сайт товару
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Відвантажити ваш фірмовий заголовок та логотип. (Ви зможете відредагувати їх пізніше).
DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Введена дата наступної амортизації - у минулому
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Введена дата наступної амортизації - у минулому
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Білий
DocType: SMS Center,All Lead (Open),Всі Lead (відкрито)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Рядок {0}: К-сть недоступна для {4} на складі {1} на час проведення ({2} {3})
@@ -1296,7 +1299,7 @@
DocType: Lead,Next Contact Date,Наступна контактна дата
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,К-сть на початок роботи
DocType: Healthcare Settings,Appointment Reminder,Нагадування про призначення
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
DocType: Program Enrollment Tool Student,Student Batch Name,Student Пакетне Ім'я
DocType: Consultation,Doctor,Доктор
DocType: Holiday List,Holiday List Name,Ім'я списку вихідних
@@ -1312,6 +1315,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Інструмент призначення відпусток
DocType: Item,Hub Category to Publish,Категорія концентратора для публікації
DocType: Leave Block List,Leave Block List Dates,Дати списку блокування відпусток
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Будь ласка, налаштуйте серію нумерації для участі в Наборі> Нумерована серія"
DocType: Sales Invoice,Billing Address GSTIN,Платіжна адреса GSTIN
DocType: Assessment Plan,Evaluate,Оцінити
DocType: Workstation,Net Hour Rate,Чиста тарифна ставка
@@ -1346,7 +1350,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Оплата по вихідному рахунку
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервовано Склад в замовлення клієнта / Склад готової продукції
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Продаж Сума
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продаж Сума
DocType: Repayment Schedule,Interest Amount,відсотки Сума
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви - погоджувач витрат для цього запису. Оновіть 'Стан' і збережіть
DocType: Serial No,Creation Document No,Створення документа Немає
@@ -1439,7 +1443,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Бухгалтерський баланс на початок
,GST Sales Register,GST продажів Реєстрація
DocType: Sales Invoice Advance,Sales Invoice Advance,Передоплата по вихідному рахунку
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Нічого не просити
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Нічого не просити
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Виберіть свої домени
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Бюджетний запис '{0}' вже існує проти {1} '{2}' для {3} бюджетного періоду
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Поля будуть скопійовані лише в момент створення.
@@ -1449,11 +1453,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Це буде додано до коду варіанту. Наприклад, якщо ваша абревіатура ""СМ"", і код товару ""Футболки"", тоді код варіанту буде ""Футболки-СМ"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Сума ""на руки"" (прописом) буде видно, як тільки ви збережете Зарплатний розрахунок."
DocType: Purchase Invoice,Is Return,Повернення
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Обережно
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Обережно
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Повернення / дебетові Примітка
DocType: Price List Country,Price List Country,Ціни Країна
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} дійсні серійні номери для позиції {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} дійсні серійні номери для позиції {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Код товару не може бути змінена для серійним номером
DocType: Purchase Invoice Item,UOM Conversion Factor,Коефіцієнт перетворення Одиниця виміру
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Будь ласка, введіть код товару, щоб отримати номер партії"
@@ -1559,7 +1563,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Замовлення клієнта {0} не є допустимим
DocType: Supplier Scorecard,Warn for new Request for Quotations,Попереджати новий запит на котирування
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Замовлення допоможуть вам планувати і стежити за ваші покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об'єднані"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об'єднані"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Лабораторія тестових рецептів
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Загальна кількість / Переміщена кількість {0} у Замовленні матеріалів {1} \ не може бути більше необхідної кількості {2} для позиції {3}
@@ -1597,7 +1601,6 @@
DocType: Warehouse,Warehouse Contact Info,Контактні дані складу
DocType: Payment Entry,Write Off Difference Amount,Списання різниця в
DocType: Volunteer,Volunteer Name,Ім'я волонтера
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Будь-ласка, встановіть систему іменування інструкторів в освіті> Параметри освіти"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Не знайдено електронної пошти працівника, тому e-mail не відправлено"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правило доставки не застосовується до країни {0}
DocType: Item,Foreign Trade Details,зовнішньоторговельна Детальніше
@@ -1610,7 +1613,7 @@
DocType: Student Group Student,Group Roll Number,Група Ролл Кількість
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов'язані з іншою дебету"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сума всіх ваг завдання повинна бути 1. Будь ласка, поміняйте ваги всіх завдань проекту, відповідно,"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Накладна {0} не проведена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Накладна {0} не проведена
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Позиція {0} має бути субпідрядною
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Капітальні обладнання
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цінове правило базується на полі ""Застосовується до"", у якому можуть бути: номенклатурна позиція, група або бренд."
@@ -1635,7 +1638,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Дитячий склад існує для цього складу. Ви не можете видалити цей склад.
DocType: Item,Website Item Groups,Групи об’єктів веб-сайту
DocType: Purchase Invoice,Total (Company Currency),Загалом (у валюті компанії)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Серійний номер {0} введений більше ніж один раз
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Серійний номер {0} введений більше ніж один раз
DocType: Journal Entry,Journal Entry,Проводка
DocType: Expense Claim Advance,Unclaimed amount,Незатребована сума
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} виготовляються товари
@@ -1732,7 +1735,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал з'єднань.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запит пропозиції недоступний з порталу, перевірте налаштування порталу."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Варіатор оцінки скорингової картки постачальника
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Сума купівлі
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Сума купівлі
DocType: Sales Invoice,Shipping Address Name,Ім'я адреси доставки
DocType: Material Request,Terms and Conditions Content,Зміст положень та умов
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Були помилки, створюючи Розклад курсу"
@@ -1996,7 +1999,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Це засновано на колодах проти цього транспортного засобу. Див графік нижче для отримання докладної інформації
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Згідно вхідного рахунку-фактури {0} від {1}
DocType: Customer,Default Price List,Прайс-лист за замовчуванням
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Рух активів {0} створено
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Рух активів {0} створено
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете видаляти фінансовий рік {0}. Фінансовий рік {0} встановлено за замовчанням в розділі Глобальні параметри
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Клієнт з тим самим ім'ям вже існує
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Це дозволить подати заробітну плату та створити нарахування вступного журналу. Ви хочете продовжити?
@@ -2010,6 +2013,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,ціноутворення
DocType: Quotation,Term Details,Термін Детальніше
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Не зміг зареєструвати більш {0} студентів для цієї групи студентів.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Усього (без податку)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ведучий граф
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,ведучий граф
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} має бути більше 0
@@ -2030,7 +2034,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Відвязувати оплати при анулюванні рахунку-фактури
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Поточне значення одометра увійшли має бути більше, ніж початковий одометр автомобіля {0}"
DocType: Restaurant Reservation,No Show,Немає шоу
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Будь-ласка, встановіть серію імен для {0} через Налаштування> Налаштування> Серія імен"
DocType: Shipping Rule Country,Shipping Rule Country,Країна правил доставки
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Відпустки та відвідуваність
DocType: Maintenance Visit,Partially Completed,Частково завершено
@@ -2123,7 +2126,7 @@
DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
DocType: Grant Application,Assessment Mark (Out of 10),Оцінка (з 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobile Немає
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Головна
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Головна
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Варіант
DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії ваших операцій
DocType: Employee Attendance Tool,Employees HTML,співробітники HTML
@@ -2173,7 +2176,7 @@
DocType: Course,Course Abbreviation,Абревіатура курсу
DocType: Student Leave Application,Student Leave Application,Студент Залишити заявку
DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Співробітник {0} на півдня на {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},"Всього тривалість робочого часу не повинна бути більше, ніж максимальний робочий час {0}"
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,на
@@ -2360,9 +2363,10 @@
DocType: Task,Actual End Date (via Time Sheet),Фактична дата закінчення (за допомогою табеля робочого часу)
DocType: Soil Texture,Soil Type,Тип грунту
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Сума {0} {1} проти {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Нове повідомлення
,Quotation Trends,Тренд пропозицій
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Група елемента не згадується у майстрі для елементу {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
DocType: Shipping Rule,Shipping Amount,Сума доставки
DocType: Supplier Scorecard Period,Period Score,Оцінка періоду
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Додати Клієнти
@@ -2373,7 +2377,7 @@
,Vehicle Expenses,Витрати транспортних засобів
DocType: Serial No,Invoice Details,Інформація про рахунки
DocType: Grant Application,Show on Website,Показати на веб-сайті
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Почніть з
DocType: Hub Category,Hub Category,Категорія концентратора
DocType: Purchase Invoice,SEZ,СЕЗ
@@ -2405,7 +2409,7 @@
DocType: Patient,B Positive,B Позитивний
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинна бути 1, оскільки елемент є основним засобом. Будь ласка, створюйте декілька рядків, якщо кількість більше 1."
DocType: Leave Block List Allow,Leave Block List Allow,Список блокування відпусток дозволяє
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
DocType: Patient Medical Record,Patient Medical Record,Пацієнтська медична довідка
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Група не-групи
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Спортивний
@@ -2456,6 +2460,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Не вдається встановити отриманий RFQ без котирування
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Всього відрахування
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Виберіть обліковий запис для друку в валюті рахунку
,Production Analytics,виробництво Аналітика
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Це базується на операціях проти цього пацієнта. Нижче наведено докладну інформацію про часовій шкалі
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Вартість Оновлене
@@ -2511,7 +2516,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Виберіть компанію ...
DocType: Leave Control Panel,Leave blank if considered for all departments,"Залиште порожнім, якщо розглядати для всіх відділів"
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
DocType: Payroll Entry,Fortnightly,раз на два тижні
DocType: Currency Exchange,From Currency,З валюти
DocType: Vital Signs,Weight (In Kilogram),Вага (у кілограмі)
@@ -2589,7 +2594,7 @@
DocType: Student,Guardians,опікуни
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ціни не будуть показані, якщо прайс-лист не встановлено"
DocType: Stock Entry,Total Incoming Value,Загальна суму приходу
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Дебет вимагається
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Дебет вимагається
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets допоможе відстежувати час, вартість і виставлення рахунків для Активності зробленої вашої команди"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Прайс-лист закупівлі
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони постачальників показників змінної.
@@ -2692,7 +2697,7 @@
DocType: Company,For Reference Only.,Для довідки тільки.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Лікар {0} недоступний на {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Виберіть Batch Немає
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невірний {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Невірний {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Довідкова інв
@@ -2729,8 +2734,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
DocType: Water Analysis,Origin,Походження
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Цей документ знаходиться над межею {0} {1} для елемента {4}. Ви робите інший {3} проти того ж {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,Вибрати рахунок для суми змін
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,Вибрати рахунок для суми змін
DocType: Purchase Invoice,Price List Currency,Валюта прайс-листа
DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
DocType: Stock Settings,Allow Negative Stock,Дозволити від'ємні залишки
@@ -2786,7 +2791,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Попереджайте про нові замовлення на купівлю
DocType: Quality Inspection Reading,Reading 9,Читання 9
DocType: Supplier,Is Frozen,Заблоковано
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,"склад групи вузлів не допускається, щоб вибрати для угод"
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,"склад групи вузлів не допускається, щоб вибрати для угод"
DocType: Buying Settings,Buying Settings,Налаштування купівлі
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Номер Норм для закінченого продукту
DocType: Upload Attendance,Attendance To Date,Відвідуваність по дату
@@ -2801,6 +2806,7 @@
DocType: Grant Application,Organization,організація
DocType: BOM Update Tool,BOM Update Tool,Інструмент оновлення BOM
DocType: SG Creation Tool Course,Student Group Name,Ім'я Студентська група
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Показати виділений вигляд
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Створення комісійних
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
DocType: Room,Room Number,Номер кімнати
@@ -2811,7 +2817,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Зробити податковий шаблон
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум користувачів
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Сировина не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
DocType: Lab Test Sample,Lab Test Sample,Лабораторія випробувань зразка
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Швидка проводка
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити вартість, якщо для елементу вказані Норми"
@@ -2882,7 +2888,7 @@
DocType: Membership,USD,Дол. США
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Зробити рахунок-фактуру
DocType: Selling Settings,Auto close Opportunity after 15 days,Авто близько Можливість через 15 днів
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Замовлення на придбання не дозволено на {0} через показник показника показника {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Замовлення на придбання не дозволено на {0} через показник показника показника {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,кінець року
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Свинець%
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Свинець%
@@ -2975,7 +2981,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Понад 90
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Рядок # {0}: Проводка {1} не має рахунку {2} або вже прив'язана до іншого документу
DocType: Supplier Scorecard Criteria,Criteria Weight,Критерії ваги
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Постачальник> Тип постачальника
DocType: Buying Settings,Default Buying Price List,Прайс-лист закупівлі за замовчуванням
DocType: Payroll Entry,Salary Slip Based on Timesheet,"Зарплатний розрахунок, на основі табелю-часу"
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Ціна покупки
@@ -3064,7 +3069,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Відслідковувати Lead-и за галуззю.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Перейти на бланки
DocType: Item Supplier,Item Supplier,Пункт Постачальник
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всі адреси.
DocType: Company,Stock Settings,Налаштування інвентаря
@@ -3242,6 +3247,7 @@
DocType: Company,Default Inventory Account,За замовчуванням інвентаризації рахунки
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Рядок {0}: Завершена кількість має бути більше нуля.
DocType: Antibiotic,Antibiotic Name,Назва антибіотиків
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Код товару> Група предметів> Бренд
DocType: Purchase Invoice,Apply Additional Discount On,Надати додаткову знижку на
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Виберіть тип ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,"Посилання на всі земельні підрозділи, в яких рослина зростає"
@@ -3437,6 +3443,7 @@
DocType: Supplier,Credit Limit,Кредитний ліміт
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Сер. Продаж тарифної ставки
DocType: Production Plan Sales Order,Salse Order Date,Salse Дата замовлення
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Постачальник> Тип постачальника
DocType: Salary Component,Salary Component,Компонент зарплати
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Оплати {0} не прив'язані
DocType: GL Entry,Voucher No,Номер документа
@@ -3446,7 +3453,7 @@
DocType: Leave Allocation,Leave Allocation,Призначення відпустки
DocType: Payment Request,Recipient Message And Payment Details,Повідомлення та платіжні реквізити
DocType: Training Event,Trainer Email,тренер Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,"Замовлення матеріалів {0}, створені"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,"Замовлення матеріалів {0}, створені"
DocType: Restaurant Reservation,No of People,Ні людей
DocType: Production Planning Tool,Include sub-contracted raw materials,Включати субконтрактну сировину
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Шаблон умов договору
@@ -3512,7 +3519,7 @@
DocType: Production Planning Tool,Create Material Requests,Створити Замовлення матеріалів
DocType: Employee Education,School/University,Школа / університет
DocType: Payment Request,Reference Details,Посилання Детальніше
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очікувана вартість після терміну використання ма бути менша за повну вартість придбання.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Очікувана вартість після терміну використання ма бути менша за повну вартість придбання.
DocType: Sales Invoice Item,Available Qty at Warehouse,Доступна к-сть на складі
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Сума виставлених рахунків
DocType: Asset,Double Declining Balance,Double Declining Balance
@@ -3524,7 +3531,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Підписатись на новини
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Рахунок {2} не належить Компанії {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Виберіть принаймні одне значення для кожного з атрибутів.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Замовлення матеріалів {0} відмінено або призупинено
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Замовлення матеріалів {0} відмінено або призупинено
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Управління відпустками
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Групувати по рахунках
DocType: Sales Order,Fully Delivered,Повністю доставлено
@@ -3535,14 +3542,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоєно Сума не може бути більше, ніж сума позики {0}"
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Перейдіть до програм
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},"Рядок {0} # Розподілена сума {1} не може перевищувати суму, яку не було заявлено {2}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Будь ласка, налаштуйте серію нумерації для участі в Наборі> Нумерована серія"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},"Номер Замовлення на придбання, необхідний для {0}"
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Виробничий замовлення не створено
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Від дати"" має бути раніше ""До дати"""
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Неможливо змінити статус студента {0} пов'язаний з додатком студента {1}
DocType: Asset,Fully Depreciated,повністю амортизується
,Stock Projected Qty,Прогнозований складський залишок
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Внесена відвідуваність HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Котирування є пропозиціями, пропозиціями відправлених до своїх клієнтів"
DocType: Sales Order,Customer's Purchase Order,Оригінал замовлення клієнта
@@ -3627,7 +3633,7 @@
DocType: Stock Settings,Item Naming By,Найменування номенклатурних позицій за
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Ще одна операція закриття періоду {0} була зроблена після {1}
DocType: Production Order,Material Transferred for Manufacturing,Матеріал для виготовлення Переведений
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Рахунок {0} не існує робить
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Рахунок {0} не існує робить
DocType: Project,Project Type,Тип проекту
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Дитяча задача існує для цієї задачі. Ви не можете видалити це завдання.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Кінцева к-сть або сума є обов'язковими
@@ -3731,11 +3737,11 @@
DocType: Company,Asset Depreciation Cost Center,Центр витрат амортизації
DocType: Sales Order Item,Sales Order Date,Дата Замовлення клієнта
DocType: Sales Invoice Item,Delivered Qty,Доставлена к-сть
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Всього Excl Податок
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Якщо позначено, всі підлеглі позиції кожного продукту будуть включені у ""Замовлення матеріалів"""
DocType: Assessment Plan,Assessment Plan,план оцінки
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Клієнт {0} створено.
DocType: Stock Settings,Limit Percent,граничне Відсоток
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Будь-ласка, встановіть систему іменування інструкторів в освіті> Параметри освіти"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,На даний момент немає запасів на будь-якому складі
,Payment Period Based On Invoice Date,Затримка оплати після виставлення рахунку
DocType: Sample Collection,No. of print,Номер друку
@@ -3751,12 +3757,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Боржники ({0})
DocType: Pricing Rule,Margin,маржа
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нові клієнти
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Загальний прибуток %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Загальний прибуток %
DocType: Appraisal Goal,Weightage (%),Weightage (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Змінити профіль POS
DocType: Bank Reconciliation Detail,Clearance Date,Clearance дата
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Оціночний звіт
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Загальна вартість придбання є обов'язковою
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Загальна вартість придбання є обов'язковою
DocType: Lead,Address Desc,Опис адреси
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Контрагент є обов'язковим
DocType: Journal Entry,JV-,JV-
@@ -3788,7 +3794,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Постійне ім'я
DocType: Stock Entry,Customer or Supplier Details,Замовник або Постачальник Подробиці
DocType: Employee Loan Application,Required by Date,потрібно Дата
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Закритий баланс (Dr - Cr)
DocType: Lead,Lead Owner,Власник Lead-а
DocType: Bin,Requested Quantity,Необхідна кількість
DocType: Patient,Marital Status,Сімейний стан
@@ -3802,7 +3807,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Кілька варіантів
DocType: Sales Invoice,Against Income Account,На рахунок доходів
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Доставлено
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Позиція {0}: Замовлена к-сть {1} не може бути менше мінімальної к-сті замовлення {2} (визначеної у інвентарній картці).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Позиція {0}: Замовлена к-сть {1} не може бути менше мінімальної к-сті замовлення {2} (визначеної у інвентарній картці).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Щомісячний Процентний розподіл
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,"Будь ласка, увійдіть як інший користувач."
DocType: Territory,Territory Targets,Територія Цілі
@@ -3903,7 +3908,7 @@
DocType: Serial No,Out of AMC,З Контракту на річне обслуговування
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Зробити Візит тех. обслуговування
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв'яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв'яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
DocType: Company,Default Cash Account,Грошовий рахунок за замовчуванням
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Це засновано на відвідуваності цього студента
@@ -4056,7 +4061,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Немає працівників за вказаними критеріями
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
DocType: Restaurant,Default Customer,За замовчуванням клієнт
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,"Будь ласка, встановіть систему найменування працівників у людських ресурсах> Параметри персоналу"
DocType: Assessment Plan,Supervisor Name,Ім'я супервайзера
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,"Не підтверджуйте, якщо зустріч призначена для того самого дня"
DocType: Program Enrollment Course,Program Enrollment Course,Програма Зарахування курс
@@ -4179,7 +4183,7 @@
DocType: BOM,Website Description,Опис веб-сайту
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Чиста зміна в капіталі
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Найновіші
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адреса електронної пошти повинен бути унікальним, вже існує для {0}"
DocType: Serial No,AMC Expiry Date,Дата закінчення річного обслуговування
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,розписка
@@ -4196,7 +4200,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Звіт про рух грошових коштів
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сума кредиту не може перевищувати максимальний Сума кредиту {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ліцензія
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year
DocType: GL Entry,Against Voucher Type,Згідно док-ту типу
DocType: Physician,Phone (R),Телефон (R)
@@ -4208,7 +4212,7 @@
DocType: Patient,B Negative,B Негативний
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Статус технічного обслуговування має бути скасований або завершено для відправлення
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Серійні номери в рядку {0} не збігається з накладною
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Серійні номери в рядку {0} не збігається з накладною
DocType: Student,Guardian Details,Детальніше Гардіан
DocType: C-Form,C-Form,С-форма
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк відвідуваності для декількох співробітників
@@ -4250,7 +4254,7 @@
DocType: Stock Entry Detail,Basic Amount,Основна кількість
DocType: Training Event,Exam,іспит
DocType: Complaint,Complaint,Скарга
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
DocType: Leave Allocation,Unused leaves,Невикористані дні відпустки
DocType: Patient,Alcohol Past Use,Спиртне минуле використання
DocType: Fertilizer Content,Fertilizer Content,Вміст добрив
@@ -4378,6 +4382,7 @@
DocType: Salary Detail,Formula,формула
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Серійний #
DocType: Lab Test Template,Lab Test Template,Шаблон Lab Test
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Рахунок продажів
DocType: Purchase Invoice Item,Total Weight,Загальна вага
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Комісія з продажу
DocType: Offer Letter Term,Value / Description,Значення / Опис
@@ -4535,7 +4540,7 @@
DocType: Customer,From Lead,З Lead-а
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Замовлення випущений у виробництво.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Виберіть фінансовий рік ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,"Необхідний POS-профіль, щоб зробити POS-операцію"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,"Необхідний POS-профіль, щоб зробити POS-операцію"
DocType: Program Enrollment Tool,Enroll Students,зарахувати студентів
DocType: Lab Test,Approved Date,Затверджена дата
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартний Продаж
@@ -4612,7 +4617,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Виробництво товару
,Employee Information,Співробітник Інформація
DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",Неможливо фільтрувати по номеру документу якщо згруповано по документах
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",Неможливо фільтрувати по номеру документу якщо згруповано по документах
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Зробити пропозицію постачальника
DocType: Quality Inspection,Incoming,Вхідний
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Шаблони податку за замовчуванням для продажу та покупки створені.
@@ -4628,7 +4633,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Примітка: {0}
,Delivery Note Trends,Тренд розхідних накладних
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Резюме цього тижня
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,В наявності Кількість
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,В наявності Кількість
DocType: Delivery Trip,Calculate Estimated Arrival Times,Обчислити розрахунковий час прибуття
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Рахунок: {0} може оновитися тільки операціями з інвентарем
DocType: Student Group Creation Tool,Get Courses,отримати курси
@@ -4644,7 +4649,7 @@
DocType: Material Request,% Ordered,% Замовлено
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Для заснованого курсу студентської групи, Курс буде перевірятися для кожного студента з зарахованих курсів в програмі зарахування."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Відрядна робота
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Сер. ціна закупівлі
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Сер. ціна закупівлі
DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
DocType: Employee,History In Company,Історія У Компанії
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Нове повідомлення від {sender}
@@ -4692,7 +4697,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Рядок {0}: Валюта BOM # {1} має дорівнювати вибрану валюту {2}
DocType: Journal Entry Account,Exchange Rate,Курс валюти
DocType: Patient,Additional information regarding the patient,Додаткова інформація щодо пацієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
DocType: Homepage,Tag Line,Tag Line
DocType: Fee Component,Fee Component,плата компонентів
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Управління флотом
@@ -4907,7 +4912,7 @@
DocType: Employee Education,Employee Education,Співробітник Освіта
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Повторювана група знахідку в таблиці групи товарів
DocType: Land Unit,Parent Land Unit,Батьківський фонд
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
DocType: Fertilizer,Fertilizer Name,Назва мінеральних добрив
DocType: Salary Slip,Net Pay,"Сума ""на руки"""
DocType: Account,Account,Рахунок
@@ -4986,7 +4991,7 @@
DocType: Item Customer Detail,Ref Code,Код посилання
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Група клієнтів потрібна в профілі POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Співробітник записів.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Будь ласка, встановіть наступну дату амортизації"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Будь ласка, встановіть наступну дату амортизації"
DocType: HR Settings,Payroll Settings,Налаштування платіжної відомості
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Зв'язати рахунки-фактури з платежами.
DocType: POS Settings,POS Settings,Налаштування POS
@@ -5154,7 +5159,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Нагадування про день народження для {0}
DocType: Asset Maintenance Task,Last Completion Date,Дата завершення останнього завершення
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дні з останнього ордена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
DocType: Buying Settings,Naming Series,Іменування серії
DocType: Leave Block List,Leave Block List Name,Назва списку блокування відпусток
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхування початку повинна бути менше, ніж дата страхування End"
@@ -5283,6 +5288,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Отримати Оплати
DocType: Quotation Item,Against Docname,На DOCNAME
DocType: SMS Center,All Employee (Active),Всі Співробітник (Активний)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Клієнт> Група клієнтів> Територія
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Дивитися зараз
DocType: BOM,Raw Material Cost,Сировина Вартість
DocType: Item Reorder,Re-Order Level,Рівень дозамовлення
@@ -5382,7 +5388,6 @@
DocType: Room,Seating Capacity,Кількість сидячих місць
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Лабораторні тестові групи
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Клієнт> Група клієнтів> Територія
DocType: Project,Total Expense Claim (via Expense Claims),Всього витрат (за Авансовими звітами)
DocType: GST Settings,GST Summary,GST Резюме
DocType: Assessment Result,Total Score,Загальний рахунок
@@ -5396,7 +5401,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Наступні курси були створені
DocType: Journal Entry,Total Debit,Всього Дебет
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Склад готової продукції за замовчуванням
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Відповідальний з продажу
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Відповідальний з продажу
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Бюджет та центр витрат
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Кілька типовий спосіб оплати за замовчуванням заборонено
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,для
@@ -5572,7 +5577,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Розглянемо податку або збору для
DocType: Driver,Driving License Category,Посвідчення категорії водіння
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактична к-сть обов'язкова
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} наразі має {1} Поставку Scorecard Постачальника, і замовлення на придбання для цього постачальника повинні бути випущені з обережністю."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} наразі має {1} Поставку Scorecard Постачальника, і замовлення на придбання для цього постачальника повинні бути випущені з обережністю."
DocType: Asset Maintenance Team,Asset Maintenance Team,Команда з обслуговування майна
DocType: Employee Loan,Loan Type,Тип кредиту
DocType: Scheduling Tool,Scheduling Tool,планування Інструмент
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index 054d4f4..8e619ce 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,قیمت کی طرف سے ترتیب دیں
,Delay Days,تاخیر کے دن
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,سروس کے اخراجات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,انوائس
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,ریٹری اسٹاک انٹری کو بنائیں
DocType: Purchase Invoice Item,Item Weight Details,آئٹم وزن کی تفصیلات
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",حوالہ: {0}، آئٹم کوڈ: {1} اور کسٹمر: {2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,کلو
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ایک کام کے لئے کھولنے.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},بوم ذیلی کنکریٹ کرنے والے آئٹم {0} کے لئے قطار {1} کے لئے مخصوص نہیں ہے.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},بوم ذیلی کنکریٹ کرنے والے آئٹم {0} کے لئے قطار {1} کے لئے مخصوص نہیں ہے.
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} نتیجہ جمع کر دیا گیا
DocType: Item Attribute,Increment,اضافہ
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,وقت کی مدت
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},کی اجازت نہیں {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,سے اشیاء حاصل
DocType: Price List,Price Not UOM Dependant,قیمت UOM انحصار نہیں ہے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},پروڈکٹ {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,کوئی آئٹم مندرج
DocType: Asset Repair,Error Description,خرابی کی تفصیل
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,گروسری
DocType: Quality Inspection Reading,Reading 1,1 پڑھنا
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,پنشن فنڈز
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,اگلا ہراس تاریخ تاریخ کی خریداری سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,اگلا ہراس تاریخ تاریخ کی خریداری سے پہلے نہیں ہو سکتا
DocType: Crop,Perennial,پیدائش
DocType: Consultation,Consultation Date,مشاورت کی تاریخ
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext صارفین کیلئے پروڈکٹ لسٹنگ اور دریافت
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",مثلا "پرائمری سکول" یا "یونیورسٹی"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,اسٹاک کی رپورٹ
DocType: Warehouse,Warehouse Detail,گودام تفصیل
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,اصطلاح آخر تاریخ بعد میں جس چیز کی اصطلاح منسلک ہے کے تعلیمی سال کے سال آخر تاریخ سے زیادہ نہیں ہو سکتا ہے (تعلیمی سال {}). تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","فکسڈ اثاثہ ہے" اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
DocType: Delivery Trip,Departure Time,روانگی کا وقت
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,تفصیلات تفصیلات حاصل
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,سپلائر اسٹینڈنگ کے سانچے.
DocType: Lead,Interested,دلچسپی رکھنے والے
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,افتتاحی
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,افتتاحی
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},سے {0} سے {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,ٹیکس سیٹ کرنے میں ناکام
DocType: Item,Copy From Item Group,آئٹم گروپ سے کاپی
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,تاریخ حاجت میں شمولیت کی تاریخ سے زیادہ ہونا چاہیے
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,سال پتے فی
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,صف {0}: براہ مہربانی چیک کریں کے اکاؤنٹ کے خلاف 'ایڈوانس ہے' {1} اس پیشگی اندراج ہے.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},{0} گودام کمپنی سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},{0} گودام کمپنی سے تعلق نہیں ہے {1}
DocType: Email Digest,Profit & Loss,منافع اور نقصان
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litre
DocType: Task,Total Costing Amount (via Time Sheet),کل لاگت کی رقم (وقت شیٹ کے ذریعے)
@@ -456,6 +456,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,یہ اس کمپنی کے خلاف ٹرانزیکشن پر مبنی ہے. تفصیلات کے لئے ذیل میں ٹائم لائن ملاحظہ کریں
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,خود کار طریقے سے مواد کی درخواست کی تخلیق پر ای میل کے ذریعے مطلع کریں
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,مزاحم
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,مشاورت
DocType: Journal Entry,Multi Currency,ملٹی کرنسی
DocType: Opening Invoice Creation Tool,Invoice Type,انوائس کی قسم
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,ترسیل کے نوٹ
@@ -529,7 +530,6 @@
DocType: Employee,Widowed,بیوہ
DocType: Request for Quotation,Request for Quotation,کوٹیشن کے لئے درخواست
DocType: Healthcare Settings,Require Lab Test Approval,لیب ٹیسٹ کی منظوری کی ضرورت ہے
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,آئٹم کوڈ> آئٹم گروپ> برانڈ
DocType: Salary Slip Timesheet,Working Hours,کام کے اوقات
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,کل بقایا
DocType: Naming Series,Change the starting / current sequence number of an existing series.,ایک موجودہ سیریز کے شروع / موجودہ ترتیب تعداد کو تبدیل کریں.
@@ -558,7 +558,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لاگت مرکز درج کریں
DocType: Drug Prescription,Dosage,خوراک
DocType: Journal Entry Account,Sales Order,سیلز آرڈر
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,اوسط. فروخت کی شرح
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,اوسط. فروخت کی شرح
DocType: Assessment Plan,Examiner Name,آڈیٹر نام
DocType: Lab Test Template,No Result,کوئی نتیجہ
DocType: Purchase Invoice Item,Quantity and Rate,مقدار اور شرح
@@ -608,6 +608,7 @@
DocType: Payroll Entry,Select Payroll Period,پے رول کی مدت کو منتخب
DocType: Purchase Invoice,Unpaid,بلا معاوضہ
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,فروخت کے لئے محفوظ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,براہ کرم انسانی وسائل> HR ترتیبات میں ملازم نامی کا نظام قائم کریں
DocType: Packing Slip,From Package No.,پیکیج نمبر سے
DocType: Item Attribute,To Range,کی حد
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,سیکورٹیز اور جمع
@@ -632,11 +633,11 @@
DocType: Training Event,Workshop,ورکشاپ
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,خریداری کے احکامات کو خبردار کریں
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,آپ کے گاہکوں میں سے چند ایک کی فہرست. وہ تنظیموں یا افراد کے ہو سکتا ہے.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,بس بہت کچھ حصوں کی تعمیر
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,بس بہت کچھ حصوں کی تعمیر
DocType: POS Profile User,POS Profile User,POS پروفائل صارف
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,براہ راست آمدنی
DocType: Patient Appointment,Date TIme,تاریخ وقت
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",اکاؤنٹ کی طرف سے گروپ ہے، اکاؤنٹ کی بنیاد پر فلٹر نہیں کر سکتے ہیں
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",اکاؤنٹ کی طرف سے گروپ ہے، اکاؤنٹ کی بنیاد پر فلٹر نہیں کر سکتے ہیں
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,ایڈمنسٹریٹو آفیسر
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,کمپنی اور ٹیکس قائم کرنا
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,کورس کا انتخاب کریں
@@ -647,7 +648,7 @@
DocType: Stock Entry Detail,Difference Account,فرق اکاؤنٹ
DocType: Purchase Invoice,Supplier GSTIN,سپلائر GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,اس کا انحصار کام {0} بند نہیں ہے کے طور پر قریب کام نہیں کر سکتے ہیں.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
DocType: Production Order,Additional Operating Cost,اضافی آپریٹنگ لاگت
DocType: Lab Test Template,Lab Routine,لیب روٹین
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,کاسمیٹک
@@ -818,7 +819,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 ساتھ تعلق
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مینیجر
DocType: Payment Entry,Payment From / To,/ سے ادائیگی
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},کسٹمر کے لئے موجودہ کریڈٹ کی حد سے کم نئی کریڈٹ کی حد کم ہے. کریڈٹ کی حد کم از کم ہے {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},کسٹمر کے لئے موجودہ کریڈٹ کی حد سے کم نئی کریڈٹ کی حد کم ہے. کریڈٹ کی حد کم از کم ہے {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},برائے مہربانی گودام میں اکاؤنٹ مقرر کریں {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,اور گروپ سے '' کی بنیاد پر 'ہی نہیں ہو سکتا
DocType: Sales Person,Sales Person Targets,فروخت شخص اہداف
@@ -829,7 +830,7 @@
DocType: Student Batch Name,Batch Name,بیچ کا نام
DocType: Fee Validity,Max number of visit,دورے کی زیادہ سے زیادہ تعداد
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet پیدا کیا:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,اندراج کریں
DocType: GST Settings,GST Settings,GST ترتیبات
DocType: Selling Settings,Customer Naming By,کی طرف سے گاہک نام دینے
@@ -955,7 +956,7 @@
DocType: Budget,Budget Against,بجٹ کے خلاف
DocType: Employee,Cell Number,سیل نمبر
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,دیئے گئے معیار کے لئے کوئی ملازم نہیں ہے. چیک کریں کہ تنخواہ سلپس پہلے ہی نہیں بنائی گئی ہیں.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,آٹو مواد درخواستوں پیدا
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,آٹو مواد درخواستوں پیدا
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,کھو
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,آپ کے کالم 'جرنل اندراج کے خلاف' میں موجودہ واؤچر داخل نہیں ہو سکتا
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,مینوفیکچرنگ کے لئے محفوظ
@@ -963,7 +964,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,توانائی
DocType: Opportunity,Opportunity From,سے مواقع
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ماہانہ تنخواہ بیان.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,قطار {0}: {1} آئٹم {2} کے لئے سیریل نمبر ضروری ہے. آپ نے {3} فراہم کیا ہے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,قطار {0}: {1} آئٹم {2} کے لئے سیریل نمبر ضروری ہے. آپ نے {3} فراہم کیا ہے.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,براہ کرم میز منتخب کریں
DocType: BOM,Website Specifications,ویب سائٹ نردجیکرن
DocType: Special Test Items,Particulars,نصاب
@@ -1031,7 +1032,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,اقتباس کی درخواست
DocType: Vital Signs,Heart Rate / Pulse,دل کی شرح / پلس
DocType: Company,Default Bank Account,پہلے سے طے شدہ بینک اکاؤنٹ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پارٹی کی بنیاد پر فلٹر کرنے کے لئے، منتخب پارٹی پہلی قسم
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",پارٹی کی بنیاد پر فلٹر کرنے کے لئے، منتخب پارٹی پہلی قسم
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},اشیاء کے ذریعے فراہم نہیں کر رہے ہیں 'اپ ڈیٹ اسٹاک' کی چیک نہیں کیا جا سکتا{0}
DocType: Vehicle,Acquisition Date,ارجن تاریخ
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,نمبر
@@ -1056,7 +1057,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),اپنا خط سر اپ لوڈ کریں (اسے 100px تک 900px کے طور پر ویب دوستانہ رکھیں)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: اکاؤنٹ {2} ایک گروپ نہیں ہو سکتا
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,آئٹم صف {IDX): (DOCTYPE} {} DOCNAME مندرجہ بالا میں موجود نہیں ہے '{DOCTYPE}' کے ٹیبل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} پہلے ہی مکمل یا منسوخ کر دیا ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Timesheet {0} پہلے ہی مکمل یا منسوخ کر دیا ہے
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,کوئی کاموں
DocType: Item Variant Settings,Copy Fields to Variant,مختلف قسم کے فیلڈز
DocType: Asset,Opening Accumulated Depreciation,جمع ہراس کھولنے
@@ -1168,9 +1169,10 @@
DocType: Production Order,Plan material for sub-assemblies,ذیلی اسمبلیوں کے لئے منصوبہ مواد
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,سیلز شراکت دار اور علاقہ
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),بند (کھولنے + کل)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),بند (کھولنے + کل)
DocType: Journal Entry,Depreciation Entry,ہراس انٹری
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,پہلی دستاویز کی قسم منتخب کریں
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,اکاؤنٹ کرنسی میں پرنٹ کریں
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,اس کی بحالی کا منسوخ کرنے سے پہلے منسوخ مواد دورہ {0}
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 معیار
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},سیریل نمبر {0} آئٹم سے تعلق نہیں ہے {1}
@@ -1196,7 +1198,7 @@
DocType: Supplier,Default Payable Accounts,پہلے سے طے شدہ قابل ادائیگی اکاؤنٹس
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ملازم فعال نہیں ہے یا موجود نہیں ہے
DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},براہ مہربانی آئٹم {0} میں اثاثہ زمرہ درج کریں
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},براہ مہربانی آئٹم {0} میں اثاثہ زمرہ درج کریں
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1248,6 +1250,7 @@
,Company Name,کمپنی کا نام
DocType: SMS Center,Total Message(s),کل پیغام (ے)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,براہ کرم سیٹ اپ کے ذریعے {0} کے سلسلے میں ناممکن سیریز ترتیب دیں
DocType: Purchase Invoice,Additional Discount Percentage,اضافی ڈسکاؤنٹ فی صد
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,تمام قسم کی مدد ویڈیوز کی ایک فہرست دیکھیں
DocType: Agriculture Analysis Criteria,Soil Texture,مٹی بنت
@@ -1276,7 +1279,7 @@
DocType: BOM Website Item,BOM Website Item,BOM ویب آئٹم
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,اپنے خط سر اور علامت (لوگو). (آپ کو بعد ان میں ترمیم کر سکتے ہیں).
DocType: Timesheet Detail,Bill,بل
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,اگلا ہراس کی تاریخ ماضی تاریخ کے طور پر درج کیا جاتا ہے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,اگلا ہراس کی تاریخ ماضی تاریخ کے طور پر درج کیا جاتا ہے
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,وائٹ
DocType: SMS Center,All Lead (Open),تمام لیڈ (کھولیں) تیار
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: کے لئے مقدار دستیاب نہیں {4} گودام میں {1} اندراج کے وقت پوسٹنگ میں ({2} {3})
@@ -1293,7 +1296,7 @@
DocType: Lead,Next Contact Date,اگلی رابطہ تاریخ
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,مقدار کھولنے
DocType: Healthcare Settings,Appointment Reminder,تقرری یاد دہانی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
DocType: Program Enrollment Tool Student,Student Batch Name,Student کی بیچ کا نام
DocType: Consultation,Doctor,ڈاکٹر
DocType: Holiday List,Holiday List Name,چھٹیوں فہرست کا نام
@@ -1309,6 +1312,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ایلوکیشن چھوڑ دیں آلہ
DocType: Item,Hub Category to Publish,حب زمرہ شائع کرنے کے لئے
DocType: Leave Block List,Leave Block List Dates,بلاک فہرست تاریخوں چھوڑ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,سیٹ اپ> نمبر نمبر کے ذریعے حاضری کے لئے براہ کرم سلسلہ نمبر سیٹ کریں
DocType: Sales Invoice,Billing Address GSTIN,بلنگ ایڈریس GSTIN
DocType: Assessment Plan,Evaluate,اندازہ
DocType: Workstation,Net Hour Rate,نیٹ گھنٹے کی شرح
@@ -1343,7 +1347,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,فروخت انوائس ادائیگی
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,سیلز آرڈر / ختم سامان گودام میں محفوظ گودام
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,فروخت رقم
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,فروخت رقم
DocType: Repayment Schedule,Interest Amount,سود کی رقم
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,آپ کو اس ریکارڈ کے لئے اخراجات کی منظوری دینے والا ہو. 'حیثیت' اور محفوظ کو اپ ڈیٹ کریں
DocType: Serial No,Creation Document No,تخلیق دستاویز
@@ -1436,7 +1440,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,کھولنے اکاؤنٹنگ بیلنس
,GST Sales Register,جی ایس ٹی سیلز رجسٹر
DocType: Sales Invoice Advance,Sales Invoice Advance,فروخت انوائس ایڈوانس
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,کچھ درخواست کرنے کے لئے
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,کچھ درخواست کرنے کے لئے
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,اپنا ڈومین منتخب کریں
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ایک اور بجٹ ریکارڈ '{0}' پہلے ہی خلاف موجود {1} '{2}' مالی سال کے لیے {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,صرف تخلیق کے وقت فیلڈز کو کاپی کیا جائے گا.
@@ -1446,11 +1450,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",یہ مختلف کی آئٹم کوڈ منسلک کیا جائے گا. آپ مخفف "ایس ایم" ہے، اور اگر مثال کے طور پر، شے کے کوڈ "ٹی شرٹ"، "ٹی شرٹ-ایس ایم" ہو جائے گا ویرینٹ کی شے کوڈ آن ہے
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,آپ کو تنخواہ پرچی بچانے بار (الفاظ میں) نیٹ پے نظر آئے گا.
DocType: Purchase Invoice,Is Return,واپسی ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,احتیاط
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,احتیاط
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,واپس / ڈیبٹ نوٹ
DocType: Price List Country,Price List Country,قیمت کی فہرست ملک
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} شے کے لئے درست سیریل نمبر {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} شے کے لئے درست سیریل نمبر {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,آئٹم کوڈ سیریل نمبر کے لئے تبدیل کر دیا گیا نہیں کیا جا سکتا
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM تبادلوں فیکٹر
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,بیچ نمبر حاصل کرنے آئٹم کوڈ داخل کریں
@@ -1556,7 +1560,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
DocType: Supplier Scorecard,Warn for new Request for Quotations,کوٹیشن کے لئے نئی درخواست کے لئے انتباہ
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,خریداری کے احکامات کو آپ کی منصوبہ بندی کی مدد کرنے اور آپ کی خریداری پر عمل
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,لیب ٹیسٹ نسخہ
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",کل مسئلہ / ٹرانسفر کی مقدار {0} مواد کی درخواست میں {1} \ {2} کی درخواست کی مقدار آئٹم کے لئے سے زیادہ نہیں ہو سکتا {3}
@@ -1594,7 +1598,6 @@
DocType: Warehouse,Warehouse Contact Info,گودام معلومات رابطہ کریں
DocType: Payment Entry,Write Off Difference Amount,فرق رقم لکھنے
DocType: Volunteer,Volunteer Name,رضاکارانہ نام
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,براہ کرم تعلیمی> تعلیمی ترتیبات میں انسٹرکٹر نامیاتی نظام قائم کریں
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: ملازم کے ای میل نہیں ملا، اس وجہ سے نہیں بھیجے گئے ای میل
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},ملک کے لئے شپنگ ضابطے لاگو نہیں ہے {0}
DocType: Item,Foreign Trade Details,فارن ٹریڈ کی تفصیلات
@@ -1607,7 +1610,7 @@
DocType: Student Group Student,Group Roll Number,گروپ رول نمبر
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0}، صرف کریڈٹ اکاؤنٹس ایک ڈیبٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,تمام کام وزن کی کل ہونا چاہئے 1. اس کے مطابق تمام منصوبے کے کاموں کے وزن کو ایڈجسٹ کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,آئٹم {0} ایک ذیلی کنٹریکٹڈ آئٹم ہونا ضروری ہے
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,کیپٹل سازوسامان
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قیمتوں کا تعین اصول سب سے پہلے کی بنیاد پر منتخب کیا جاتا ہے آئٹم آئٹم گروپ یا برانڈ ہو سکتا ہے، میدان 'پر لگائیں'.
@@ -1632,7 +1635,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,چائلڈ گودام اس گودام کے لئے موجود ہے. آپ نے اس کے گودام حذف نہیں کر سکتے.
DocType: Item,Website Item Groups,ویب سائٹ آئٹم گروپس
DocType: Purchase Invoice,Total (Company Currency),کل (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,{0} سیریل نمبر ایک سے زائد بار میں داخل
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,{0} سیریل نمبر ایک سے زائد بار میں داخل
DocType: Journal Entry,Journal Entry,جرنل اندراج
DocType: Expense Claim Advance,Unclaimed amount,اعلان شدہ رقم
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} رفت میں اشیاء
@@ -1728,7 +1731,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,مواصلات لاگ ان کریں.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",کوٹیشن کے لئے درخواست میں مزید چیک کے پورٹل کی ترتیبات کے لئے، پورٹل سے رسائی کے لئے غیر فعال ہے.
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,سپلائر اسکور کارڈ سکورنگ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,خرید رقم
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,خرید رقم
DocType: Sales Invoice,Shipping Address Name,شپنگ ایڈریس کا نام
DocType: Material Request,Terms and Conditions Content,شرائط و ضوابط مواد
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,کورس شیڈول بنانے میں غلطیاں موجود تھیں
@@ -1992,7 +1995,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,یہ اس گاڑی کے خلاف نوشتہ پر مبنی ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},پردایک خلاف انوائس {0} ء {1}
DocType: Customer,Default Price List,پہلے سے طے شدہ قیمت کی فہرست
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,آپ مالی سال {0} کو حذف نہیں کر سکتے ہیں. مالی سال {0} گلوبل ترتیبات میں ڈیفالٹ کے طور پر مقرر کیا جاتا ہے
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,ایک ہی نام کے ساتھ گاہک پہلے ہی موجود ہے
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,یہ تنخواہ سلپس جمع کردیتا ہے اور اسکرین جرنل انٹری تخلیق کرتا ہے. کیا آپ آگے بڑھنا چاہتے ہیں؟
@@ -2006,6 +2009,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,قیمتوں کا تعین
DocType: Quotation,Term Details,ٹرم تفصیلات
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} اس طالب علم گروپ کے لیے طالب علموں کو داخلہ سے زیادہ نہیں ہوسکتی.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),کل (ٹیکس کے بغیر)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,لیڈ شمار
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,لیڈ شمار
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}صفر سےبڈا ھونا ڇاھۓ
@@ -2025,7 +2029,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,انوائس کی منسوخی پر ادائیگی کا لنک ختم کریں
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},درج کردہ موجودہ Odometer پڑھنا ابتدائی گاڑی Odometer سے زیادہ ہونا چاہئے {0}
DocType: Restaurant Reservation,No Show,کوئی شو نہیں
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,براہ کرم سیٹ اپ کے ذریعے {0} کے سلسلے میں ناممکن سیریز ترتیب دیں
DocType: Shipping Rule Country,Shipping Rule Country,شپنگ حکمرانی ملک
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,چھوڑ دو اور حاضری
DocType: Maintenance Visit,Partially Completed,جزوی طور پر مکمل
@@ -2118,7 +2121,7 @@
DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
DocType: Grant Application,Assessment Mark (Out of 10),تشخیص مارک (10 سے باہر)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 موبائل نمبر
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,مین
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,مین
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,ویرینٹ
DocType: Naming Series,Set prefix for numbering series on your transactions,آپ کے لین دین پر سیریز تعداد کے لئے مقرر اپسرگ
DocType: Employee Attendance Tool,Employees HTML,ملازمین ایچ ٹی ایم ایل
@@ -2166,7 +2169,7 @@
DocType: Course,Course Abbreviation,کورس مخفف
DocType: Student Leave Application,Student Leave Application,Student کی رخصت کی درخواست
DocType: Item,Will also apply for variants,بھی مختلف حالتوں کے لئے لاگو ہوں گے
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",اثاثہ منسوخ نہیں کیا جاسکتا ہے، کیونکہ یہ پہلے سے ہی ہے {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",اثاثہ منسوخ نہیں کیا جاسکتا ہے، کیونکہ یہ پہلے سے ہی ہے {0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ملازم {0} پر نصف دن پر {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},کل کام کرنے کا گھنٹوں زیادہ سے زیادہ کام کے گھنٹوں سے زیادہ نہیں ہونا چاہئے {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,پر
@@ -2350,9 +2353,10 @@
DocType: Task,Actual End Date (via Time Sheet),اصل تاریخ اختتام (وقت شیٹ کے ذریعے)
DocType: Soil Texture,Soil Type,مٹی کی قسم
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,نیا پیغام
,Quotation Trends,کوٹیشن رجحانات
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},آئٹم گروپ شے کے لئے شے ماسٹر میں ذکر نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
DocType: Shipping Rule,Shipping Amount,شپنگ رقم
DocType: Supplier Scorecard Period,Period Score,مدت کا اسکور
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,صارفین کا اضافہ کریں
@@ -2363,7 +2367,7 @@
,Vehicle Expenses,گاڑیوں کے اخراجات
DocType: Serial No,Invoice Details,انوائس کی تفصیلات دیکھیں
DocType: Grant Application,Show on Website,ویب سائٹ پر دکھائیں
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},مفید زندگی کے بعد متوقع قدر {0} سے زیادہ یا برابر ہونا ضروری ہے.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},مفید زندگی کے بعد متوقع قدر {0} سے زیادہ یا برابر ہونا ضروری ہے.
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,شروع کرو
DocType: Hub Category,Hub Category,حب زمرہ
DocType: Purchase Invoice,SEZ,SEZ
@@ -2395,7 +2399,7 @@
DocType: Patient,B Positive,بی مثبت
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
DocType: Leave Block List Allow,Leave Block List Allow,بلاک فہرست اجازت دیں چھوڑ دو
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
DocType: Patient Medical Record,Patient Medical Record,مریض میڈیکل ریکارڈ
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,غیر گروپ سے گروپ
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,کھیل
@@ -2446,6 +2450,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,کوئی اقتباس نہیں موصول آر ایف آر مقرر نہیں کرسکتا
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,کل کٹوتی
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,اکاؤنٹ کرنسی میں پرنٹ کرنے کا ایک اکاؤنٹ منتخب کریں
,Production Analytics,پیداوار کے تجزیات
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,یہ اس مریض کے خلاف ٹرانزیکشنز پر مبنی ہے. تفصیلات کے لئے ذیل میں ٹائم لائن ملاحظہ کریں
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,لاگت اپ ڈیٹ
@@ -2501,7 +2506,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,کمپنی کو منتخب کریں ...
DocType: Leave Control Panel,Leave blank if considered for all departments,تمام محکموں کے لئے تصور کیا جاتا ہے تو خالی چھوڑ دیں
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
DocType: Payroll Entry,Fortnightly,پندرہ روزہ
DocType: Currency Exchange,From Currency,کرنسی سے
DocType: Vital Signs,Weight (In Kilogram),وزن (کلوگرام)
@@ -2579,7 +2584,7 @@
DocType: Student,Guardians,رکھوالوں
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,قیمت کی فہرست مقرر نہیں ہے تو قیمتیں نہیں دکھایا جائے گا
DocType: Stock Entry,Total Incoming Value,کل موصولہ ویلیو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",timesheets کو آپ کی ٹیم کی طرف سے کیا سرگرمیوں کے لئے وقت، لاگت اور بلنگ کا ٹریک رکھنے میں مدد
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قیمت خرید کی فہرست
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,سپلائر سکور کارڈ متغیر کے سانچے.
@@ -2680,7 +2685,7 @@
apps/erpnext/erpnext/crm/doctype/lead/lead.py +51,Next Contact Date cannot be in the past,اگلی تاریخ سے رابطہ ماضی میں نہیں ہو سکتا
DocType: Company,For Reference Only.,صرف ریفرنس کے لئے.
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,بیچ منتخب نہیں
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},غلط {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},غلط {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,حوالہ انو
@@ -2717,8 +2722,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",آپریشن، آپریٹنگ لاگت کی وضاحت کریں اور اپنے آپریشن کی کوئی ایک منفرد آپریشن دے.
DocType: Water Analysis,Origin,اصل
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,یہ دستاویز کی طرف سے حد سے زیادہ ہے {0} {1} شے کے لئے {4}. آپ کر رہے ہیں ایک اور {3} اسی کے خلاف {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
DocType: Purchase Invoice,Price List Currency,قیمت کی فہرست کرنسی
DocType: Naming Series,User must always select,صارف نے ہمیشہ منتخب کرنا ضروری ہے
DocType: Stock Settings,Allow Negative Stock,منفی اسٹاک کی اجازت دیں
@@ -2773,7 +2778,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,نئے خریداری کے حکم کے لئے انتباہ کریں
DocType: Quality Inspection Reading,Reading 9,9 پڑھنا
DocType: Supplier,Is Frozen,منجمد ہے
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,گروپ نوڈ گودام لین دین کے لئے منتخب کرنے کے لئے کی اجازت نہیں ہے
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,گروپ نوڈ گودام لین دین کے لئے منتخب کرنے کے لئے کی اجازت نہیں ہے
DocType: Buying Settings,Buying Settings,خرید ترتیبات
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,ایک ختم اچھی شے کے لئے BOM نمبر
DocType: Upload Attendance,Attendance To Date,تاریخ کرنے کے لئے حاضری
@@ -2788,6 +2793,7 @@
DocType: Grant Application,Organization,ادارہ
DocType: BOM Update Tool,BOM Update Tool,BOM اپ ڈیٹ کا آلہ
DocType: SG Creation Tool Course,Student Group Name,طالب علم گروپ کا نام
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,دھماکہ خیز منظر دکھائیں
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,فیس تخلیق
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,تم واقعی میں اس کمپنی کے لئے تمام لین دین کو حذف کرنا چاہتے براہ کرم یقینی بنائیں. یہ ہے کے طور پر آپ ماسٹر ڈیٹا رہیں گے. اس کارروائی کو رد نہیں کیا جا سکتا.
DocType: Room,Room Number,کمرہ نمبر
@@ -2798,7 +2804,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,ٹیکس سانچہ بنائیں
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,صارف فورم
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
DocType: Lab Test Sample,Lab Test Sample,لیب ٹیسٹنگ نمونہ
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,فوری جرنل اندراج
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,BOM کسی بھی شے agianst ذکر اگر آپ کی شرح کو تبدیل نہیں کر سکتے ہیں
@@ -2869,7 +2875,7 @@
DocType: Membership,USD,امریکن روپے
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,انوائس بنائیں
DocType: Selling Settings,Auto close Opportunity after 15 days,15 دنوں کے بعد آٹو بند مواقع
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} کے سکور کارڈ کارڈ کے سبب {0} کے لئے خریداری کے حکم کی اجازت نہیں ہے.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} کے سکور کارڈ کارڈ کے سبب {0} کے لئے خریداری کے حکم کی اجازت نہیں ہے.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,اختتام سال
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,عمومی quot / لیڈ٪
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,عمومی quot / لیڈ٪
@@ -2961,7 +2967,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,۹۰ سے بڑھ کر
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,صف # {0}: جرنل اندراج {1} اکاؤنٹ نہیں ہے {2} یا پہلے سے ہی ایک اور واؤچر کے خلاف میچ نہیں کرتے
DocType: Supplier Scorecard Criteria,Criteria Weight,معیار وزن
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,سپلائر> سپلائی کی قسم
DocType: Buying Settings,Default Buying Price List,پہلے سے طے شدہ خرید قیمت کی فہرست
DocType: Payroll Entry,Salary Slip Based on Timesheet,تنخواہ کی پرچی Timesheet کی بنیاد پر
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,خریداری کی شرح
@@ -3051,7 +3056,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ٹریک صنعت کی قسم کی طرف جاتا ہے.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,لیٹر ہیڈز پر جائیں
DocType: Item Supplier,Item Supplier,آئٹم پردایک
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام پتے.
DocType: Company,Stock Settings,اسٹاک ترتیبات
@@ -3229,6 +3234,7 @@
DocType: Company,Default Inventory Account,پہلے سے طے شدہ انوینٹری اکاؤنٹ
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,صف {0}: مکمل مقدار صفر سے زیادہ ہونا چاہیے.
DocType: Antibiotic,Antibiotic Name,اینٹی بائیوٹک نام
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,آئٹم کوڈ> آئٹم گروپ> برانڈ
DocType: Purchase Invoice,Apply Additional Discount On,اضافی رعایت پر لاگو ہوتے ہیں
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,قسم منتخب کریں ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,تمام زمین یونٹس کا ایک لنک جس میں فصل بڑھ رہی ہے
@@ -3423,6 +3429,7 @@
DocType: Supplier,Credit Limit,ادھار کی حد
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,اوسط. قیمت کی فہرست کی قیمت فروخت
DocType: Production Plan Sales Order,Salse Order Date,Salse آرڈر تاریخ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,سپلائر> سپلائی کی قسم
DocType: Salary Component,Salary Component,تنخواہ کے اجزاء
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,ادائیگی لکھے {0} کو غیر منسلک ہیں
DocType: GL Entry,Voucher No,واؤچر کوئی
@@ -3432,7 +3439,7 @@
DocType: Leave Allocation,Leave Allocation,ایلوکیشن چھوڑ دو
DocType: Payment Request,Recipient Message And Payment Details,وصول کنندہ کا پیغام اور ادائیگی کی تفصیلات
DocType: Training Event,Trainer Email,ٹرینر کوارسال کریں
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,پیدا مواد درخواستوں {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,پیدا مواد درخواستوں {0}
DocType: Restaurant Reservation,No of People,لوگ نہیں
DocType: Production Planning Tool,Include sub-contracted raw materials,ذیلی کنٹریکٹ خام مواد شامل
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,شرائط یا معاہدے کے سانچے.
@@ -3498,7 +3505,7 @@
DocType: Production Planning Tool,Create Material Requests,مواد درخواست پیدا
DocType: Employee Education,School/University,سکول / یونیورسٹی
DocType: Payment Request,Reference Details,حوالہ تفصیلات
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,مفید زندگی کے بعد کی متوقع قدر مجموعی خریداری کی رقم سے کم ہونا چاہیے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,مفید زندگی کے بعد کی متوقع قدر مجموعی خریداری کی رقم سے کم ہونا چاہیے
DocType: Sales Invoice Item,Available Qty at Warehouse,گودام میں دستیاب مقدار
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,بل کی گئی رقم
DocType: Asset,Double Declining Balance,ڈبل کمی توازن
@@ -3510,7 +3517,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,تازہ ترین معلومات حاصل کریں
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: اکاؤنٹ {2} کمپنی سے تعلق نہیں ہے {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,ہر صفات سے کم سے کم ایک قدر منتخب کریں.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,مواد درخواست {0} منسوخ یا بند کر دیا ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,مواد درخواست {0} منسوخ یا بند کر دیا ہے
apps/erpnext/erpnext/config/hr.py +310,Leave Management,مینجمنٹ چھوڑ دو
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,اکاؤنٹ کی طرف سے گروپ
DocType: Sales Order,Fully Delivered,مکمل طور پر ہونے والا
@@ -3521,14 +3528,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},معاوضہ رقم قرض کی رقم سے زیادہ نہیں ہوسکتی ہے {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,پروگراموں پر جائیں
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},قطار {0} # تخصیص کردہ رقم {1} غیر مقفل شدہ رقم سے زیادہ نہیں ہوسکتی ہے {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,سیٹ اپ> نمبر نمبر کے ذریعے حاضری کے لئے براہ کرم سلسلہ نمبر سیٹ کریں
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},آئٹم کے لئے ضروری آرڈر نمبر خریداری {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,پروڈکشن آرڈر نہیں بنائی
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','تاریخ سے' کے بعد 'تاریخ کے لئے' ہونا ضروری ہے
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},حیثیت کو تبدیل نہیں کر سکتے کیونکہ طالب علم {0} طالب علم کی درخواست کے ساتھ منسلک ہے {1}
DocType: Asset,Fully Depreciated,مکمل طور پر فرسودگی
,Stock Projected Qty,اسٹاک مقدار متوقع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,نشان حاضری ایچ ٹی ایم ایل
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",کوٹیشن، تجاویز ہیں بولیاں آپ اپنے گاہکوں کو بھیجا ہے
DocType: Sales Order,Customer's Purchase Order,گاہک کی خریداری کے آرڈر
@@ -3613,7 +3619,7 @@
DocType: Stock Settings,Item Naming By,شے کی طرف سے نام
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ایک اور مدت بند انٹری {0} کے بعد بنایا گیا ہے {1}
DocType: Production Order,Material Transferred for Manufacturing,مواد مینوفیکچرنگ کے لئے منتقل
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,اکاؤنٹ {0} نہیں موجود
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,اکاؤنٹ {0} نہیں موجود
DocType: Project,Project Type,منصوبے کی قسم
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,اس ٹاسک کے لئے بچے کا کام موجود ہے. آپ اس ٹاسک کو حذف نہیں کر سکتے ہیں.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,بہر ہدف مقدار یا ہدف رقم لازمی ہے.
@@ -3715,11 +3721,11 @@
DocType: Company,Asset Depreciation Cost Center,اثاثہ ہراس لاگت سینٹر
DocType: Sales Order Item,Sales Order Date,سیلز آرڈر کی تاریخ
DocType: Sales Invoice Item,Delivered Qty,ہونے والا مقدار
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,کل Excl. ٹیکس
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",جانچ پڑتال کی، تو ہر ایک کی پیداوار شے کے تمام بچوں مواد درخواستوں میں شامل کیا جائے گا.
DocType: Assessment Plan,Assessment Plan,تشخیص کی منصوبہ بندی
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,کسٹمر {0} پیدا ہوتا ہے.
DocType: Stock Settings,Limit Percent,حد فیصد
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,براہ کرم تعلیمی> تعلیمی ترتیبات میں انسٹرکٹر نامیاتی نظام قائم کریں
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,فی الحال کوئی اسٹاک کسی بھی گودام میں دستیاب نہیں ہے
,Payment Period Based On Invoice Date,انوائس کی تاریخ کی بنیاد پر ادائیگی کی مدت
DocType: Sample Collection,No. of print,پرنٹ نمبر نہیں
@@ -3735,12 +3741,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),دیندار ({0})
DocType: Pricing Rule,Margin,مارجن
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نئے گاہکوں
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,کل منافع ٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,کل منافع ٪
DocType: Appraisal Goal,Weightage (%),اہمیت (٪)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS پروفائل کو تبدیل کریں
DocType: Bank Reconciliation Detail,Clearance Date,کلیئرنس تاریخ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,تشخیص کی رپورٹ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,مجموعی خریداری کی رقم لازمی ہے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,مجموعی خریداری کی رقم لازمی ہے
DocType: Lead,Address Desc,DESC ایڈریس
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,پارٹی لازمی ہے
DocType: Journal Entry,JV-,JV-
@@ -3772,7 +3778,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,اسٹینڈنگ نام
DocType: Stock Entry,Customer or Supplier Details,مستقل خریدار یا سپلائر تفصیلات
DocType: Employee Loan Application,Required by Date,تاریخ کی طرف سے کی ضرورت
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),کلائنٹ بیلنس (ڈاکٹر - کر)
DocType: Lead,Lead Owner,لیڈ مالک
DocType: Bin,Requested Quantity,درخواست کی مقدار
DocType: Patient,Marital Status,ازدواجی حالت
@@ -3786,7 +3791,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,ایک سے زیادہ متغیرات
DocType: Sales Invoice,Against Income Account,انکم اکاؤنٹ کے خلاف
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ پھنچ گیا
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,آئٹم {0}: حکم کی مقدار {1} کم از کم آرڈر کی مقدار {2} (آئٹم میں بیان کیا) سے کم نہیں ہو سکتا.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,آئٹم {0}: حکم کی مقدار {1} کم از کم آرڈر کی مقدار {2} (آئٹم میں بیان کیا) سے کم نہیں ہو سکتا.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ماہانہ تقسیم فی صد
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,براہ کرم دوسرے صارف کے طور پر لاگ ان کریں.
DocType: Territory,Territory Targets,علاقہ اہداف
@@ -3886,7 +3891,7 @@
DocType: Serial No,Out of AMC,اے ایم سی کے باہر
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,بحالی دورہ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
DocType: Company,Default Cash Account,پہلے سے طے شدہ کیش اکاؤنٹ
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,کمپنی (نہیں مستقل خریدار یا سپلائر) ماسٹر.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,یہ اس طالب علم کی حاضری پر مبنی ہے
@@ -4038,7 +4043,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,ذکر کردہ معیار کے لئے کوئی ملازم نہیں
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
DocType: Restaurant,Default Customer,ڈیفالٹ کسٹمر
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,براہ کرم انسانی وسائل> HR ترتیبات میں ملازم نامی کا نظام قائم کریں
DocType: Assessment Plan,Supervisor Name,سپروائزر کا نام
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,اس بات کی توثیق نہ کریں کہ ایک ہی دن کے لئے اپوزیشن کا قیام کیا گیا ہے
DocType: Program Enrollment Course,Program Enrollment Course,پروگرام اندراج کورس
@@ -4161,7 +4165,7 @@
DocType: BOM,Website Description,ویب سائٹ تفصیل
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ایکوئٹی میں خالص تبدیلی
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,تازہ ترین
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",ای میل پتہ منفرد ہونا ضروری ہے، پہلے ہی {0} کے لئے موجود ہے.
DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,رسید
@@ -4178,7 +4182,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,کیش فلو کا بیان
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},قرض کی رقم {0} کی زیادہ سے زیادہ قرض کی رقم سے زیادہ نہیں ہوسکتی
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,لائسنس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,آپ کو بھی گزشتہ مالی سال کے توازن رواں مالی سال کے لئے چھوڑ دیتا شامل کرنے کے لئے چاہتے ہیں تو آگے بڑھانے براہ مہربانی منتخب کریں
DocType: GL Entry,Against Voucher Type,واؤچر قسم کے خلاف
DocType: Physician,Phone (R),فون (آر)
@@ -4190,7 +4194,7 @@
DocType: Patient,B Negative,بی منفی
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,بحالی کی حیثیت منسوخ کرنا یا جمع کرنے کے لئے مکمل کرنا ہوگا
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,{0} قطار میں سیریل نمبر ڈلیوری نوٹ کے ساتھ میل نہیں کھاتا
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,{0} قطار میں سیریل نمبر ڈلیوری نوٹ کے ساتھ میل نہیں کھاتا
DocType: Student,Guardian Details,گارڈین کی تفصیلات دیکھیں
DocType: C-Form,C-Form,سی فارم
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ایک سے زیادہ ملازمین کے لئے نشان حاضری
@@ -4232,7 +4236,7 @@
DocType: Stock Entry Detail,Basic Amount,بنیادی رقم
DocType: Training Event,Exam,امتحان
DocType: Complaint,Complaint,شکایت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
DocType: Leave Allocation,Unused leaves,غیر استعمال شدہ پتے
DocType: Patient,Alcohol Past Use,شراب ماضی کا استعمال
DocType: Fertilizer Content,Fertilizer Content,ارورائزر مواد
@@ -4360,6 +4364,7 @@
DocType: Salary Detail,Formula,فارمولہ
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,سیریل نمبر
DocType: Lab Test Template,Lab Test Template,لیب ٹیسٹنگ سانچہ
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,سیلز اکاؤنٹ
DocType: Purchase Invoice Item,Total Weight,کل وزن
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,فروخت پر کمیشن
DocType: Offer Letter Term,Value / Description,ویلیو / تفصیل
@@ -4516,7 +4521,7 @@
DocType: Customer,From Lead,لیڈ سے
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,احکامات کی پیداوار کے لئے جاری.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,مالی سال منتخب کریں ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
DocType: Program Enrollment Tool,Enroll Students,طلباء اندراج کریں
DocType: Lab Test,Approved Date,منظور شدہ تاریخ
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,سٹینڈرڈ فروخت
@@ -4592,7 +4597,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,پیداوار آئٹم
,Employee Information,ملازم کی معلومات
DocType: Stock Entry Detail,Additional Cost,اضافی لاگت
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",واؤچر نمبر کی بنیاد پر فلٹر کر سکتے ہیں، واؤچر کی طرف سے گروپ ہے
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",واؤچر نمبر کی بنیاد پر فلٹر کر سکتے ہیں، واؤچر کی طرف سے گروپ ہے
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,پردایک کوٹیشن بنائیں
DocType: Quality Inspection,Incoming,موصولہ
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,سیلز اور خریداری کے لئے پہلے سے طے شدہ ٹیکس ٹیمپلیٹس بنائے جاتے ہیں.
@@ -4609,7 +4614,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},نوٹ: {0}
,Delivery Note Trends,ترسیل کے نوٹ رجحانات
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,اس ہفتے کے خلاصے
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,اسٹاک قی میں
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,اسٹاک قی میں
DocType: Delivery Trip,Calculate Estimated Arrival Times,متوقع آنے والے ٹائمز کا حساب لگائیں
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,اکاؤنٹ: {0} صرف اسٹاک معاملات کے ذریعے اپ ڈیٹ کیا جا سکتا ہے
DocType: Student Group Creation Tool,Get Courses,کورسز حاصل کریں
@@ -4625,7 +4630,7 @@
DocType: Material Request,% Ordered,٪سامان آرڈرھوگیا
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",کورس کی بنیاد پر طالب علم گروپ کے لئے، کورس کے پروگرام اندراج میں اندراج کورس سے ہر طالب علم کے لئے جائز قرار دیا جائے گا.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,اوسط. خرید کی شرح
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,اوسط. خرید کی شرح
DocType: Task,Actual Time (in Hours),(گھنٹوں میں) اصل وقت
DocType: Employee,History In Company,کمپنی کی تاریخ
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{بھیجنے والا} سے نیا پیغام
@@ -4673,7 +4678,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},صف {0}: BOM کی کرنسی # {1} کو منتخب کردہ کرنسی کے برابر ہونا چاہئے {2}
DocType: Journal Entry Account,Exchange Rate,زر مبادلہ کی شرح
DocType: Patient,Additional information regarding the patient,مریض کے متعلق اضافی معلومات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
DocType: Homepage,Tag Line,ٹیگ لائن
DocType: Fee Component,Fee Component,فیس اجزاء
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,بیڑے کے انتظام
@@ -4888,7 +4893,7 @@
DocType: Employee Education,Employee Education,ملازم تعلیم
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,مثنی شے گروپ شے گروپ کے ٹیبل میں پایا
DocType: Land Unit,Parent Land Unit,والدین لینڈ یونٹ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
DocType: Fertilizer,Fertilizer Name,کھاد کا نام
DocType: Salary Slip,Net Pay,نقد ادائیگی
DocType: Account,Account,اکاؤنٹ
@@ -4967,7 +4972,7 @@
DocType: Item Customer Detail,Ref Code,ممبران کوڈ
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,پی ایس او پروفائل میں کسٹمر گروپ کی ضرورت ہے
apps/erpnext/erpnext/config/hr.py +12,Employee records.,ملازم کے ریکارڈ.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,مقرر مہربانی اگلا ہراس تاریخ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,مقرر مہربانی اگلا ہراس تاریخ
DocType: HR Settings,Payroll Settings,پے رول کی ترتیبات
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,غیر منسلک انوائس اور ادائیگی ملاپ.
DocType: POS Settings,POS Settings,پوزیشن کی ترتیبات
@@ -5135,7 +5140,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},کے لئے سالگرہ کی یاد دہانی {0}
DocType: Asset Maintenance Task,Last Completion Date,آخری تکمیل کی تاریخ
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,آخری آرڈر کے بعد دن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
DocType: Buying Settings,Naming Series,نام سیریز
DocType: Leave Block List,Leave Block List Name,بلاک کریں فہرست کا نام چھوڑ دو
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,انشورنس تاریخ آغاز انشورنس تاریخ اختتام سے کم ہونا چاہئے
@@ -5264,6 +5269,7 @@
DocType: Bank Reconciliation,Get Payment Entries,ادائیگی لکھے حاصل کریں
DocType: Quotation Item,Against Docname,Docname خلاف
DocType: SMS Center,All Employee (Active),تمام ملازم (ایکٹو)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,کسٹمر> کسٹمر گروپ> علاقہ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,اب ملاحظہ
DocType: BOM,Raw Material Cost,خام مواد کی لاگت
DocType: Item Reorder,Re-Order Level,دوبارہ آرڈر کی سطح
@@ -5363,7 +5369,6 @@
DocType: Room,Seating Capacity,بیٹھنے کی گنجائش
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,لیب ٹیسٹنگ گروپ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,کسٹمر> کسٹمر گروپ> علاقہ
DocType: Project,Total Expense Claim (via Expense Claims),کل اخراجات کا دعوی (اخراجات کے دعووں کے ذریعے)
DocType: GST Settings,GST Summary,جی ایس ٹی کا خلاصہ
DocType: Assessment Result,Total Score,مجموعی سکور
@@ -5377,7 +5382,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,مندرجہ ذیل کورس شیڈول بنائے گئے تھے
DocType: Journal Entry,Total Debit,کل ڈیبٹ
DocType: Manufacturing Settings,Default Finished Goods Warehouse,پہلے سے طے شدہ تیار مال گودام
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,فروخت شخص
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,فروخت شخص
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,بجٹ اور لاگت سینٹر
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,ادائیگی کے ایک سے زیادہ ڈیفالٹ موڈ کی اجازت نہیں ہے
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,کے لئے
@@ -5552,7 +5557,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,کے لئے ٹیکس یا انچارج غور
DocType: Driver,Driving License Category,ڈرائیونگ لائسنس زمرہ
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,اصل مقدار لازمی ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} فی الحال ایک {1} سپلائر اسکور کارڈ کھڑا ہے، اور اس سپلائر کو خریدنے والے احکامات کو احتیاط کے ساتھ جاری کیا جانا چاہئے.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} فی الحال ایک {1} سپلائر اسکور کارڈ کھڑا ہے، اور اس سپلائر کو خریدنے والے احکامات کو احتیاط کے ساتھ جاری کیا جانا چاہئے.
DocType: Asset Maintenance Team,Asset Maintenance Team,اثاثہ بحالی کی ٹیم
DocType: Employee Loan,Loan Type,قرض کی قسم
DocType: Scheduling Tool,Scheduling Tool,شیڈولنگ کا آلہ
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index 9e39060..6622bfe 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Narx bo'yicha saralash
,Delay Days,Kechikish kunlari
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Xizmat ketadi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriya raqami: {0} savdo faturasında zikr qilingan: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriya raqami: {0} savdo faturasında zikr qilingan: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Billing
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Saqlashni o'z ichiga oladi
DocType: Purchase Invoice Item,Item Weight Details,Og'irligi haqida ma'lumot
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Malumot: {0}, mahsulot kodi: {1} va mijoz: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ish uchun ochilish.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},{1} qatorida {0} subpudratchilar uchun BOM ko'rsatilgan emas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},{1} qatorida {0} subpudratchilar uchun BOM ko'rsatilgan emas
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} natijalar yuborildi
DocType: Item Attribute,Increment,Ortiqcha
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Timespan
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},{0} uchun ruxsat berilmagan
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Elementlarni oling
DocType: Price List,Price Not UOM Dependant,Narx UOMga qaram emas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Stokni etkazib berishga qarshi yangilanib bo'lmaydi. {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Stokni etkazib berishga qarshi yangilanib bo'lmaydi. {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Mahsulot {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ro'yxatda hech narsa yo'q
DocType: Asset Repair,Error Description,Xato tavsifi
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Bakkallar
DocType: Quality Inspection Reading,Reading 1,O'qish 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Pensiya jamg'armalari
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Keyingi Amortizatsiya tarixi sotib olish sanasidan oldin bo'la olmaydi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Keyingi Amortizatsiya tarixi sotib olish sanasidan oldin bo'la olmaydi
DocType: Crop,Perennial,Ko'p yillik
DocType: Consultation,Consultation Date,Maslahatlashuv sanasi
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Mahsulot ro'yxati va ERPNext foydalanuvchilari uchun kashfiyot
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","Masalan, "Boshlang'ich maktab" yoki "Universitet""
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Birja yangiliklari
DocType: Warehouse,Warehouse Detail,QXI detali
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},{0} {1} / {2} mijoz uchun kredit cheklovi kesib o'tdi
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},{0} {1} / {2} mijoz uchun kredit cheklovi kesib o'tdi
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Davrning tugash sanasi atamalar bilan bog'liq bo'lgan Akademik yilning Yil oxiri sanasidan (Akademik yil) {} o'tishi mumkin emas. Iltimos, sanalarni tahrirlang va qaytadan urinib ko'ring."
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Ruxsat etilgan aktivlar" ni belgilash mumkin emas, chunki ob'ektga nisbatan Asset yozuvi mavjud"
DocType: Delivery Trip,Departure Time,Chiqish vaqti
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Shartnoma ma'lumotlarini oling
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Yetkazib beruvchi reytinglarining namunalari.
DocType: Lead,Interested,Qiziquvchan
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Ochilish
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Ochilish
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},{0} dan {1} gacha
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Soliqlarni o'rnatish amalga oshmadi
DocType: Item,Copy From Item Group,Mavzu guruhidan nusxa olish
@@ -364,7 +364,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Ajratish sanasi qo'shilish sanasidan katta bo'lishi kerak
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Yillar davomida barglar
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: agar bu oldindan yoziladigan bo'lsa, {1} hisobiga "Ish haqi" ni tekshiring."
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},{0} ombori {1} kompaniyasiga tegishli emas
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},{0} ombori {1} kompaniyasiga tegishli emas
DocType: Email Digest,Profit & Loss,Qor va ziyon
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,Litr
DocType: Task,Total Costing Amount (via Time Sheet),Jami xarajat summasi (vaqt jadvalidan)
@@ -455,6 +455,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Bu kompaniya bilan tuzilgan bitimlarga asoslanadi. Tafsilotlar uchun quyidagi jadvalga qarang
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Avtomatik Materializatsiya so'rovini yaratish haqida E-mail orqali xabar bering
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Chidamli
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Maslahatlashuv
DocType: Journal Entry,Multi Currency,Ko'p valyuta
DocType: Opening Invoice Creation Tool,Invoice Type,Faktura turi
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Yetkazib berish eslatmasi
@@ -527,7 +528,6 @@
DocType: Employee,Widowed,Yigit
DocType: Request for Quotation,Request for Quotation,Buyurtma uchun so'rov
DocType: Healthcare Settings,Require Lab Test Approval,Laboratoriya tekshiruvini tasdiqlashni talab qiling
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Mahsulot kodi> Mahsulot guruhi> Tovar
DocType: Salary Slip Timesheet,Working Hours,Ish vaqti
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Umumiy natija
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mavjud ketma-ketlikning boshlang'ich / to`g`ri qatorini o`zgartirish.
@@ -556,7 +556,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Xarajat markazini kiriting
DocType: Drug Prescription,Dosage,Dozaj
DocType: Journal Entry Account,Sales Order,Savdo buyurtmasi
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Ort Sotish darajasi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Ort Sotish darajasi
DocType: Assessment Plan,Examiner Name,Ekspert nomi
DocType: Lab Test Template,No Result,Natija yo'q
DocType: Purchase Invoice Item,Quantity and Rate,Miqdor va foiz
@@ -604,6 +604,7 @@
DocType: Payroll Entry,Select Payroll Period,Ajratish davrini tanlang
DocType: Purchase Invoice,Unpaid,Bepul emas
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Savdo uchun ajratilgan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Inson resurslari> HR parametrlarini Xodimlar uchun nomlash tizimini sozlang
DocType: Packing Slip,From Package No.,To'plam №
DocType: Item Attribute,To Range,Oralig'ida
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Qimmatli Qog'ozlar va depozitlar
@@ -628,11 +629,11 @@
DocType: Training Event,Workshop,Seminar
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Sotib olish buyurtmalarini ogohlantiring
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Mijozlaringizning bir qismini ro'yxatlang. Ular tashkilotlar yoki shaxslar bo'lishi mumkin.
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Qurilish uchun yetarli qismlar
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Qurilish uchun yetarli qismlar
DocType: POS Profile User,POS Profile User,Qalin Foydalanuvchining profili
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,To'g'ridan-to'g'ri daromad
DocType: Patient Appointment,Date TIme,Sana TIme
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Hisob asosida guruhlangan bo'lsa, hisob qaydnomasi asosida filtrlay olmaydi"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Hisob asosida guruhlangan bo'lsa, hisob qaydnomasi asosida filtrlay olmaydi"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Ma'muriy xodim
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Kompaniya va soliqlarni o'rnatish
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,"Iltimos, kursni tanlang"
@@ -642,7 +643,7 @@
DocType: Stock Entry Detail,Difference Account,Farq hisob
DocType: Purchase Invoice,Supplier GSTIN,Yetkazib beruvchi GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,"Vazifani yopib bo'lmaydi, chunki unga bog'liq {0} vazifasi yopilmaydi."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Iltimos, Materiallar talabi ko'tariladigan omborga kiriting"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,"Iltimos, Materiallar talabi ko'tariladigan omborga kiriting"
DocType: Production Order,Additional Operating Cost,Qo'shimcha operatsion narx
DocType: Lab Test Template,Lab Routine,Laboratoriya muntazamligi
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Kosmetika
@@ -810,7 +811,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Guardian2 bilan aloqalar
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Menejer
DocType: Payment Entry,Payment From / To,To'lov / To
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yangi kredit limiti mijoz uchun mavjud summasidan kamroq. Kredit cheklovi atigi {0} bo'lishi kerak
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yangi kredit limiti mijoz uchun mavjud summasidan kamroq. Kredit cheklovi atigi {0} bo'lishi kerak
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},"Iltimos, hisob qaydnomasini {0}"
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Based On' va 'Group By' bir xil bo'lishi mumkin emas
DocType: Sales Person,Sales Person Targets,Sotuvdagi shaxsning maqsadlari
@@ -821,7 +822,7 @@
DocType: Student Batch Name,Batch Name,Partiya nomi
DocType: Fee Validity,Max number of visit,Tashrifning maksimal soni
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Tuzilish sahifasi:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},"Iltimos, odatdagi Cash yoki Bank hisobini {0} To'lov tartibi rejimida tanlang."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},"Iltimos, odatdagi Cash yoki Bank hisobini {0} To'lov tartibi rejimida tanlang."
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Ro'yxatga olish
DocType: GST Settings,GST Settings,GST sozlamalari
DocType: Selling Settings,Customer Naming By,Xaridor tomonidan nomlash
@@ -945,7 +946,7 @@
DocType: Budget,Budget Against,Byudjetga qarshi
DocType: Employee,Cell Number,Hujayra raqami
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Ushbu mezon bo'yicha xodimlar yo'q. Ish haqi tovarlarining hali yaratilmaganligini tekshiring.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Avtomatik material talablari yaratildi
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Avtomatik material talablari yaratildi
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Yo'qotilgan
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,"Jurnalga qarshi" ustunidan hozirgi kvotani kirita olmaysiz
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Ishlab chiqarish uchun ajratilgan
@@ -953,7 +954,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energiya
DocType: Opportunity,Opportunity From,Imkoniyatdan foydalanish
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Oylik oylik maoshi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serial raqamlari {2} uchun kerak. Siz {3} ni taqdim qildingiz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serial raqamlari {2} uchun kerak. Siz {3} ni taqdim qildingiz.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Iltimos, jadval tanlang"
DocType: BOM,Website Specifications,Veb-saytning texnik xususiyatlari
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} - "Qabul qiluvchilar" bo'limida noto'g'ri e-pochta manzili
@@ -1021,7 +1022,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,So'ralgan
DocType: Vital Signs,Heart Rate / Pulse,Yurak urishi / zarba
DocType: Company,Default Bank Account,Standart bank hisobi
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Partiyaga asoslangan filtrni belgilash uchun birinchi navbatda Partiya turini tanlang
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",Partiyaga asoslangan filtrni belgilash uchun birinchi navbatda Partiya turini tanlang
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},""Yangilash kabinetga" tekshirilishi mumkin emas, chunki elementlar {0}"
DocType: Vehicle,Acquisition Date,Qabul qilish sanasi
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1045,7 +1046,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Maktubingiz boshini yuklang (veb-sahifani do'stingiz sifatida 900px sifatida 100px sifatida saqlang)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Hisob {2} guruh bo'lolmaydi
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Mahsulot satr {idx}: {doctype} {docname} yuqoridagi "{doctype}" jadvalida mavjud emas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Vaqt jadvalining {0} allaqachon tugallangan yoki bekor qilingan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,Vaqt jadvalining {0} allaqachon tugallangan yoki bekor qilingan
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Vazifalar yo'q
DocType: Item Variant Settings,Copy Fields to Variant,Maydonlarni Variantlarga nusxalash
DocType: Asset,Opening Accumulated Depreciation,Biriktirilgan amortizatsiyani ochish
@@ -1157,9 +1158,10 @@
DocType: Production Order,Plan material for sub-assemblies,Sub-assemblies uchun rejalashtirilgan material
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Savdo hamkorlari va hududi
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} faol bo'lishi kerak
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Yakunlovchi (ochilish + jami)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Yakunlovchi (ochilish + jami)
DocType: Journal Entry,Depreciation Entry,Amortizatsiyani kiritish
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Iltimos, avval hujjat turini tanlang"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,Hisob valyutasida chop etish
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialni bekor qilish Bu Xizmat tashrifini bekor qilishdan avval {0} tashrif
DocType: Crop Cycle,ISO 8016 standard,ISO 8016 standarti
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},No {0} seriyasi {1} mahsulotiga tegishli emas
@@ -1185,7 +1187,7 @@
DocType: Supplier,Default Payable Accounts,To'lanadigan qarz hisoblari
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Xodim {0} faol emas yoki mavjud emas
DocType: Fee Structure,Components,Komponentlar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Iltimos, {0} dagi Asset kategoriyasi kiriting"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},"Iltimos, {0} dagi Asset kategoriyasi kiriting"
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Mavzu Variantlari {0} yangilandi
DocType: Quality Inspection Reading,Reading 6,O'qish 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1237,6 +1239,7 @@
,Company Name,kopmaniya nomi
DocType: SMS Center,Total Message(s),Jami xabar (lar)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Transfer uchun ob'ektni tanlang
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Iltimos, {0} uchun nomlash seriyasini Sozlamalar> Sozlamalar> Naming Series orqali sozlang"
DocType: Purchase Invoice,Additional Discount Percentage,Qo'shimcha imtiyozli foiz
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Barcha yordam videoslarining ro'yxatini ko'ring
DocType: Agriculture Analysis Criteria,Soil Texture,Tuproq to'qimalari
@@ -1264,7 +1267,7 @@
DocType: BOM Website Item,BOM Website Item,BOM veb-sayt elementi
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Sizning xat boshingizni va logotipingizni yuklang. (keyinchalik ularni tahrirlashingiz mumkin).
DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Keyingi Amortizatsiya tarixi o'tgan sana sifatida kiritiladi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Keyingi Amortizatsiya tarixi o'tgan sana sifatida kiritiladi
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Oq rang
DocType: SMS Center,All Lead (Open),Barcha qo'rg'oshin (ochiq)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: ({2} {3}) kirish vaqtida {1} omborida {4} uchun mavjud emas
@@ -1280,7 +1283,7 @@
DocType: Lead,Next Contact Date,Keyingi aloqa kuni
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Miqdorni ochish
DocType: Healthcare Settings,Appointment Reminder,Uchrashuv eslatmasi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,O'zgarish uchun Hisobni kiriting
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,O'zgarish uchun Hisobni kiriting
DocType: Program Enrollment Tool Student,Student Batch Name,Isoning shogirdi nomi
DocType: Consultation,Doctor,Doktor
DocType: Holiday List,Holiday List Name,Dam olish ro'yxati nomi
@@ -1296,6 +1299,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Tahsis vositasini qoldiring
DocType: Item,Hub Category to Publish,Nashr etiladigan tovush kategoriyasi
DocType: Leave Block List,Leave Block List Dates,Bloklash ro'yxatini qoldiring
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Iltimos, Setup> Numbering Series orqali tomosha qilish uchun raqamlash seriyasini sozlang"
DocType: Sales Invoice,Billing Address GSTIN,To'lov manzili GSTIN
DocType: Assessment Plan,Evaluate,Baholash
DocType: Workstation,Net Hour Rate,Net soat tezligi
@@ -1329,7 +1333,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,Sotuvdagi Billing to'lovi
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Savdo Buyurtma va tugagan tovarlar omborida zaxiralangan ombor
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Sotish miqdori
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Sotish miqdori
DocType: Repayment Schedule,Interest Amount,Foiz miqdori
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Siz ushbu yozuv uchun sizning xarajatlaringizni tasdiqlovchisiz. Iltimos, "Status" ni va Saqlash-ni yangilang"
DocType: Serial No,Creation Document No,Yaratilish hujjati №
@@ -1420,7 +1424,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Buxgalteriya balansini ochish
,GST Sales Register,GST Sotuvdagi Ro'yxatdan
DocType: Sales Invoice Advance,Sales Invoice Advance,Sotuvdagi schyot-faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,So'raladigan hech narsa yo'q
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,So'raladigan hech narsa yo'q
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Domenlaringizni tanlang
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Moliyaviy yil uchun {1} "{2}" ga qarshi "{0}" yana bir byudjet rekordi {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Maydonlar faqat yaratilish vaqtida nusxalanadi.
@@ -1430,11 +1434,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bunga Variantning Mahsulot kodiga qo'shiladi. Misol uchun, qisqartma "SM" bo'lsa va element kodi "T-SHIRT" bo'lsa, variantning element kodi "T-SHIRT-SM""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Ish haqi miqdorini saqlaganingizdan so'ng, aniq to'lov (so'zlar bilan) ko'rinadi."
DocType: Purchase Invoice,Is Return,Qaytish
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,E'tibor bering
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,E'tibor bering
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Qaytaring / Debet Eslatma
DocType: Price List Country,Price List Country,Narxlar ro'yxati
DocType: Item,UOMs,UOMlar
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{1} uchun {0} joriy ketma-ket nos
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{1} uchun {0} joriy ketma-ket nos
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Mahsulot kodini ketma-ket kod uchun o'zgartirish mumkin emas.
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM ishlab chiqarish omili
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Partiya raqami olish uchun mahsulot kodini kiriting
@@ -1538,7 +1542,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Savdo Buyurtmani {0} haqiqiy emas
DocType: Supplier Scorecard,Warn for new Request for Quotations,Takliflar uchun yangi so'rov uchun ogohlantir
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Xarid qilish buyurtmalari xaridlarni rejalashtirish va kuzatib borishingizga yordam beradi
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Kechirasiz, kompaniyalar birlashtirilmaydi"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Kechirasiz, kompaniyalar birlashtirilmaydi"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Laboratoriya testlari retseptlari
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Kichik
DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Billingni yaratish vositasi elementini ochish
@@ -1574,7 +1578,6 @@
DocType: Warehouse,Warehouse Contact Info,Qoidalarga oid aloqa ma'lumotlari
DocType: Payment Entry,Write Off Difference Amount,Foiz miqdorini yozing
DocType: Volunteer,Volunteer Name,Ko'ngilli ism
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Marhamat, Ta'lim bo'yicha o'qituvchilarni nomlash tizimini sozlash> Ta'lim sozlamalari"
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent","{0}: Xodimlarning elektron pochta manzili topilmadi, shuning uchun elektron pochta orqali yuborilmadi"
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},{0} mamlakat uchun yuk qoidalari qo'llanilmaydi
DocType: Item,Foreign Trade Details,Tashqi savdo tafsilotlari
@@ -1586,7 +1589,7 @@
DocType: Student Group Student,Group Roll Number,Guruh Rulksi raqami
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0} uchun faqat kredit hisoblari boshqa to'lov usullariga bog'liq bo'lishi mumkin
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Barcha topshiriqlarning umumiy og'irligi 1 bo'lishi kerak. Iltimos, barcha loyiha vazifalarining vaznini mos ravishda moslang"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Yetkazib berish eslatmasi {0} yuborilmadi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Yetkazib berish eslatmasi {0} yuborilmadi
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,{0} mahsuloti sub-shartnoma qo'yilgan bo'lishi kerak
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Kapital uskunalar
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Raqobatchilarimiz qoidasi "Apply O'n" maydoniga asoslanib tanlangan, bular Item, Item Group yoki Tovar bo'lishi mumkin."
@@ -1611,7 +1614,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,Ushbu ombor uchun bolalar ombori mavjud. Ushbu omborni o'chira olmaysiz.
DocType: Item,Website Item Groups,Veb-sayt elementlari guruhlari
DocType: Purchase Invoice,Total (Company Currency),Jami (Kompaniya valyutasi)
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Seriya raqami {0} bir necha marta kiritilgan
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Seriya raqami {0} bir necha marta kiritilgan
DocType: Journal Entry,Journal Entry,Jurnalga kirish
DocType: Expense Claim Advance,Unclaimed amount,Talab qilinmagan miqdor
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,Joriy {0} ta element
@@ -1706,7 +1709,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Aloqa yozuvi.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Ilovaning so'rovi portaldan kirish uchun o'chirib qo'yilgan, portalni yanada aniqroq tekshirish uchun."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Yetkazib beruvchi Scorecard Scoring Variable
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Xarid qilish miqdori
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Xarid qilish miqdori
DocType: Sales Invoice,Shipping Address Name,Yuk tashish manzili nomi
DocType: Material Request,Terms and Conditions Content,Shartlar va shartlar tarkibi
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Dars jadvali yaratishda xatolar yuz berdi
@@ -1968,7 +1971,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,"Bu, ushbu avtomobilga qarshi jurnallarga asoslangan. Tafsilotlar uchun quyidagi jadvalga qarang"
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},{1} {0} etkazib beruvchi hisob-fakturasiga qarshi
DocType: Customer,Default Price List,Standart narx ro'yxati
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,Aktivlar harakati qaydlari {0} yaratildi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,Aktivlar harakati qaydlari {0} yaratildi
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Moliyaviy yil {0} ni o'chirib bo'lmaydi. Moliyaviy yil {0} global sozlamalarda sukut o'rnatilgan
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Xuddi shu nomga ega bo'lgan mijoz allaqachon mavjud
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Bu ish haqi to`plarini taqdim etadi va hisobga olish jurnalini yaratadi. Davom etmoqchimisiz?
@@ -1982,6 +1985,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Raqobatchilar
DocType: Quotation,Term Details,Terim detallari
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Ushbu talabalar guruhida {0} dan ortiq talabalarni ro'yxatdan o'tkazib bo'lmaydi.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Hammasi bo'lib (soliqsiz)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Qo'rg'oshin soni
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 dan katta bo'lishi kerak
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +30,Stock Available,Mavjudotlar mavjud
@@ -2000,7 +2004,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Billingni bekor qilish bo'yicha to'lovni uzish
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Qo`yilgan O`chiratkichni o`zgartirishni o`zgartirish dastlabki Avtomobil Odometridan {0}
DocType: Restaurant Reservation,No Show,Ko'rish yo'q
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Iltimos, {0} uchun nomlash seriyasini Sozlamalar> Sozlamalar> Naming Series orqali sozlang"
DocType: Shipping Rule Country,Shipping Rule Country,Yuk tashish qoidalari mamlakat
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Qoldiring va davom eting
DocType: Maintenance Visit,Partially Completed,Qisman bajarildi
@@ -2089,7 +2092,7 @@
DocType: Student Group Instructor,Student Group Instructor,Talabalar guruhining o'qituvchisi
DocType: Grant Application,Assessment Mark (Out of 10),Baholash belgisi (10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2 Mobil raqami
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Asosiy
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Asosiy
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
DocType: Naming Series,Set prefix for numbering series on your transactions,Sizning operatsiyalaringizda raqamlash seriyasi uchun prefiksni o'rnating
DocType: Employee Attendance Tool,Employees HTML,Xodimlar HTML
@@ -2136,7 +2139,7 @@
DocType: Course,Course Abbreviation,Kurs qisqartmasi
DocType: Student Leave Application,Student Leave Application,Talabalar uchun ariza
DocType: Item,Will also apply for variants,"Shuningdek, variantlar uchun ham qo'llaniladi"
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Aktivni bekor qilish mumkin emas, chunki allaqachon {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Aktivni bekor qilish mumkin emas, chunki allaqachon {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Yarim kun {1} da xizmatdosh {0}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Umumiy ish soatlari eng ko'p ish vaqti {0} dan ortiq bo'lmasligi kerak
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Yoqilgan
@@ -2320,9 +2323,10 @@
DocType: Task,Actual End Date (via Time Sheet),Haqiqiy tugash sanasi (vaqt jadvalidan orqali)
DocType: Soil Texture,Soil Type,Tuproq turi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},{0} {1} miqdori {2} {3} ga qarshi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Yangi xabar
,Quotation Trends,Iqtiboslar tendentsiyalari
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},{0} element uchun maqola ustidagi ob'ektlar guruhi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Debet Hisobni hisobvaraq deb hisoblash kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,Debet Hisobni hisobvaraq deb hisoblash kerak
DocType: Shipping Rule,Shipping Amount,Yuk tashish miqdori
DocType: Supplier Scorecard Period,Period Score,Davr hisoboti
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Mijozlarni qo'shish
@@ -2333,7 +2337,7 @@
,Vehicle Expenses,Avtomobil xarajatlari
DocType: Serial No,Invoice Details,Faktura tafsilotlari
DocType: Grant Application,Show on Website,Saytda ko'rsatish
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Foydali umrdan keyin kutilgan qiymat {0} dan katta yoki unga teng bo'lishi kerak
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},Foydali umrdan keyin kutilgan qiymat {0} dan katta yoki unga teng bo'lishi kerak
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Boshlang
DocType: Hub Category,Hub Category,Hub-toifa
DocType: Purchase Invoice,SEZ,SEZ
@@ -2364,7 +2368,7 @@
DocType: Patient,B Positive,B ijobiy
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: element 1 element bo'lishi shart. Iltimos, bir necha qty uchun alohida qatordan foydalaning."
DocType: Leave Block List Allow,Leave Block List Allow,Bloklashlar ro'yxatini qoldiring
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Abbr bo'sh yoki bo'sh joy bo'la olmaydi
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Abbr bo'sh yoki bo'sh joy bo'la olmaydi
DocType: Patient Medical Record,Patient Medical Record,Kasal Tibbiy Ro'yxatdan
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Guruh bo'lmaganlar guruhiga
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Sport
@@ -2413,6 +2417,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Hechqisi taklif qilinmagan RFQni o'rnatib bo'lmaydi
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Jami cheklov
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Hisob valyutasini chop etish uchun hisobni tanlang
,Production Analytics,Ishlab chiqarish tahlillari
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Bu bemorga qilingan operatsiyalarga asoslanadi. Tafsilotlar uchun quyidagi jadvalga qarang
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Qiymati yangilandi
@@ -2467,7 +2472,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Kompaniyani tanlang ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Barcha bo'limlarda ko'rib chiqilsa bo'sh qoldiring
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Ish turlari (doimiy, shartnoma, stajyor va hk)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} {1} mahsulot uchun majburiydir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} {1} mahsulot uchun majburiydir
DocType: Payroll Entry,Fortnightly,Ikki kun davomida
DocType: Currency Exchange,From Currency,Valyutadan
DocType: Vital Signs,Weight (In Kilogram),Og'irligi (kilogrammda)
@@ -2543,7 +2548,7 @@
DocType: Student,Guardians,Himoyachilar
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Narxlar ro'yxati o'rnatilmagan bo'lsa, narxlar ko'rsatilmaydi"
DocType: Stock Entry,Total Incoming Value,Jami kirish qiymati
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Debet kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,Debet kerak
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Vaqt jadvallari sizning jamoangiz tomonidan amalga oshiriladigan tadbirlar uchun vaqtni, narxni va hisob-kitoblarni kuzatish imkonini beradi"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Sotib olish narxlari ro'yxati
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Yetkazib beruvchilar kartalari o'zgaruvchilari shabloni.
@@ -2644,7 +2649,7 @@
DocType: Company,For Reference Only.,Faqat ma'lumot uchun.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},{1} shifokori {1} da mavjud emas
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Partiya no. Ni tanlang
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Noto'g'ri {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Noto'g'ri {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Malumot
@@ -2681,8 +2686,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Operatsiyalarni, operatsion narxini belgilang va sizning operatsiyalaringizni bajarish uchun noyob Operatsiyani taqdim eting."
DocType: Water Analysis,Origin,Kelib chiqishi
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ushbu hujjat {4} uchun {0} {1} tomonidan cheklangan. {2} ga qarshi yana bitta {3} qilyapsizmi?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Saqlaganingizdan keyin takroriy-ni tanlang
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,O'zgarish miqdorini tanlang
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Saqlaganingizdan keyin takroriy-ni tanlang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,O'zgarish miqdorini tanlang
DocType: Purchase Invoice,Price List Currency,Narxlari valyutasi
DocType: Naming Series,User must always select,Foydalanuvchiga har doim tanlangan bo'lishi kerak
DocType: Stock Settings,Allow Negative Stock,Salbiy aksiyaga ruxsat berish
@@ -2737,7 +2742,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Yangi Buyurtma Buyurtmalarini ogohlantiring
DocType: Quality Inspection Reading,Reading 9,O'qish 9
DocType: Supplier,Is Frozen,Muzlatilgan
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,Guruh tugunli omborga bitimlarni tanlashga ruxsat berilmaydi
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,Guruh tugunli omborga bitimlarni tanlashga ruxsat berilmaydi
DocType: Buying Settings,Buying Settings,Sozlamalarni xarid qilish
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Yaxshi natija uchun BOM No
DocType: Upload Attendance,Attendance To Date,Ishtirok etish tarixi
@@ -2751,6 +2756,7 @@
DocType: Grant Application,Organization,Tashkilot
DocType: BOM Update Tool,BOM Update Tool,BOMni yangilash vositasi
DocType: SG Creation Tool Course,Student Group Name,Isoning shogirdi guruhi nomi
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Portlash ko'rinishini ko'rsatish
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Narxlarni yaratish
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Iltimos, ushbu kompaniya uchun barcha operatsiyalarni o'chirib tashlamoqchimisiz. Sizning asosiy ma'lumotlaringiz qoladi. Ushbu amalni bekor qilish mumkin emas."
DocType: Room,Room Number,Xona raqami
@@ -2760,7 +2766,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Soliq jadvalini yarating
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foydalanuvchining forumi
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Xom ashyoni bo'sh bo'lishi mumkin emas.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Qimmatli qog'ozlar yangilanib bo'lmadi, hisob-faktura tomchi qoplama mahsulotini o'z ichiga oladi."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Qimmatli qog'ozlar yangilanib bo'lmadi, hisob-faktura tomchi qoplama mahsulotini o'z ichiga oladi."
DocType: Lab Test Sample,Lab Test Sample,Laborotoriya namunasi
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Tez jurnalni kiritish
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,"Agar BOM biron-bir elementni eslatmasa, tarifni o'zgartira olmaysiz"
@@ -2831,7 +2837,7 @@
DocType: Membership,USD,USD
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Billing-ni tanlang
DocType: Selling Settings,Auto close Opportunity after 15 days,Avtomatik yopish 15 kundan keyin Imkoniyat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} belgisi tufayli buyurtma berish buyurtmalariga {0} uchun ruxsat berilmaydi.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,{1} belgisi tufayli buyurtma berish buyurtmalariga {0} uchun ruxsat berilmaydi.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Year
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Qisqacha / qo'rg'oshin%
apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,Shartnoma tugash sanasi qo'shilish sanasidan katta bo'lishi kerak
@@ -2922,7 +2928,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-yuqorida
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,{{0} qatori: {1} yozuvi {2} hisobiga ega emas yoki boshqa kafelga qarama-qarshi
DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterlar Og'irligi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Yetkazib beruvchi> Yetkazib beruvchi turi
DocType: Buying Settings,Default Buying Price List,Standart xarid narxlari
DocType: Payroll Entry,Salary Slip Based on Timesheet,Vaqt jadvaliga asosan ish haqi miqdori
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Xarid qilish darajasi
@@ -3010,7 +3015,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Sanoat turiga qarab kuzatish.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Antetli qog'ozlarga o'ting
DocType: Item Supplier,Item Supplier,Mahsulot etkazib beruvchisi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,"Iltimos, mahsulot kodini kiriting"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,"Iltimos, mahsulot kodini kiriting"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},"Iltimos, {0} uchun kotirovka qiymatini tanlang {1}"
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Barcha manzillar.
DocType: Company,Stock Settings,Kabinetga sozlamalari
@@ -3186,6 +3191,7 @@
DocType: Company,Default Inventory Account,Inventarizatsiyadan hisob qaydnomasi
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,Row {0}: Tugallangan Miqdor noldan katta bo'lishi kerak.
DocType: Antibiotic,Antibiotic Name,Antibiotik nomi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Mahsulot kodi> Mahsulot guruhi> Tovar
DocType: Purchase Invoice,Apply Additional Discount On,Qo'shimcha imtiyozni yoqish
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Turini tanlang ...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,O'simliklar o'sadigan barcha yer uchastkalari bilan bog'lanish
@@ -3377,6 +3383,7 @@
DocType: Supplier,Credit Limit,Kredit cheklovi
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Ort Sotish narxi narxlari darajasi
DocType: Production Plan Sales Order,Salse Order Date,Buyurtma tarixi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Yetkazib beruvchi> Yetkazib beruvchi turi
DocType: Salary Component,Salary Component,Ish haqi komponenti
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,To'lov yozuvlari {0} un-bog'lanmagan
DocType: GL Entry,Voucher No,Voucher No.
@@ -3385,7 +3392,7 @@
DocType: Leave Allocation,Leave Allocation,Ajratishni qoldiring
DocType: Payment Request,Recipient Message And Payment Details,Qabul qiluvchi Xabar va to'lov ma'lumoti
DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Materiallar talablari {0} yaratildi
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Materiallar talablari {0} yaratildi
DocType: Restaurant Reservation,No of People,Odamlar yo'q
DocType: Production Planning Tool,Include sub-contracted raw materials,Sub-pudratli xom ashyolarni o'z ichiga oladi
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Atamalar yoki shartnoma namunalari.
@@ -3448,7 +3455,7 @@
DocType: Production Planning Tool,Create Material Requests,Materiallar so'rovlarini yaratish
DocType: Employee Education,School/University,Maktab / Universitet
DocType: Payment Request,Reference Details,Ma'lumotnoma ma'lumotlari
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Foydali umrdan keyin kutilgan qiymat Brüt Xarid qilish miqdoridan kam bo'lishi kerak
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Foydali umrdan keyin kutilgan qiymat Brüt Xarid qilish miqdoridan kam bo'lishi kerak
DocType: Sales Invoice Item,Available Qty at Warehouse,Mavjud QXI da
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,To'lov miqdori
DocType: Asset,Double Declining Balance,Ikki marta tushgan muvozanat
@@ -3460,7 +3467,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Yangilanishlarni oling
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Hisob {2} Kompaniyaga tegishli emas {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Har bir atributdan kamida bitta qiymatni tanlang.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Materialda so'rov {0} bekor qilindi yoki to'xtatildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Materialda so'rov {0} bekor qilindi yoki to'xtatildi
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Boshqarishni qoldiring
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Hisobga ko'ra guruh
DocType: Sales Order,Fully Delivered,To'liq topshirildi
@@ -3471,13 +3478,12 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Ish haqi miqdori Kredit summasidan katta bo'lishi mumkin emas {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Dasturlarga o'ting
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} # Ajratilgan miqdor {1} da'vo qilinmagan miqdordan ortiq bo'lmasligi mumkin {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,"Iltimos, Setup> Numbering Series orqali tomosha qilish uchun raqamlash seriyasini sozlang"
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},{0} band uchun xaridni tartib raqami talab qilinadi
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Ishlab chiqarish tartibi yaratilmadi
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Sana" kunidan keyin "To Date"
DocType: Asset,Fully Depreciated,To'liq Amortizatsiyalangan
,Stock Projected Qty,Qimmatli qog'ozlar miqdori
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Xaridor {0} loyihaga {1} tegishli emas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Xaridor {0} loyihaga {1} tegishli emas
DocType: Employee Attendance Tool,Marked Attendance HTML,Belgilangan tomoshabin HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Qabullar sizning mijozlaringizga yuborilgan takliflar, takliflar"
DocType: Sales Order,Customer's Purchase Order,Xaridor buyurtma buyurtmasi
@@ -3559,7 +3565,7 @@
DocType: Stock Settings,Item Naming By,Nomlanishi nomga ega
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Boshqa bir davrni yopish {0} {1}
DocType: Production Order,Material Transferred for Manufacturing,Ishlab chiqarish uchun mo'ljallangan material
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Hisob {0} mavjud emas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Hisob {0} mavjud emas
DocType: Project,Project Type,Loyiha turi
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Ushbu Vazifa uchun Bola vazifasi mavjud. Ushbu vazifani o'chira olmaysiz.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Nishon miqdor yoki maqsad miqdori majburiydir.
@@ -3661,11 +3667,11 @@
DocType: Company,Asset Depreciation Cost Center,Aktivlar Amortizatsiya Narxlari Markazi
DocType: Sales Order Item,Sales Order Date,Savdo Buyurtma sanasi
DocType: Sales Invoice Item,Delivered Qty,Miqdori topshirilgan
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Jami Eksport. Soliq
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Belgilangan bo'lsa, har bir ishlab chiqarilgan mahsulotning barcha bolalari Materiallar Talablariga kiritiladi."
DocType: Assessment Plan,Assessment Plan,Baholash rejasi
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Xaridor {0} yaratildi.
DocType: Stock Settings,Limit Percent,Limit ulushi
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,"Marhamat, Ta'lim bo'yicha o'qituvchilarni nomlash tizimini sozlash> Ta'lim sozlamalari"
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hozirda biron-bir omborda stok yo'q
,Payment Period Based On Invoice Date,Hisob-faktura sanasi asosida to'lov davri
DocType: Sample Collection,No. of print,Chop etish soni
@@ -3681,12 +3687,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Qarzdorlar ({0})
DocType: Pricing Rule,Margin,Marjin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Yangi mijozlar
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Yalpi foyda %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Yalpi foyda %
DocType: Appraisal Goal,Weightage (%),Og'irligi (%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,POS profilini o'zgartirish
DocType: Bank Reconciliation Detail,Clearance Date,Bo'shatish sanasi
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Baholash bo'yicha hisobot
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Umumiy xarid miqdori majburiydir
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Umumiy xarid miqdori majburiydir
DocType: Lead,Address Desc,Manzil raq
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Partiya majburiydir
DocType: Journal Entry,JV-,JV-
@@ -3718,7 +3724,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Doimiy ism
DocType: Stock Entry,Customer or Supplier Details,Xaridor yoki yetkazib beruvchi ma'lumotlari
DocType: Employee Loan Application,Required by Date,Sana bo'yicha talab qilinadi
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Yakunlovchi balans (doktor - Cr)
DocType: Lead,Lead Owner,Qurilish egasi
DocType: Bin,Requested Quantity,Kerakli miqdor
DocType: Patient,Marital Status,Oilaviy holat
@@ -3732,7 +3737,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Bir nechta varianti
DocType: Sales Invoice,Against Income Account,Daromad hisobiga qarshi
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% taslim etildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,{0} elementi: Buyurtma berilgan qty {1} minimal buyurtma miqdordan kam {2} dan kam bo'lmasligi kerak.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,{0} elementi: Buyurtma berilgan qty {1} minimal buyurtma miqdordan kam {2} dan kam bo'lmasligi kerak.
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Oylik tarqatish foizi
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Iltimos boshqa foydalanuvchi sifatida kiring.
DocType: Territory,Territory Targets,Mintaqaviy maqsadlar
@@ -3831,7 +3836,7 @@
DocType: Serial No,Out of AMC,AMCdan tashqarida
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Qayd qilingan amortizatsiya miqdori jami Amortizatsiya miqdoridan ko'p bo'lishi mumkin emas
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Xizmatga tashrif buyurish
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Sotish bo'yicha Magistr Direktori {0} roli mavjud foydalanuvchi bilan bog'laning
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Sotish bo'yicha Magistr Direktori {0} roli mavjud foydalanuvchi bilan bog'laning
DocType: Company,Default Cash Account,Naqd pul hisobvarag'i
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Kompaniya (mijoz yoki yetkazib beruvchi emas) ustasi.
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Bu talaba ushbu talabaga asoslanadi
@@ -3981,7 +3986,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Ko'rsatilgan mezonlarga xodimlar yo'q
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Ishlab chiqarish uchun materiallar varaqasi yo'q
DocType: Restaurant,Default Customer,Standart mijoz
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Inson resurslari> HR parametrlarini Xodimlar uchun nomlash tizimini sozlang
DocType: Assessment Plan,Supervisor Name,Boshqaruvchi nomi
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Xuddi shu kuni Uchrashuvni tashkil etganligini tasdiqlamang
DocType: Program Enrollment Course,Program Enrollment Course,Dasturlarni ro'yxatga olish kursi
@@ -4099,7 +4103,7 @@
DocType: BOM,Website Description,Veb-sayt ta'rifi
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Özkaynakta aniq o'zgarishlar
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Yangilar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Avval xaridlar fakturasini {0} bekor qiling
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Avval xaridlar fakturasini {0} bekor qiling
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pochta manzili noyob bo'lishi kerak, {0} uchun allaqachon mavjud"
DocType: Serial No,AMC Expiry Date,AMC tugash sanasi
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Qabul qilish
@@ -4126,7 +4130,7 @@
DocType: Patient,B Negative,B salbiy
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Xizmat holatini bekor qilish yoki topshirish uchun bajarilishi lozim
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Hisob {0} kompaniya {1} ga tegishli emas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,{0} qatoridagi ketma-ket raqamlar etkazib berish eslatmasiga mos kelmaydi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,{0} qatoridagi ketma-ket raqamlar etkazib berish eslatmasiga mos kelmaydi
DocType: Student,Guardian Details,Guardian tafsilotlari
DocType: C-Form,C-Form,C-shakl
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Bir nechta xodimlar uchun Markni tomosha qiling
@@ -4168,7 +4172,7 @@
DocType: Stock Entry Detail,Basic Amount,Asosiy miqdori
DocType: Training Event,Exam,Test
DocType: Complaint,Complaint,Shikoyat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},{0} uchun kabinetga ombori kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},{0} uchun kabinetga ombori kerak
DocType: Leave Allocation,Unused leaves,Foydalanilmagan barglar
DocType: Patient,Alcohol Past Use,Spirtli ichimliklarni o'tmishda ishlatish
DocType: Fertilizer Content,Fertilizer Content,Go'ng tarkibi
@@ -4291,6 +4295,7 @@
DocType: Salary Detail,Formula,Formulalar
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Seriya #
DocType: Lab Test Template,Lab Test Template,Laboratoriya viktorina namunasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Savdo hisobi
DocType: Purchase Invoice Item,Total Weight,Jami Og'irligi
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Savdo bo'yicha komissiya
DocType: Offer Letter Term,Value / Description,Qiymati / ta'rifi
@@ -4447,7 +4452,7 @@
DocType: Customer,From Lead,Qo'rg'oshin
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ishlab chiqarish uchun chiqarilgan buyurtmalar.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Moliyaviy yilni tanlang ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,Qalin kirishni amalga oshirish uchun qalin profil talab qilinadi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,Qalin kirishni amalga oshirish uchun qalin profil talab qilinadi
DocType: Program Enrollment Tool,Enroll Students,O'quvchilarni ro'yxatga olish
DocType: Lab Test,Approved Date,Tasdiqlangan sana
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart sotish
@@ -4523,7 +4528,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Ishlab chiqarish mahsulotlari
,Employee Information,Xodimlar haqida ma'lumot
DocType: Stock Entry Detail,Additional Cost,Qo'shimcha xarajatlar
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Voucher tomonidan guruhlangan bo'lsa, Voucher No ga asoslangan holda filtrlay olmaydi"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Voucher tomonidan guruhlangan bo'lsa, Voucher No ga asoslangan holda filtrlay olmaydi"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Yetkazib beruvchini taklif eting
DocType: Quality Inspection,Incoming,Kiruvchi
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Savdo va xarid uchun odatiy soliq namunalari yaratilgan.
@@ -4540,7 +4545,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Eslatma: {0}
,Delivery Note Trends,Yetkazib berish bo'yicha eslatma trend
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Ushbu xaftaning qisqacha bayoni
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Qimmatli qog'ozlar sonida
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Qimmatli qog'ozlar sonida
DocType: Delivery Trip,Calculate Estimated Arrival Times,Bashoratli keladigan vaqtni hisoblash
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Hisob: {0} faqatgina kabinetga operatsiyalari orqali yangilanishi mumkin
DocType: Student Group Creation Tool,Get Courses,Kurslar oling
@@ -4556,7 +4561,7 @@
DocType: Material Request,% Ordered,% Buyurtma qilingan
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kurs asosidagi talabalar guruhi uchun Kursni ro'yxatdan o'tishda ro'yxatdan o'tgan kurslardan har bir talaba uchun tasdiqlanadi.
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Perework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Ort Xarid qilish darajasi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ort Xarid qilish darajasi
DocType: Task,Actual Time (in Hours),Haqiqiy vaqt (soati)
DocType: Employee,History In Company,Kompaniya tarixida
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},{Sender} dan yangi xabar
@@ -4604,7 +4609,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: BOM # {1} valyutasi tanlangan valyutaga teng bo'lishi kerak {2}
DocType: Journal Entry Account,Exchange Rate,Valyuta kursi
DocType: Patient,Additional information regarding the patient,Bemor haqida qo'shimcha ma'lumot
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Savdo Buyurtma {0} yuborilmadi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Savdo Buyurtma {0} yuborilmadi
DocType: Homepage,Tag Line,Tag qatori
DocType: Fee Component,Fee Component,Narxlar komponenti
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Filo boshqarish
@@ -4816,7 +4821,7 @@
DocType: Employee Education,Employee Education,Xodimlarni o'qitish
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Elementlar guruhi jadvalida topilgan nusxalash elementlari guruhi
DocType: Land Unit,Parent Land Unit,Ota-ona uchastkasi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Ma'lumotlar ma'lumotlarini olish kerak.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Ma'lumotlar ma'lumotlarini olish kerak.
DocType: Fertilizer,Fertilizer Name,Go'ng nomi
DocType: Salary Slip,Net Pay,Net to'lov
DocType: Account,Account,Hisob
@@ -4894,7 +4899,7 @@
DocType: Item Customer Detail,Ref Code,Qayta kod
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Qalin profilda mijozlar guruhi talab qilinadi
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Xodimlarning yozuvlari.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Iltimos, keyingi Amortizatsiya sanasini belgilang"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,"Iltimos, keyingi Amortizatsiya sanasini belgilang"
DocType: HR Settings,Payroll Settings,Bordro Sozlamalari
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Bog'langan bo'lmagan Xarajatlar va To'lovlar bilan bog'lang.
DocType: POS Settings,POS Settings,Qalin sozlamalari
@@ -5061,7 +5066,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},{0} uchun tug'ilgan kun eslatmasi
DocType: Asset Maintenance Task,Last Completion Date,Oxirgi tugash sanasi
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Oxirgi Buyurtma berib o'tgan kunlar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Debet Hisobni balans hisoboti bo'lishi kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,Debet Hisobni balans hisoboti bo'lishi kerak
DocType: Buying Settings,Naming Series,Namunaviy qator
DocType: Leave Block List,Leave Block List Name,Blok ro'yxati nomini qoldiring
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sug'urtaning boshlanish sanasi sug'urta tugagan sanadan kam bo'lishi kerak
@@ -5187,6 +5192,7 @@
DocType: Bank Reconciliation,Get Payment Entries,To'lov yozuvlarini oling
DocType: Quotation Item,Against Docname,Docnamega qarshi
DocType: SMS Center,All Employee (Active),Barcha xodimlar (faol)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Xaridor> Mijozlar guruhi> Zonasi
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Hozir ko'rish
DocType: BOM,Raw Material Cost,Xomashyo narxlari
DocType: Item Reorder,Re-Order Level,Buyurtma darajasini qayta yuklash
@@ -5285,7 +5291,6 @@
DocType: Room,Seating Capacity,Yashash imkoniyati
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Laborotoriya guruhlari
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Xaridor> Mijozlar guruhi> Zonasi
DocType: Project,Total Expense Claim (via Expense Claims),Jami xarajat talabi (xarajatlar bo'yicha da'vo)
DocType: GST Settings,GST Summary,GST Xulosa
DocType: Assessment Result,Total Score,Umumiy reyting
@@ -5298,7 +5303,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Kurs jadvallarini tuzishdan keyin yaratildi
DocType: Journal Entry,Total Debit,Jami debet
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standart tayyorlangan tovarlar ombori
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Savdo vakili
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Savdo vakili
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Byudjet va xarajatlar markazi
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Ko'p ko'rsatiladigan to'lov shakli yo'l qo'yilmaydi
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,uchun
@@ -5471,7 +5476,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Soliqni yoki to'lovni ko'rib chiqing
DocType: Driver,Driving License Category,Haydovchilik guvohnomasi kategoriyasi
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Haqiqiy miqdori majburiydir
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hozirda {1} Yetkazib beruvchi reyting kartasiga ega va ushbu etkazib beruvchiga Buyurtma buyurtmalari ehtiyotkorlik bilan berilishi kerak.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hozirda {1} Yetkazib beruvchi reyting kartasiga ega va ushbu etkazib beruvchiga Buyurtma buyurtmalari ehtiyotkorlik bilan berilishi kerak.
DocType: Asset Maintenance Team,Asset Maintenance Team,Aktivlarni texnik xizmat ko'rsatish guruhi
DocType: Employee Loan,Loan Type,Kredit turi
DocType: Scheduling Tool,Scheduling Tool,Vositachi rejalashtirish
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 39def5a..98128dd 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Sắp xếp theo Giá
,Delay Days,Delay Days
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Chi phí dịch vụ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,Hóa đơn
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Thực hiện Mục nhập Lưu giữ
DocType: Purchase Invoice Item,Item Weight Details,Chi tiết Trọng lượng Chi tiết
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tham khảo: {0}, Mã hàng: {1} và Khách hàng: {2}"
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Mở đầu cho một công việc.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},BOM không được chỉ định cho mục thầu phụ {0} tại hàng {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},BOM không được chỉ định cho mục thầu phụ {0} tại hàng {1}
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Đã gửi kết quả
DocType: Item Attribute,Increment,Tăng
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Thời gian
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},Không được phép cho {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Lấy dữ liệu từ
DocType: Price List,Price Not UOM Dependant,Giá Không phụ thuộc UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Sản phẩm {0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Không có mẫu nào được liệt kê
DocType: Asset Repair,Error Description,Mô tả lỗi
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Cửa hàng tạp hóa
DocType: Quality Inspection Reading,Reading 1,Đọc 1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Quỹ lương hưu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Kỳ hạn khấu hao tiếp theo không thể trước ngày mua hàng
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,Kỳ hạn khấu hao tiếp theo không thể trước ngày mua hàng
DocType: Crop,Perennial,Lâu năm
DocType: Consultation,Consultation Date,Ngày tham vấn
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Danh sách sản phẩm và khám phá cho người dùng ERPNext
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",ví dụ: "Trường Tiểu học" hay "Đại học"
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Báo cáo hàng tồn kho
DocType: Warehouse,Warehouse Detail,Chi tiết kho
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Hạn mức tín dụng đã được thông qua cho khách hàng {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},Hạn mức tín dụng đã được thông qua cho khách hàng {0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Những ngày cuối kỳ không thể muộn hơn so với ngày cuối năm của năm học mà điều khoản này được liên kết (Năm học {}). Xin vui lòng sửa ngày và thử lại.
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Là Tài Sản Cố Định"" không thể bỏ đánh dấu, vì bản ghi Tài Sản tồn tại đối nghịch với vật liệu"
DocType: Delivery Trip,Departure Time,Giờ khởi hành
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,Thông số kỹ thuật chi tiết được
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Mẫu bảng xếp hạng nhà cung cấp.
DocType: Lead,Interested,Quan tâm
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,Mở ra
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,Mở ra
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},Từ {0} đến {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,Không thiết lập được thuế
DocType: Item,Copy From Item Group,Sao chép Từ mục Nhóm
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Các di dời mỗi năm
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Hàng {0}: Vui lòng kiểm tra 'là cấp cao' đối với tài khoản {1} nếu điều này là một bút toán cấp cao.
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
DocType: Email Digest,Profit & Loss,Mất lợi nhuận
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,lít
DocType: Task,Total Costing Amount (via Time Sheet),Tổng chi phí (thông qua thời gian biểu)
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Điều này dựa trên các giao dịch đối với Công ty này. Xem dòng thời gian bên dưới để biết chi tiết
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Thông báo qua email trên tạo ra các yêu cầu vật liệu tự động
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Kháng cự
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Tư vấn
DocType: Journal Entry,Multi Currency,Đa ngoại tệ
DocType: Opening Invoice Creation Tool,Invoice Type,Loại hóa đơn
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Phiếu giao hàng
@@ -531,7 +532,6 @@
DocType: Employee,Widowed,Góa
DocType: Request for Quotation,Request for Quotation,Yêu cầu báo giá
DocType: Healthcare Settings,Require Lab Test Approval,Yêu cầu phê duyệt thử nghiệm Lab
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Mã hàng> Nhóm mặt hàng> Thương hiệu
DocType: Salary Slip Timesheet,Working Hours,Giờ làm việc
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Tổng số
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Thay đổi bắt đầu / hiện số thứ tự của một loạt hiện có.
@@ -560,7 +560,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vui lòng nhập Bộ phận Chi phí
DocType: Drug Prescription,Dosage,Liều dùng
DocType: Journal Entry Account,Sales Order,Đơn đặt hàng
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,Giá bán bình quân
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Giá bán bình quân
DocType: Assessment Plan,Examiner Name,Tên người dự thi
DocType: Lab Test Template,No Result,Không kết quả
DocType: Purchase Invoice Item,Quantity and Rate,Số lượng và tỷ giá
@@ -610,6 +610,7 @@
DocType: Payroll Entry,Select Payroll Period,Chọn lương Thời gian
DocType: Purchase Invoice,Unpaid,Chưa thanh toán
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Dành cho các bán
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực> Cài đặt Nhân sự
DocType: Packing Slip,From Package No.,Từ gói thầu số
DocType: Item Attribute,To Range,để khoanh vùng
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Chứng khoán và tiền gửi
@@ -634,11 +635,11 @@
DocType: Training Event,Workshop,xưởng
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Lệnh mua hàng cảnh báo
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,lên danh sách một vài khách hàng của bạn. Họ có thể là các tổ chức hoặc cá nhân
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Phần đủ để xây dựng
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Phần đủ để xây dựng
DocType: POS Profile User,POS Profile User,Người dùng Hồ sơ POS
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Thu nhập trực tiếp
DocType: Patient Appointment,Date TIme,Ngày giờ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Không thể lọc dựa trên tài khoản, nếu nhóm theo tài khoản"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account","Không thể lọc dựa trên tài khoản, nếu nhóm theo tài khoản"
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Nhân viên hành chính
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Thành lập công ty và thuế
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Vui lòng chọn Khoá học
@@ -649,7 +650,7 @@
DocType: Stock Entry Detail,Difference Account,Tài khoản chênh lệch
DocType: Purchase Invoice,Supplier GSTIN,Mã số nhà cung cấp
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,Không thể nhiệm vụ gần như là nhiệm vụ của nó phụ thuộc {0} là không đóng cửa.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
DocType: Production Order,Additional Operating Cost,Chi phí điều hành khác
DocType: Lab Test Template,Lab Routine,Lab Routine
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Mỹ phẩm
@@ -820,7 +821,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Mối quan hệ với Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Chi cục trưởng
DocType: Payment Entry,Payment From / To,Thanh toán Từ / Đến
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},hạn mức tín dụng mới thấp hơn số tồn đọng chưa trả cho khách hàng. Hạn mức tín dụng phải ít nhất {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},hạn mức tín dụng mới thấp hơn số tồn đọng chưa trả cho khách hàng. Hạn mức tín dụng phải ít nhất {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},Vui lòng đặt tài khoản trong Kho {0}
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Dựa Trên' và 'Nhóm Bởi' không thể giống nhau
DocType: Sales Person,Sales Person Targets,Mục tiêu người bán hàng
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,Tên đợt hàng
DocType: Fee Validity,Max number of visit,Số lần truy cập tối đa
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Thời gian biểu đã tạo:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Ghi danh
DocType: GST Settings,GST Settings,Cài đặt GST
DocType: Selling Settings,Customer Naming By,đặt tên khách hàng theo
@@ -958,7 +959,7 @@
DocType: Budget,Budget Against,Ngân sách với
DocType: Employee,Cell Number,Số di động
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,Không có nhân viên nào cho các tiêu chí nhất định. Kiểm tra xem phiếu lương chưa được tạo.
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Các yêu cầu tự động Chất liệu Generated
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,Các yêu cầu tự động Chất liệu Generated
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mất
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện hành tại cột 'Chứng từ đối ứng'
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Dành cho sản xuất
@@ -966,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Năng lượng
DocType: Opportunity,Opportunity From,CƠ hội từ
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Báo cáo tiền lương hàng tháng.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Hàng {0}: {1} Số sêri cần có cho mục {2}. Bạn đã cung cấp {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Hàng {0}: {1} Số sêri cần có cho mục {2}. Bạn đã cung cấp {3}.
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vui lòng chọn một bảng
DocType: BOM,Website Specifications,Thông số kỹ thuật website
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} là địa chỉ email không hợp lệ trong 'Người nhận'
@@ -1035,7 +1036,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Yêu cầu được yêu cầu
DocType: Vital Signs,Heart Rate / Pulse,Nhịp tim / Pulse
DocType: Company,Default Bank Account,Tài khoản Ngân hàng mặc định
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Để lọc dựa vào Đối tác, chọn loại đối tác đầu tiên"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first","Để lọc dựa vào Đối tác, chọn loại đối tác đầu tiên"
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Cập nhật hàng hóa"" không thể được kiểm tra vì vật tư không được vận chuyển với {0}"
DocType: Vehicle,Acquisition Date,ngày thu mua
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Số
@@ -1060,7 +1061,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Tải lên đầu thư của bạn (Giữ cho trang web thân thiện với kích thước 900px x 100px)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Tài khoản {2} không thể là một Nhóm
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Dãy mẫu vật {idx}: {DOCTYPE} {DOCNAME} không tồn tại trên '{DOCTYPE}' bảng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,thời gian biểu{0} đã được hoàn thành hoặc bị hủy bỏ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,thời gian biểu{0} đã được hoàn thành hoặc bị hủy bỏ
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,không nhiệm vụ
DocType: Item Variant Settings,Copy Fields to Variant,Sao chép trường sang biến thể
DocType: Asset,Opening Accumulated Depreciation,Mở Khấu hao lũy kế
@@ -1172,9 +1173,10 @@
DocType: Production Order,Plan material for sub-assemblies,Lên nguyên liệu cho các lần lắp ráp phụ
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Đại lý bán hàng và địa bàn
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} phải hoạt động
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),Đóng cửa (Mở + Tổng cộng)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),Đóng cửa (Mở + Tổng cộng)
DocType: Journal Entry,Depreciation Entry,Nhập Khấu hao
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Hãy chọn các loại tài liệu đầu tiên
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,In bằng tiền tệ Tài khoản
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hủy bỏ {0} thăm Vật liệu trước khi hủy bỏ bảo trì đăng nhập này
DocType: Crop Cycle,ISO 8016 standard,Tiêu chuẩn ISO 8016
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},Không nối tiếp {0} không thuộc về hàng {1}
@@ -1200,7 +1202,7 @@
DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
DocType: Fee Structure,Components,Các thành phần
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},Vui lòng nhập loại tài sản trong mục {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},Vui lòng nhập loại tài sản trong mục {0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Các biến thể mục {0} cập nhật
DocType: Quality Inspection Reading,Reading 6,Đọc 6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1252,6 +1254,7 @@
,Company Name,Tên công ty
DocType: SMS Center,Total Message(s),Tổng số tin nhắn (s)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt> Cài đặt> Đặt tên Series
DocType: Purchase Invoice,Additional Discount Percentage,Tỷ lệ giảm giá bổ sung
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Xem danh sách tất cả các video giúp đỡ
DocType: Agriculture Analysis Criteria,Soil Texture,Cấu tạo của đất
@@ -1280,7 +1283,7 @@
DocType: BOM Website Item,BOM Website Item,Mẫu hàng Website BOM
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Tải lên tiêu đề trang và logo. (Bạn có thể chỉnh sửa chúng sau này).
DocType: Timesheet Detail,Bill,Hóa đơn
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Kỳ hạn khấu hao tiếp theo được nhập vào như kỳ hạn cũ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,Kỳ hạn khấu hao tiếp theo được nhập vào như kỳ hạn cũ
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Trắng
DocType: SMS Center,All Lead (Open),Tất cả Tiềm năng (Mở)
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Hàng {0}: Số lượng không có sẵn cho {4} trong kho {1} tại đăng thời gian nhập cảnh ({2} {3})
@@ -1297,7 +1300,7 @@
DocType: Lead,Next Contact Date,Ngày Liên hệ Tiếp theo
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Số lượng mở đầu
DocType: Healthcare Settings,Appointment Reminder,Nhắc nhở bổ nhiệm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
DocType: Program Enrollment Tool Student,Student Batch Name,Tên sinh viên hàng loạt
DocType: Consultation,Doctor,Bác sĩ
DocType: Holiday List,Holiday List Name,Tên Danh Sách Kỳ Nghỉ
@@ -1313,6 +1316,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Công cụ để phân bổ
DocType: Item,Hub Category to Publish,Danh mục Hub để Xuất bản
DocType: Leave Block List,Leave Block List Dates,Để lại các kỳ hạn cho danh sách chặn
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup> Numbering Series
DocType: Sales Invoice,Billing Address GSTIN,Địa chỉ thanh toán GSTIN
DocType: Assessment Plan,Evaluate,Đánh giá
DocType: Workstation,Net Hour Rate,Tỷ giá giờ thuần
@@ -1347,7 +1351,7 @@
DocType: Purchase Receipt,PREC-RET-,Prec-RET-
DocType: POS Profile,Sales Invoice Payment,Thanh toán hóa đơn bán hàng
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,tồn kho dự trữ cho đơn hàng / SP hoàn thành
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,Số tiền bán
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Số tiền bán
DocType: Repayment Schedule,Interest Amount,Số tiền lãi
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Bạn là người phê duyệt chi phí cho hồ sơ này. Hãy cập nhật mục 'Tình trạng' và ""Lưu"""
DocType: Serial No,Creation Document No,Tạo ra văn bản số
@@ -1440,7 +1444,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Mở cân đối kế toán
,GST Sales Register,Đăng ký mua GST
DocType: Sales Invoice Advance,Sales Invoice Advance,Hóa đơn bán hàng trước
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Không có gì để yêu cầu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,Không có gì để yêu cầu
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,Chọn tên miền của bạn
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Một kỷ lục Ngân sách '{0}' đã tồn tại đối với {1} {2} 'cho năm tài chính {3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,Các trường sẽ được sao chép chỉ trong thời gian tạo ra.
@@ -1450,11 +1454,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Điều này sẽ được nối thêm vào các mã hàng của các biến thể. Ví dụ, nếu bạn viết tắt là ""SM"", và các mã hàng là ""T-shirt"", các mã hàng của các biến thể sẽ là ""T-shirt-SM"""
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Tiền thực phải trả (bằng chữ) sẽ hiện ra khi bạn lưu bảng lương
DocType: Purchase Invoice,Is Return,Là trả lại
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,Cảnh cáo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,Cảnh cáo
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Trả về /Ghi chú nợ
DocType: Price List Country,Price List Country,Giá Danh sách Country
DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} Các dãy số hợp lệ cho vật liệu {1}
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0} Các dãy số hợp lệ cho vật liệu {1}
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Mã hàng không có thể được thay đổi cho Số sản
DocType: Purchase Invoice Item,UOM Conversion Factor,UOM chuyển đổi yếu tố
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,Vui lòng nhập Item Code để có được Số lô
@@ -1560,7 +1564,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Đơn đặt hàng {0} không hợp lệ
DocType: Supplier Scorecard,Warn for new Request for Quotations,Cảnh báo cho Yêu cầu Báo giá Mới
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,đơn đặt hàng giúp bạn lập kế hoạch và theo dõi mua hàng của bạn
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged","Xin lỗi, không thể hợp nhất các công ty"
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged","Xin lỗi, không thể hợp nhất các công ty"
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Lab Test Prescriptions
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",Tổng khối lượng phát hành / Chuyển {0} trong Chất liệu Yêu cầu {1} \ không thể nhiều hơn số lượng yêu cầu {2} cho mục {3}
@@ -1598,7 +1602,6 @@
DocType: Warehouse,Warehouse Contact Info,Kho Thông tin Liên hệ
DocType: Payment Entry,Write Off Difference Amount,Viết Tắt Chênh lệch Số tiền
DocType: Volunteer,Volunteer Name,Tên tình nguyện viên
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vui lòng thiết lập Hệ thống Đặt tên Người dạy học trong Giáo dục> Cài đặt Giáo dục
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: không tìm thấy email của nhân viên. do đó không gửi được email
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Quy tắc gửi hàng không áp dụng cho quốc gia {0}
DocType: Item,Foreign Trade Details,Chi tiết Ngoại thương
@@ -1611,7 +1614,7 @@
DocType: Student Group Student,Group Roll Number,Số cuộn nhóm
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Tổng khối lượng nhiệm vụ nhiệm vụ cần được 1. Vui lòng điều chỉnh khối lượng của tất cả các công việc của dự án một cách hợp lý
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,Phiếu giao hàng {0} không được ghi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,Phiếu giao hàng {0} không được ghi
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Thiết bị vốn
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Luật giá được lựa chọn đầu tiên dựa vào trường ""áp dụng vào"", có thể trở thành mẫu hàng, nhóm mẫu hàng, hoặc nhãn hiệu."
@@ -1636,7 +1639,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,kho con tồn tại cho nhà kho này. Bạn không thể xóa nhà kho này.
DocType: Item,Website Item Groups,Các Nhóm mục website
DocType: Purchase Invoice,Total (Company Currency),Tổng số (Tiền công ty )
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Nối tiếp số {0} vào nhiều hơn một lần
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,Nối tiếp số {0} vào nhiều hơn một lần
DocType: Journal Entry,Journal Entry,Bút toán nhật ký
DocType: Expense Claim Advance,Unclaimed amount,Số tiền chưa được xác nhận
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} mục trong tiến trình
@@ -1733,7 +1736,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,Đăng nhập thông tin liên lạc.
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.","Yêu cầu báo giá được vô hiệu hóa truy cập từ cổng thông tin, cho biết thêm cài đặt cổng kiểm tra."
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,Quy mô ghi điểm của nhà cung cấp thẻ chấm điểm
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Số tiền mua
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Số tiền mua
DocType: Sales Invoice,Shipping Address Name,tên địa chỉ vận chuyển
DocType: Material Request,Terms and Conditions Content,Điều khoản và Điều kiện nội dung
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Có lỗi khi tạo Lịch học
@@ -2000,7 +2003,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Điều này được dựa trên các bản ghi với xe này. Xem thời gian dưới đây để biết chi tiết
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},Gắn với hóa đơn NCC {0} ngày {1}
DocType: Customer,Default Price List,Mặc định Giá liệt kê
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Bạn không thể xóa năm tài chính {0}. Năm tài chính {0} được thiết lập mặc định như trong Global Settings
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Một khách hàng có cùng tên đã tồn tại
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Điều này sẽ gửi phiếu lương và tạo Khoản Ghi Theo Dồn. Bạn có muốn tiếp tục?
@@ -2014,6 +2017,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Vật giá
DocType: Quotation,Term Details,Chi tiết điều khoản
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Không thể ghi danh hơn {0} sinh viên cho nhóm sinh viên này.
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),Tổng (Không Thuế)
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Đếm Tiềm năng
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Đếm Tiềm năng
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} phải lớn hơn 0
@@ -2034,7 +2038,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Bỏ liên kết Thanh toán Hủy hóa đơn
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Hiện đo dặm đọc vào phải lớn hơn ban đầu Xe máy đo dặm {0}
DocType: Restaurant Reservation,No Show,Không hiển thị
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt> Cài đặt> Đặt tên Series
DocType: Shipping Rule Country,Shipping Rule Country,QUy tắc vận chuyển quốc gia
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Để lại và chấm công
DocType: Maintenance Visit,Partially Completed,Một phần hoàn thành
@@ -2127,7 +2130,7 @@
DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
DocType: Grant Application,Assessment Mark (Out of 10),Đánh giá Đánh giá (Trong số 10)
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Số di động Guardian2
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,Chính
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,Chính
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Biến thể
DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
DocType: Employee Attendance Tool,Employees HTML,Nhân viên HTML
@@ -2177,7 +2180,7 @@
DocType: Course,Course Abbreviation,Tên viết tắt khóa học
DocType: Student Leave Application,Student Leave Application,Ứng dụng Để lại Sinh viên
DocType: Item,Will also apply for variants,Cũng sẽ được áp dụng cho các biến thể
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} vào ngày nửa trên {1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Tổng số giờ làm việc không nên lớn hơn so với giờ làm việc tối đa {0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Bật
@@ -2365,9 +2368,10 @@
DocType: Task,Actual End Date (via Time Sheet),Ngày kết thúc thực tế (thông qua thời gian biểu)
DocType: Soil Texture,Soil Type,Loại đất
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Số tiền {0} {1} với {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,Tin nhắn mới
,Quotation Trends,Các Xu hướng dự kê giá
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Nhóm mục không được đề cập trong mục tổng thể cho mục {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,tài khoản nợ phải nhận được tiền
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,tài khoản nợ phải nhận được tiền
DocType: Shipping Rule,Shipping Amount,Số tiền vận chuyển
DocType: Supplier Scorecard Period,Period Score,Điểm thời gian
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Thêm khách hàng
@@ -2378,7 +2382,7 @@
,Vehicle Expenses,Chi phí phương tiện
DocType: Serial No,Invoice Details,Chi tiết hóa đơn
DocType: Grant Application,Show on Website,Hiển thị trên trang web
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},giá trị dự kiến sau khi cuộc sống hữu ích phải lớn hơn hoặc bằng {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},giá trị dự kiến sau khi cuộc sống hữu ích phải lớn hơn hoặc bằng {0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Bắt đầu vào
DocType: Hub Category,Hub Category,Danh mục Trung tâm
DocType: Purchase Invoice,SEZ,SEZ
@@ -2410,7 +2414,7 @@
DocType: Patient,B Positive,B dương tính
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Hàng # {0}: Số lượng phải là 1, mục là một tài sản cố định. Vui lòng sử dụng hàng riêng biệt cho đa dạng số lượng"
DocType: Leave Block List Allow,Leave Block List Allow,Để lại danh sách chặn cho phép
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,Viết tắt ko được để trống
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,Viết tắt ko được để trống
DocType: Patient Medical Record,Patient Medical Record,Hồ sơ Y khoa Bệnh nhân
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Nhóm Non-Group
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Các môn thể thao
@@ -2461,6 +2465,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,Không thể thiết lập một RFQ nhận được để Không có Trích dẫn
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,Tổng số trích
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,Chọn tài khoản để in bằng tiền tệ của tài khoản
,Production Analytics,Analytics sản xuất
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Điều này dựa trên các giao dịch đối với Bệnh nhân này. Xem dòng thời gian bên dưới để biết chi tiết
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Chi phí đã được cập nhật
@@ -2516,7 +2521,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Chọn Công ty ...
DocType: Leave Control Panel,Leave blank if considered for all departments,Để trống nếu xem xét tất cả các phòng ban
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Loại lao động (thường xuyên, hợp đồng, vv tập)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
DocType: Payroll Entry,Fortnightly,mổi tháng hai lần
DocType: Currency Exchange,From Currency,Từ tệ
DocType: Vital Signs,Weight (In Kilogram),Trọng lượng (tính bằng kilogram)
@@ -2594,7 +2599,7 @@
DocType: Student,Guardians,người giám hộ
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Giá sẽ không được hiển thị nếu thực Giá liệt kê không được thiết lập
DocType: Stock Entry,Total Incoming Value,Tổng giá trị tới
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,nợ được yêu cầu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,nợ được yêu cầu
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","các bảng thời gian biểu giúp theo dõi thời gian, chi phí và thanh toán cho các hoạt động được thực hiện bởi nhóm của bạn"
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Danh sách mua Giá
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Mẫu của các biến thẻ điểm của nhà cung cấp.
@@ -2697,7 +2702,7 @@
DocType: Company,For Reference Only.,Chỉ để tham khảo.
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},Bác sĩ {0} không có mặt trên {1}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,Chọn Batch No
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Không hợp lệ {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},Không hợp lệ {0}: {1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,Inv Inv
@@ -2734,8 +2739,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Xác định các hoạt động, chi phí vận hành và số hiệu của một hoạt động độc nhất tới các hoạt động của bạn"
DocType: Water Analysis,Origin,Gốc
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tài liệu này bị quá giới hạn bởi {0} {1} cho mục {4}. bạn đang làm cho một {3} so với cùng {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,tài khoản số lượng Chọn thay đổi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,tài khoản số lượng Chọn thay đổi
DocType: Purchase Invoice,Price List Currency,Danh sách giá ngoại tệ
DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
DocType: Stock Settings,Allow Negative Stock,Cho phép tồn kho âm
@@ -2791,7 +2796,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,Cảnh báo đối với Đơn mua hàng mới
DocType: Quality Inspection Reading,Reading 9,Đọc 9
DocType: Supplier,Is Frozen,Là đóng băng
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,kho nút Nhóm không được phép chọn cho các giao dịch
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,kho nút Nhóm không được phép chọn cho các giao dịch
DocType: Buying Settings,Buying Settings,Thiết lập thông số Mua hàng
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,số hiệu BOM cho một sản phẩm hoàn thành chất lượng
DocType: Upload Attendance,Attendance To Date,Có mặt đến ngày
@@ -2806,6 +2811,7 @@
DocType: Grant Application,Organization,Cơ quan
DocType: BOM Update Tool,BOM Update Tool,Công cụ cập nhật BOM
DocType: SG Creation Tool Course,Student Group Name,Tên nhóm học sinh
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,Hiển thị điểm phát nổ
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Tạo các khoản phí
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Hãy chắc chắn rằng bạn thực sự muốn xóa tất cả các giao dịch cho công ty này. Dữ liệu tổng thể của bạn vẫn được giữ nguyên. Thao tác này không thể được hoàn tác.
DocType: Room,Room Number,Số phòng
@@ -2816,7 +2822,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,Tạo mẫu thuế
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Diễn đàn người dùng
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
DocType: Lab Test Sample,Lab Test Sample,Mẫu thử nghiệm phòng thí nghiệm
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Bút toán nhật ký
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu BOM đã được đối ứng với vật tư bất kỳ.
@@ -2887,7 +2893,7 @@
DocType: Membership,USD,đô la Mỹ
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Làm cho hóa đơn
DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Cơ hội gần thi hành sau 15 ngày
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Đơn đặt hàng mua không được cho {0} do bảng điểm của điểm số {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Đơn đặt hàng mua không được cho {0} do bảng điểm của điểm số {1}.
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,cuối Năm
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Báo giá/Tiềm năng %
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Báo giá/Tiềm năng %
@@ -2979,7 +2985,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Trên - 90
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Hàng # {0}: Bút toán nhật ký {1} không có tài khoản {2} hoặc đã xuất hiện đối với chứng từ khác
DocType: Supplier Scorecard Criteria,Criteria Weight,Tiêu chí Trọng lượng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Nhà cung cấp> Loại nhà cung cấp
DocType: Buying Settings,Default Buying Price List,Bảng giá mua hàng mặc định
DocType: Payroll Entry,Salary Slip Based on Timesheet,Phiếu lương Dựa trên bảng thời gian
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,Tỷ lệ mua
@@ -3069,7 +3074,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Theo dõi Tiềm năng theo Loại Ngành.
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,Tới Tiêu đề thư
DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tất cả các địa chỉ.
DocType: Company,Stock Settings,Thiết lập thông số hàng tồn kho
@@ -3259,6 +3264,7 @@
DocType: Company,Default Inventory Account,tài khoản mặc định
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,dãy {0}: Đã hoàn thành Số lượng phải lớn hơn không.
DocType: Antibiotic,Antibiotic Name,Tên kháng sinh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,Mã hàng> Nhóm mặt hàng> Thương hiệu
DocType: Purchase Invoice,Apply Additional Discount On,Áp dụng khác Giảm Ngày
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,Lựa chọn đối tượng...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,Liên kết đến tất cả các Đơn vị Đất đai trong đó Cây trồng đang phát triển
@@ -3454,6 +3460,7 @@
DocType: Supplier,Credit Limit,Hạn chế tín dụng
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,Avg. Bảng giá bán
DocType: Production Plan Sales Order,Salse Order Date,Salse hàng ngày
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,Nhà cung cấp> Loại nhà cung cấp
DocType: Salary Component,Salary Component,Phần lương
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,Các bút toán thanh toán {0} không được liên kết
DocType: GL Entry,Voucher No,Chứng từ số
@@ -3463,7 +3470,7 @@
DocType: Leave Allocation,Leave Allocation,Phân bổ lại
DocType: Payment Request,Recipient Message And Payment Details,Tin nhắn người nhận và chi tiết thanh toán
DocType: Training Event,Trainer Email,email người huấn luyện
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,Các yêu cầu nguyên liệu {0} đã được tiến hành
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,Các yêu cầu nguyên liệu {0} đã được tiến hành
DocType: Restaurant Reservation,No of People,Số người
DocType: Production Planning Tool,Include sub-contracted raw materials,Bao gồm các nguyên liệu phụ ký hợp đồng
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mẫu thời hạn hoặc hợp đồng.
@@ -3529,7 +3536,7 @@
DocType: Production Planning Tool,Create Material Requests,Các yêu cầu tạo ra vật liệu
DocType: Employee Education,School/University,Học / Đại học
DocType: Payment Request,Reference Details,Chi tiết tham khảo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Giá trị dự kiến After Life viết phải nhỏ hơn tổng tiền mua hàng
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,Giá trị dự kiến After Life viết phải nhỏ hơn tổng tiền mua hàng
DocType: Sales Invoice Item,Available Qty at Warehouse,Số lượng có sẵn tại kho
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Số lượng đã được lập hóa đơn
DocType: Asset,Double Declining Balance,Đôi Balance sụt giảm
@@ -3541,7 +3548,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nhận thông tin cập nhật
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Tài khoản {2} không thuộc về Công ty {3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,Chọn ít nhất một giá trị từ mỗi thuộc tính.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Yêu cầu nguyên liệu {0} được huỷ bỏ hoặc dừng lại
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,Yêu cầu nguyên liệu {0} được huỷ bỏ hoặc dừng lại
apps/erpnext/erpnext/config/hr.py +310,Leave Management,Rời khỏi quản lý
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Nhóm bởi tài khoản
DocType: Sales Order,Fully Delivered,Giao đầy đủ
@@ -3552,14 +3559,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Số tiền giải ngân không thể lớn hơn Số tiền vay {0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Đi đến Chương trình
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Hàng {0} # Số tiền được phân bổ {1} không được lớn hơn số tiền chưa được xác nhận {2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup> Numbering Series
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Thao tác đặt hàng sản phẩm không được tạo ra
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ Ngày' phải sau 'Đến Ngày'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},Không thể thay đổi tình trạng như sinh viên {0} được liên kết với các ứng dụng sinh viên {1}
DocType: Asset,Fully Depreciated,khấu hao hết
,Stock Projected Qty,Dự kiến số lượng tồn kho
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
DocType: Employee Attendance Tool,Marked Attendance HTML,Đánh dấu có mặt HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Báo giá là đề xuất, giá thầu bạn đã gửi cho khách hàng"
DocType: Sales Order,Customer's Purchase Order,Đơn Mua hàng của khách hàng
@@ -3644,7 +3650,7 @@
DocType: Stock Settings,Item Naming By,Mẫu hàng đặt tên bởi
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Thời gian đóng cửa khác nhập {0} đã được thực hiện sau khi {1}
DocType: Production Order,Material Transferred for Manufacturing,Chất liệu được chuyển giao cho sản xuất
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Tài khoản {0} không tồn tại
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,Tài khoản {0} không tồn tại
DocType: Project,Project Type,Loại dự án
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,Child Task tồn tại cho tác vụ này. Bạn không thể xóa Tác vụ này.
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Hoặc SL mục tiêu hoặc số lượng mục tiêu là bắt buộc.
@@ -3748,11 +3754,11 @@
DocType: Company,Asset Depreciation Cost Center,Chi phí bộ phận - khấu hao tài sản
DocType: Sales Order Item,Sales Order Date,Ngày đơn đặt hàng
DocType: Sales Invoice Item,Delivered Qty,Số lượng giao
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,Tổng cộng không Thuế
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Nếu được kiểm tra, tất cả các mục con của từng hạng mục sản xuất sẽ được bao gồm trong các yêu cầu vật liệu."
DocType: Assessment Plan,Assessment Plan,Kế hoạch đánh giá
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,Đã tạo {0} khách hàng.
DocType: Stock Settings,Limit Percent,phần trăm giới hạn
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,Vui lòng thiết lập Hệ thống Đặt tên Người dạy học trong Giáo dục> Cài đặt Giáo dục
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hiện tại không có kho dự trữ nào trong nhà kho
,Payment Period Based On Invoice Date,Thời hạn thanh toán Dựa trên hóa đơn ngày
DocType: Sample Collection,No. of print,Số lượng in
@@ -3768,12 +3774,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),Con nợ ({0})
DocType: Pricing Rule,Margin,Biên
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Khách hàng mới
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Lợi nhuận gộp%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Lợi nhuận gộp%
DocType: Appraisal Goal,Weightage (%),Trọng lượng(%)
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,Thay đổi Hồ sơ POS
DocType: Bank Reconciliation Detail,Clearance Date,Ngày chốt sổ
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Báo cáo đánh giá
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Tổng tiền mua hàng là bắt buộc
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,Tổng tiền mua hàng là bắt buộc
DocType: Lead,Address Desc,Giải quyết quyết định
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Đối tác là bắt buộc
DocType: Journal Entry,JV-,JV-
@@ -3805,7 +3811,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,Tên thường trực
DocType: Stock Entry,Customer or Supplier Details,Chi tiết khách hàng hoặc nhà cung cấp
DocType: Employee Loan Application,Required by Date,Theo yêu cầu của ngày
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),Số dư cuối kỳ (Dr - Cr)
DocType: Lead,Lead Owner,Người sở hữu Tiềm năng
DocType: Bin,Requested Quantity,yêu cầu Số lượng
DocType: Patient,Marital Status,Tình trạng hôn nhân
@@ -3819,7 +3824,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,Nhiều biến thể
DocType: Sales Invoice,Against Income Account,Đối với tài khoản thu nhập
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Đã giao hàng
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Mục {0}: qty Ra lệnh {1} không thể ít hơn qty đặt hàng tối thiểu {2} (quy định tại khoản).
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Tỷ lệ phân phối hàng tháng
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Vui lòng đăng nhập như một người dùng khác.
DocType: Territory,Territory Targets,Các mục tiêu tại khu vực
@@ -3920,7 +3925,7 @@
DocType: Serial No,Out of AMC,Của AMC
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ với người Quản lý Bán hàng Chính {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ với người Quản lý Bán hàng Chính {0}
DocType: Company,Default Cash Account,Tài khoản mặc định tiền
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Quản trị Công ty (không phải khách hàng hoặc nhà cung cấp)
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Điều này được dựa trên sự tham gia của sinh viên này
@@ -4072,7 +4077,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,Không có nhân viên nào cho các tiêu chí đã đề cập
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,Không có mẫu hàng với hóa đơn nguyên liệu để sản xuất
DocType: Restaurant,Default Customer,Khách hàng Mặc định
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực> Cài đặt Nhân sự
DocType: Assessment Plan,Supervisor Name,Tên Supervisor
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,Không xác nhận nếu cuộc hẹn được tạo ra cho cùng một ngày
DocType: Program Enrollment Course,Program Enrollment Course,Khóa học ghi danh chương trình
@@ -4195,7 +4199,7 @@
DocType: BOM,Website Description,Mô tả Website
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Chênh lệch giá tịnh trong vốn sở hữu
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,Mới nhất
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,Hãy hủy hóa đơn mua hàng {0} đầu tiên
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,Hãy hủy hóa đơn mua hàng {0} đầu tiên
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Địa chỉ email phải là duy nhất, đã tồn tại cho {0}"
DocType: Serial No,AMC Expiry Date,Ngày hết hạn hợp đồng bảo hành (AMC)
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,Phiếu nhận
@@ -4212,7 +4216,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Báo cáo lưu chuyển tiền mặt
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Số tiền cho vay không thể vượt quá Số tiền cho vay tối đa của {0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,bằng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vui lòng chọn Carry Forward nếu bạn cũng muốn bao gồm cân bằng tài chính của năm trước để lại cho năm tài chính này
DocType: GL Entry,Against Voucher Type,Loại chống lại Voucher
DocType: Physician,Phone (R),Điện thoại (R)
@@ -4224,7 +4228,7 @@
DocType: Patient,B Negative,B Phủ định
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,Trạng thái Bảo trì phải được Hủy hoặc Hoàn thành để Gửi
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tài khoản {0} không thuộc về công ty {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,Số sê-ri trong hàng {0} không khớp với Lưu lượng giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,Số sê-ri trong hàng {0} không khớp với Lưu lượng giao hàng
DocType: Student,Guardian Details,Chi tiết người giám hộ
DocType: C-Form,C-Form,C - Mẫu
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Đánh dấu cho nhiều nhân viên
@@ -4266,7 +4270,7 @@
DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
DocType: Training Event,Exam,Thi
DocType: Complaint,Complaint,Lời phàn nàn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
DocType: Leave Allocation,Unused leaves,Quyền nghỉ phép chưa sử dụng
DocType: Patient,Alcohol Past Use,Uống rượu quá khứ
DocType: Fertilizer Content,Fertilizer Content,Nội dung Phân bón
@@ -4394,6 +4398,7 @@
DocType: Salary Detail,Formula,Công thức
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
DocType: Lab Test Template,Lab Test Template,Mẫu thử nghiệm Lab
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,Tài khoản bán hàng
DocType: Purchase Invoice Item,Total Weight,Tổng khối lượng
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Hoa hồng trên doanh thu
DocType: Offer Letter Term,Value / Description,Giá trị / Mô tả
@@ -4551,7 +4556,7 @@
DocType: Customer,From Lead,Từ Tiềm năng
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Đơn đặt hàng phát hành cho sản phẩm.
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Chọn năm tài chính ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
DocType: Program Enrollment Tool,Enroll Students,Ghi danh học sinh
DocType: Lab Test,Approved Date,Ngày được chấp thuận
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Bán hàng tiêu chuẩn
@@ -4628,7 +4633,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Sản xuất hàng
,Employee Information,Thông tin nhân viên
DocType: Stock Entry Detail,Additional Cost,Chi phí bổ sung
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên số hiệu Voucher, nếu nhóm theo Voucher"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên số hiệu Voucher, nếu nhóm theo Voucher"
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Tạo báo giá của NCC
DocType: Quality Inspection,Incoming,Đến
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,Mẫu thuế mặc định cho bán hàng và mua hàng được tạo.
@@ -4645,7 +4650,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Lưu ý: {0}
,Delivery Note Trends,Xu hướng phiếu giao hàng
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Tóm tắt tuần này
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,Số lượng hàng trong kho
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,Số lượng hàng trong kho
DocType: Delivery Trip,Calculate Estimated Arrival Times,Tính thời gian đến dự kiến
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Tài khoản: {0} chỉ có thể được cập nhật thông qua bút toán kho
DocType: Student Group Creation Tool,Get Courses,Nhận Học
@@ -4661,7 +4666,7 @@
DocType: Material Request,% Ordered,% đã đặt
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Đối với Nhóm Sinh viên dựa trên Khóa học, khóa học sẽ được xác nhận cho mỗi Sinh viên từ các môn học ghi danh tham gia vào Chương trình Ghi danh."
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Việc làm ăn khoán
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Giá mua bình quân
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Giá mua bình quân
DocType: Task,Actual Time (in Hours),Thời gian thực tế (tính bằng giờ)
DocType: Employee,History In Company,Lịch sử trong công ty
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},Bài viết mới từ {sender}
@@ -4709,7 +4714,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Hàng {0}: Tiền tệ của BOM # {1} phải bằng tiền mà bạn chọn {2}
DocType: Journal Entry Account,Exchange Rate,Tỷ giá
DocType: Patient,Additional information regarding the patient,Thông tin bổ sung về bệnh nhân
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
DocType: Homepage,Tag Line,Dòng đánh dấu
DocType: Fee Component,Fee Component,phí Component
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Quản lý đội tàu
@@ -4924,7 +4929,7 @@
DocType: Employee Education,Employee Education,Giáo dục nhân viên
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,Nhóm bút toán trùng lặp được tìm thấy trong bảng nhóm mẫu hàng
DocType: Land Unit,Parent Land Unit,Đơn vị Phụ Huynh
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
DocType: Fertilizer,Fertilizer Name,Tên phân bón
DocType: Salary Slip,Net Pay,Tiền thực phải trả
DocType: Account,Account,Tài khoản
@@ -5003,7 +5008,7 @@
DocType: Item Customer Detail,Ref Code,Mã tài liệu tham khảo
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,Nhóm khách hàng là bắt buộc trong hồ sơ POS
apps/erpnext/erpnext/config/hr.py +12,Employee records.,Hồ sơ nhân viên.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,Hãy đặt Tiếp Khấu hao ngày
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,Hãy đặt Tiếp Khấu hao ngày
DocType: HR Settings,Payroll Settings,Thiết lập bảng lương
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Phù hợp với hoá đơn không liên kết và Thanh toán.
DocType: POS Settings,POS Settings,Cài đặt POS
@@ -5171,7 +5176,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Nhắc ngày sinh nhật cho {0}
DocType: Asset Maintenance Task,Last Completion Date,Ngày Hoàn thành Mới
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ngày tính từ lần yêu cầu cuối cùng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,nợ tài khoản phải khớp với giấy tờ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,nợ tài khoản phải khớp với giấy tờ
DocType: Buying Settings,Naming Series,Đặt tên series
DocType: Leave Block List,Leave Block List Name,Để lại tên danh sách chặn
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ngày Bảo hiểm bắt đầu phải ít hơn ngày kết thúc Bảo hiểm
@@ -5302,6 +5307,7 @@
DocType: Bank Reconciliation,Get Payment Entries,Nhận thanh toán Entries
DocType: Quotation Item,Against Docname,Chống lại Docname
DocType: SMS Center,All Employee (Active),Tất cả các nhân viên (Active)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Khách hàng> Nhóm Khách hàng> Lãnh thổ
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Xem ngay bây giờ
DocType: BOM,Raw Material Cost,Chi phí nguyên liệu thô
DocType: Item Reorder,Re-Order Level,mức đặt mua lại
@@ -5402,7 +5408,6 @@
DocType: Room,Seating Capacity,Dung ngồi
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,Nhóm thử nghiệm phòng thí nghiệm
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Khách hàng> Nhóm Khách hàng> Lãnh thổ
DocType: Project,Total Expense Claim (via Expense Claims),Tổng số yêu cầu bồi thường chi phí (thông qua yêu cầu bồi thường chi phí)
DocType: GST Settings,GST Summary,Tóm tắt GST
DocType: Assessment Result,Total Score,Tổng điểm
@@ -5416,7 +5421,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,Sau lịch trình khóa học đã được tạo ra
DocType: Journal Entry,Total Debit,Tổng số Nợ
DocType: Manufacturing Settings,Default Finished Goods Warehouse,Kho chứa SP hoàn thành mặc định
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Người bán hàng
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Người bán hàng
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Ngân sách và Trung tâm chi phí
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,Không cho phép nhiều chế độ mặc định
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,cho
@@ -5592,7 +5597,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Xem xét thuế hoặc phí cho
DocType: Driver,Driving License Category,Lái xe loại giấy phép
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Số lượng thực tế là bắt buộc
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hiện đang có {1} Bảng xếp hạng của Nhà cung cấp và Đơn hàng mua cho nhà cung cấp này nên được cấp một cách thận trọng.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} hiện đang có {1} Bảng xếp hạng của Nhà cung cấp và Đơn hàng mua cho nhà cung cấp này nên được cấp một cách thận trọng.
DocType: Asset Maintenance Team,Asset Maintenance Team,Đội bảo trì tài sản
DocType: Employee Loan,Loan Type,Loại cho vay
DocType: Scheduling Tool,Scheduling Tool,Công cụ lập kế hoạch
diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index 414c6e8..fdc9bae 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -78,7 +78,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,按價格排序
,Delay Days,延遲天數
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服務費用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,發票
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,保留股票入場
DocType: Purchase Invoice Item,Item Weight Details,項目重量細節
@@ -123,7 +123,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",參考：{0}，商品編號：{1}和顧客：{2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,公斤
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,開放的工作。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},沒有為行{1}的轉包商品{0}指定BOM
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},沒有為行{1}的轉包商品{0}指定BOM
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0}結果提交
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,時間跨度
apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,選擇倉庫...
@@ -132,7 +132,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},不允許{0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,取得項目來源
DocType: Price List,Price Not UOM Dependant,價格不依賴於UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,沒有列出項目
DocType: Asset Repair,Error Description,錯誤說明
@@ -140,7 +140,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,雜貨
DocType: Quality Inspection Reading,Reading 1,閱讀1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,養老基金
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下來折舊日期不能購買日期之前
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,接下來折舊日期不能購買日期之前
DocType: Consultation,Consultation Date,諮詢日期
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext用戶的產品列表和發現
DocType: SMS Center,All Sales Person,所有的銷售人員
@@ -153,7 +153,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",如“小學”或“大學”
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,庫存報告
DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,該期限結束日期不能晚於學年年終日期到這個詞聯繫在一起（學年{}）。請更正日期，然後再試一次。
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中，作為資產記錄存在對項目
DocType: Delivery Trip,Departure Time,出發時間
@@ -173,7 +173,7 @@
DocType: Quality Inspection,Get Specification Details,獲取詳細規格
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,供應商榜單。
DocType: Lead,Interested,有興趣
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,開盤
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,開盤
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},從{0} {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,無法設置稅收
DocType: Item,Copy From Item Group,從項目群組複製
@@ -333,7 +333,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,每年葉
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
DocType: Email Digest,Profit & Loss,利潤損失
DocType: Task,Total Costing Amount (via Time Sheet),總成本計算量（通過時間表）
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +69,Please setup Students under Student Groups,請設置學生組的學生
@@ -485,7 +485,6 @@
DocType: Employee,Widowed,寡
DocType: Request for Quotation,Request for Quotation,詢價
DocType: Healthcare Settings,Require Lab Test Approval,需要實驗室測試批准
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,項目代碼>項目組>品牌
DocType: Salary Slip Timesheet,Working Hours,工作時間
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,總計傑出
DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改現有系列的開始/當前的序列號。
@@ -510,7 +509,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,請輸入成本中心
DocType: Drug Prescription,Dosage,劑量
DocType: Journal Entry Account,Sales Order,銷售訂單
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,平均。賣出價
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均。賣出價
DocType: Assessment Plan,Examiner Name,考官名稱
DocType: Lab Test Template,No Result,沒有結果
DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
@@ -556,6 +555,7 @@
DocType: Item,Show in Website (Variant),展網站（變體）
DocType: Employee,Health Concerns,健康問題
DocType: Payroll Entry,Select Payroll Period,選擇工資期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,請在人力資源>人力資源設置中設置員工命名系統
DocType: Packing Slip,From Package No.,從包裹編號
DocType: Item Attribute,To Range,為了範圍
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,證券及存款
@@ -578,11 +578,11 @@
DocType: Pricing Rule,Valid Upto,到...為止有效
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告採購訂單
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,足夠的配件組裝
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足夠的配件組裝
DocType: POS Profile User,POS Profile User,POS配置文件用戶
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接收入
DocType: Patient Appointment,Date TIme,約會時間
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,政務主任
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,建立公司和稅收
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,請選擇課程
@@ -592,7 +592,7 @@
DocType: Stock Entry Detail,Difference Account,差異帳戶
DocType: Purchase Invoice,Supplier GSTIN,供應商GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
DocType: Production Order,Additional Operating Cost,額外的運營成本
DocType: Lab Test Template,Lab Routine,實驗室常規
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化妝品
@@ -747,7 +747,7 @@
DocType: Employee,Passport Number,護照號碼
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,與關係Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,經理
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用額度小於當前餘額為客戶著想。信用額度是ATLEAST {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用額度小於當前餘額為客戶著想。信用額度是ATLEAST {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},請在倉庫{0}中設置帳戶
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
DocType: Sales Person,Sales Person Targets,銷售人員目標
@@ -756,7 +756,7 @@
DocType: Lab Test Template,Compound,複合
DocType: Fee Validity,Max number of visit,最大訪問次數
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,創建時間表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,註冊
DocType: GST Settings,GST Settings,GST設置
DocType: Selling Settings,Customer Naming By,客戶命名由
@@ -871,13 +871,13 @@
DocType: Budget,Budget Against,反對財政預算案
DocType: Employee,Cell Number,手機號碼
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,給定的標準沒有僱員。檢查工資單還沒有被創建。
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,汽車材料的要求生成
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,汽車材料的要求生成
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,預留製造
DocType: Opportunity,Opportunity From,機會從
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月薪聲明。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}項目{2}所需的序列號。你已經提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}項目{2}所需的序列號。你已經提供{3}。
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,請選擇一張桌子
DocType: BOM,Website Specifications,網站規格
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}是“收件人”中的無效電子郵件地址
@@ -958,7 +958,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,無權限
DocType: Vital Signs,Heart Rate / Pulse,心率/脈搏
DocType: Company,Default Bank Account,預設銀行帳戶
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},不能勾選`更新庫存'，因為項目未交付{0}
DocType: Vehicle,Acquisition Date,採集日期
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,NOS
@@ -983,7 +983,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),上傳你的信頭（保持網頁友好，900px乘100px）
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帳戶{2}不能是一個組
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,項目行的{idx} {文檔類型} {} DOCNAME上面不存在'{}的文檔類型“表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,沒有任務
DocType: Item Variant Settings,Copy Fields to Variant,將字段複製到變式
DocType: Asset,Opening Accumulated Depreciation,打開累計折舊
@@ -1084,9 +1084,10 @@
DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,銷售合作夥伴和地區
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0}必須是積極的
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),閉幕（開幕+總計）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),閉幕（開幕+總計）
DocType: Journal Entry,Depreciation Entry,折舊分錄
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,請先選擇文檔類型
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,以賬戶貨幣打印
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
DocType: Crop Cycle,ISO 8016 standard,ISO 8016標準
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
@@ -1111,7 +1112,7 @@
DocType: Supplier,Default Payable Accounts,預設應付帳款
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
DocType: Fee Structure,Components,組件
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},請輸入項目資產類別{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},請輸入項目資產類別{0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,項目變種{0}更新
DocType: Quality Inspection Reading,Reading 6,6閱讀
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1158,6 +1159,7 @@
,Company Name,公司名稱
DocType: SMS Center,Total Message(s),訊息總和（s ）
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,請通過設置>設置>命名系列為{0}設置命名系列
DocType: Purchase Invoice,Additional Discount Percentage,額外折扣百分比
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有幫助影片名單
DocType: Agriculture Analysis Criteria,Soil Texture,土壤紋理
@@ -1186,7 +1188,7 @@
DocType: BOM Website Item,BOM Website Item,BOM網站項目
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
DocType: Timesheet Detail,Bill,法案
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,接下來折舊日期輸入為過去的日期
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,接下來折舊日期輸入為過去的日期
DocType: SMS Center,All Lead (Open),所有鉛（開放）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：數量不適用於{4}在倉庫{1}在發布條目的時間（{2} {3}）
DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
@@ -1202,7 +1204,7 @@
DocType: Lead,Next Contact Date,下次聯絡日期
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,開放數量
DocType: Healthcare Settings,Appointment Reminder,預約提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,對於漲跌額請輸入帳號
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,對於漲跌額請輸入帳號
DocType: Program Enrollment Tool Student,Student Batch Name,學生批名
DocType: Consultation,Doctor,醫生
DocType: Holiday List,Holiday List Name,假日列表名稱
@@ -1218,6 +1220,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,排假工具
DocType: Item,Hub Category to Publish,集線器類別發布
DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,請通過設置>編號系列設置考勤編號系列
DocType: Sales Invoice,Billing Address GSTIN,帳單地址GSTIN
DocType: Assessment Plan,Evaluate,評估
DocType: Workstation,Net Hour Rate,淨小時率
@@ -1249,7 +1252,7 @@
DocType: Landed Cost Item,Purchase Receipt Item,採購入庫項目
DocType: POS Profile,Sales Invoice Payment,銷售發票付款
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,銷售金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,銷售金額
DocType: Repayment Schedule,Interest Amount,利息金額
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
DocType: Serial No,Creation Document No,文檔創建編號
@@ -1338,7 +1341,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,打開會計平衡
,GST Sales Register,消費稅銷售登記冊
DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,無需求
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,無需求
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,選擇您的域名
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一個預算記錄“{0}”已存在對{1}“{2}”為年度{3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,字段將僅在創建時復制。
@@ -1351,7 +1354,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,返回/借記注
DocType: Price List Country,Price List Country,價目表國家
DocType: Item,UOMs,計量單位
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,產品編號不能為序列號改變
DocType: Purchase Invoice Item,UOM Conversion Factor,計量單位換算係數
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,請輸入產品代碼來獲得批號
@@ -1443,7 +1446,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,銷售訂單{0}無效
DocType: Supplier Scorecard,Warn for new Request for Quotations,警告新的報價請求
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,採購訂單幫助您規劃和跟進您的購買
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",對不起，企業不能合併
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",對不起，企業不能合併
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,實驗室測試處方
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",在材質要求總發行/傳輸量{0} {1} \不能超過請求的數量{2}的項目更大的{3}
@@ -1476,7 +1479,6 @@
DocType: Warehouse,Warehouse Contact Info,倉庫聯絡方式
DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
DocType: Volunteer,Volunteer Name,志願者姓名
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,請在教育>教育設置中設置教師命名系統
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},運費規則不適用於國家/地區{0}
DocType: Item,Foreign Trade Details,外貿詳細
@@ -1488,7 +1490,7 @@
DocType: Student Group Student,Group Roll Number,組卷編號
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任務的權重合計應為1。請相應調整的所有項目任務重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,送貨單{0}未提交
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,資本設備
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
@@ -1511,7 +1513,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,兒童倉庫存在這個倉庫。您不能刪除這個倉庫。
DocType: Item,Website Item Groups,網站項目群組
DocType: Purchase Invoice,Total (Company Currency),總計（公司貨幣）
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,序號{0}多次輸入
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,序號{0}多次輸入
DocType: Journal Entry,Journal Entry,日記帳分錄
DocType: Expense Claim Advance,Unclaimed amount,無人認領的金額
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,正在進行{0}項目
@@ -1600,7 +1602,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",詢價被禁止訪問門脈，為更多的檢查門戶設置。
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,供應商記分卡評分變量
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,購買金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,購買金額
DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
DocType: Material Request,Terms and Conditions Content,條款及細則內容
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,創建課程表時出現錯誤
@@ -1838,7 +1840,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,這是基於對本車輛的日誌。詳情請參閱以下時間表
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
DocType: Customer,Default Price List,預設價格表
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,資產運動記錄{0}創建
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,資產運動記錄{0}創建
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,一個同名的客戶已經存在
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,這將提交工資單，並創建權責發生製日記賬分錄。你想繼續嗎？
@@ -1852,6 +1854,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,價錢
DocType: Quotation,Term Details,長期詳情
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,不能註冊超過{0}學生該學生群體更多。
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),總計（不含稅）
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必須大於0
@@ -1871,7 +1874,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},進入當前的里程表讀數應該比最初的車輛里程表更大的{0}
DocType: Restaurant Reservation,No Show,沒有出現
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,請通過設置>設置>命名系列為{0}設置命名系列
DocType: Shipping Rule Country,Shipping Rule Country,航運規則國家
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,假離和缺勤
DocType: Leave Type,Include holidays within leaves as leaves,休假中包含節日做休假
@@ -1957,7 +1959,7 @@
DocType: Student Group Instructor,Student Group Instructor,學生組教練
DocType: Grant Application,Assessment Mark (Out of 10),評估標記（滿分10分）
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手機號碼
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,主頁
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,主頁
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,變種
DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
DocType: Employee Attendance Tool,Employees HTML,員工HTML
@@ -2005,7 +2007,7 @@
DocType: Course,Course Abbreviation,當然縮寫
DocType: Student Leave Application,Student Leave Application,學生請假申請
DocType: Item,Will also apply for variants,同時將申請變種
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},員工{0}上半天{1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,開啟
@@ -2181,7 +2183,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},量{0} {1}對{2} {3}
,Quotation Trends,報價趨勢
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
DocType: Shipping Rule,Shipping Amount,航運量
DocType: Supplier Scorecard Period,Period Score,期間得分
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,添加客戶
@@ -2192,7 +2194,7 @@
,Vehicle Expenses,車輛費用
DocType: Serial No,Invoice Details,發票明細
DocType: Grant Application,Show on Website,在網站上顯示
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},使用壽命後預期值必須大於或等於{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},使用壽命後預期值必須大於或等於{0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,開始
DocType: Hub Category,Hub Category,中心類別
DocType: Purchase Receipt,Vehicle Number,車號
@@ -2223,7 +2225,7 @@
DocType: Patient,B Positive,B積極
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,縮寫不能為空白或輸入空白鍵
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,縮寫不能為空白或輸入空白鍵
DocType: Patient Medical Record,Patient Medical Record,病人醫療記錄
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,集團以非組
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,體育
@@ -2268,6 +2270,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +913,Quotation,報價
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,無法將收到的詢價單設置為無報價
DocType: Salary Slip,Total Deduction,扣除總額
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,選擇一個賬戶以賬戶貨幣進行打印
,Production Analytics,生產Analytics（分析）
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,這是基於對這個病人的交易。有關詳情，請參閱下面的時間表
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,項{0}已被退回
@@ -2317,7 +2320,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,選擇公司...
DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0}是強制性的項目{1}
DocType: Currency Exchange,From Currency,從貨幣
DocType: Vital Signs,Weight (In Kilogram),體重（公斤）
DocType: Chapter,"chapters/chapter_name
@@ -2389,7 +2392,7 @@
DocType: Student,Guardians,守護者
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,價格將不會顯示如果沒有設置價格
DocType: Stock Entry,Total Incoming Value,總收入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,借方是必填項
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,借方是必填項
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",時間表幫助追踪的時間，費用和結算由你的團隊做activites
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,採購價格表
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供應商記分卡變數模板。
@@ -2483,7 +2486,7 @@
DocType: Company,For Reference Only.,僅供參考。
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},{1}醫生{0}不可用
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,選擇批號
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無效的{0}：{1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},無效的{0}：{1}
DocType: Fee Validity,Reference Inv,參考文獻
DocType: Sales Invoice Advance,Advance Amount,提前量
DocType: Manufacturing Settings,Capacity Planning,產能規劃
@@ -2514,8 +2517,8 @@
DocType: Fees,Send Payment Request,發送付款請求
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,這份文件是超過限制，通過{0} {1}項{4}。你在做另一個{3}對同一{2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,請設置保存後復發
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,選擇變化量賬戶
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,選擇變化量賬戶
DocType: Purchase Invoice,Price List Currency,價格表之貨幣
DocType: Naming Series,User must always select,用戶必須始終選擇
DocType: Stock Settings,Allow Negative Stock,允許負庫存
@@ -2565,7 +2568,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,警告新的採購訂單
DocType: Quality Inspection Reading,Reading 9,9閱讀
DocType: Supplier,Is Frozen,就是冰凍
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,組節點倉庫不允許選擇用於交易
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,組節點倉庫不允許選擇用於交易
DocType: Buying Settings,Buying Settings,採購設定
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM編號為成品產品
DocType: Upload Attendance,Attendance To Date,出席會議日期
@@ -2578,6 +2581,7 @@
DocType: Grant Application,Organization,組織
DocType: Grant Application,Organization,組織
DocType: SG Creation Tool Course,Student Group Name,學生組名稱
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,顯示爆炸視圖
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,創造費用
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
DocType: Room,Room Number,房間號
@@ -2589,7 +2593,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,使稅收模板
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用戶論壇
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
DocType: Lab Test Sample,Lab Test Sample,實驗室測試樣品
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,快速日記帳分錄
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
@@ -2652,7 +2656,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +794,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,製作發票
DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡，{0}不允許採購訂單。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡，{0}不允許採購訂單。
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,結束年份
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
@@ -2757,7 +2761,6 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,公用事業費用
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日記條目{1}沒有帳戶{2}或已經對另一憑證匹配
DocType: Supplier Scorecard Criteria,Criteria Weight,標準重量
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,供應商>供應商類型
DocType: Buying Settings,Default Buying Price List,預設採購價格表
DocType: Payroll Entry,Salary Slip Based on Timesheet,基於時間表工資單
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,購買率
@@ -2840,7 +2843,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,以行業類型追蹤訊息。
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,去信頭
DocType: Item Supplier,Item Supplier,產品供應商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
DocType: Company,Stock Settings,庫存設定
apps/erpnext/erpnext/accounts/doctype/account/account.py +183,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
@@ -3019,6 +3022,7 @@
DocType: Company,Default Inventory Account,默認庫存帳戶
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成數量必須大於零。
DocType: Antibiotic,Antibiotic Name,抗生素名稱
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,項目代碼>項目組>品牌
DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,選擇類型...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,與作物生長的所有土地單位的鏈接
@@ -3198,6 +3202,7 @@
DocType: Supplier,Credit Limit,信用額度
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,平均。出售價目表率
DocType: Production Plan Sales Order,Salse Order Date,Salse訂單日期
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,供應商>供應商類型
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,付款項{0}是聯合國聯
DocType: GL Entry,Voucher No,憑證編號
,Lead Owner Efficiency,主導效率
@@ -3206,7 +3211,7 @@
DocType: Leave Allocation,Leave Allocation,排假
DocType: Payment Request,Recipient Message And Payment Details,收件人郵件和付款細節
DocType: Training Event,Trainer Email,教練電子郵件
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,{0}物料需求已建立
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,{0}物料需求已建立
DocType: Restaurant Reservation,No of People,沒有人
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,模板條款或合同。
DocType: Purchase Invoice,Address and Contact,地址和聯絡方式
@@ -3265,7 +3270,7 @@
DocType: Production Planning Tool,Create Material Requests,建立物料需求
DocType: Employee Education,School/University,學校/大學
DocType: Payment Request,Reference Details,詳細參考訊息
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用壽命結束後必須小於總消費金額
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用壽命結束後必須小於總消費金額
DocType: Sales Invoice Item,Available Qty at Warehouse,有貨數量在倉庫
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,帳單金額
DocType: Asset,Double Declining Balance,雙倍餘額遞減
@@ -3276,7 +3281,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,從每個屬性中至少選擇一個值。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
apps/erpnext/erpnext/config/hr.py +310,Leave Management,離開管理
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,以帳戶分群組
DocType: Lead,Lower Income,較低的收入
@@ -3286,14 +3291,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,轉到程序
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}＃分配的金額{1}不能大於無人認領的金額{2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,請通過設置>編號系列設置考勤編號系列
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,生產訂單未創建
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
DocType: Asset,Fully Depreciated,已提足折舊
,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
DocType: Employee Attendance Tool,Marked Attendance HTML,顯著的考勤HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",語錄是建議，你已經發送到你的客戶提高出價
DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
@@ -3369,7 +3373,7 @@
DocType: Stock Settings,Item Naming By,產品命名規則
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},另一個期末錄入{0}作出後{1}
DocType: Production Order,Material Transferred for Manufacturing,物料轉倉用於製造
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,帳戶{0}不存在
DocType: Project,Project Type,專案類型
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,子任務存在這個任務。你不能刪除這個任務。
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
@@ -3466,10 +3470,10 @@
DocType: Company,Asset Depreciation Cost Center,資產折舊成本中心
DocType: Sales Order Item,Sales Order Date,銷售訂單日期
DocType: Sales Invoice Item,Delivered Qty,交付數量
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,總計稅
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",如果選中，各個生產項目的所有孩子將被列入材料請求。
DocType: Assessment Plan,Assessment Plan,評估計劃
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,客戶{0}已創建。
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,請在教育>教育設置中設置教師命名系統
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前任何倉庫沒有庫存
,Payment Period Based On Invoice Date,基於發票日的付款期
DocType: Sample Collection,No. of print,打印數量
@@ -3484,7 +3488,7 @@
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客戶
DocType: Appraisal Goal,Weightage (%),權重（％）
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,評估報告
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,總消費金額是強制性
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,總消費金額是強制性
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,黨是強制性
DocType: Journal Entry,JV-,將N-
apps/erpnext/erpnext/controllers/accounts_controller.py +707,Rows with duplicate due dates in other rows were found: {list},在其他行中找到具有重複到期日的行：{list}
@@ -3513,7 +3517,6 @@
DocType: Account,Accumulated Depreciation,累計折舊
DocType: Supplier Scorecard Scoring Standing,Standing Name,常務名稱
DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細訊息
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),期末餘額（Dr - Cr）
DocType: Lead,Lead Owner,主導擁有者
DocType: Bin,Requested Quantity,要求的數量
DocType: Patient,Marital Status,婚姻狀況
@@ -3525,7 +3528,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,多種變體
DocType: Sales Invoice,Against Income Account,對收入帳戶
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,請以其他用戶身份登錄。
DocType: Territory,Territory Targets,境內目標
@@ -3621,7 +3624,7 @@
DocType: Serial No,Out of AMC,出資產管理公司
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,使維護訪問
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
DocType: Company,Default Cash Account,預設的現金帳戶
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,這是基於這名學生出席
@@ -3768,7 +3771,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,沒有僱員提到的標準
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
DocType: Restaurant,Default Customer,默認客戶
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,請在人力資源>人力資源設置中設置員工命名系統
DocType: Assessment Plan,Supervisor Name,主管名稱
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要確認是否在同一天創建約會
DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
@@ -3881,7 +3883,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Expense account is mandatory for item {0},交際費是強制性的項目{0}
DocType: BOM,Website Description,網站簡介
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在淨資產收益變化
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子郵件地址必須是唯一的，已經存在了{0}
DocType: Serial No,AMC Expiry Date,AMC到期時間
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,收據
@@ -3898,7 +3900,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,現金流量表
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,執照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉，如果你還需要包括上一會計年度的資產負債葉本財年
DocType: GL Entry,Against Voucher Type,對憑證類型
DocType: Physician,Phone (R),電話（R）
@@ -3910,7 +3912,7 @@
DocType: Patient,B Negative,B負面
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,維護狀態必須取消或完成提交
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
DocType: Student,Guardian Details,衛詳細
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,馬克出席了多個員工
DocType: Agriculture Task,Start Day,開始日
@@ -3950,7 +3952,7 @@
DocType: Opening Invoice Creation Tool,Sales,銷售
DocType: Stock Entry Detail,Basic Amount,基本金額
DocType: Training Event,Exam,考試
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
DocType: Patient,Alcohol Past Use,酒精過去使用
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +188,Cr,鉻
DocType: Tax Rule,Billing State,計費狀態
@@ -4061,6 +4063,7 @@
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +66,Opening Value,開度值
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,序列號
DocType: Lab Test Template,Lab Test Template,實驗室測試模板
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,銷售帳戶
DocType: Purchase Invoice Item,Total Weight,總重量
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,銷售佣金
DocType: Offer Letter Term,Value / Description,值/說明
@@ -4206,7 +4209,7 @@
DocType: Customer,From Lead,從鉛
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,發布生產訂單。
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,所需的POS資料，使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,所需的POS資料，使POS進入
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準銷售
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +148,Atleast one warehouse is mandatory,至少要有一間倉庫
DocType: BOM Update Tool,Replace,更換
@@ -4274,7 +4277,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,生產項目
,Employee Information,僱員資料
DocType: Stock Entry Detail,Additional Cost,額外費用
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務，你需要角色
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務，你需要角色
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,讓供應商報價
DocType: Quality Inspection,Incoming,來
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,銷售和採購的默認稅收模板被創建。
@@ -4288,7 +4291,7 @@
DocType: Agriculture Task,End Day,結束的一天
,Delivery Note Trends,送貨單趨勢
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,本週的總結
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,庫存數量
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,庫存數量
DocType: Delivery Trip,Calculate Estimated Arrival Times,計算預計到達時間
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
DocType: Student Group Creation Tool,Get Courses,獲取課程
@@ -4303,7 +4306,7 @@
DocType: Material Request,% Ordered,% 已訂購
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",對於基於課程的學生小組，課程將從入學課程中的每個學生確認。
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,計件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,平均。買入價
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,平均。買入價
DocType: Task,Actual Time (in Hours),實際時間（小時）
DocType: Employee,History In Company,公司歷史
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},來自{sender}的新留言
@@ -4345,7 +4348,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的貨幣{1}應等於所選貨幣{2}
DocType: Journal Entry Account,Exchange Rate,匯率
DocType: Patient,Additional information regarding the patient,有關患者的其他信息
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,銷售訂單{0}未提交
DocType: Homepage,Tag Line,標語
DocType: Fee Component,Fee Component,收費組件
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,車隊的管理
@@ -4538,7 +4541,7 @@
DocType: Employee Education,Employee Education,員工教育
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在項目組表中找到重複的項目組
DocType: Land Unit,Parent Land Unit,家長土地單位
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,需要獲取項目細節。
DocType: Fertilizer,Fertilizer Name,肥料名稱
DocType: Salary Slip,Net Pay,淨收費
DocType: Account,Account,帳戶
@@ -4608,7 +4611,7 @@
DocType: Item Customer Detail,Ref Code,參考代碼
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS Profile中需要客戶組
apps/erpnext/erpnext/config/hr.py +12,Employee records.,員工記錄。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,請設置下折舊日期
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,請設置下折舊日期
DocType: HR Settings,Payroll Settings,薪資設置
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
DocType: POS Settings,POS Settings,POS設置
@@ -4763,7 +4766,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},生日提醒{0}
DocType: Asset Maintenance Task,Last Completion Date,最後完成日期
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,庫存資產
@@ -4882,6 +4885,7 @@
DocType: Bank Reconciliation,Get Payment Entries,獲取付款項
DocType: Quotation Item,Against Docname,對Docname
DocType: SMS Center,All Employee (Active),所有員工（活動）
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客戶>客戶組>地區
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
DocType: Item Reorder,Re-Order Level,重新排序級別
DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
@@ -4971,7 +4975,6 @@
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +66,Please select the Company,請選擇公司
DocType: Room,Seating Capacity,座位數
DocType: Lab Test Groups,Lab Test Groups,實驗室測試組
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客戶>客戶組>地區
DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）
DocType: GST Settings,GST Summary,消費稅總結
DocType: Assessment Result,Total Score,總得分
@@ -4984,7 +4987,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,按照課程時間表創建
DocType: Journal Entry,Total Debit,借方總額
DocType: Manufacturing Settings,Default Finished Goods Warehouse,預設成品倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,銷售人員
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,銷售人員
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,預算和成本中心
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,不允許多種默認付款方式
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,為了
@@ -5142,7 +5145,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考慮稅收或收費
DocType: Driver,Driving License Category,駕駛執照類別
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡，而採購訂單應謹慎提供給供應商。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡，而採購訂單應謹慎提供給供應商。
DocType: Asset Maintenance Team,Asset Maintenance Team,資產維護團隊
DocType: Employee Loan,Loan Type,貸款類型
DocType: Scheduling Tool,Scheduling Tool,調度工具
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index f7af294..c8ac72d 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -88,7 +88,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,按价格排序
,Delay Days,延迟天数
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +886,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Invoice,发票
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,保留股票入场
DocType: Purchase Invoice Item,Item Weight Details,项目重量细节
@@ -139,7 +139,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，商品编号：{1}和顾客：{2}
apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,千克
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,开放的工作。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +104,BOM is not specified for subcontracting item {0} at row {1},没有为行{1}的转包商品{0}指定BOM
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +110,BOM is not specified for subcontracting item {0} at row {1},没有为行{1}的转包商品{0}指定BOM
apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0}结果提交
DocType: Item Attribute,Increment,增量
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,时间跨度
@@ -150,7 +150,7 @@
apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},不允许{0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,从获取物料
DocType: Price List,Price Not UOM Dependant,价格不依赖于UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +454,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,没有列出项目
DocType: Asset Repair,Error Description,错误说明
@@ -158,7 +158,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,杂货
DocType: Quality Inspection Reading,Reading 1,阅读1
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,养老基金
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +91,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
DocType: Crop,Perennial,多年生
DocType: Consultation,Consultation Date,咨询日期
apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,ERPNext用户的产品列表和发现
@@ -173,7 +173,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",如“小学”或“大学”
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,库存报告
DocType: Warehouse,Warehouse Detail,仓库详细信息
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +193,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,该期限结束日期不能晚于学年年终日期到这个词联系在一起（学年{}）。请更正日期，然后再试一次。
apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
DocType: Delivery Trip,Departure Time,出发时间
@@ -193,7 +193,7 @@
DocType: Quality Inspection,Get Specification Details,获取详细规格
apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,供应商榜单。
DocType: Lead,Interested,有兴趣
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +226,Opening,开盘
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +191,Opening,开盘
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +30,From {0} to {1},从{0}至 {1}
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,无法设置税收
DocType: Item,Copy From Item Group,从品目组复制
@@ -365,7 +365,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,每年叶
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
-apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
+apps/erpnext/erpnext/stock/utils.py +216,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
DocType: Email Digest,Profit & Loss,利润损失
apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,升
DocType: Task,Total Costing Amount (via Time Sheet),总成本计算量（通过时间表）
@@ -457,6 +457,7 @@
apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,这是基于对本公司的交易。有关详情，请参阅下面的时间表
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,耐
+apps/erpnext/erpnext/config/desktop.py +309,Consultationt,Consultationt
DocType: Journal Entry,Multi Currency,多币种
DocType: Opening Invoice Creation Tool,Invoice Type,发票类型
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,送货单
@@ -532,7 +533,6 @@
DocType: Employee,Widowed,丧偶
DocType: Request for Quotation,Request for Quotation,询价
DocType: Healthcare Settings,Require Lab Test Approval,需要实验室测试批准
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,项目代码>项目组>品牌
DocType: Salary Slip Timesheet,Working Hours,工作时间
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,总计杰出
DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
@@ -561,7 +561,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,请输入成本中心
DocType: Drug Prescription,Dosage,剂量
DocType: Journal Entry Account,Sales Order,销售订单
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Selling Rate,平均卖出价
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均卖出价
DocType: Assessment Plan,Examiner Name,考官名称
DocType: Lab Test Template,No Result,没有结果
DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
@@ -611,6 +611,7 @@
DocType: Payroll Entry,Select Payroll Period,选择工资期
DocType: Purchase Invoice,Unpaid,未付
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,保留出售
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,请在人力资源>人力资源设置中设置员工命名系统
DocType: Packing Slip,From Package No.,起始包号
DocType: Item Attribute,To Range,为了范围
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,证券及存款
@@ -635,11 +636,11 @@
DocType: Training Event,Workshop,作坊
DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告采购订单
apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,足够的配件组装
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足够的配件组装
DocType: POS Profile User,POS Profile User,POS配置文件用户
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接收益
DocType: Patient Appointment,Date TIme,约会时间
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +41,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,行政主任
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,建立公司和税收
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,请选择课程
@@ -650,7 +651,7 @@
DocType: Stock Entry Detail,Difference Account,差异科目
DocType: Purchase Invoice,Supplier GSTIN,供应商GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,请重新拉。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,请重新拉。
DocType: Production Order,Additional Operating Cost,额外的运营成本
DocType: Lab Test Template,Lab Routine,实验室常规
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化妆品
@@ -820,7 +821,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,与关系Guardian2
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,经理
DocType: Payment Entry,Payment From / To,支付自/至
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于该客户未付总额。信用额度至少应该是 {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于该客户未付总额。信用额度至少应该是 {0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +428,Please set account in Warehouse {0},请在仓库{0}中设置帐户
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
DocType: Sales Person,Sales Person Targets,销售人员目标
@@ -831,7 +832,7 @@
DocType: Student Batch Name,Batch Name,批名
DocType: Fee Validity,Max number of visit,最大访问次数
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +913,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,注册
DocType: GST Settings,GST Settings,GST设置
DocType: Selling Settings,Customer Naming By,客户命名方式
@@ -958,7 +959,7 @@
DocType: Budget,Budget Against,预算对象
DocType: Employee,Cell Number,手机号码
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,给定的标准没有雇员。检查工资单还没有被创建。
-apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,已自动生成材料需求
+apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,已自动生成材料需求
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,预留制造
@@ -966,7 +967,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,能源
DocType: Opportunity,Opportunity From,从机会
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月度工资结算
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}项目{2}所需的序列号。你已经提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}项目{2}所需的序列号。你已经提供{3}。
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,请选择一张桌子
DocType: BOM,Website Specifications,网站规格
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0}是“收件人”中的无效电子邮件地址
@@ -1046,7 +1047,7 @@
apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,引用要求
DocType: Vital Signs,Heart Rate / Pulse,心率/脉搏
DocType: Company,Default Bank Account,默认银行账户
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",如果基于往来单位过滤，请先选择往来单位类型
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"To filter based on Party, select Party Type first",如果基于往来单位过滤，请先选择往来单位类型
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
DocType: Vehicle,Acquisition Date,采集日期
apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Nos
@@ -1071,7 +1072,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),上传你的信头（保持网页友好，900px乘100px）
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帐户{2}不能是一个组
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +284,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
DocType: Item Variant Settings,Copy Fields to Variant,将字段复制到变式
DocType: Asset,Opening Accumulated Depreciation,打开累计折旧
@@ -1183,9 +1184,10 @@
DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM{0}必须处于激活状态
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +228,Closing (Opening + Total),闭幕（开幕+总计）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +193,Closing (Opening + Total),闭幕（开幕+总计）
DocType: Journal Entry,Depreciation Entry,折旧分录
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,请选择文档类型第一
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +111,Print in Account Currency,以账户货币打印
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
DocType: Crop Cycle,ISO 8016 standard,ISO 8016标准
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
@@ -1211,7 +1213,7 @@
DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
DocType: Fee Structure,Components,组件
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},请输入项目资产类别{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +276,Please enter Asset Category in Item {0},请输入项目资产类别{0}
apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,项目变体{0}已更新
DocType: Quality Inspection Reading,Reading 6,阅读6
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
@@ -1263,6 +1265,7 @@
,Company Name,公司名称
DocType: SMS Center,Total Message(s),总信息（s ）
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +917,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,请通过设置>设置>命名系列为{0}设置命名系列
DocType: Purchase Invoice,Additional Discount Percentage,额外折扣百分比
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助视频清单
DocType: Agriculture Analysis Criteria,Soil Texture,土壤纹理
@@ -1291,7 +1294,7 @@
DocType: BOM Website Item,BOM Website Item,BOM网站项目
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
DocType: Timesheet Detail,Bill,账单
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,白
DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：数量不适用于{4}在仓库{1}在发布条目的时间（{2} {3}）
@@ -1307,7 +1310,7 @@
DocType: Lead,Next Contact Date,下次联络日期
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,开放数量
DocType: Healthcare Settings,Appointment Reminder,预约提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,对于涨跌额请输入帐号
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please enter Account for Change Amount,对于涨跌额请输入帐号
DocType: Program Enrollment Tool Student,Student Batch Name,学生批名
DocType: Consultation,Doctor,医生
DocType: Holiday List,Holiday List Name,假期列表名称
@@ -1323,6 +1326,7 @@
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,假期调配工具
DocType: Item,Hub Category to Publish,集线器类别发布
DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,请通过设置>编号系列设置考勤编号系列
DocType: Sales Invoice,Billing Address GSTIN,帐单地址GSTIN
DocType: Assessment Plan,Evaluate,评估
DocType: Workstation,Net Hour Rate,净小时价格
@@ -1357,7 +1361,7 @@
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,销售发票付款
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,销售金额
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,销售金额
DocType: Repayment Schedule,Interest Amount,利息总额
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人，请更新‘状态’字段并保存。
DocType: Serial No,Creation Document No,创建文档编号
@@ -1450,7 +1454,7 @@
apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,打开会计平衡
,GST Sales Register,消费税销售登记册
DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,没有申请内容
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,没有申请内容
apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,选择您的域名
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一个预算记录“{0}”已存在对{1}“{2}”为年度{3}
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,字段将仅在创建时复制。
@@ -1460,11 +1464,11 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到变异的项目代码。例如，如果你的英文缩写为“SM”，而该项目的代码是“T-SHIRT”，该变种的项目代码将是“T-SHIRT-SM”
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
DocType: Purchase Invoice,Is Return,再来
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Caution,警告
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,Caution,警告
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,退货/借记单
DocType: Price List Country,Price List Country,价目表国家
DocType: Item,UOMs,计量单位
-apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
+apps/erpnext/erpnext/stock/utils.py +209,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,项目编号不能因序列号改变
DocType: Purchase Invoice Item,UOM Conversion Factor,计量单位换算系数
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,请输入产品代码来获得批号
@@ -1570,7 +1574,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,销售订单{0}无效
DocType: Supplier Scorecard,Warn for new Request for Quotations,警告新的报价请求
apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
-apps/erpnext/erpnext/setup/doctype/company/company.py +222,"Sorry, companies cannot be merged",抱歉，公司不能合并
+apps/erpnext/erpnext/setup/doctype/company/company.py +228,"Sorry, companies cannot be merged",抱歉，公司不能合并
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,实验室测试处方
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
@@ -1608,7 +1612,6 @@
DocType: Warehouse,Warehouse Contact Info,仓库联系方式
DocType: Payment Entry,Write Off Difference Amount,核销金额差异
DocType: Volunteer,Volunteer Name,志愿者姓名
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,请在教育>教育设置中设置教师命名系统
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},运费规则不适用于国家/地区{0}
DocType: Item,Foreign Trade Details,外贸详细
@@ -1621,7 +1624,7 @@
DocType: Student Group Student,Group Roll Number,组卷编号
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Delivery Note {0} is not submitted,送货单{0}未提交
apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,资本设备
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
@@ -1646,7 +1649,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,儿童仓库存在这个仓库。您不能删除这个仓库。
DocType: Item,Website Item Groups,网站物件组
DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
-apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,序列号{0}已多次输入
+apps/erpnext/erpnext/stock/utils.py +204,Serial number {0} entered more than once,序列号{0}已多次输入
DocType: Journal Entry,Journal Entry,日记帐分录
DocType: Expense Claim Advance,Unclaimed amount,无人认领的金额
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0}处理项
@@ -1743,7 +1746,7 @@
apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +193,"Request for Quotation is disabled to access from portal, for more check portal settings.",询价被禁止访问门脉，为更多的检查门户设置。
DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,供应商记分卡评分变量
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,采购数量
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,采购数量
DocType: Sales Invoice,Shipping Address Name,送货地址姓名
DocType: Material Request,Terms and Conditions Content,条款和条件内容
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,创建课程表时出现错误
@@ -2007,7 +2010,7 @@
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,这是基于对本车辆的日志。详情请参阅以下时间表
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
DocType: Customer,Default Price List,默认价格表
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,资产运动记录{0}创建
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +269,Asset Movement record {0} created,资产运动记录{0}创建
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}被设置为默认的全局设置
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,已存在同名客户
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,这将提交工资单，并创建权责发生制日记账分录。你想继续吗？
@@ -2021,6 +2024,7 @@
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,价钱
DocType: Quotation,Term Details,条款详情
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,不能注册超过{0}学生该学生群体更多。
+apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),总计（不含税）
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,铅计数
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,铅计数
apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必须大于0
@@ -2041,7 +2045,6 @@
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消发票时去掉关联的付款
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},进入当前的里程表读数应该比最初的车辆里程表更大的{0}
DocType: Restaurant Reservation,No Show,没有出现
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup > Settings > Naming Series,请通过设置>设置>命名系列为{0}设置命名系列
DocType: Shipping Rule Country,Shipping Rule Country,航运规则国家
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,离开和考勤
DocType: Maintenance Visit,Partially Completed,部分完成
@@ -2133,7 +2136,7 @@
DocType: Student Group Instructor,Student Group Instructor,学生组教练
DocType: Grant Application,Assessment Mark (Out of 10),评估标记（满分10分）
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手机号码
-apps/erpnext/erpnext/setup/doctype/company/company.py +201,Main,主
+apps/erpnext/erpnext/setup/doctype/company/company.py +207,Main,主
apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,变体
DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
DocType: Employee Attendance Tool,Employees HTML,HTML员工
@@ -2183,7 +2186,7 @@
DocType: Course,Course Abbreviation,当然缩写
DocType: Student Leave Application,Student Leave Application,学生请假申请
DocType: Item,Will also apply for variants,会同时应用于变体
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +164,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},员工{0}上半天{1}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
apps/erpnext/erpnext/templates/pages/task_info.html +90,On,于
@@ -2371,9 +2374,10 @@
DocType: Task,Actual End Date (via Time Sheet),实际结束日期（通过时间表）
DocType: Soil Texture,Soil Type,土壤类型
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +318,New Message,新消息
,Quotation Trends,报价趋势
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Receivable account,入借帐户必须是应收账科目
DocType: Shipping Rule,Shipping Amount,发货数量
DocType: Supplier Scorecard Period,Period Score,期间得分
apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,添加客户
@@ -2384,7 +2388,7 @@
,Vehicle Expenses,车辆费用
DocType: Serial No,Invoice Details,发票明细
DocType: Grant Application,Show on Website,在网站上显示
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +159,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,开始
DocType: Hub Category,Hub Category,中心类别
DocType: Purchase Invoice,SEZ,SEZ
@@ -2416,7 +2420,7 @@
DocType: Patient,B Positive,B积极
apps/erpnext/erpnext/controllers/accounts_controller.py +595,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：订购数量必须是1，因为项目是固定资产。请使用单独的行多数量。
DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +302,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +310,Abbr can not be blank or space,缩写不能为空或空格
DocType: Patient Medical Record,Patient Medical Record,病人医疗记录
apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,集团以非组
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,体育
@@ -2467,6 +2471,7 @@
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,无法将收到的询价单设置为无报价
DocType: Quotation,QTN-,QTN-
DocType: Salary Slip,Total Deduction,扣除总额
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +15,Select an account to print in account currency,选择一个账户以账户货币进行打印
,Production Analytics,生产Analytics（分析）
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,这是基于对这个病人的交易。有关详情，请参阅下面的时间表
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,成本更新
@@ -2522,7 +2527,7 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,选择公司...
DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0}是{1}的必填项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,{0} is mandatory for Item {1},{0}是{1}的必填项
DocType: Payroll Entry,Fortnightly,半月刊
DocType: Currency Exchange,From Currency,源货币
DocType: Vital Signs,Weight (In Kilogram),体重（公斤）
@@ -2600,7 +2605,7 @@
DocType: Student,Guardians,守护者
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
DocType: Stock Entry,Total Incoming Value,总传入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +349,Debit To is required,借记是必需的
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供应商记分卡变数模板。
@@ -2703,7 +2708,7 @@
DocType: Company,For Reference Only.,仅供参考。
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},{1}医生{0}不可用
apps/erpnext/erpnext/accounts/page/pos/pos.js +2539,Select Batch No,选择批号
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},无效的{0}：{1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,Invalid {0}: {1},无效的{0}：{1}
,GSTR-1,GSTR-1
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Fee Validity,Reference Inv,参考文献
@@ -2740,8 +2745,8 @@
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
DocType: Water Analysis,Origin,起源
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件是超过限制，通过{0} {1}项{4}。你在做另一个{3}对同一{2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1139,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,选择变化量账户
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1142,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +756,Select change amount account,选择变化量账户
DocType: Purchase Invoice,Price List Currency,价格表货币
DocType: Naming Series,User must always select,用户必须始终选择
DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -2797,7 +2802,7 @@
DocType: Supplier Scorecard,Warn for new Purchase Orders,警告新的采购订单
DocType: Quality Inspection Reading,Reading 9,阅读9
DocType: Supplier,Is Frozen,被冻结
-apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,组节点仓库不允许选择用于交易
+apps/erpnext/erpnext/stock/utils.py +221,Group node warehouse is not allowed to select for transactions,组节点仓库不允许选择用于交易
DocType: Buying Settings,Buying Settings,采购设置
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,成品品目的BOM编号
DocType: Upload Attendance,Attendance To Date,考勤结束日期
@@ -2811,6 +2816,7 @@
DocType: Grant Application,Organization,组织
DocType: BOM Update Tool,BOM Update Tool,BOM更新工具
DocType: SG Creation Tool Course,Student Group Name,学生组名称
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js +17,Show exploded view,显示爆炸视图
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,创造费用
apps/erpnext/erpnext/setup/doctype/company/company.js +91,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
DocType: Room,Room Number,房间号
@@ -2821,7 +2827,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +35,Make Tax Template,使税收模板
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含由供应商交货（直接发运）项目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含由供应商交货（直接发运）项目。
DocType: Lab Test Sample,Lab Test Sample,实验室测试样品
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,快速日记帐分录
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
@@ -2892,7 +2898,7 @@
DocType: Membership,USD,美元
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,创建发票
DocType: Selling Settings,Auto close Opportunity after 15 days,15天之后自动关闭商机
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由于{1}的记分卡，{0}不允许采购订单。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由于{1}的记分卡，{0}不允许采购订单。
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,结束年份
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
@@ -2997,7 +3003,6 @@
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日记条目{1}没有帐户{2}或已经对另一凭证匹配
DocType: Supplier Scorecard Criteria,Criteria Weight,标准重量
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,供应商>供应商类型
DocType: Buying Settings,Default Buying Price List,默认采购价格表
DocType: Payroll Entry,Salary Slip Based on Timesheet,基于时间表工资单
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +43,Buying Rate,购买率
@@ -3087,7 +3092,7 @@
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,轨道信息通过行业类型。
apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,去信头
DocType: Item Supplier,Item Supplier,项目供应商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1240,Please enter Item Code to get batch no,请输入产品编号，以获得批号
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1243,Please enter Item Code to get batch no,请输入产品编号，以获得批号
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
DocType: Company,Stock Settings,库存设置
@@ -3265,6 +3270,7 @@
DocType: Company,Default Inventory Account,默认存货科目
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成数量必须大于零。
DocType: Antibiotic,Antibiotic Name,抗生素名称
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,项目代码>项目组>品牌
DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,选择类型...
DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,与作物生长的所有土地单位的链接
@@ -3460,6 +3466,7 @@
DocType: Supplier,Credit Limit,信用额度
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,平均。出售价目表率
DocType: Production Plan Sales Order,Salse Order Date,Salse订单日期
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,供应商>供应商类型
DocType: Salary Component,Salary Component,薪金部分
apps/erpnext/erpnext/accounts/utils.py +495,Payment Entries {0} are un-linked,付款记录{0}没有关联
DocType: GL Entry,Voucher No,凭证编号
@@ -3469,7 +3476,7 @@
DocType: Leave Allocation,Leave Allocation,假期调配
DocType: Payment Request,Recipient Message And Payment Details,收件人邮件和付款细节
DocType: Training Event,Trainer Email,讲师电子邮件
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Material Requests {0} created,物料申请{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Material Requests {0} created,物料申请{0}已创建
DocType: Restaurant Reservation,No of People,没有人
DocType: Production Planning Tool,Include sub-contracted raw materials,包括分包原料
apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,条款或合同模板。
@@ -3533,7 +3540,7 @@
DocType: Production Planning Tool,Create Material Requests,创建物料需要
DocType: Employee Education,School/University,学校/大学
DocType: Payment Request,Reference Details,详细参考信息
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用寿命结束后必须小于总消费金额
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +56,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用寿命结束后必须小于总消费金额
DocType: Sales Invoice Item,Available Qty at Warehouse,库存可用数量
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,已开票金额
DocType: Asset,Double Declining Balance,双倍余额递减
@@ -3545,7 +3552,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帐户{2}不属于公司{3}
apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,从每个属性中至少选择一个值。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +162,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
apps/erpnext/erpnext/config/hr.py +310,Leave Management,离开管理
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,基于账户分组
DocType: Sales Order,Fully Delivered,完全交付
@@ -3556,14 +3563,13 @@
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,转到程序
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}＃分配的金额{1}不能大于无人认领的金额{2}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,请通过设置>编号系列设置考勤编号系列
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},所需物品的采购订单号{0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,生产订单未创建
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
DocType: Asset,Fully Depreciated,已提足折旧
,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +431,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
DocType: Sales Order,Customer's Purchase Order,客户采购订单
@@ -3648,7 +3654,7 @@
DocType: Stock Settings,Item Naming By,项目命名方式
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
DocType: Production Order,Material Transferred for Manufacturing,材料移送制造
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,科目{0}不存在
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +37,Account {0} does not exists,科目{0}不存在
DocType: Project,Project Type,项目类型
apps/erpnext/erpnext/projects/doctype/task/task.py +142,Child Task exists for this Task. You can not delete this Task.,子任务存在这个任务。你不能删除这个任务。
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
@@ -3752,11 +3758,11 @@
DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
DocType: Sales Order Item,Sales Order Date,销售订单日期
DocType: Sales Invoice Item,Delivered Qty,已交付数量
-apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total Excl. Tax,总计税
DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",如果选中，各个生产项目的所有孩子将被列入材料请求。
DocType: Assessment Plan,Assessment Plan,评估计划
apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,客户{0}已创建。
DocType: Stock Settings,Limit Percent,限制百分比
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,请在教育>教育设置中设置教师命名系统
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前没有任何仓库可用的库存
,Payment Period Based On Invoice Date,已经提交。
DocType: Sample Collection,No. of print,打印数量
@@ -3772,12 +3778,12 @@
apps/erpnext/erpnext/shopping_cart/cart.py +375,Debtors ({0}),债务人（{0}）
DocType: Pricing Rule,Margin,利润
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客户
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,毛利％
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,毛利％
DocType: Appraisal Goal,Weightage (%),权重（％）
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +496,Change POS Profile,更改POS配置文件
DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,评估报告
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,总消费金额是强制性
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Gross Purchase Amount is mandatory,总消费金额是强制性
DocType: Lead,Address Desc,地址倒序
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,请输入往来单位
DocType: Journal Entry,JV-,将N-
@@ -3809,7 +3815,6 @@
DocType: Supplier Scorecard Scoring Standing,Standing Name,常务名称
DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
DocType: Employee Loan Application,Required by Date,按日期必填
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +229,Closing Balance (Dr - Cr),期末余额（Dr - Cr）
DocType: Lead,Lead Owner,线索所有者
DocType: Bin,Requested Quantity,要求的数量
DocType: Patient,Marital Status,婚姻状况
@@ -3823,7 +3828,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,多种变体
DocType: Sales Invoice,Against Income Account,对收益账目
apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}％交付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +97,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,请以其他用户身份登录。
DocType: Territory,Territory Targets,区域目标
@@ -3924,7 +3929,7 @@
DocType: Serial No,Out of AMC,出资产管理公司
apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,创建维护访问
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +199,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
DocType: Company,Default Cash Account,默认现金账户
apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,这是基于这名学生出席
@@ -4076,7 +4081,6 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,没有雇员提到的标准
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
DocType: Restaurant,Default Customer,默认客户
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,请在人力资源>人力资源设置中设置员工命名系统
DocType: Assessment Plan,Supervisor Name,主管名称
DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要确认是否在同一天创建约会
DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
@@ -4199,7 +4203,7 @@
DocType: BOM,Website Description,网站简介
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在净资产收益变化
apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,最新
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +167,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
DocType: Serial No,AMC Expiry Date,AMC到期时间
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +869,Receipt,收据
@@ -4216,7 +4220,7 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,现金流量表
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +478,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
DocType: GL Entry,Against Voucher Type,对凭证类型
DocType: Physician,Phone (R),电话（R）
@@ -4228,7 +4232,7 @@
DocType: Patient,B Negative,B负面
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,维护状态必须取消或完成提交
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +871,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
DocType: Student,Guardian Details,卫详细
DocType: C-Form,C-Form,C-表
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,马克出席了多个员工
@@ -4270,7 +4274,7 @@
DocType: Stock Entry Detail,Basic Amount,基本金额
DocType: Training Event,Exam,考试
DocType: Complaint,Complaint,抱怨
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Warehouse required for stock Item {0},物件{0}需要指定仓库
DocType: Leave Allocation,Unused leaves,未使用的休假
DocType: Patient,Alcohol Past Use,酒精过去使用
DocType: Fertilizer Content,Fertilizer Content,肥料含量
@@ -4398,6 +4402,7 @@
DocType: Salary Detail,Formula,式
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,序列号
DocType: Lab Test Template,Lab Test Template,实验室测试模板
+apps/erpnext/erpnext/setup/doctype/company/company.py +170,Sales Account,销售帐户
DocType: Purchase Invoice Item,Total Weight,总重量
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,销售佣金
DocType: Offer Letter Term,Value / Description,值/说明
@@ -4555,7 +4560,7 @@
DocType: Customer,From Lead,来自潜在客户
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +554,POS Profile required to make POS Entry,需要POS资料，使POS进入
DocType: Program Enrollment Tool,Enroll Students,招生
DocType: Lab Test,Approved Date,批准日期
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,标准销售
@@ -4632,7 +4637,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,生产项目
,Employee Information,雇员资料
DocType: Stock Entry Detail,Additional Cost,额外费用
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +44,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,创建供应商报价
DocType: Quality Inspection,Incoming,接收
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Default tax templates for sales and purchase are created.,销售和采购的默认税收模板被创建。
@@ -4649,7 +4654,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},注： {0}
,Delivery Note Trends,送货单趋势
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,本周的总结
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,库存量
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,库存量
DocType: Delivery Trip,Calculate Estimated Arrival Times,计算预计到达时间
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,科目{0}只能通过库存处理更新
DocType: Student Group Creation Tool,Get Courses,获取课程
@@ -4665,7 +4670,7 @@
DocType: Material Request,% Ordered,% 已排序
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",对于基于课程的学生组，课程将从入学课程中的每个学生确认。
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,计件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,平均买入价
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,平均买入价
DocType: Task,Actual Time (in Hours),实际时间（小时）
DocType: Employee,History In Company,公司内历史
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +311,New Message from {sender},来自{sender}的新留言
@@ -4713,7 +4718,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的货币{1}应等于所选货币{2}
DocType: Journal Entry Account,Exchange Rate,汇率
DocType: Patient,Additional information regarding the patient,有关患者的其他信息
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,Sales Order {0} is not submitted,销售订单{0}未提交
DocType: Homepage,Tag Line,标语
DocType: Fee Component,Fee Component,收费组件
apps/erpnext/erpnext/config/hr.py +204,Fleet Management,车队的管理
@@ -4928,7 +4933,7 @@
DocType: Employee Education,Employee Education,雇员教育
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在项目组表中找到重复的项目组
DocType: Land Unit,Parent Land Unit,家长土地单位
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1098,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1101,It is needed to fetch Item Details.,这是需要获取项目详细信息。
DocType: Fertilizer,Fertilizer Name,肥料名称
DocType: Salary Slip,Net Pay,净支付金额
DocType: Account,Account,账户
@@ -5007,7 +5012,7 @@
DocType: Item Customer Detail,Ref Code,参考代码
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS Profile中需要客户组
apps/erpnext/erpnext/config/hr.py +12,Employee records.,雇员记录。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,请设置下折旧日期
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +95,Please set Next Depreciation Date,请设置下折旧日期
DocType: HR Settings,Payroll Settings,薪资设置
apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
DocType: POS Settings,POS Settings,POS设置
@@ -5175,7 +5180,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},{0}的生日提醒
DocType: Asset Maintenance Task,Last Completion Date,最后完成日期
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
DocType: Buying Settings,Naming Series,命名系列
DocType: Leave Block List,Leave Block List Name,禁离日列表名称
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保险开始日期应小于保险终止日期
@@ -5306,6 +5311,7 @@
DocType: Bank Reconciliation,Get Payment Entries,获取付款项
DocType: Quotation Item,Against Docname,对文档名称
DocType: SMS Center,All Employee (Active),所有员工（活动）
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客户>客户组>地区
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即查看
DocType: BOM,Raw Material Cost,原材料成本
DocType: Item Reorder,Re-Order Level,再次订货级别
@@ -5406,7 +5412,6 @@
DocType: Room,Seating Capacity,座位数
DocType: Issue,ISS-,ISS-
DocType: Lab Test Groups,Lab Test Groups,实验室测试组
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客户>客户组>地区
DocType: Project,Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）
DocType: GST Settings,GST Summary,消费税总结
DocType: Assessment Result,Total Score,总得分
@@ -5420,7 +5425,7 @@
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,按照课程时间表创建
DocType: Journal Entry,Total Debit,总借方金额
DocType: Manufacturing Settings,Default Finished Goods Warehouse,默认成品仓库
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,销售人员
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,销售人员
apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,预算和成本中心
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,不允许多种默认付款方式
apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,为了
@@ -5596,7 +5601,7 @@
DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考虑税收或收费
DocType: Driver,Driving License Category,驾驶执照类别
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,实际数量是必须项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，而采购订单应谨慎提供给供应商。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +88,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，而采购订单应谨慎提供给供应商。
DocType: Asset Maintenance Team,Asset Maintenance Team,资产维护团队
DocType: Employee Loan,Loan Type,贷款类型
DocType: Scheduling Tool,Scheduling Tool,调度工具
diff --git a/erpnext/utilities/product.py b/erpnext/utilities/product.py
index 9d5c056..415056d 100644
--- a/erpnext/utilities/product.py
+++ b/erpnext/utilities/product.py
@@ -4,25 +4,70 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cint, fmt_money, flt
+from frappe.utils import cint, fmt_money, flt, nowdate, getdate
from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item
+from erpnext.stock.doctype.batch.batch import get_batch_qty
-def get_qty_in_stock(item_code, item_warehouse_field):
+def get_qty_in_stock(item_code, item_warehouse_field, warehouse=None):
in_stock, stock_qty = 0, ''
template_item_code, is_stock_item = frappe.db.get_value("Item", item_code, ["variant_of", "is_stock_item"])
- warehouse = frappe.db.get_value("Item", item_code, item_warehouse_field)
+ if not warehouse:
+ warehouse = frappe.db.get_value("Item", item_code, item_warehouse_field)
+
if not warehouse and template_item_code and template_item_code != item_code:
warehouse = frappe.db.get_value("Item", template_item_code, item_warehouse_field)
if warehouse:
stock_qty = frappe.db.sql("""select GREATEST(actual_qty - reserved_qty, 0) from tabBin where
item_code=%s and warehouse=%s""", (item_code, warehouse))
- if stock_qty:
+
+ if stock_qty:
+ stock_qty = adjust_qty_for_expired_items(item_code, stock_qty, warehouse)
+
+ if stock_qty:
+ in_stock = stock_qty[0][0] > 0 and 1 or 0
+
+ if stock_qty:
in_stock = stock_qty[0][0] > 0 and 1 or 0
return frappe._dict({"in_stock": in_stock, "stock_qty": stock_qty, "is_stock_item": is_stock_item})
+
+def adjust_qty_for_expired_items(item_code, stock_qty, warehouse):
+ batches = frappe.get_all('Batch', filters=[{'item': item_code}], fields=['expiry_date', 'name'])
+ expired_batches = get_expired_batches(batches)
+ stock_qty = [list(item) for item in stock_qty]
+
+ for batch in expired_batches:
+ if warehouse:
+ stock_qty[0][0] = max(0, stock_qty[0][0] - get_batch_qty(batch, warehouse))
+ else:
+ stock_qty[0][0] = max(0, stock_qty[0][0] - qty_from_all_warehouses(get_batch_qty(batch)))
+
+ if not stock_qty[0][0]:
+ break
+
+ return stock_qty
+
+
+def get_expired_batches(batches):
+ """
+ :param batches: A list of dict in the form [{'expiry_date': datetime.date(20XX, 1, 1), 'name': 'batch_id'}, ...]
+ """
+ return [b.name for b in batches if b.expiry_date and b.expiry_date <= getdate(nowdate())]
+
+
+def qty_from_all_warehouses(batch_info):
+ """
+ :param batch_info: A list of dict in the form [{u'warehouse': u'Stores - I', u'qty': 0.8}, ...]
+ """
+ qty = 0
+ for batch in batch_info:
+ qty = qty + batch.qty
+
+ return qty
+
def get_price(item_code, price_list, customer_group, company, qty=1):
template_item_code = frappe.db.get_value("Item", item_code, "variant_of")
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 0032e80..6594c30 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -8,6 +8,8 @@
from frappe.utils import cstr, now_datetime, cint, flt, get_time
from erpnext.controllers.status_updater import StatusUpdater
+from six import string_types
+
class UOMMustBeIntegerError(frappe.ValidationError): pass
class TransactionBase(StatusUpdater):
@@ -139,7 +141,7 @@
where ref_type=%s and ref_name=%s""", (ref_type, ref_name)), for_reload=True)
def validate_uom_is_integer(doc, uom_field, qty_fields, child_dt=None):
- if isinstance(qty_fields, basestring):
+ if isinstance(qty_fields, string_types):
qty_fields = [qty_fields]
distinct_uoms = list(set([d.get(uom_field) for d in doc.get_all_children()]))
diff --git a/erpnext/utilities/user_progress.py b/erpnext/utilities/user_progress.py
index aa93c65..3873213 100644
--- a/erpnext/utilities/user_progress.py
+++ b/erpnext/utilities/user_progress.py
@@ -13,9 +13,9 @@
doc = frappe.get_doc("Setup Progress")
item = [d for d in doc.get("actions") if d.action_name == "Set Sales Target"][0]
- item.action_document = company
- item.save()
- doc.save()
+ if not item.action_document:
+ item.action_document = company
+ doc.save()
# Initial state of slides
return [
diff --git a/erpnext/utilities/user_progress_utils.py b/erpnext/utilities/user_progress_utils.py
index 18d38c0..58a03e3 100644
--- a/erpnext/utilities/user_progress_utils.py
+++ b/erpnext/utilities/user_progress_utils.py
@@ -40,12 +40,12 @@
@frappe.whitelist()
def create_letterhead(args_data):
args = json.loads(args_data)
- letterhead = args.get("letterhead").encode('utf-8')
+ letterhead = args.get("letterhead")
if letterhead:
try:
frappe.get_doc({
"doctype":"Letter Head",
- "content":"""<div><img src="{0}" style='max-width: 100%%;'><br></div>""".format(letterhead),
+ "content":"""<div><img src="{0}" style='max-width: 100%%;'><br></div>""".format(letterhead.encode('utf-8')),
"letter_head_name": _("Standard"),
"is_default": 1
}).insert()
diff --git a/requirements.txt b/requirements.txt
index a6cfaf2..7b5d8da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@
unidecode
pygithub
googlemaps
+python-stdnum
